projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch to No Gnus 200411120157.
[elisp/gnus.git-]
/
lisp
/
score-mode.el
diff --git
a/lisp/score-mode.el
b/lisp/score-mode.el
index
fdb8d71
..
2a54dcc
100644
(file)
--- a/
lisp/score-mode.el
+++ b/
lisp/score-mode.el
@@
-1,7
+1,8
@@
;;; score-mode.el --- mode for editing Gnus score files
;;; score-mode.el --- mode for editing Gnus score files
-;; Copyright (C) 1996 Free Software Foundation, Inc.
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Copyright (C) 1996, 2001, 2004 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
;; This file is part of GNU Emacs.
;; Keywords: news, mail
;; This file is part of GNU Emacs.
@@
-25,9
+26,9
@@
;;; Code:
;;; Code:
-(require 'easymenu)
-(require 'timezone)
(eval-when-compile (require 'cl))
(eval-when-compile (require 'cl))
+(eval-when-compile (require 'static))
+(require 'gnus-util) ; for gnus-pp
(defvar gnus-score-mode-hook nil
"*Hook run in score mode buffers.")
(defvar gnus-score-mode-hook nil
"*Hook run in score mode buffers.")
@@
-40,11
+41,20
@@
(defvar gnus-score-mode-map nil)
(unless gnus-score-mode-map
(defvar gnus-score-mode-map nil)
(unless gnus-score-mode-map
- (setq gnus-score-mode-map (copy-keymap emacs-lisp-mode-map))
+ (setq gnus-score-mode-map (make-sparse-keymap))
+ (set-keymap-parent gnus-score-mode-map emacs-lisp-mode-map)
(define-key gnus-score-mode-map "\C-c\C-c" 'gnus-score-edit-exit)
(define-key gnus-score-mode-map "\C-c\C-d" 'gnus-score-edit-insert-date)
(define-key gnus-score-mode-map "\C-c\C-p" 'gnus-score-pretty-print))
(define-key gnus-score-mode-map "\C-c\C-c" 'gnus-score-edit-exit)
(define-key gnus-score-mode-map "\C-c\C-d" 'gnus-score-edit-insert-date)
(define-key gnus-score-mode-map "\C-c\C-p" 'gnus-score-pretty-print))
+(defvar score-mode-syntax-table
+ (let ((table (copy-syntax-table lisp-mode-syntax-table)))
+ (modify-syntax-entry ?| "w" table)
+ table)
+ "Syntax table used in score-mode buffers.")
+
+(defvar score-mode-coding-system 'ctext)
+
;;;###autoload
(defun gnus-score-mode ()
"Mode for editing Gnus score files.
;;;###autoload
(defun gnus-score-mode ()
"Mode for editing Gnus score files.
@@
-55,7
+65,7
@@
This mode is an extended emacs-lisp mode.
(kill-all-local-variables)
(use-local-map gnus-score-mode-map)
(gnus-score-make-menu-bar)
(kill-all-local-variables)
(use-local-map gnus-score-mode-map)
(gnus-score-make-menu-bar)
- (set-syntax-table emacs-lisp-mode-syntax-table)
+ (set-syntax-table score-mode-syntax-table)
(setq major-mode 'gnus-score-mode)
(setq mode-name "Score")
(lisp-mode-variables nil)
(setq major-mode 'gnus-score-mode)
(setq mode-name "Score")
(lisp-mode-variables nil)
@@
-75,7
+85,7
@@
This mode is an extended emacs-lisp mode.
(defun gnus-score-edit-insert-date ()
"Insert date in numerical format."
(interactive)
(defun gnus-score-edit-insert-date ()
"Insert date in numerical format."
(interactive)
- (princ (gnus-score-day-number (current-time)) (current-buffer)))
+ (princ (time-to-days (current-time)) (current-buffer)))
(defun gnus-score-pretty-print ()
"Format the current score file."
(defun gnus-score-pretty-print ()
"Format the current score file."
@@
-83,7
+93,8
@@
This mode is an extended emacs-lisp mode.
(goto-char (point-min))
(let ((form (read (current-buffer))))
(erase-buffer)
(goto-char (point-min))
(let ((form (read (current-buffer))))
(erase-buffer)
- (pp form (current-buffer)))
+ (let ((emacs-lisp-mode-syntax-table score-mode-syntax-table))
+ (gnus-pp form)))
(goto-char (point-min)))
(defun gnus-score-edit-exit ()
(goto-char (point-min)))
(defun gnus-score-edit-exit ()
@@
-91,7
+102,7
@@
This mode is an extended emacs-lisp mode.
(interactive)
(unless (file-exists-p (file-name-directory (buffer-file-name)))
(make-directory (file-name-directory (buffer-file-name)) t))
(interactive)
(unless (file-exists-p (file-name-directory (buffer-file-name)))
(make-directory (file-name-directory (buffer-file-name)) t))
- (save-buffer)
+ (save-buffer-as-coding-system score-mode-coding-system)
(bury-buffer (current-buffer))
(let ((buf (current-buffer)))
(when gnus-score-edit-exit-function
(bury-buffer (current-buffer))
(let ((buf (current-buffer)))
(when gnus-score-edit-exit-function
@@
-99,11
+110,6
@@
This mode is an extended emacs-lisp mode.
(when (eq buf (current-buffer))
(switch-to-buffer (other-buffer (current-buffer))))))
(when (eq buf (current-buffer))
(switch-to-buffer (other-buffer (current-buffer))))))
-(defun gnus-score-day-number (time)
- (let ((dat (decode-time time)))
- (timezone-absolute-from-gregorian
- (nth 4 dat) (nth 3 dat) (nth 5 dat))))
-
(provide 'score-mode)
;;; score-mode.el ends here
(provide 'score-mode)
;;; score-mode.el ends here