From a1522a362cdddc72566be952144980057a39a995 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 6 Aug 2005 00:48:18 +0000 Subject: [PATCH 001/347] Add missing 2005-06-28 entry for progmodes/compile.el. --- lisp/ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8429e43e601..6ed747aa48c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1894,6 +1894,13 @@ * progmodes/compile.el (compilation-next-error-function): Don't switch buffers; operate on the current buffer. + * progmodes/compile.el (compilation-error-file-name) + (compilation-warning-file-name, compilation-info-file-name) + (compilation-line-number, compilation-column-number): New faces. + (compilation-error-face, compilation-warning-face) + (compilation-info-face, compilation-line-face) + (compilation-column-face): Use them. + * facemenu.el (facemenu-add-face): Warn when font-lock is active. * comint.el (comint-password-prompt-regexp): Accept ", try again". From f533b4d95885ccea6f34785a3e63ee767c2a1313 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 6 Aug 2005 00:55:11 +0000 Subject: [PATCH 002/347] Add examples of finished compilation. --- etc/compilation.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/compilation.txt b/etc/compilation.txt index 42e62af9dff..781596b2737 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -394,3 +394,7 @@ checking FONTCONFIG_CFLAGS... g++ -o foo.o foo.cc tool1 -output=foo foo.x tool2 --outfile foo foo.y + +Compilation exited abnormally with code 1 at Wed Jul 20 12:21:12 + +Compilation finished at Thu Jul 21 15:02:15 From fa947ef393a9755f41f54815fb8a2a10ccb7e49a Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 6 Aug 2005 01:10:09 +0000 Subject: [PATCH 003/347] (compilation-mode-font-lock-keywords): Use `compilation-text-face', `compilation-info-text-face' and `compilation-error-text-face' instead of `font-lock-keyword-face'. (compilation-error): New face. (compilation-error-file-name): Inherit from `compilation-error' instead of `font-lock-warning-face'. (compilation-warning-file-name): Inherit from `compilation-warning' instead of `font-lock-warning-face'. (compilation-info, compilation-error-file-name) (compilation-warning-file-name, compilation-info-file-name) (compilation-line-number, compilation-column-number): Doc fix. (compilation-error-text-face, compilation-warning-text-face) (compilation-info-text-face): New face variables. (compilation-line-face, compilation-column-face) (compilation-enter-directory-face) (compilation-leave-directory-face): Doc fix. (compilation-text-face): New function. --- lisp/progmodes/compile.el | 50 +++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index fa9eac2e021..b7b14c238b3 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -377,13 +377,13 @@ you may also want to change `compilation-page-delimiter'.") '(;; configure output lines. ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$" (1 font-lock-variable-name-face) - (2 font-lock-keyword-face)) + (2 (compilation-text-face '(4 . 3)))) ;; Command output lines. Recognize `make[n]:' lines too. ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:" (1 font-lock-function-name-face) (3 compilation-line-face nil t)) (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1) - ("^Compilation finished" . font-lock-keyword-face) - ("^Compilation exited abnormally" . font-lock-keyword-face)) + ("^Compilation finished" . compilation-info-text-face) + ("^Compilation exited abnormally" . compilation-error-text-face)) "Additional things to highlight in Compilation mode. This gets tacked on the end of the generated expressions.") @@ -468,6 +468,12 @@ starting the compilation process.") ;; History of compile commands. (defvar compile-history nil) +(defface compilation-error + '((t :inherit font-lock-warning-face)) + "Face used to highlight compiler errors." + :group 'font-lock-highlighting-faces + :version "22.1") + (defface compilation-warning '((((class color) (min-colors 16)) (:foreground "Orange" :weight bold)) (((class color)) (:foreground "cyan" :weight bold)) @@ -487,44 +493,44 @@ starting the compilation process.") (:foreground "Green" :weight bold)) (((class color)) (:foreground "green" :weight bold)) (t (:weight bold))) - "Face used to highlight compiler warnings." + "Face used to highlight compiler information." :group 'font-lock-highlighting-faces :version "22.1") ;; backward-compatibility alias (put 'compilation-info-face 'face-alias 'compilation-info) (defface compilation-error-file-name - '((default :inherit font-lock-warning-face) + '((default :inherit compilation-error) (((supports :underline t)) :underline t)) - "Face for displaying file names in compilation errors." + "Face for displaying file names in error messages." :group 'font-lock-highlighting-faces :version "22.1") (defface compilation-warning-file-name - '((default :inherit font-lock-warning-face) + '((default :inherit compilation-warning) (((supports :underline t)) :underline t)) - "Face for displaying file names in compilation errors." + "Face for displaying file names in warning messages." :group 'font-lock-highlighting-faces :version "22.1") (defface compilation-info-file-name '((default :inherit compilation-info) (((supports :underline t)) :underline t)) - "Face for displaying file names in compilation errors." + "Face for displaying file names in informational messages." :group 'font-lock-highlighting-faces :version "22.1") (defface compilation-line-number '((default :inherit font-lock-variable-name-face) (((supports :underline t)) :underline t)) - "Face for displaying file names in compilation errors." + "Face for displaying line numbers in compiler messages." :group 'font-lock-highlighting-faces :version "22.1") (defface compilation-column-number '((default :inherit font-lock-type-face) (((supports :underline t)) :underline t)) - "Face for displaying file names in compilation errors." + "Face for displaying column numbers in compiler messages." :group 'font-lock-highlighting-faces :version "22.1") @@ -537,24 +543,33 @@ Faces `compilation-error-face', `compilation-warning-face', (defvar compilation-error-face 'compilation-error-file-name "Face name to use for file name in error messages.") +(defvar compilation-error-text-face 'compilation-error + "Face name to use for text of error messages.") + (defvar compilation-warning-face 'compilation-warning-file-name "Face name to use for file name in warning messages.") +(defvar compilation-warning-text-face 'compilation-warning + "Face name to use for text of warning messages.") + (defvar compilation-info-face 'compilation-info-file-name "Face name to use for file name in informational messages.") +(defvar compilation-info-text-face 'compilation-info + "Face name to use for text of informational messages.") + (defvar compilation-line-face 'compilation-line-number - "Face name to use for line number in message.") + "Face name to use for line numbers in compiler message.") (defvar compilation-column-face 'compilation-column-number - "Face name to use for column number in message.") + "Face name to use for column numbers in compiler messages.") ;; same faces as dired uses (defvar compilation-enter-directory-face 'font-lock-function-name-face - "Face name to use for column number in message.") + "Face name to use for entering directory messages.") (defvar compilation-leave-directory-face 'font-lock-type-face - "Face name to use for column number in message.") + "Face name to use for leaving directory messages.") @@ -570,6 +585,11 @@ Faces `compilation-error-face', `compilation-warning-face', (and (cdr type) (match-end (cdr type)) compilation-info-face) compilation-error-face)) +(defun compilation-text-face (type) + (or (and (car type) (match-end (car type)) compilation-warning-text-face) + (and (cdr type) (match-end (cdr type)) compilation-info-text-face) + compilation-error-text-face)) + ;; Internal function for calculating the text properties of a directory ;; change message. The directory property is important, because it is ;; the stack of nested enter-messages. Relative filenames on the following From ba65be24d42b78e229c3ef18b17ef7b2f1cb987b Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 6 Aug 2005 01:11:41 +0000 Subject: [PATCH 004/347] (grep-regexp-alist): Set 5th arg `TYPE' to 0 instead of 1 to display binary file names as info file links. (grep-error-face): Use `compilation-error-face' instead of `font-lock-keyword-face'. (grep-mode-font-lock-keywords): Use `compilation-info-text-face' and `compilation-warning-text-face' instead of `font-lock-keyword-face'. Use `compilation-error-text-face' instead of `grep-error-face'. --- lisp/ChangeLog | 28 ++++++++++++++++++++++++++++ lisp/progmodes/grep.el | 13 ++++++------- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ed747aa48c..e9d4b0cb6fc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,31 @@ +2005-08-06 Juri Linkov + + * progmodes/compile.el (compilation-mode-font-lock-keywords): + Use `compilation-text-face', `compilation-info-text-face' and + `compilation-error-text-face' instead of `font-lock-keyword-face'. + (compilation-error): New face. + (compilation-error-file-name): Inherit from + `compilation-error' instead of `font-lock-warning-face'. + (compilation-warning-file-name): Inherit from + `compilation-warning' instead of `font-lock-warning-face'. + (compilation-info, compilation-error-file-name) + (compilation-warning-file-name, compilation-info-file-name) + (compilation-line-number, compilation-column-number): Doc fix. + (compilation-error-text-face, compilation-warning-text-face) + (compilation-info-text-face): New face variables. + (compilation-line-face, compilation-column-face) + (compilation-enter-directory-face) + (compilation-leave-directory-face): Doc fix. + (compilation-text-face): New function. + + * progmodes/grep.el (grep-regexp-alist): Set 5th arg `TYPE' to + 0 instead of 1 to display binary file names as info file links. + (grep-error-face): Use `compilation-error-face' instead of + `font-lock-keyword-face'. + (grep-mode-font-lock-keywords): Use `compilation-info-text-face' + and `compilation-warning-text-face' instead of `font-lock-keyword-face'. + Use `compilation-error-text-face' instead of `grep-error-face'. + 2005-08-05 Kenichi Handa * international/code-pages.el: Add autoload cookies for all coding diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 4378a7c253d..3af5aebfc6a 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -261,7 +261,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (lambda () (- (match-end 5) (match-end 1) (- (match-end 4) (match-beginning 4))))) nil 1) - ("^Binary file \\(.+\\) matches$" 1 nil nil 1 1)) + ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "Regexp used to match grep hits. See `compilation-error-regexp-alist'.") (defvar grep-error "grep hit" @@ -272,8 +272,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (defvar grep-hit-face compilation-info-face "Face name to use for grep hits.") -;; compilation-error-face is wrong for this; it's designed to look like a link. -(defvar grep-error-face font-lock-keyword-face +(defvar grep-error-face compilation-error-face "Face name to use for grep error messages.") (defvar grep-match-face 'match @@ -290,12 +289,12 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies ;; remove match from grep-regexp-alist before fontifying ("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*" (0 '(face nil message nil help-echo nil mouse-face nil) t) - (1 font-lock-keyword-face nil t) - (2 font-lock-keyword-face nil t)) + (1 compilation-info-text-face nil t) + (2 compilation-warning-text-face nil t)) ("^Grep \\(exited abnormally\\) with code \\([0-9]+\\).*" (0 '(face nil message nil help-echo nil mouse-face nil) t) - (1 grep-error-face) - (2 grep-error-face)) + (1 compilation-error-text-face) + (2 compilation-error-text-face)) ("^[^\n-]+-[0-9]+-.*" (0 grep-context-face)) ;; Highlight grep matches and delete markers ("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)" From b268465a4853dcfb84d30a154484e42dbcff3e0d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Aug 2005 07:18:18 +0000 Subject: [PATCH 005/347] (MS-DOS and MULE): Clarify that this section is for the MS-DOS port only. --- man/ChangeLog | 5 +++++ man/msdog.texi | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/man/ChangeLog b/man/ChangeLog index f68e9bcdc8e..ec144071ba7 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2005-08-06 Eli Zaretskii + + * msdog.texi (MS-DOS and MULE): Clarify that this section is for + the MS-DOS port only. + 2005-07-30 Eli Zaretskii * makefile.w32-in (info): Don't run multi-install-info.bat. diff --git a/man/msdog.texi b/man/msdog.texi index a5aea27f161..af136266bd2 100644 --- a/man/msdog.texi +++ b/man/msdog.texi @@ -583,6 +583,12 @@ However, due to incompatibilities between MS-DOS/MS-Windows and other systems, there are several DOS-specific aspects of this support that you should be aware of. This section describes these aspects. + The description below is largely specific to the MS-DOS port of +Emacs, especially where it talks about practical implications for +Emacs users. For other operating systems, see the @file{code-pages.el} +package, which implements support for MS-DOS- and MS-Windows-specific +encodings for all platforms other than MS-DOS. + @table @kbd @item M-x dos-codepage-setup Set up Emacs display and coding systems as appropriate for the current @@ -721,7 +727,8 @@ DOS codepages for the same locale. For example, DOS codepage 850 supports the same character set as Windows codepage 1252; DOS codepage 855 supports the same character set as Windows codepage 1251, etc. The MS-Windows version of Emacs uses the current codepage for display -when invoked with the @samp{-nw} option. +when invoked with the @samp{-nw} option. Support for codepages in the +Windows port of Emacs is part of the @file{code-pages.el} package. @node MS-DOS Processes @section Subprocesses on MS-DOS From 553193ea9cde75f0b031fb8809a5c06caafcbf16 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Aug 2005 07:27:33 +0000 Subject: [PATCH 006/347] (Coding Systems): Rephrase the paragraph about codepages: no need for "M-x codepage-setup" anymore, except on MS-DOS. --- man/mule.texi | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/man/mule.texi b/man/mule.texi index 7156c814f71..2c34e2861bc 100644 --- a/man/mule.texi +++ b/man/mule.texi @@ -592,12 +592,15 @@ coding systems @code{no-conversion}, @code{raw-text} and @cindex international files from DOS/Windows systems A special class of coding systems, collectively known as @dfn{codepages}, is designed to support text encoded by MS-Windows and -MS-DOS software. To use any of these systems, you need to create it -with @kbd{M-x codepage-setup}. @xref{MS-DOS and MULE}. After -creating the coding system for the codepage, you can use it as any -other coding system. For example, to visit a file encoded in codepage -850, type @kbd{C-x @key{RET} c cp850 @key{RET} C-x C-f @var{filename} -@key{RET}}. +MS-DOS software. The names of these coding systems are +@code{cp@var{nnnn}}, where @var{nnnn} is a 3- or 4-digit number of the +codepage. You can use these encodings just like any other coding +system; for example, to visit a file encoded in codepage 850, type +@kbd{C-x @key{RET} c cp850 @key{RET} C-x C-f @var{filename} +@key{RET}}@footnote{ +In the MS-DOS port of Emacs, you need to create a @code{cp@var{nnn}} +coding system with @kbd{M-x codepage-setup}, before you can use it. +@xref{MS-DOS and MULE}.}. In addition to converting various representations of non-@acronym{ASCII} characters, a coding system can perform end-of-line conversion. Emacs From 6f048d2655820d07c6c39745bebd7df793aa7f02 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Aug 2005 07:37:45 +0000 Subject: [PATCH 007/347] (scheme-trace-command, scheme-untrace-command) (scheme-macro-expand-command): New user options. (scheme-trace-procedure, scheme-expand-current-form): New commands. (scheme-form-at-point, scheme-start-file): New functions. (run-scheme): Call `scheme-start-file' to get start file, and pass it to `make-comint'. (switch-to-scheme, scheme-proc): Call `scheme-interactively-start-process' if no Scheme buffer/process is available. (scheme-get-process): New function extracted from `scheme-proc'. (scheme-interactively-start-process): New function. --- lisp/cmuscheme.el | 131 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 115 insertions(+), 16 deletions(-) diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index 102347f345a..8cc467fe0df 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -127,6 +127,8 @@ (define-key scheme-mode-map "\C-c\M-r" 'scheme-send-region-and-go) (define-key scheme-mode-map "\C-c\M-c" 'scheme-compile-definition) (define-key scheme-mode-map "\C-c\C-c" 'scheme-compile-definition-and-go) +(define-key scheme-mode-map "\C-c\C-t" 'scheme-trace-procedure) +(define-key scheme-mode-map "\C-c\C-x" 'scheme-expand-current-form) (define-key scheme-mode-map "\C-c\C-z" 'switch-to-scheme) (define-key scheme-mode-map "\C-c\C-l" 'scheme-load-file) (define-key scheme-mode-map "\C-c\C-k" 'scheme-compile-file) ;k for "kompile" @@ -143,6 +145,10 @@ '("Compile Definition & Go" . scheme-compile-definition-and-go)) (define-key map [com-def] '("Compile Definition" . scheme-compile-definition)) + (define-key map [exp-form] + '("Expand current form" . scheme-expand-current-form)) + (define-key map [trace-proc] + '("Trace procedure" . scheme-trace-procedure)) (define-key map [send-def-go] '("Evaluate Last Definition & Go" . scheme-send-definition-and-go)) (define-key map [send-def] @@ -153,7 +159,7 @@ '("Evaluate Region" . scheme-send-region)) (define-key map [send-sexp] '("Evaluate Last S-expression" . scheme-send-last-sexp)) -) + ) (defvar scheme-buffer) @@ -233,11 +239,15 @@ Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters." ;;;###autoload (defun run-scheme (cmd) - "Run an inferior Scheme process, input and output via buffer *scheme*. + "Run an inferior Scheme process, input and output via buffer `*scheme*'. If there is a process already running in `*scheme*', switch to that buffer. With argument, allows you to edit the command line (default is value -of `scheme-program-name'). Runs the hooks `inferior-scheme-mode-hook' -\(after the `comint-mode-hook' is run). +of `scheme-program-name'). +If a file `~/.emacs_SCHEMENAME' exists, it is given as initial input. +Note that this may lose due to a timing error if the Scheme processor +discards input when it starts up. +Runs the hook `inferior-scheme-mode-hook' \(after the `comint-mode-hook' +is run). \(Type \\[describe-mode] in the process buffer for a list of commands.)" (interactive (list (if current-prefix-arg @@ -246,13 +256,24 @@ of `scheme-program-name'). Runs the hooks `inferior-scheme-mode-hook' (if (not (comint-check-proc "*scheme*")) (let ((cmdlist (scheme-args-to-list cmd))) (set-buffer (apply 'make-comint "scheme" (car cmdlist) - nil (cdr cmdlist))) + (scheme-start-file (car cmdlist)) (cdr cmdlist))) (inferior-scheme-mode))) (setq scheme-program-name cmd) (setq scheme-buffer "*scheme*") (pop-to-buffer "*scheme*")) ;;;###autoload (add-hook 'same-window-buffer-names "*scheme*") +(defun scheme-start-file (prog) + "Return the name of the start file corresponding to PROG. +Search in the directories \"~\" and \"~/.emacs.d\", in this +order. Return nil if no start file found." + (let* ((name (concat ".emacs_" (file-name-nondirectory prog))) + (start-file (concat "~/" name))) + (if (file-exists-p start-file) + start-file + (let ((start-file (concat user-emacs-directory name))) + (and (file-exists-p start-file) start-file))))) + (defun scheme-send-region (start end) "Send the current region to the inferior Scheme process." (interactive "r") @@ -296,16 +317,80 @@ of `scheme-program-name'). Runs the hooks `inferior-scheme-mode-hook' (beginning-of-defun) (scheme-compile-region (point) end)))) +(defcustom scheme-trace-command "(trace %s)" + "*Template for issuing commands to trace a Scheme procedure. +Some Scheme implementations might require more elaborate commands here. +For PLT-Scheme, e.g., one should use + + (setq scheme-trace-command \"(begin (require (lib \\\"trace.ss\\\")) (trace %s))\") + +For Scheme 48 and Scsh use \",trace %s\"." + :type 'string + :group 'cmuscheme) + +(defcustom scheme-untrace-command "(untrace %s)" + "*Template for switching off tracing of a Scheme procedure. +Scheme 48 and Scsh users should set this variable to \",untrace %s\"." + + :type 'string + :group 'cmuscheme) + +(defun scheme-trace-procedure (proc &optional untrace) + "Trace procedure PROC in the inferior Scheme process. +With a prefix argument switch off tracing of procedure PROC." + (interactive + (list (let ((current (symbol-at-point)) + (action (if current-prefix-arg "Untrace" "Trace"))) + (if current + (read-string (format "%s procedure [%s]: " action current) nil nil (symbol-name current)) + (read-string (format "%s procedure: " action)))) + current-prefix-arg)) + (when (= (length proc) 0) + (error "Invalid procedure name")) + (comint-send-string (scheme-proc) + (format + (if untrace scheme-untrace-command scheme-trace-command) + proc)) + (comint-send-string (scheme-proc) "\n")) + +(defcustom scheme-macro-expand-command "(expand %s)" + "*Template for macro-expanding a Scheme form. +For Scheme 48 and Scsh use \",expand %s\"." + :type 'string + :group 'cmuscheme) + +(defun scheme-expand-current-form () + "Macro-expand the form at point in the inferior Scheme process." + (interactive) + (let ((current-form (scheme-form-at-point))) + (if current-form + (progn + (comint-send-string (scheme-proc) + (format + scheme-macro-expand-command + current-form)) + (comint-send-string (scheme-proc) "\n")) + (error "Not at a form")))) + +(defun scheme-form-at-point () + (let ((next-sexp (thing-at-point 'sexp))) + (if (and next-sexp (string-equal (substring next-sexp 0 1) "(")) + next-sexp + (save-excursion + (backward-up-list) + (scheme-form-at-point))))) + (defun switch-to-scheme (eob-p) "Switch to the scheme process buffer. With argument, position cursor at end of buffer." (interactive "P") - (if (get-buffer scheme-buffer) + (if (or (and scheme-buffer (get-buffer scheme-buffer)) + (scheme-interactively-start-process)) (pop-to-buffer scheme-buffer) - (error "No current process buffer. See variable `scheme-buffer'")) - (cond (eob-p - (push-mark) - (goto-char (point-max))))) + (error "No current process buffer. See variable `scheme-buffer'")) + (when eob-p + (push-mark) + (goto-char (point-max)))) (defun scheme-send-region-and-go (start end) "Send the current region to the inferior Scheme process. @@ -417,13 +502,27 @@ for running inferior Lisp and Scheme processes. The approach taken here is for a minimal, simple implementation. Feel free to extend it.") (defun scheme-proc () - "Return the current scheme process. See variable `scheme-buffer'." - (let ((proc (get-buffer-process (if (eq major-mode 'inferior-scheme-mode) - (current-buffer) - scheme-buffer)))) - (or proc - (error "No current process. See variable `scheme-buffer'")))) + "Return the current Scheme process, starting one if necessary. +See variable `scheme-buffer'." + (unless (and scheme-buffer + (get-buffer scheme-buffer) + (comint-check-proc scheme-buffer)) + (scheme-interactively-start-process)) + (or (scheme-get-process) + (error "No current process. See variable `scheme-buffer'"))) +(defun scheme-get-process () + "Return the current Scheme process or nil if none is running." + (get-buffer-process (if (eq major-mode 'inferior-scheme-mode) + (current-buffer) + scheme-buffer))) + +(defun scheme-interactively-start-process (&optional cmd) + "Start an inferior Scheme process. Return the process started. +Since this command is run implicitly, always ask the user for the +command to run." + (save-window-excursion + (run-scheme (read-string "Run Scheme: " scheme-program-name)))) ;;; Do the user's customisation... From cb8fc40aa9e3e42a9013692cc0dcad1556b5848f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Aug 2005 07:39:22 +0000 Subject: [PATCH 008/347] *** empty log message *** --- lisp/ChangeLog | 14 ++++++++++++++ man/ChangeLog | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9d4b0cb6fc..5548b8614c2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2005-08-06 Emilio C. Lopes + + * cmuscheme.el (scheme-trace-command, scheme-untrace-command) + (scheme-macro-expand-command): New user options. + (scheme-trace-procedure, scheme-expand-current-form): New commands. + (scheme-form-at-point, scheme-start-file) + (scheme-interactively-start-process): New functions. + (scheme-get-process): New function, extracted from `scheme-proc'. + (run-scheme): Call `scheme-start-file' to get start file, and pass + it to `make-comint'. + (switch-to-scheme, scheme-proc): Call + `scheme-interactively-start-process' if no Scheme buffer/process + is available. + 2005-08-06 Juri Linkov * progmodes/compile.el (compilation-mode-font-lock-keywords): diff --git a/man/ChangeLog b/man/ChangeLog index ec144071ba7..ddb84cb91be 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,5 +1,9 @@ 2005-08-06 Eli Zaretskii + * mule.texi (Coding Systems): Rephrase the paragraph about + codepages: no need for "M-x codepage-setup" anymore, except on + MS-DOS. + * msdog.texi (MS-DOS and MULE): Clarify that this section is for the MS-DOS port only. From 97beadbd1f109740f91e5d078c3fab64de028121 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Aug 2005 07:42:06 +0000 Subject: [PATCH 009/347] Mention changes in cmuscheme. --- etc/NEWS | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 1f31d3faa7b..71975e02e56 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1750,6 +1750,22 @@ This was actually done in Emacs-21.1, and was not documented. * Changes in Specialized Modes and Packages in Emacs 22.1: +--- +** Changes to cmuscheme + +*** Emacs now offers to start Scheme if the user tries to +evaluate a Scheme expression but no Scheme subprocess is running. + +*** If a file `.emacs_NAME' (where NAME is the name of the Scheme interpreter) +exists in the user's home directory or in `user-emacs-directory', its +contents are sent to the Scheme subprocess upon startup. + +*** There are new commands to instruct the Scheme interpreter to trace +procedure calls (`scheme-trace-procedure') and to expand syntactic forms +(`scheme-expand-current-form'). The commands actually sent to the Scheme +subprocess are controlled by the user options `scheme-trace-command', +`scheme-untrace-command' and `scheme-expand-current-form'. + --- ** Makefile mode has submodes for automake, gmake, makepp and BSD make. From 71ddfde5a548ac9a56b3652c4c8c1dd4f3fce1ce Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 15:55:38 +0000 Subject: [PATCH 010/347] Update years in copyright notice; nfc. --- lisp/url/url-about.el | 2 +- lisp/url/url-auth.el | 3 ++- lisp/url/url-cache.el | 7 ++++--- lisp/url/url-cid.el | 2 +- lisp/url/url-cookie.el | 3 ++- lisp/url/url-dav.el | 2 +- lisp/url/url-dired.el | 3 ++- lisp/url/url-expand.el | 2 +- lisp/url/url-file.el | 3 ++- lisp/url/url-ftp.el | 3 ++- lisp/url/url-gw.el | 2 +- lisp/url/url-handlers.el | 3 ++- lisp/url/url-history.el | 3 ++- lisp/url/url-http.el | 2 +- lisp/url/url-https.el | 2 +- lisp/url/url-imap.el | 2 +- lisp/url/url-irc.el | 3 ++- lisp/url/url-ldap.el | 5 +++-- lisp/url/url-mailto.el | 3 ++- lisp/url/url-methods.el | 3 ++- lisp/url/url-misc.el | 3 ++- lisp/url/url-news.el | 3 ++- lisp/url/url-nfs.el | 3 ++- lisp/url/url-ns.el | 2 +- lisp/url/url-parse.el | 5 +++-- lisp/url/url-privacy.el | 3 ++- lisp/url/url-proxy.el | 2 +- lisp/url/url-util.el | 3 ++- lisp/url/url-vars.el | 3 ++- lisp/url/url.el | 14 +++++++------- lisp/url/vc-dav.el | 4 ++-- 31 files changed, 61 insertions(+), 42 deletions(-) diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el index d2fae55b141..c305bb31f7a 100644 --- a/lisp/url/url-about.el +++ b/lisp/url/url-about.el @@ -1,6 +1,6 @@ ;;; url-about.el --- Show internal URLs -;; Copyright (c) 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index 336c28eab26..317f91c9a13 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el @@ -1,6 +1,7 @@ ;;; url-auth.el --- Uniform Resource Locator authorization modules -;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el index e80ba059393..40967446dd7 100644 --- a/lisp/url/url-cache.el +++ b/lisp/url/url-cache.el @@ -1,6 +1,7 @@ ;;; url-cache.el --- Uniform Resource Locator retrieval tool -;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia @@ -39,7 +40,7 @@ (if (file-exists-p file) (not (file-directory-p file)) (file-directory-p (file-name-directory file))))) - + (defun url-cache-prepare (file) "Makes it possible to cache data in FILE. Creates any necessary parent directories, deleting any non-directory files @@ -70,7 +71,7 @@ FILE can be created or overwritten." (if (url-cache-prepare fname) (let ((coding-system-for-write 'binary)) (write-region (point-min) (point-max) fname nil 5))))))) - + ;;;###autoload (defun url-is-cached (url) "Return non-nil if the URL is cached." diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el index 40307c49eaf..abaf8dd9e76 100644 --- a/lisp/url/url-cid.el +++ b/lisp/url/url-cid.el @@ -1,6 +1,6 @@ ;;; url-cid.el --- Content-ID URL loader -;; Copyright (c) 1998 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index 314911f789b..618f89e60e9 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -1,6 +1,7 @@ ;;; url-cookie.el --- Netscape Cookie support -;; Copyright (c) 1996 - 1999,2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el index 1b683124c94..2a6b28b9b3c 100644 --- a/lisp/url/url-dav.el +++ b/lisp/url/url-dav.el @@ -1,6 +1,6 @@ ;;; url-dav.el --- WebDAV support -;; Copyright (C) 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. ;; Author: Bill Perry ;; Maintainer: Bill Perry diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el index 5d5381db0bf..7c635d13e3b 100644 --- a/lisp/url/url-dired.el +++ b/lisp/url/url-dired.el @@ -1,6 +1,7 @@ ;;; url-dired.el --- URL Dired minor mode -;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, files diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index c8e17a524bb..ca4b8c72ab8 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -1,6 +1,6 @@ ;;; url-expand.el --- expand-file-name for URLs -;; Copyright (c) 1999 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el index 7e224bd1420..44a4f8bd9f4 100644 --- a/lisp/url/url-file.el +++ b/lisp/url/url-file.el @@ -1,6 +1,7 @@ ;;; url-file.el --- File retrieval code -;; Copyright (c) 1996 - 1999,2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el index 966000249d3..633f4ed40d1 100644 --- a/lisp/url/url-ftp.el +++ b/lisp/url/url-ftp.el @@ -1,6 +1,7 @@ ;;; url-ftp.el --- FTP wrapper -;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el index e0ccbbdc4e7..66ac39612fd 100644 --- a/lisp/url/url-gw.el +++ b/lisp/url/url-gw.el @@ -1,6 +1,6 @@ ;;; url-gw.el --- Gateway munging for URL loading -;; Copyright (c) 1997, 1998, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2004, 2005 Free Software Foundation, Inc. ;; Author: Bill Perry ;; Keywords: comm, data, processes diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el index cc626a4cb44..bbbf19f53fc 100644 --- a/lisp/url/url-handlers.el +++ b/lisp/url/url-handlers.el @@ -1,6 +1,7 @@ ;;; url-handlers.el --- file-name-handler stuff for URL loading -;; Copyright (c) 1996, 1997, 1998, 1999, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el index 040f83ad2f2..6da5dd91551 100644 --- a/lisp/url/url-history.el +++ b/lisp/url/url-history.el @@ -1,6 +1,7 @@ ;;; url-history.el --- Global history tracking for URL package -;; Copyright (c) 1996 - 1999,2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index b8bf920e2e5..2071b4e058f 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -1,6 +1,6 @@ ;;; url-http.el --- HTTP retrieval routines -;; Copyright (c) 1999, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2004, 2005 Free Software Foundation, Inc. ;; Author: Bill Perry ;; Keywords: comm, data, processes diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el index e7aeffde788..1777da0b6b9 100644 --- a/lisp/url/url-https.el +++ b/lisp/url/url-https.el @@ -1,6 +1,6 @@ ;;; url-https.el --- HTTP over SSL/TLS routines -;; Copyright (c) 1999, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el index 9d923e17259..8d1b9b3877b 100644 --- a/lisp/url/url-imap.el +++ b/lisp/url/url-imap.el @@ -1,6 +1,6 @@ ;;; url-imap.el --- IMAP retrieval routines -;; Copyright (c) 1999 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: comm, data, processes diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el index dd88a85a03a..a06bdff5bfd 100644 --- a/lisp/url/url-irc.el +++ b/lisp/url/url-irc.el @@ -1,6 +1,7 @@ ;;; url-irc.el --- IRC URL interface -;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el index 9b7ce5c89b4..ce7b7a9bab1 100644 --- a/lisp/url/url-ldap.el +++ b/lisp/url/url-ldap.el @@ -1,5 +1,6 @@ ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code -;; Copyright (c) 1998, 1999, 2004, 2005 Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes @@ -189,7 +190,7 @@ URL can be a URL string, or a URL vector of the type returned by (setq binddn (cdr-safe (or (assoc "bindname" extensions) (assoc "!bindname" extensions)))) - + ;; Now, let's actually do something with it. (setq results (cdr (ldap-search-internal (list 'host (concat host ":" (number-to-string port)) diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el index fc3eb97e085..86f5d4a88b6 100644 --- a/lisp/url/url-mailto.el +++ b/lisp/url/url-mailto.el @@ -1,6 +1,7 @@ ;;; url-mail.el --- Mail Uniform Resource Locator retrieval code -;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el index a82d78db3ac..e39ffa1eb5b 100644 --- a/lisp/url/url-methods.el +++ b/lisp/url/url-methods.el @@ -1,6 +1,7 @@ ;;; url-methods.el --- Load URL schemes as needed -;; Copyright (c) 1996,1997,1998,1999,2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el index e937c99a518..5041a407420 100644 --- a/lisp/url/url-misc.el +++ b/lisp/url/url-misc.el @@ -1,6 +1,7 @@ ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code -;; Copyright (c) 1996,1997,1998,1999,2002 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el index 969edf6f684..593f33bb3f7 100644 --- a/lisp/url/url-news.el +++ b/lisp/url/url-news.el @@ -1,6 +1,7 @@ ;;; url-news.el --- News Uniform Resource Locator retrieval code -;; Copyright (c) 1996 - 1999, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el index 0273415b8ab..858cd029a85 100644 --- a/lisp/url/url-nfs.el +++ b/lisp/url/url-nfs.el @@ -1,6 +1,7 @@ ;;; url-nfs.el --- NFS URL interface -;; Copyright (c) 1996,1997,1998,1999,2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el index d76c7cf459d..3edbf2c84d4 100644 --- a/lisp/url/url-ns.el +++ b/lisp/url/url-ns.el @@ -1,6 +1,6 @@ ;;; url-ns.el --- Various netscape-ish functions for proxy definitions -;; Copyright (c) 1997 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2004, 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el index db85c43a38f..bbe7f112cea 100644 --- a/lisp/url/url-parse.el +++ b/lisp/url/url-parse.el @@ -1,6 +1,7 @@ ;;; url-parse.el --- Uniform Resource Locator parser -;; Copyright (c) 1996,1997,1998,1999,2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes @@ -84,7 +85,7 @@ (defmacro url-set-full (urlobj val) `(aset ,urlobj 8 ,val)) - + ;;;###autoload (defun url-recreate-url (urlobj) "Recreate a URL string from the parsed URLOBJ." diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el index e28a388dfa3..7700bb13941 100644 --- a/lisp/url/url-privacy.el +++ b/lisp/url/url-privacy.el @@ -1,6 +1,7 @@ ;;; url-privacy.el --- Global history tracking for URL package -;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el index 1eb8f90bda3..c5d7753daf5 100644 --- a/lisp/url/url-proxy.el +++ b/lisp/url/url-proxy.el @@ -1,6 +1,6 @@ ;;; url-proxy.el --- Proxy server support -;; Copyright (c) 1999 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index e64d328fd3d..bec0c7a3133 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -1,6 +1,7 @@ ;;; url-util.el --- Miscellaneous helper routines for URL library -;; Copyright (c) 1996,1997,1998,1999,2001,2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Bill Perry ;; Keywords: comm, data, processes diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 76669899172..53b8a5eef31 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -1,6 +1,7 @@ ;;; url-vars.el --- Variables for Uniform Resource Locator tool -;; Copyright (c) 1996,1997,1998,1999,2001,2004 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia diff --git a/lisp/url/url.el b/lisp/url/url.el index 21859ad9566..ef101fe6f2a 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -1,7 +1,7 @@ ;;; url.el --- Uniform Resource Locator retrieval tool -;; Copyright (c) 1996, 1997, 1998, 1999, 2001, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Bill Perry ;; Keywords: comm, data, processes, hypermedia @@ -56,7 +56,7 @@ (require 'url-parse) (require 'url-util) -;; Fixme: customize? convert-standard-filename? +;; Fixme: customize? convert-standard-filename? ;;;###autoload (defvar url-configuration-directory "~/.url") @@ -71,7 +71,7 @@ Emacs." (mailcap-parse-mailcaps) (mailcap-parse-mimetypes) - + ;; Register all the authentication schemes we can handle (url-register-auth-scheme "basic" nil 4) (url-register-auth-scheme "digest" nil 7) @@ -79,11 +79,11 @@ Emacs." (setq url-cookie-file (or url-cookie-file (expand-file-name "cookies" url-configuration-directory))) - + (setq url-history-file (or url-history-file (expand-file-name "history" url-configuration-directory))) - + ;; Parse the global history file if it exists, so that it can be used ;; for URL completion, etc. (url-history-parse-history) @@ -229,7 +229,7 @@ no further processing). URL is either a string or a parsed URL." (message "Viewing externally") (kill-buffer (current-buffer))) (display-buffer (current-buffer)) - (add-hook 'kill-buffer-hook + (add-hook 'kill-buffer-hook `(lambda () (mm-destroy-parts ',handle)) nil t))))) diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el index bfc532958b6..926b90d5f31 100644 --- a/lisp/url/vc-dav.el +++ b/lisp/url/vc-dav.el @@ -1,6 +1,6 @@ ;;; vc-dav.el --- vc.el support for WebDAV -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. ;; Author: Bill Perry ;; Maintainer: Bill Perry @@ -57,7 +57,7 @@ For a list of possible values, see `vc-state'." ;; _WE_ have a lock 'edited (cdr (car locks))))))) - + (defun vc-dav-checkout-model (url) "Indicate whether URL needs to be \"checked out\" before it can be edited. See `vc-checkout-model' for a list of possible values." From c51af4463992c0430649e7439a97cf1a34cee241 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 16:20:52 +0000 Subject: [PATCH 011/347] Update "copyright years" section. --- admin/FOR-RELEASE | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 47fd2c4b00b..58382d56fbf 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -98,17 +98,22 @@ DIRECTORY STATUS IN CHARGE leim working Kenichi Handa lisp/calc done Thien-Thi Nguyen lisp/calendar working Glenn Morris +lisp/emacs-lisp working Thien-Thi Nguyen lisp/emulation done Thien-Thi Nguyen lisp/eshell done Thien-Thi Nguyen +lisp/gnus working Thien-Thi Nguyen lisp/international done Kenichi Handa -lisp/languages done Kenichi Handa +lisp/language done Kenichi Handa +lisp/mail working Thien-Thi Nguyen lisp/mh-e working Bill Wohler lisp/net done Thien-Thi Nguyen +lisp/obsolete working Thien-Thi Nguyen lisp/play done Thien-Thi Nguyen lisp/progmodes done Nick Roberts lisp/term done Thien-Thi Nguyen +lisp/textmodes working Thien-Thi Nguyen lisp/toolbar done Thien-Thi Nguyen -lisp/url working Thien-Thi Nguyen +lisp/url done Thien-Thi Nguyen ** Check the Emacs manual. From 38685583801c774f1c17a32f02b29e426bdd0a96 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Sat, 6 Aug 2005 16:58:54 +0000 Subject: [PATCH 012/347] 2005-08-06 Michael Kifer * viper-cmd.el (viper-harness-minor-mode,viper-exec-delete, viper-exec-yank,viper-put-back): don't display modification msg if in the minibuffer. * viper-init.el (viper-replace-overlay-cursor-color, viper-insert-state-cursor-color,viper-vi-state-cursor-color): make variables frame local. * viper-util.el (viper-append-filter-alist): use append instead of nconc. * viper.el (viper-vi-state-mode-list,viper-emacs-state-mode-list): move help-mode and completion-list-mode from the first list to the second. (viper-mode): docstring. (viper-go-away,viper-non-hook-settings): don't localize minor-mode-alist in newer emacsen. Add advice to set-cursor-color. Don't bind "\C-c\\". --- lisp/ChangeLog | 21 ++++++++++++++++ lisp/emulation/viper-cmd.el | 28 +++++++++++++-------- lisp/emulation/viper-init.el | 7 ++++++ lisp/emulation/viper-util.el | 2 +- lisp/emulation/viper.el | 48 +++++++++++++++++++++++++----------- man/viper.texi | 5 ++-- 6 files changed, 82 insertions(+), 29 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5548b8614c2..7550d1cd739 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2005-08-06 Michael Kifer + + * viper-cmd.el (viper-harness-minor-mode,viper-exec-delete, + viper-exec-yank,viper-put-back): don't display modification msg if in + the minibuffer. + + * viper-init.el (viper-replace-overlay-cursor-color, + viper-insert-state-cursor-color,viper-vi-state-cursor-color): make + variables frame local. + + * viper-util.el (viper-append-filter-alist): use append instead of + nconc. + + * viper.el (viper-vi-state-mode-list,viper-emacs-state-mode-list): move + help-mode and completion-list-mode from the first list to the second. + (viper-mode): docstring. + (viper-go-away,viper-non-hook-settings): don't localize + minor-mode-alist in newer emacsen. + Add advice to set-cursor-color. + Don't bind "\C-c\\". + 2005-08-06 Emilio C. Lopes * cmuscheme.el (scheme-trace-command, scheme-untrace-command) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index ce8b61fd022..99a130e7f1d 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -942,8 +942,10 @@ Suffixes such as .el or .elc should be stripped." ;; Change the default for minor-mode-map-alist each time a harnessed minor ;; mode adds its own keymap to the a-list. - (eval-after-load - load-file '(setq-default minor-mode-map-alist minor-mode-map-alist)) + (unless + (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) + (eval-after-load + load-file '(setq-default minor-mode-map-alist minor-mode-map-alist))) ) @@ -1421,7 +1423,8 @@ as a Meta key and any number of multiple escapes is allowed." (if (eq last-command 'd-command) 'kill-region nil)) (setq chars-deleted (abs (- (point) viper-com-point))) (if (> chars-deleted viper-change-notification-threshold) - (message "Deleted %d characters" chars-deleted)) + (unless (viper-is-in-minibuffer) + (message "Deleted %d characters" chars-deleted))) (kill-region viper-com-point (point)) (setq this-command 'd-command) (if viper-ex-style-motion @@ -1447,7 +1450,8 @@ as a Meta key and any number of multiple escapes is allowed." (if (eq last-command 'D-command) 'kill-region nil)) (setq lines-deleted (count-lines (point) viper-com-point)) (if (> lines-deleted viper-change-notification-threshold) - (message "Deleted %d lines" lines-deleted)) + (unless (viper-is-in-minibuffer) + (message "Deleted %d lines" lines-deleted))) (kill-region (mark t) (point)) (if (eq m-com 'viper-line) (setq this-command 'D-command))) (back-to-indentation))) @@ -1472,7 +1476,8 @@ as a Meta key and any number of multiple escapes is allowed." (copy-region-as-kill viper-com-point (point)) (setq chars-saved (abs (- (point) viper-com-point))) (if (> chars-saved viper-change-notification-threshold) - (message "Saved %d characters" chars-saved)) + (unless (viper-is-in-minibuffer) + (message "Saved %d characters" chars-saved))) (goto-char viper-com-point))) ;; save lines @@ -1496,7 +1501,8 @@ as a Meta key and any number of multiple escapes is allowed." (copy-region-as-kill (mark t) (point)) (setq lines-saved (count-lines (mark t) (point))) (if (> lines-saved viper-change-notification-threshold) - (message "Saved %d lines" lines-saved)))) + (unless (viper-is-in-minibuffer) + (message "Saved %d lines" lines-saved))))) (viper-deactivate-mark) (goto-char viper-com-point)) @@ -4020,8 +4026,9 @@ Null string will repeat previous search." lines-inserted (abs (count-lines (point) sv-point))) (if (or (> chars-inserted viper-change-notification-threshold) (> lines-inserted viper-change-notification-threshold)) - (message "Inserted %d character(s), %d line(s)" - chars-inserted lines-inserted))) + (unless (viper-is-in-minibuffer) + (message "Inserted %d character(s), %d line(s)" + chars-inserted lines-inserted)))) ;; Vi puts cursor on the last char when the yanked text doesn't contain a ;; newline; it leaves the cursor at the beginning when the text contains ;; a newline @@ -4062,8 +4069,9 @@ Null string will repeat previous search." lines-inserted (abs (count-lines (point) sv-point))) (if (or (> chars-inserted viper-change-notification-threshold) (> lines-inserted viper-change-notification-threshold)) - (message "Inserted %d character(s), %d line(s)" - chars-inserted lines-inserted))) + (unless (viper-is-in-minibuffer) + (message "Inserted %d character(s), %d line(s)" + chars-inserted lines-inserted)))) ;; Vi puts cursor on the last char when the yanked text doesn't contain a ;; newline; it leaves the cursor at the beginning when the text contains ;; a newline diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 3c984a3596e..9c1df1b0ad5 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -424,13 +424,20 @@ delete the text being replaced, as in standard Vi." "*Cursor color when Viper is in Replace state." :type 'string :group 'viper) +(if (fboundp 'make-variable-frame-local) + (make-variable-frame-local 'viper-replace-overlay-cursor-color)) + (defcustom viper-insert-state-cursor-color "Green" "Cursor color when Viper is in insert state." :type 'string :group 'viper) +(if (fboundp 'make-variable-frame-local) + (make-variable-frame-local 'viper-insert-state-cursor-color)) ;; internal var, used to remember the default cursor color of emacs frames (defvar viper-vi-state-cursor-color nil) +(if (fboundp 'make-variable-frame-local) + (make-variable-frame-local 'viper-vi-state-cursor-color)) (viper-deflocalvar viper-replace-overlay nil "") (put 'viper-replace-overlay 'permanent-local t) diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 5bd67e1735f..cc9f42b9800 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -360,7 +360,7 @@ (setq lis2 (delq elt lis2))) (setq temp (cdr temp))) - (nconc lis1 lis2))) + (append lis1 lis2))) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index edc1fb1e9de..52d0fefcd20 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -372,7 +372,6 @@ widget." (defcustom viper-vi-state-mode-list '(fundamental-mode makefile-mode - help-mode awk-mode m4-mode @@ -398,7 +397,7 @@ widget." tex-mode latex-mode bibtex-mode ps-mode - completion-list-mode + ;; completion-list-mode diff-mode idl-mode @@ -433,6 +432,9 @@ widget." gnus-group-mode gnus-summary-mode + completion-list-mode + help-mode + Info-mode Buffer-menu-mode compilation-mode @@ -523,7 +525,7 @@ If Viper is enabled, turn it off. Otherwise, turn it on." ;;;###autoload (defun viper-mode () - "Turn on Viper emulation of Vi." + "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'." (interactive) (if (not noninteractive) (progn @@ -656,8 +658,7 @@ This function tries to do as good a job as possible. However, it may undo some user customization, unrelated to Viper. For instance, if the user advised `read-file-name', `describe-key', and some others, then this advice will be undone. -It also doesn't undo some Viper settings. For instance, `minor-mode-map-alist' -remains buffer-local." +It also can't undo some Viper settings." (interactive) ;; restore non-viper vars @@ -683,7 +684,9 @@ remains buffer-local." 'mark-even-if-inactive viper-saved-non-viper-variables))) ;; Ideally, we would like to be able to de-localize local variables - (viper-delocalize-var 'minor-mode-map-alist) + (unless + (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) + (viper-delocalize-var 'minor-mode-map-alist)) (viper-delocalize-var 'require-final-newline) (if viper-xemacs-p (viper-delocalize-var 'bar-cursor)) @@ -889,6 +892,14 @@ remains buffer-local." ad-do-it )) + (defadvice set-cursor-color (after viper-set-cursor-color-ad activate) + "Change cursor color in VI state." + ;;(setq viper-vi-state-cursor-color (ad-get-arg 0)) + (modify-frame-parameters + (selected-frame) + (list (cons 'viper-vi-state-cursor-color (ad-get-arg 0)))) + ) + (when (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) ;; needs to be as early as possible (add-to-ordered-list @@ -993,7 +1004,10 @@ remains buffer-local." ;; viper-vi-local-user-map, viper-insert-local-user-map, and others can have ;; different keymaps for different buffers. Also, the keymaps associated ;; with viper-vi/insert-state-modifier-minor-mode can be different. - (make-variable-buffer-local 'minor-mode-map-alist) + ;; ***This is needed only in case emulation-mode-map-alists is not defined + (unless + (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) + (make-variable-buffer-local 'minor-mode-map-alist)) ;; Viper changes the default mode-line-buffer-identification (setq-default mode-line-buffer-identification '(" %b")) @@ -1088,9 +1102,11 @@ remains buffer-local." viper-advice-add-minor-mode (toggle name &optional keymap after toggle-fun) activate) - "Run viper-normalize-minor-mode-map-alist after adding a minor mode." - (viper-normalize-minor-mode-map-alist) - (setq-default minor-mode-map-alist minor-mode-map-alist)) + "Run viper-normalize-minor-mode-map-alist after adding a minor mode." + (viper-normalize-minor-mode-map-alist) + (unless + (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) + (setq-default minor-mode-map-alist minor-mode-map-alist))) ;; catch frame switching event (if (viper-window-display-p) @@ -1264,11 +1280,10 @@ These two lines must come in the order given. (define-key viper-emacs-intercept-map viper-toggle-key 'viper-change-state-to-vi) +;;; Removed to avoid bad interaction with cua-mode. ;;; Escape from Emacs and Insert modes to Vi for one command -(define-key - viper-emacs-intercept-map "\C-c\\" 'viper-escape-to-vi) -(define-key - viper-insert-intercept-map "\C-c\\" 'viper-escape-to-vi) +;;(define-key viper-emacs-intercept-map "\C-c\\" 'viper-escape-to-vi) +;;(define-key viper-insert-intercept-map "\C-c\\" 'viper-escape-to-vi) (if viper-mode (setq-default viper-emacs-intercept-minor-mode t @@ -1296,7 +1311,10 @@ These two lines must come in the order given. (if (and viper-mode (eq viper-current-state 'emacs-state)) (progn (viper-change-state-to-emacs) - (setq-default minor-mode-map-alist minor-mode-map-alist) + (unless + (and (fboundp 'add-to-ordered-list) + (boundp 'emulation-mode-map-alists)) + (setq-default minor-mode-map-alist minor-mode-map-alist)) )) (if (and viper-mode (this-major-mode-requires-vi-state major-mode)) diff --git a/man/viper.texi b/man/viper.texi index 0156c4c6387..6d05d365f8b 100644 --- a/man/viper.texi +++ b/man/viper.texi @@ -507,9 +507,8 @@ modes designed for editing files, such as cc-mode or latex-mode, use key sequences that begin with @kbd{C-x} and @kbd{C-c}. There is also a key that lets you temporarily escape to Vi command state -from Emacs or Insert states: typing @kbd{C-c \} will let you execute a -single Vi command while staying in Viper's Emacs or Insert state. -In Insert state, the same can also be achieved by typing @kbd{C-z}. +from the Insert state: typing @kbd{C-z} will let you execute a +single Vi command while staying in Viper's Insert state. @node Vi State, Insert State, Emacs State, States in Viper From 3731a85096c5e067f05d53573e559d63c8860f15 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 17:48:15 +0000 Subject: [PATCH 013/347] Update years in copyright notice; nfc. --- lisp/emacs-lisp/advice.el | 3 +- lisp/emacs-lisp/assoc.el | 2 +- lisp/emacs-lisp/authors.el | 2 +- lisp/emacs-lisp/autoload.el | 2 +- lisp/emacs-lisp/backquote.el | 3 +- lisp/emacs-lisp/benchmark.el | 2 +- lisp/emacs-lisp/bindat.el | 2 +- lisp/emacs-lisp/byte-opt.el | 4 +- lisp/emacs-lisp/byte-run.el | 2 +- lisp/emacs-lisp/bytecomp.el | 2 +- lisp/emacs-lisp/checkdoc.el | 3 +- lisp/emacs-lisp/cl-compat.el | 2 +- lisp/emacs-lisp/cl-extra.el | 3 +- lisp/emacs-lisp/cl-indent.el | 3 +- lisp/emacs-lisp/cl-seq.el | 2 +- lisp/emacs-lisp/cl-specs.el | 2 +- lisp/emacs-lisp/cl.el | 2 +- lisp/emacs-lisp/copyright.el | 4 +- lisp/emacs-lisp/crm.el | 4 +- lisp/emacs-lisp/cust-print.el | 2 +- lisp/emacs-lisp/debug.el | 6 +- lisp/emacs-lisp/derived.el | 3 +- lisp/emacs-lisp/disass.el | 3 +- lisp/emacs-lisp/easymenu.el | 4 +- lisp/emacs-lisp/edebug.el | 4 +- lisp/emacs-lisp/eldoc.el | 4 +- lisp/emacs-lisp/elint.el | 2 +- lisp/emacs-lisp/elp.el | 3 +- lisp/emacs-lisp/ewoc.el | 4 +- lisp/emacs-lisp/find-func.el | 3 +- lisp/emacs-lisp/find-gc.el | 2 +- lisp/emacs-lisp/float-sup.el | 3 +- lisp/emacs-lisp/generic.el | 3 +- lisp/emacs-lisp/gulp.el | 2 +- lisp/emacs-lisp/helper.el | 2 +- lisp/emacs-lisp/levents.el | 3 +- lisp/emacs-lisp/lisp-mnt.el | 5 +- lisp/emacs-lisp/lisp-mode.el | 4 +- lisp/emacs-lisp/lisp.el | 4 +- lisp/emacs-lisp/lmenu.el | 3 +- lisp/emacs-lisp/lselect.el | 13 ++-- lisp/emacs-lisp/lucid.el | 3 +- lisp/emacs-lisp/macroexp.el | 4 +- lisp/emacs-lisp/map-ynp.el | 3 +- lisp/emacs-lisp/pp.el | 3 +- lisp/emacs-lisp/re-builder.el | 3 +- lisp/emacs-lisp/regexp-opt.el | 4 +- lisp/emacs-lisp/regi.el | 2 +- lisp/emacs-lisp/ring.el | 2 +- lisp/emacs-lisp/rx.el | 2 +- lisp/emacs-lisp/shadow.el | 2 +- lisp/emacs-lisp/sregex.el | 3 +- lisp/emacs-lisp/syntax.el | 3 +- lisp/emacs-lisp/tcover-ses.el | 2 +- lisp/emacs-lisp/tcover-unsafep.el | 2 +- lisp/emacs-lisp/testcover.el | 2 +- lisp/emacs-lisp/timer.el | 2 +- lisp/emacs-lisp/tq.el | 3 +- lisp/emacs-lisp/trace.el | 3 +- lisp/emacs-lisp/unsafep.el | 2 +- lisp/emacs-lisp/warnings.el | 2 +- lisp/obsolete/awk-mode.el | 3 +- lisp/obsolete/fast-lock.el | 3 +- lisp/obsolete/float.el | 4 +- lisp/obsolete/hilit19.el | 3 +- lisp/obsolete/hscroll.el | 4 +- lisp/obsolete/iso-acc.el | 4 +- lisp/obsolete/iso-swed.el | 2 +- lisp/obsolete/keyswap.el | 2 +- lisp/obsolete/lazy-lock.el | 4 +- lisp/obsolete/mlsupport.el | 2 +- lisp/obsolete/ooutline.el | 3 +- lisp/obsolete/options.el | 2 +- lisp/obsolete/profile.el | 3 +- lisp/obsolete/rnews.el | 3 +- lisp/obsolete/rnewspost.el | 3 +- lisp/obsolete/rsz-mini.el | 3 +- lisp/obsolete/scribe.el | 2 +- lisp/obsolete/sun-curs.el | 2 +- lisp/obsolete/sun-fns.el | 2 +- lisp/obsolete/uncompress.el | 3 +- lisp/obsolete/x-apollo.el | 2 +- lisp/obsolete/x-menu.el | 2 +- lisp/textmodes/artist.el | 3 +- lisp/textmodes/bib-mode.el | 2 +- lisp/textmodes/bibtex.el | 4 +- lisp/textmodes/conf-mode.el | 2 +- lisp/textmodes/dns-mode.el | 3 +- lisp/textmodes/enriched.el | 3 +- lisp/textmodes/fill.el | 2 +- lisp/textmodes/flyspell.el | 3 +- lisp/textmodes/ispell.el | 4 +- lisp/textmodes/makeinfo.el | 3 +- lisp/textmodes/nroff-mode.el | 3 +- lisp/textmodes/org.el | 3 +- lisp/textmodes/page-ext.el | 3 +- lisp/textmodes/page.el | 2 +- lisp/textmodes/paragraphs.el | 6 +- lisp/textmodes/picture.el | 3 +- lisp/textmodes/po.el | 3 +- lisp/textmodes/refbib.el | 2 +- lisp/textmodes/refer.el | 3 +- lisp/textmodes/refill.el | 2 +- lisp/textmodes/reftex-auc.el | 19 ++--- lisp/textmodes/reftex-cite.el | 125 +++++++++++++++--------------- lisp/textmodes/reftex-dcr.el | 5 +- lisp/textmodes/reftex-global.el | 5 +- lisp/textmodes/reftex-index.el | 5 +- lisp/textmodes/reftex-parse.el | 5 +- lisp/textmodes/reftex-ref.el | 5 +- lisp/textmodes/reftex-sel.el | 5 +- lisp/textmodes/reftex-toc.el | 5 +- lisp/textmodes/reftex-vars.el | 5 +- lisp/textmodes/reftex.el | 5 +- lisp/textmodes/sgml-mode.el | 4 +- lisp/textmodes/spell.el | 2 +- lisp/textmodes/table.el | 6 +- lisp/textmodes/tex-mode.el | 2 +- lisp/textmodes/texinfmt.el | 4 +- lisp/textmodes/texinfo.el | 2 +- lisp/textmodes/texnfo-upd.el | 3 +- lisp/textmodes/text-mode.el | 3 +- lisp/textmodes/tildify.el | 3 +- lisp/textmodes/two-column.el | 3 +- lisp/textmodes/underline.el | 2 +- 125 files changed, 293 insertions(+), 233 deletions(-) diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 9f6a0b782ac..480c838b878 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1,6 +1,7 @@ ;;; advice.el --- an overloading mechanism for Emacs Lisp functions -;; Copyright (C) 1993,1994,2000,01,2004,2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2000, 2001, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Hans Chalupsky ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el index 35cfba617c3..d12b1dcbcb5 100644 --- a/lisp/emacs-lisp/assoc.el +++ b/lisp/emacs-lisp/assoc.el @@ -1,6 +1,6 @@ ;;; assoc.el --- insert/delete/sort functions on association lists -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw ;; Keywords: extensions diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index ca28fc06783..ec5446eef38 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -1,6 +1,6 @@ ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Gerd Moellmann ;; Maintainer: Kim F. Storm diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 852c33cb41b..3cd6fe53bad 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -1,7 +1,7 @@ ;; autoload.el --- maintain autoloads in loaddefs.el ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Roland McGrath ;; Keywords: maint diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el index 7c7023fc85e..627c2cfdbc7 100644 --- a/lisp/emacs-lisp/backquote.el +++ b/lisp/emacs-lisp/backquote.el @@ -1,6 +1,7 @@ ;;; backquote.el --- implement the ` Lisp construct -;; Copyright (C) 1990, 92, 1994, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1992, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Rick Sladkey ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el index 6de2eef53a8..c2be5a5c3b5 100644 --- a/lisp/emacs-lisp/benchmark.el +++ b/lisp/emacs-lisp/benchmark.el @@ -1,6 +1,6 @@ ;;; benchmark.el --- support for benchmarking code -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Love ;; Keywords: lisp, extensions diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index 5fa9835bea1..f2b1d19a696 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -1,6 +1,6 @@ ;;; bindat.el --- binary data structure packing and unpacking. -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Kim F. Storm ;; Assignment name: struct.el diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 7ac9077ca74..7d47d809673 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1,7 +1,7 @@ ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler -;; Copyright (c) 1991, 1994, 2000, 2001, 2002, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski ;; Hallvard Furuseth diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index b4af4b44009..c31036f02ed 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -1,6 +1,6 @@ ;;; byte-run.el --- byte-compiler support for inlining -;; Copyright (C) 1992, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski ;; Hallvard Furuseth diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 6ccf65b1fd9..559d2bd86c6 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1,7 +1,7 @@ ;;; bytecomp.el --- compilation of Lisp code into byte code ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski ;; Hallvard Furuseth diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 2ed1f9b552b..6b6d3ba4393 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1,6 +1,7 @@ ;;; checkdoc.el --- check documentation strings for style requirements -;;; Copyright (C) 1997, 1998, 2001, 2004 Free Software Foundation +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam ;; Version: 0.6.2 diff --git a/lisp/emacs-lisp/cl-compat.el b/lisp/emacs-lisp/cl-compat.el index 9ced7879114..66425576b5f 100644 --- a/lisp/emacs-lisp/cl-compat.el +++ b/lisp/emacs-lisp/cl-compat.el @@ -1,6 +1,6 @@ ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility) -;; Copyright (C) 1993, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie ;; Version: 2.02 diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 16e777ed2b5..4ac1a72b0d7 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -1,6 +1,7 @@ ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2000, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie ;; Keywords: extensions diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index 1bcd2c72edc..2497e02dc62 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -1,6 +1,7 @@ ;;; cl-indent.el --- enhanced lisp-indent mode -;; Copyright (C) 1987, 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Richard Mlynarik ;; Created: July 1987 diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index 98c9a2207ee..ba7845aaa9c 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -1,6 +1,6 @@ ;;; cl-seq.el --- Common Lisp features, part 3 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie ;; Version: 2.02 diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el index ac3089f2efb..650a341f955 100644 --- a/lisp/emacs-lisp/cl-specs.el +++ b/lisp/emacs-lisp/cl-specs.el @@ -1,6 +1,6 @@ ;;; cl-specs.el --- Edebug specs for cl.el -*- no-byte-compile: t -*- -;; Copyright (C) 1993, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte ;; Keywords: lisp, tools, maint diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index d29c18dd0ff..8875366cc9c 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -1,6 +1,6 @@ ;;; cl.el --- Common Lisp extensions for Emacs -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie ;; Version: 2.02 diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index fbebfeabe96..ff44b3cb59e 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -1,7 +1,7 @@ ;;; copyright.el --- update the copyright notice in current buffer -;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer ;; Keywords: maint, tools diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 8e52a42921a..46ae6186e44 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el @@ -1,7 +1,7 @@ ;;; crm.el --- read multiple strings with completion -;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Sen Nagata ;; Keywords: completion, minibuffer, multiple elements diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el index 96fbe737c26..102efdae9b9 100644 --- a/lisp/emacs-lisp/cust-print.el +++ b/lisp/emacs-lisp/cust-print.el @@ -1,6 +1,6 @@ ;;; cust-print.el --- handles print-level and print-circle -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte ;; Adapted-By: ESR diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 4f968c60b5e..58b12376b05 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -1,7 +1,7 @@ ;;; debug.el --- debuggers and related commands for Emacs -;; Copyright (C) 1985, 1986, 1994, 2001, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, tools, maint @@ -709,7 +709,7 @@ Redefining FUNCTION also cancels it." (let ((fn (function-called-at-point)) val) (when (debugger-special-form-p fn) (setq fn nil)) - (setq val (completing-read + (setq val (completing-read (if fn (format "Debug on entry to function (default %s): " fn) "Debug on entry to function: ") diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 764f58bcd23..8e1f79f95ee 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -1,7 +1,8 @@ ;;; derived.el --- allow inheritance of major modes ;; (formerly mode-clone.el) -;; Copyright (C) 1993, 1994, 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: David Megginson (dmeggins@aix1.uottawa.ca) ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el index fa368902f69..fa0898f609e 100644 --- a/lisp/emacs-lisp/disass.el +++ b/lisp/emacs-lisp/disass.el @@ -1,6 +1,7 @@ ;;; disass.el --- disassembler for compiled Emacs Lisp code -;; Copyright (C) 1986, 1991, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1991, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Doug Cutting ;; Jamie Zawinski diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index a1a1f470c58..634c2397411 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -1,7 +1,7 @@ ;;; easymenu.el --- support the easymenu interface for defining a menu -;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: emulations ;; Author: Richard Stallman diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index f80e9f36dd0..765548083b5 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -1,7 +1,7 @@ ;;; edebug.el --- a source-level debugger for Emacs Lisp -;; Copyright (C) 1988,89,90,91,92,93,94,95,97,1999,2000,01,03,2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 1492e29e3c6..74fc12ac12e 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -1,7 +1,7 @@ ;;; eldoc.el --- show function arglist or variable docstring in echo area -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: friedman@splode.com diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index 51e2ed98713..e72613695e3 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -1,6 +1,6 @@ ;;; elint.el --- Lint Emacs Lisp -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Peter Liljenberg ;; Created: May 1997 diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el index dbda66a2615..426c79e51c3 100644 --- a/lisp/emacs-lisp/elp.el +++ b/lisp/emacs-lisp/elp.el @@ -1,6 +1,7 @@ ;;; elp.el --- Emacs Lisp Profiler -;; Copyright (C) 1994,1995,1997,1998, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index 1984423d9dd..da9aa09119a 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -1,7 +1,7 @@ ;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer -;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 04 -;; Free Software Foundation +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Per Cederqvist ;; Inge Wallin diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 945acaac73e..d860bfcd598 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -1,6 +1,7 @@ ;;; find-func.el --- find the definition of the Emacs Lisp function near point -;; Copyright (C) 1997, 1999, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Jens Petersen ;; Maintainer: petersen@kurims.kyoto-u.ac.jp diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el index 8d3b0b02a4e..29e9dffbbde 100644 --- a/lisp/emacs-lisp/find-gc.el +++ b/lisp/emacs-lisp/find-gc.el @@ -1,6 +1,6 @@ ;;; find-gc.el --- detect functions that call the garbage collector -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el index b07b6f837fb..1d30d60ea99 100644 --- a/lisp/emacs-lisp/float-sup.el +++ b/lisp/emacs-lisp/float-sup.el @@ -1,6 +1,7 @@ ;;; float-sup.el --- define some constants useful for floating point numbers. -;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el index 785368e290c..c140fe4c47d 100644 --- a/lisp/emacs-lisp/generic.el +++ b/lisp/emacs-lisp/generic.el @@ -1,6 +1,7 @@ ;;; generic.el --- defining simple major modes with comment and font-lock ;; -;; Copyright (C) 1997, 1999, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Peter Breton ;; Created: Fri Sep 27 1996 diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el index 43311b6ff5d..6e0c4ded4dd 100644 --- a/lisp/emacs-lisp/gulp.el +++ b/lisp/emacs-lisp/gulp.el @@ -1,6 +1,6 @@ ;;; gulp.el --- ask for updates for Lisp packages -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Sam Shteingold ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el index eac18a5dca1..e97491aa6bb 100644 --- a/lisp/emacs-lisp/helper.el +++ b/lisp/emacs-lisp/helper.el @@ -1,6 +1,6 @@ ;;; helper.el --- utility help package supporting help in electric modes -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/levents.el b/lisp/emacs-lisp/levents.el index 87a6725f171..70961912815 100644 --- a/lisp/emacs-lisp/levents.el +++ b/lisp/emacs-lisp/levents.el @@ -1,6 +1,7 @@ ;;; levents.el --- emulate the Lucid event data type and associated functions -;; Copyright (C) 1993, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index d6c7c8c3458..b102b4da581 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -1,6 +1,7 @@ ;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers -;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Eric S. Raymond ;; Maintainer: FSF @@ -306,7 +307,7 @@ If FILE is nil, execute BODY in the current buffer." (insert-file-contents ,filesym) (lisp-mode) ,@body) - (save-excursion + (save-excursion ;; Switching major modes is too drastic, so just switch ;; temporarily to the Lisp mode syntax table. (with-syntax-table lisp-mode-syntax-table diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 88e6319709b..6d281e5deb2 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1,7 +1,7 @@ ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands -;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, languages diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index a20b79335cb..d248882d882 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -1,7 +1,7 @@ ;;; lisp.el --- Lisp editing commands for Emacs -;; Copyright (C) 1985, 1986, 1994, 2000, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1994, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: lisp, languages diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el index c047e0b91e7..168d6fde1f4 100644 --- a/lisp/emacs-lisp/lmenu.el +++ b/lisp/emacs-lisp/lmenu.el @@ -1,6 +1,7 @@ ;;; lmenu.el --- emulate Lucid's menubar support -;; Copyright (C) 1992, 1993, 1994, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: emulations obsolete diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el index f1d0244f0ea..38ae8b74460 100644 --- a/lisp/emacs-lisp/lselect.el +++ b/lisp/emacs-lisp/lselect.el @@ -1,6 +1,7 @@ ;;; lselect.el --- Lucid interface to X Selections -;; Copyright (C) 1990, 1993, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1993, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations @@ -101,9 +102,9 @@ (defun x-own-selection (selection &optional type) - "Make a primary X Selection of the given argument. -The argument may be a string, a cons of two markers, or an extent. -In the latter cases the selection is considered to be the text + "Make a primary X Selection of the given argument. +The argument may be a string, a cons of two markers, or an extent. +In the latter cases the selection is considered to be the text between the markers, or the between extents endpoints." (interactive (if (not current-prefix-arg) (list (read-string "Store text for pasting: ")) @@ -124,7 +125,7 @@ between the markers, or the between extents endpoints." (defun x-own-secondary-selection (selection &optional type) - "Make a secondary X Selection of the given argument. The argument may be a + "Make a secondary X Selection of the given argument. The argument may be a string or a cons of two markers (in which case the selection is considered to be the text between those markers.)" (interactive (if (not current-prefix-arg) @@ -182,7 +183,7 @@ secondary selection instead of the primary selection." ;; Random utility functions (defun x-kill-primary-selection () - "If there is a selection, delete the text it covers, and copy it to + "If there is a selection, delete the text it covers, and copy it to both the kill ring and the Clipboard." (interactive) (or (x-selection-owner-p) (error "emacs does not own the primary selection")) diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el index 3374a4d7d73..f3c9519edf0 100644 --- a/lisp/emacs-lisp/lucid.el +++ b/lisp/emacs-lisp/lucid.el @@ -1,6 +1,7 @@ ;;; lucid.el --- emulate some Lucid Emacs functions -;; Copyright (C) 1993, 1995, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 02ad05639a3..98e4f67f630 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -1,6 +1,6 @@ ;;; macroexp.el --- Additional macro-expansion support ;; -;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; ;; Author: Miles Bader ;; Keywords: lisp, compiler, macros @@ -91,7 +91,7 @@ FORMS." CLAUSES is a list of lists of forms; any clause that's not a list is ignored. If SKIP is non-nil, then don't expand that many elements at the start of each clause." - (macroexp-accumulate (clause clauses) + (macroexp-accumulate (clause clauses) (if (listp clause) (macroexpand-all-forms clause skip) clause))) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 6447f7e438c..e4b6f1ddce0 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -1,6 +1,7 @@ ;;; map-ynp.el --- general-purpose boolean question-asker -;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Roland McGrath ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el index 7bbd56d8af5..542948c777c 100644 --- a/lisp/emacs-lisp/pp.el +++ b/lisp/emacs-lisp/pp.el @@ -1,6 +1,7 @@ ;;; pp.el --- pretty printer for Emacs Lisp -;; Copyright (C) 1989, 1993, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Randal Schwartz ;; Keywords: lisp diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index e0a3c5ed285..1d1e002cf5f 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -1,6 +1,7 @@ ;;; re-builder.el --- building Regexps with visual feedback -;; Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Detlev Zundel ;; Keywords: matching, lisp, tools diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index 8c44f11babc..da2fdf85f81 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -1,7 +1,7 @@ ;;; regexp-opt.el --- generate efficient regexps to match strings -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Marshall ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el index 7f9d313542d..4326ba37786 100644 --- a/lisp/emacs-lisp/regi.el +++ b/lisp/emacs-lisp/regi.el @@ -1,6 +1,6 @@ ;;; regi.el --- REGular expression Interpreting engine -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. ;; Maintainer: bwarsaw@cen.com diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el index 24b90650f0a..f04d98f399d 100644 --- a/lisp/emacs-lisp/ring.el +++ b/lisp/emacs-lisp/ring.el @@ -1,6 +1,6 @@ ;;; ring.el --- handle rings of items -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: extensions diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index c3147815fc9..f526ffae948 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -1,6 +1,6 @@ ;;; rx.el --- sexp notation for regular expressions -;; Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Gerd Moellmann ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index b36ce4a332e..9cea82d7780 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -1,6 +1,6 @@ ;;; shadow.el --- locate Emacs Lisp file shadowings -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Terry Jones ;; Keywords: lisp diff --git a/lisp/emacs-lisp/sregex.el b/lisp/emacs-lisp/sregex.el index 84cb9785f6f..7bfa9402836 100644 --- a/lisp/emacs-lisp/sregex.el +++ b/lisp/emacs-lisp/sregex.el @@ -1,6 +1,7 @@ ;;; sregex.el --- symbolic regular expressions -;; Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Bob Glickstein ;; Maintainer: Bob Glickstein diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index bb5e782b001..a3683e82d2b 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -1,6 +1,7 @@ ;;; syntax.el --- helper functions to find syntactic context -;; Copyright (C) 2000, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el index 4c2ee1ee33c..1374aa1fdc0 100644 --- a/lisp/emacs-lisp/tcover-ses.el +++ b/lisp/emacs-lisp/tcover-ses.el @@ -1,6 +1,6 @@ ;;;; testcover-ses.el -- Example use of `testcover' to test "SES" -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner ;; Maintainer: Jonathan Yavner diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el index 9544bc396b4..354cfe6ab16 100644 --- a/lisp/emacs-lisp/tcover-unsafep.el +++ b/lisp/emacs-lisp/tcover-unsafep.el @@ -1,6 +1,6 @@ ;;;; testcover-unsafep.el -- Use testcover to test unsafep's code coverage -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner ;; Maintainer: Jonathan Yavner diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el index a5e761d9cba..4473d514c89 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -1,6 +1,6 @@ ;;;; testcover.el -- Visual code-coverage tool -;; Copyright (C) 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner ;; Maintainer: Jonathan Yavner diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 27f14a6d3ad..83b01642c56 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -1,6 +1,6 @@ ;;; timer.el --- run a function with args at some time in future -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el index d94b4925c4d..8b1baad6596 100644 --- a/lisp/emacs-lisp/tq.el +++ b/lisp/emacs-lisp/tq.el @@ -1,6 +1,7 @@ ;;; tq.el --- utility to maintain a transaction queue -;; Copyright (C) 1985, 1986, 1987, 1992, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Scott Draves ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el index 8cd5d0fa317..cda23f39c04 100644 --- a/lisp/emacs-lisp/trace.el +++ b/lisp/emacs-lisp/trace.el @@ -1,6 +1,7 @@ ;;; trace.el --- tracing facility for Emacs Lisp functions -;; Copyright (C) 1993, 1998, 2000, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Hans Chalupsky ;; Maintainer: FSF diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el index c59b44cddb2..4b1312d58d7 100644 --- a/lisp/emacs-lisp/unsafep.el +++ b/lisp/emacs-lisp/unsafep.el @@ -1,6 +1,6 @@ ;;;; unsafep.el -- Determine whether a Lisp form is safe to evaluate -;; Copyright (C)2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner ;; Maintainer: Jonathan Yavner diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el index 1f573673495..61f6b98005e 100644 --- a/lisp/emacs-lisp/warnings.el +++ b/lisp/emacs-lisp/warnings.el @@ -1,6 +1,6 @@ ;;; warnings.el --- log and display warnings -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el index 9603d768c7d..166986fd34e 100644 --- a/lisp/obsolete/awk-mode.el +++ b/lisp/obsolete/awk-mode.el @@ -1,6 +1,7 @@ ;;; awk-mode.el --- AWK code editing commands for Emacs -;; Copyright (C) 1988,94,96,2000 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 1996, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: unix, languages diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el index 89754716292..725e2b21e70 100644 --- a/lisp/obsolete/fast-lock.el +++ b/lisp/obsolete/fast-lock.el @@ -1,6 +1,7 @@ ;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode -;; Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Marshall ;; Maintainer: FSF diff --git a/lisp/obsolete/float.el b/lisp/obsolete/float.el index eb29f331ce7..bc5e752e013 100644 --- a/lisp/obsolete/float.el +++ b/lisp/obsolete/float.el @@ -1,6 +1,6 @@ -;;; float.el --- obsolete floating point arithmetic package +f;;; float.el --- obsolete floating point arithmetic package -;; Copyright (C) 1986 Free Software Foundation, Inc. +;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Bill Rosenblatt ;; Maintainer: FSF diff --git a/lisp/obsolete/hilit19.el b/lisp/obsolete/hilit19.el index 162d2984eb8..666c580098f 100644 --- a/lisp/obsolete/hilit19.el +++ b/lisp/obsolete/hilit19.el @@ -1,6 +1,7 @@ ;;; hilit19.el --- customizable highlighting for Emacs 19 -;; Copyright (c) 1993, 1994, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Jonathan Stigelman ;; Maintainer: FSF diff --git a/lisp/obsolete/hscroll.el b/lisp/obsolete/hscroll.el index 1d727eb8d98..5e3d141f73b 100644 --- a/lisp/obsolete/hscroll.el +++ b/lisp/obsolete/hscroll.el @@ -1,5 +1,7 @@ ;;; hscroll.el --- automatically scroll truncated lines horizontally -;;; Copyright (C) 1992, 1993, 1995, 1996 Free Software Foundation, Inc. + +;; Copyright (C) 1992, 1993, 1995, 1996, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Wayne Mesard ;; Keywords: display diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el index 279548b81d6..6ff9e31d7fd 100644 --- a/lisp/obsolete/iso-acc.el +++ b/lisp/obsolete/iso-acc.el @@ -1,7 +1,7 @@ ;;; iso-acc.el --- minor mode providing electric accent keys -;; Copyright (C) 1993, 1994, 1996, 2001, 2002, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1996, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Johan Vromans ;; Maintainer: FSF diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el index abe9dd9c472..ab5287bc97a 100644 --- a/lisp/obsolete/iso-swed.el +++ b/lisp/obsolete/iso-swed.el @@ -1,6 +1,6 @@ ;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys -;; Copyright (C) 1987 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/obsolete/keyswap.el b/lisp/obsolete/keyswap.el index 9bb0b9c63d3..0ed70d61dee 100644 --- a/lisp/obsolete/keyswap.el +++ b/lisp/obsolete/keyswap.el @@ -1,6 +1,6 @@ ;;; keyswap.el --- swap BS and DEL keys -*- no-byte-compile: t -*- -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Eric S. Raymond ;; Keywords: terminals diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el index 558377289ed..2daf779bc73 100644 --- a/lisp/obsolete/lazy-lock.el +++ b/lisp/obsolete/lazy-lock.el @@ -1,7 +1,7 @@ ;;; lazy-lock.el --- lazy demand-driven fontification for fast Font Lock mode -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Marshall ;; Maintainer: FSF diff --git a/lisp/obsolete/mlsupport.el b/lisp/obsolete/mlsupport.el index e36eae66942..1df047878e1 100644 --- a/lisp/obsolete/mlsupport.el +++ b/lisp/obsolete/mlsupport.el @@ -1,6 +1,6 @@ ;;; mlsupport.el --- run-time support for mocklisp code -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: extensions diff --git a/lisp/obsolete/ooutline.el b/lisp/obsolete/ooutline.el index fbba7709bb0..17374ba1781 100644 --- a/lisp/obsolete/ooutline.el +++ b/lisp/obsolete/ooutline.el @@ -1,6 +1,7 @@ ;;; ooutline.el --- outline mode commands for Emacs -;; Copyright (C) 1986, 1993, 1994, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1993, 1994, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: outlines diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el index 4defa96f2ce..733e3740dc0 100644 --- a/lisp/obsolete/options.el +++ b/lisp/obsolete/options.el @@ -1,6 +1,6 @@ ;;; options.el --- edit Options command for Emacs -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/obsolete/profile.el b/lisp/obsolete/profile.el index c4a5b4a0359..3d5ea982b86 100644 --- a/lisp/obsolete/profile.el +++ b/lisp/obsolete/profile.el @@ -1,6 +1,7 @@ ;;; profile.el --- Emacs profiler (OBSOLETE; use elp.el instead) -;; Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Boaz Ben-Zvi ;; Created: 07 Feb 1992 diff --git a/lisp/obsolete/rnews.el b/lisp/obsolete/rnews.el index 98a52d4f830..71158f47b4c 100644 --- a/lisp/obsolete/rnews.el +++ b/lisp/obsolete/rnews.el @@ -1,6 +1,7 @@ ;;; rnews.el --- USENET news reader for GNU Emacs -;; Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: news diff --git a/lisp/obsolete/rnewspost.el b/lisp/obsolete/rnewspost.el index 6e08a66b74a..3dbeb5d871a 100644 --- a/lisp/obsolete/rnewspost.el +++ b/lisp/obsolete/rnewspost.el @@ -1,6 +1,7 @@ ;;; rnewspost.el --- USENET news poster/mailer for GNU Emacs -;; Copyright (C) 1985, 1986, 1987, 1995 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail, news diff --git a/lisp/obsolete/rsz-mini.el b/lisp/obsolete/rsz-mini.el index 693c2987952..94b7e212279 100644 --- a/lisp/obsolete/rsz-mini.el +++ b/lisp/obsolete/rsz-mini.el @@ -1,6 +1,7 @@ ;;; rsz-mini.el --- dynamically resize minibuffer to display entire contents -;; Copyright (C) 1990, 1993, 1994, 1995, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1993, 1994, 1995, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Roland McGrath diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el index 7d627df191d..2870b93fade 100644 --- a/lisp/obsolete/scribe.el +++ b/lisp/obsolete/scribe.el @@ -1,6 +1,6 @@ ;;; scribe.el --- scribe mode, and its idiosyncratic commands -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp diff --git a/lisp/obsolete/sun-curs.el b/lisp/obsolete/sun-curs.el index 5fe18221b0c..99cba421350 100644 --- a/lisp/obsolete/sun-curs.el +++ b/lisp/obsolete/sun-curs.el @@ -1,6 +1,6 @@ ;;; sun-curs.el --- cursor definitions for Sun windows -;; Copyright (C) 1987 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jeff Peck ;; Keywords: hardware diff --git a/lisp/obsolete/sun-fns.el b/lisp/obsolete/sun-fns.el index 88241e813ec..bca76730e48 100644 --- a/lisp/obsolete/sun-fns.el +++ b/lisp/obsolete/sun-fns.el @@ -1,6 +1,6 @@ ;;; sun-fns.el --- subroutines of Mouse handling for Sun windows -;; Copyright (C) 1987 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jeff Peck ;; Maintainer: none diff --git a/lisp/obsolete/uncompress.el b/lisp/obsolete/uncompress.el index 22bf08b2dd6..7ee25992218 100644 --- a/lisp/obsolete/uncompress.el +++ b/lisp/obsolete/uncompress.el @@ -1,6 +1,7 @@ ;;; uncompress.el --- auto-decompression hook for visiting .Z files -;; Copyright (C) 1992, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: files diff --git a/lisp/obsolete/x-apollo.el b/lisp/obsolete/x-apollo.el index e15516b40e7..edf3436aa96 100644 --- a/lisp/obsolete/x-apollo.el +++ b/lisp/obsolete/x-apollo.el @@ -1,6 +1,6 @@ ;;; x-apollo.el --- Apollo support functions -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/obsolete/x-menu.el b/lisp/obsolete/x-menu.el index bba20747f53..048cea05ecb 100644 --- a/lisp/obsolete/x-menu.el +++ b/lisp/obsolete/x-menu.el @@ -1,6 +1,6 @@ ;;; x-menu.el --- menu support for X -;; Copyright (C) 1986 Free Software Foundation, Inc. +;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 245658b62b4..c50239ec635 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -1,6 +1,7 @@ ;;; artist.el --- draw ascii graphics with your mouse -;; Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Tomas Abrahamsson ;; Maintainer: Tomas Abrahamsson diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el index a6d47589d35..6609673289b 100644 --- a/lisp/textmodes/bib-mode.el +++ b/lisp/textmodes/bib-mode.el @@ -1,6 +1,6 @@ ;;; bib-mode.el --- major mode for editing bib files -;; Copyright (C) 1989 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: bib diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index de387e86542..6f7fe0dec99 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -1,7 +1,7 @@ ;;; bibtex.el --- BibTeX mode for GNU Emacs -;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Schoef ;; Bengt Martensson diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 75249f7b547..ca7ea570ab0 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -1,6 +1,6 @@ ;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -;; Copyright (C) 2004 by Daniel Pfeiffer +;; Copyright (C) 2004, 2005 by Daniel Pfeiffer ;; Keywords: conf ini windows java ;; This file is part of GNU Emacs. diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el index a6f3517d722..12f99ba090e 100644 --- a/lisp/textmodes/dns-mode.el +++ b/lisp/textmodes/dns-mode.el @@ -1,5 +1,6 @@ ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files -;; Copyright (c) 2000, 2001, 2003, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: DNS master zone file SOA diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el index 61960e9d975..dc8d4c96b2b 100644 --- a/lisp/textmodes/enriched.el +++ b/lisp/textmodes/enriched.el @@ -1,6 +1,7 @@ ;;; enriched.el --- read and save files in text/enriched format -;; Copyright (c) 1994, 1995, 1996, 2002, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Boris Goldowsky ;; Keywords: wp, faces diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 9997b2a166e..d77daaeed39 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -1,7 +1,7 @@ ;;; fill.el --- fill commands for Emacs -*- coding: iso-2022-7bit -*- ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1999, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 6b7b5492409..9acf8b9890c 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -1,6 +1,7 @@ ;;; flyspell.el --- on-the-fly spell checker -;; Copyright (C) 1998, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Manuel Serrano ;; Maintainer: FSF diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 3e08cf4a6f5..a0a0ca20218 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1,7 +1,7 @@ ;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2 -;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Ken Stevens ;; Maintainer: Ken Stevens diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el index bbea460cf6e..f2c407975e2 100644 --- a/lisp/textmodes/makeinfo.el +++ b/lisp/textmodes/makeinfo.el @@ -1,6 +1,7 @@ ;;; makeinfo.el --- run makeinfo conveniently -;; Copyright (C) 1991, 1993, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1993, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Maintainer: FSF diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el index 48de6b3243e..05a740ee390 100644 --- a/lisp/textmodes/nroff-mode.el +++ b/lisp/textmodes/nroff-mode.el @@ -1,6 +1,7 @@ ;;; nroff-mode.el --- GNU Emacs major mode for editing nroff source -;; Copyright (C) 1985, 86, 94, 95, 97, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1994, 1995, 1997, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index 26708deefe2..b7d714249dc 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -1,6 +1,7 @@ ;; org.el --- Outline-based notes management and organizer ;; Carstens outline-mode for keeping track of everything. -;; Copyright (c) 2004, 2005 Free Software Foundation + +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index c8828e1a6d5..365ed19d9ce 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -1,6 +1,7 @@ ;;; page-ext.el --- extended page handling commands -;; Copyright (C) 1990, 1991, 1993, 1994 Free Software Foundation +;; Copyright (C) 1990, 1991, 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: Robert J. Chassell ;; Keywords: wp data diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el index 712b1ef12a1..ffb4c89f2db 100644 --- a/lisp/textmodes/page.el +++ b/lisp/textmodes/page.el @@ -1,6 +1,6 @@ ;;; page.el --- page motion commands for Emacs -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp convenience diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index c4f7750fe70..f4af34fdabf 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el @@ -1,7 +1,7 @@ ;;; paragraphs.el --- paragraph and sentence parsing -;; Copyright (C) 1985, 86, 87, 91, 94, 95, 96, 1997, 1999, 2000, 2001, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1991, 1994, 1995, 1996, 1997, 1999, 2000, +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp @@ -358,7 +358,7 @@ If ARG is negative, point is put at end of this paragraph, mark is put at beginning of this or a previous paragraph. Interactively, if this command is repeated -or (in Transient Mark mode) if the mark is active, +or (in Transient Mark mode) if the mark is active, it marks the next ARG paragraphs after the ones already marked." (interactive "p\np") (unless arg (setq arg 1)) diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 3ae39213dff..5d528dec109 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -1,6 +1,7 @@ ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model -;; Copyright (C) 1985, 1994, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index cf80f02090a..c9af801bef0 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el @@ -1,6 +1,7 @@ ;;; po.el --- basic support of PO translation files -*- coding: latin-1; -*- -;; Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Authors: François Pinard , ;; Greg McGary , diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index 7fcfc44fb2d..55e6b9db515 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el @@ -1,6 +1,6 @@ ;;; refbib.el --- convert refer-style references to ones usable by Latex bib -;; Copyright (C) 1989, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Henry Kautz ;; Keywords: bib, tex diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el index 3ff01ef5c76..82f06576c1a 100644 --- a/lisp/textmodes/refer.el +++ b/lisp/textmodes/refer.el @@ -1,6 +1,7 @@ ;;; refer.el --- look up references in bibliography files -;; Copyright (C) 1992, 1996, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Ashwin Ram ;; Maintainer: Gernot Heiser diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el index d49513ccf3f..bf8938a7ec5 100644 --- a/lisp/textmodes/refill.el +++ b/lisp/textmodes/refill.el @@ -1,6 +1,6 @@ ;;; refill.el --- `auto-fill' by refilling paragraphs on changes -;; Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Love ;; Maintainer: Miles Bader diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index 1c6741806f0..f11d607f3e2 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el @@ -1,6 +1,7 @@ ;;; reftex-auc.el --- RefTeX's interface to AUCTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 @@ -75,7 +76,7 @@ What is being used depends upon `reftex-plug-into-AUCTeX'." (defun reftex-arg-index-tag (optional &optional prompt &rest args) - "Prompt for an index tag with completion. + "Prompt for an index tag with completion. This is the name of an index, not the entry." (let (tag taglist) (setq prompt (concat (if optional "(Optional) " "") @@ -85,8 +86,8 @@ This is the name of an index, not the entry." ;; Use RefTeX completion (progn (reftex-access-scan-info nil) - (setq taglist - (cdr (assoc 'index-tags + (setq taglist + (cdr (assoc 'index-tags (symbol-value reftex-docstruct-symbol))) tag (completing-read prompt (mapcar 'list taglist)))) ;; Just ask like AUCTeX does. @@ -131,7 +132,7 @@ argument identify one of multiple indices." ;; Replace AUCTeX functions with RefTeX functions. ;; Which functions are replaced is controlled by the variable ;; `reftex-plug-into-AUCTeX'. - + (if (reftex-plug-flag 0) (setq LaTeX-label-function 'reftex-label) (setq LaTeX-label-function nil)) @@ -143,11 +144,11 @@ argument identify one of multiple indices." (and (reftex-plug-flag 3) (fboundp 'TeX-arg-cite) (fset 'TeX-arg-cite 'reftex-arg-cite)) - - (and (reftex-plug-flag 4) + + (and (reftex-plug-flag 4) (fboundp 'TeX-arg-index-tag) (fset 'TeX-arg-index-tag 'reftex-arg-index-tag)) - (and (reftex-plug-flag 4) + (and (reftex-plug-flag 4) (fboundp 'TeX-arg-index) (fset 'TeX-arg-index 'reftex-arg-index))) diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el index 6a15665ea21..08ee88e1a74 100644 --- a/lisp/textmodes/reftex-cite.el +++ b/lisp/textmodes/reftex-cite.el @@ -1,6 +1,7 @@ ;;; reftex-cite.el --- creating citations with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 @@ -69,7 +70,7 @@ (unless (eq (get 'reftex-default-bibliography :reftex-raw) reftex-default-bibliography) (put 'reftex-default-bibliography :reftex-expanded - (reftex-locate-bibliography-files + (reftex-locate-bibliography-files default-directory reftex-default-bibliography)) (put 'reftex-default-bibliography :reftex-raw reftex-default-bibliography)) @@ -128,7 +129,7 @@ ;; If RETURN is non-nil, just return the entry. (let* ((re - (if item + (if item (concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}") (concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key) "[, \t\r\n}]"))) @@ -150,7 +151,7 @@ (when return ;; Just return the relevant entry (if item (goto-char (match-end 0))) - (setq return (buffer-substring + (setq return (buffer-substring (point) (reftex-end-of-bib-entry item))) (set-buffer buffer-conf) (throw 'exit return)) @@ -166,9 +167,9 @@ (error "No BibTeX entry with citation key %s" key))))) (defun reftex-end-of-bib-entry (item) - (save-excursion + (save-excursion (condition-case nil - (if item + (if item (progn (end-of-line) (re-search-forward "\\\\bibitem\\|\\end{thebibliography}") @@ -189,16 +190,16 @@ ;; Read a regexp, completing on known citation keys. (setq default (regexp-quote (reftex-get-bibkey-default))) - (setq re-list - (split-string - (completing-read + (setq re-list + (split-string + (completing-read (concat "Regex { && Regex...}: " "[" default "]: ") (if reftex-mode (if (fboundp 'LaTeX-bibitem-list) (LaTeX-bibitem-list) - (cdr (assoc 'bibview-cache + (cdr (assoc 'bibview-cache (symbol-value reftex-docstruct-symbol)))) nil) nil nil nil 'reftex-cite-regexp-hist) @@ -245,7 +246,7 @@ (error (goto-char key-point) (throw 'search-again nil))) (setq end-point (point)) - + ;; Ignore @string, @comment and @c entries or things ;; outside entries (when (or (string= (downcase (match-string 2)) "string") @@ -254,12 +255,12 @@ (< (point) key-point)) ; this means match not in {} (goto-char key-point) (throw 'search-again nil)) - + ;; Well, we have got a match ;;(setq entry (concat ;; (buffer-substring start-point (point)) "\n")) (setq entry (buffer-substring start-point (point))) - + ;; Check if other regexp match as well (setq re-list rest-re) (while re-list @@ -267,24 +268,24 @@ ;; nope - move on (throw 'search-again nil)) (pop re-list)) - + (setq alist (reftex-parse-bibtex-entry nil start-point end-point)) (push (cons "&entry" entry) alist) - + ;; check for crossref entries (if (assoc "crossref" alist) (setq alist (append alist (reftex-get-crossref-alist alist)))) - + ;; format the entry (push (cons "&formatted" (reftex-format-bib-entry alist)) alist) - + ;; make key the first element (push (reftex-get-bib-field "&key" alist) alist) - + ;; add it to the list (push alist found-list))))) (reftex-kill-temporary-buffers)))) @@ -347,7 +348,7 @@ (unless files (error "Need file name to find thebibliography environment")) (while (setq file (pop files)) - (setq buf (reftex-get-file-buffer-force + (setq buf (reftex-get-file-buffer-force file (not reftex-keep-temporary-buffers))) (unless buf (error "No such file %s" file)) @@ -358,21 +359,21 @@ (save-restriction (widen) (goto-char (point-min)) - (while (re-search-forward + (while (re-search-forward "\\(\\`\\|[\n\r]\\)[ \t]*\\\\begin{thebibliography}" nil t) (beginning-of-line 2) (setq start (point)) - (if (re-search-forward + (if (re-search-forward "\\(\\`\\|[\n\r]\\)[ \t]*\\\\end{thebibliography}" nil t) (progn (beginning-of-line 1) (setq end (point)))) (when (and start end) - (setq entries + (setq entries (append entries (mapcar 'reftex-parse-bibitem (delete "" - (split-string + (split-string (buffer-substring-no-properties start end) "[ \t\n\r]*\\\\bibitem\\(\\[[^]]*]\\)*")))))) (goto-char end))))) @@ -381,16 +382,16 @@ ;; Read a regexp, completing on known citation keys. (setq default (regexp-quote (reftex-get-bibkey-default))) - (setq re-list - (split-string - (completing-read + (setq re-list + (split-string + (completing-read (concat "Regex { && Regex...}: " "[" default "]: ") (if reftex-mode (if (fboundp 'LaTeX-bibitem-list) (LaTeX-bibitem-list) - (cdr (assoc 'bibview-cache + (cdr (assoc 'bibview-cache (symbol-value reftex-docstruct-symbol)))) nil) nil nil nil 'reftex-cite-regexp-hist) @@ -403,14 +404,14 @@ (error "Empty regular expression")) (while (and (setq re (pop re-list)) entries) - (setq entries + (setq entries (delq nil (mapcar (lambda (x) (if (string-match re (cdr (assoc "&entry" x))) x nil)) entries)))) - (setq entries - (mapcar + (setq entries + (mapcar (lambda (x) (push (cons "&formatted" (reftex-format-bibitem x)) x) (push (reftex-get-bib-field "&key" x) x) @@ -654,9 +655,9 @@ While entering the regexp, completion on knows citation keys is possible. ;; FIXME: Unfortunately, this meens that commenting does not work right. (pop selected-entries) (let ((concat-keys (mapconcat 'car selected-entries ","))) - (setq insert-entries + (setq insert-entries (list (list concat-keys (cons "&key" concat-keys)))))) - + (unless no-insert ;; We shall insert this into the buffer... @@ -683,7 +684,7 @@ While entering the regexp, completion on knows citation keys is possible. ;; it has to go. If there is only a single arg and empty, it can go ;; as well. (when reftex-cite-cleanup-optional-args - (cond + (cond ((string-match "\\([a-zA-Z0-9]\\)\\[\\]{" string) (setq string (replace-match "\\1{" nil nil string))) ((string-match "\\[\\]\\(\\[[a-zA-Z0-9., ]+\\]\\)" string) @@ -698,14 +699,14 @@ While entering the regexp, completion on knows citation keys is possible. (delete-char 1)) ;; Tell AUCTeX - (when (and reftex-mode + (when (and reftex-mode (fboundp 'LaTeX-add-bibitems) reftex-plug-into-AUCTeX) (apply 'LaTeX-add-bibitems (mapcar 'car selected-entries))) - + ;; Produce the cite-view strings (when (and reftex-mode reftex-cache-cite-echo cite-view) - (mapcar (lambda (entry) + (mapcar (lambda (entry) (reftex-make-cite-echo-string entry docstruct-symbol)) selected-entries)) @@ -713,16 +714,16 @@ While entering the regexp, completion on knows citation keys is possible. (set-marker reftex-select-return-marker nil) (reftex-kill-buffer "*RefTeX Select*") - + ;; Check if the prefix arg was numeric, and call recursively (when (integerp arg) (if (> arg 1) - (progn + (progn (skip-chars-backward "}") (decf arg) (reftex-do-citation arg)) (forward-char 1))) - + ;; Return the citation key (car (car selected-entries)))) @@ -736,7 +737,7 @@ While entering the regexp, completion on knows citation keys is possible. (no-insert ;; Format does not really matter because nothing will be inserted. (setq format "%l")) - + ((and (stringp macro) (string-match "\\`\\\\cite\\|cite\\'" macro)) ;; We are already inside a cite macro @@ -757,7 +758,7 @@ While entering the regexp, completion on knows citation keys is possible. (when (listp format) (setq key (or format-key - (reftex-select-with-char + (reftex-select-with-char "" (concat "SELECT A CITATION FORMAT\n\n" (mapconcat (lambda (x) @@ -786,8 +787,8 @@ While entering the regexp, completion on knows citation keys is possible. (let ((bibtype (reftex-bib-or-thebib)) found-list rtn key data selected-entries) - (while - (not + (while + (not (catch 'done ;; Scan bibtex files (setq found-list @@ -802,20 +803,20 @@ While entering the regexp, completion on knows citation keys is possible. (reftex-extract-bib-entries-from-thebibliography (reftex-uniquify (mapcar 'cdr - (reftex-all-assq + (reftex-all-assq 'thebib (symbol-value reftex-docstruct-symbol)))))) (reftex-default-bibliography (message "Using default bibliography") (reftex-extract-bib-entries (reftex-default-bibliography))) (t (error "No valid bibliography in this document, and no default available")))) - + (unless found-list (error "Sorry, no matches found")) - + ;; Remember where we came from (setq reftex-call-back-to-this-buffer (current-buffer)) (set-marker reftex-select-return-marker (point)) - + ;; Offer selection (save-window-excursion (delete-other-windows) @@ -856,15 +857,15 @@ While entering the regexp, completion on knows citation keys is possible. (goto-char 1)) ((eq key ?A) ;; Take all (marked) - (setq selected-entries + (setq selected-entries (if reftex-select-marked (mapcar 'car (nreverse reftex-select-marked)) found-list)) (throw 'done t)) ((eq key ?a) ;; Take all (marked), and push the symbol 'concat - (setq selected-entries - (cons 'concat + (setq selected-entries + (cons 'concat (if reftex-select-marked (mapcar 'car (nreverse reftex-select-marked)) found-list))) @@ -883,9 +884,9 @@ While entering the regexp, completion on knows citation keys is possible. ((or (eq key ?\C-m) (eq key 'return)) ;; Take selected - (setq selected-entries + (setq selected-entries (if reftex-select-marked - (cons 'concat + (cons 'concat (mapcar 'car (nreverse reftex-select-marked))) (if data (list data) nil))) (throw 'done t)) @@ -925,7 +926,7 @@ While entering the regexp, completion on knows citation keys is possible. (let ((file (read-file-name "File to create: "))) (find-file-other-window file) (if (> (buffer-size) 0) - (unless (yes-or-no-p + (unless (yes-or-no-p (format "Overwrite non-empty file %s? " file)) (error "Abort"))) (erase-buffer) @@ -950,7 +951,7 @@ While entering the regexp, completion on knows citation keys is possible. reftex-mouse-selected-face nil)) tmp len) - (mapcar + (mapcar (lambda (x) (setq tmp (cdr (assoc "&formatted" x)) len (length tmp)) @@ -1045,7 +1046,7 @@ While entering the regexp, completion on knows citation keys is possible. (defun reftex-make-cite-echo-string (entry docstruct-symbol) ;; Format a bibtex entry for the echo area and cache the result. (let* ((key (reftex-get-bib-field "&key" entry)) - (string + (string (let* ((reftex-cite-punctuation '(" " " & " " etal."))) (reftex-format-citation entry reftex-cite-view-format))) (cache (assq 'bibview-cache (symbol-value docstruct-symbol))) @@ -1087,7 +1088,7 @@ While entering the regexp, completion on knows citation keys is possible. (setq bibfile-list (reftex-uniquify (mapcar 'cdr - (reftex-all-assq + (reftex-all-assq 'thebib (symbol-value reftex-docstruct-symbol)))) item t)) (reftex-default-bibliography @@ -1098,10 +1099,10 @@ While entering the regexp, completion on knows citation keys is possible. (setq bibfile-list (reftex-visited-files bibfile-list))) (condition-case nil - (reftex-pop-to-bibtex-entry + (reftex-pop-to-bibtex-entry key bibfile-list (not reftex-keep-temporary-buffers) t item) (error (ding)))) - + (select-window win))) ;;; Global BibTeX file @@ -1130,7 +1131,7 @@ While entering the regexp, completion on knows citation keys is possible. "Create a new BibTeX database file with all entries referenced in document. The command prompts for a filename and writes the collected entries to that file. Only entries referenced in the current document with -any \\cite-like macros are used. +any \\cite-like macros are used. The sequence in the new file is the same as it was in the old database." (interactive "FNew BibTeX file: ") (let ((keys (reftex-all-used-citation-keys)) @@ -1144,7 +1145,7 @@ The sequence in the new file is the same as it was in the old database." (save-restriction (widen) (goto-char (point-min)) - (while (re-search-forward + (while (re-search-forward "^[ \t]*@[a-zA-Z]+[ \t]*{\\([^ \t\r\n]+\\)," nil t) (setq key (match-string 1) @@ -1161,7 +1162,7 @@ The sequence in the new file is the same as it was in the old database." keys (delete key keys))))))))) (find-file-other-window bibfile) (if (> (buffer-size) 0) - (unless (yes-or-no-p + (unless (yes-or-no-p (format "Overwrite non-empty file %s? " bibfile)) (error "Abort"))) (erase-buffer) diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 2a518ae9d77..e4f09d04902 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -1,6 +1,7 @@ ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index f7f635aaf1b..281e852a40d 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -1,6 +1,7 @@ ;;; reftex-global.el --- operations on entire documents with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index a0bc2d85754..ebcc5d06754 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1,6 +1,7 @@ ;;; reftex-index.el --- index support with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 76372dc1ddb..b08d1e87999 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -1,6 +1,7 @@ ;;; reftex-parse.el --- parser functions for RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el index bc4260367d8..edc284a3060 100644 --- a/lisp/textmodes/reftex-ref.el +++ b/lisp/textmodes/reftex-ref.el @@ -1,6 +1,7 @@ ;;; reftex-ref.el --- code to create labels and references with RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index 90f2e057aa8..1c91d9a662b 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -1,6 +1,7 @@ ;;; reftex-sel.el --- the selection modes for RefTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index a9f1a280dcf..7f922ce85a4 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -1,6 +1,7 @@ ;;; reftex-toc.el --- RefTeX's table of contents mode -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 5f39167bb46..170b77d9e36 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -1,6 +1,7 @@ ;;; reftex-vars.el --- configuration variables for RefTeX -;; Copyright (c) 1997, 1998, 1999, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index a97d122c17e..01d40a6ea5b 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -1,6 +1,7 @@ ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX -;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Version: 4.28 diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index b4e36b215ef..7b5e2c520a1 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -1,7 +1,7 @@ ;;; sgml-mode.el --- SGML- and HTML-editing modes -;; Copyright (C) 1992, 1995, 1996, 1998, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1995, 1996, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: James Clark ;; Maintainer: FSF diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el index 99046988036..077e9b0fd35 100644 --- a/lisp/textmodes/spell.el +++ b/lisp/textmodes/spell.el @@ -1,6 +1,6 @@ ;;; spell.el --- spelling correction interface for Emacs -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp, unix diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 4b6e305922b..f0cde251504 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -1,12 +1,12 @@ ;;; table.el --- create and edit WYSIWYG text based embedded tables -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Keywords: wp, convenience ;; Author: Takaaki Ota ;; Created: Sat Jul 08 2000 13:28:45 (PST) -;; Revised: Fri Mar 18 2005 13:50:13 (PST) +;; Revised: Sat Aug 06 2005 19:42:54 (CEST) ;; This file is part of GNU Emacs. diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index f9a2db01386..b5d82f55a0b 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,7 +1,7 @@ ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*- ;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: tex diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 8425d691d77..d46d2f81fd4 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -1,8 +1,8 @@ ;;; texinfmt.el --- format Texinfo files into Info files ;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, -;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2005 -;; Free Software Foundation, Inc. +;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: Robert J. Chassell ;; Keywords: maint, tex, docs diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index 693ab4e608e..8fce8099ed7 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el @@ -1,7 +1,7 @@ ;;; texinfo.el --- major mode for editing Texinfo files ;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, -;; 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Date: [See date below for texinfo-version] diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index dbd9b8a5c67..110981d33b0 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el @@ -1,6 +1,7 @@ ;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files -;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Maintainer: bug-texinfo@gnu.org diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 0737f64f768..5e4cfc88471 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -1,6 +1,7 @@ ;;; text-mode.el --- text mode, and its idiosyncratic commands -;; Copyright (C) 1985, 1992, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1992, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index 469cd73cd66..c317131d955 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -1,6 +1,7 @@ ;;; tildify.el --- adding hard spaces into texts -;; Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Milan Zamazal ;; Version: 4.5 diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 30429638cb8..1e83b7a725b 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -1,6 +1,7 @@ ;;; two-column.el --- minor mode for editing of two-column text -;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer ;; Adapted-By: ESR, Daniel Pfeiffer diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el index c380c809a7d..3c67307da51 100644 --- a/lisp/textmodes/underline.el +++ b/lisp/textmodes/underline.el @@ -1,6 +1,6 @@ ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp From cac87e302e52bae078f22a786ca3d9e2407683c4 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 18:27:09 +0000 Subject: [PATCH 014/347] (Fexpt): Use floats for negative exponent. --- src/ChangeLog | 5 +++++ src/floatfns.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6d8608dde22..9ff58e7f5a8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-08-06 Thien-Thi Nguyen + + * floatfns.c (Fexpt): Use floats for negative + exponent (computing a root). Reported by D Goel. + 2005-08-02 Richard M. Stallman * frame.c (Fframe_char_width): Doc fix. diff --git a/src/floatfns.c b/src/floatfns.c index 529e7b76e39..cbcc0bfe520 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -460,7 +460,8 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg1); CHECK_NUMBER_OR_FLOAT (arg2); if (INTEGERP (arg1) /* common lisp spec */ - && INTEGERP (arg2)) /* don't promote, if both are ints */ + && INTEGERP (arg2) /* don't promote, if both are ints, and */ + && 0 <= XINT (arg2)) /* we are not computing the -ARG2 root */ { /* this can be improved by pre-calculating */ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; From e84b4b8614aecf2b935fff2122e2f360134e13ff Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 19:51:42 +0000 Subject: [PATCH 015/347] Update years in copyright notice; nfc. --- lisp/gnus/binhex.el | 4 +++- lisp/gnus/canlock.el | 4 ++-- lisp/gnus/compface.el | 3 ++- lisp/gnus/dig.el | 4 +++- lisp/gnus/dns.el | 3 ++- lisp/gnus/earcon.el | 3 ++- lisp/gnus/flow-fill.el | 3 ++- lisp/gnus/format-spec.el | 4 +++- lisp/gnus/gnus-agent.el | 5 +++-- lisp/gnus/gnus-art.el | 5 +++-- lisp/gnus/gnus-async.el | 5 +++-- lisp/gnus/gnus-audio.el | 4 +++- lisp/gnus/gnus-bcklg.el | 5 +++-- lisp/gnus/gnus-cache.el | 5 +++-- lisp/gnus/gnus-cite.el | 5 ++--- lisp/gnus/gnus-cus.el | 6 +++--- lisp/gnus/gnus-delay.el | 2 +- lisp/gnus/gnus-demon.el | 4 ++-- lisp/gnus/gnus-diary.el | 2 +- lisp/gnus/gnus-dired.el | 4 ++-- lisp/gnus/gnus-draft.el | 5 +++-- lisp/gnus/gnus-dup.el | 5 +++-- lisp/gnus/gnus-eform.el | 5 +++-- lisp/gnus/gnus-ems.el | 5 +++-- lisp/gnus/gnus-fun.el | 3 ++- lisp/gnus/gnus-gl.el | 4 ++-- lisp/gnus/gnus-group.el | 5 +++-- lisp/gnus/gnus-int.el | 5 +++-- lisp/gnus/gnus-kill.el | 5 +++-- lisp/gnus/gnus-logic.el | 5 +++-- lisp/gnus/gnus-mh.el | 5 +++-- lisp/gnus/gnus-ml.el | 3 ++- lisp/gnus/gnus-mlspl.el | 4 ++-- lisp/gnus/gnus-move.el | 5 +++-- lisp/gnus/gnus-msg.el | 5 +++-- lisp/gnus/gnus-nocem.el | 5 ++--- lisp/gnus/gnus-picon.el | 4 ++-- lisp/gnus/gnus-range.el | 4 ++-- lisp/gnus/gnus-registry.el | 5 +++-- lisp/gnus/gnus-salt.el | 4 ++-- lisp/gnus/gnus-score.el | 5 +++-- lisp/gnus/gnus-setup.el | 4 ++-- lisp/gnus/gnus-sieve.el | 3 ++- lisp/gnus/gnus-soup.el | 4 ++-- lisp/gnus/gnus-spec.el | 5 +++-- lisp/gnus/gnus-srvr.el | 4 ++-- lisp/gnus/gnus-start.el | 5 +++-- lisp/gnus/gnus-sum.el | 5 +++-- lisp/gnus/gnus-topic.el | 5 +++-- lisp/gnus/gnus-undo.el | 4 ++-- lisp/gnus/gnus-util.el | 5 +++-- lisp/gnus/gnus-uu.el | 9 +++++---- lisp/gnus/gnus-vm.el | 4 ++-- lisp/gnus/gnus-win.el | 5 +++-- lisp/gnus/gnus.el | 4 ++-- lisp/gnus/hex-util.el | 3 ++- lisp/gnus/html2text.el | 1 + lisp/gnus/ietf-drums.el | 5 +++-- lisp/gnus/imap.el | 5 +++-- lisp/gnus/mail-parse.el | 5 +++-- lisp/gnus/mail-prsvr.el | 4 +++- lisp/gnus/mail-source.el | 5 +++-- lisp/gnus/mailcap.el | 5 +++-- lisp/gnus/message.el | 5 +++-- lisp/gnus/messcompat.el | 4 ++-- lisp/gnus/mm-bodies.el | 4 ++-- lisp/gnus/mm-decode.el | 5 +++-- lisp/gnus/mm-encode.el | 5 +++-- lisp/gnus/mm-extern.el | 4 +++- lisp/gnus/mm-partial.el | 4 +++- lisp/gnus/mm-url.el | 3 ++- lisp/gnus/mm-util.el | 5 +++-- lisp/gnus/mm-uu.el | 4 +++- lisp/gnus/mm-view.el | 5 +++-- lisp/gnus/mml-sec.el | 4 +++- lisp/gnus/mml-smime.el | 4 +++- lisp/gnus/mml.el | 5 +++-- lisp/gnus/mml1991.el | 5 +++-- lisp/gnus/mml2015.el | 5 +++-- lisp/gnus/nnagent.el | 4 ++-- lisp/gnus/nnbabyl.el | 4 ++-- lisp/gnus/nndb.el | 4 ++-- lisp/gnus/nndiary.el | 4 ++-- lisp/gnus/nndir.el | 4 ++-- lisp/gnus/nndoc.el | 5 +++-- lisp/gnus/nndraft.el | 4 ++-- lisp/gnus/nneething.el | 4 ++-- lisp/gnus/nnfolder.el | 5 +++-- lisp/gnus/nngateway.el | 4 ++-- lisp/gnus/nnheader.el | 6 +++--- lisp/gnus/nnimap.el | 5 +++-- lisp/gnus/nnkiboze.el | 4 ++-- lisp/gnus/nnlistserv.el | 3 ++- lisp/gnus/nnmail.el | 5 +++-- lisp/gnus/nnmbox.el | 4 ++-- lisp/gnus/nnmh.el | 4 ++-- lisp/gnus/nnml.el | 5 +++-- lisp/gnus/nnoo.el | 6 +++--- lisp/gnus/nnrss.el | 3 ++- lisp/gnus/nnslashdot.el | 4 +++- lisp/gnus/nnsoup.el | 4 ++-- lisp/gnus/nnspool.el | 3 +-- lisp/gnus/nntp.el | 18 +++++++++--------- lisp/gnus/nnultimate.el | 3 ++- lisp/gnus/nnvirtual.el | 5 +++-- lisp/gnus/nnwarchive.el | 4 +++- lisp/gnus/nnweb.el | 5 +++-- lisp/gnus/nnwfm.el | 3 ++- lisp/gnus/pgg-def.el | 2 +- lisp/gnus/pgg-gpg.el | 3 ++- lisp/gnus/pgg-parse.el | 2 +- lisp/gnus/pgg-pgp.el | 3 ++- lisp/gnus/pgg-pgp5.el | 3 ++- lisp/gnus/pgg.el | 3 ++- lisp/gnus/pop3.el | 5 ++--- lisp/gnus/qp.el | 4 ++-- lisp/gnus/rfc1843.el | 4 +++- lisp/gnus/rfc2045.el | 3 ++- lisp/gnus/rfc2047.el | 4 ++-- lisp/gnus/rfc2104.el | 4 +++- lisp/gnus/rfc2231.el | 4 ++-- lisp/gnus/score-mode.el | 3 ++- lisp/gnus/sha1.el | 3 ++- lisp/gnus/sieve-manage.el | 3 ++- lisp/gnus/sieve-mode.el | 3 ++- lisp/gnus/sieve.el | 3 ++- lisp/gnus/smiley.el | 3 ++- lisp/gnus/smime.el | 4 +++- lisp/gnus/spam-report.el | 3 ++- lisp/gnus/spam-stat.el | 2 +- lisp/gnus/spam.el | 1 + lisp/gnus/starttls.el | 4 ++-- lisp/gnus/utf7.el | 4 +++- lisp/gnus/uudecode.el | 3 ++- lisp/gnus/webmail.el | 4 +++- lisp/gnus/yenc.el | 3 ++- lisp/mail/blessmail.el | 2 +- lisp/mail/emacsbug.el | 4 ++-- lisp/mail/footnote.el | 3 ++- lisp/mail/mail-extr.el | 4 ++-- lisp/mail/mail-hist.el | 2 +- lisp/mail/mail-utils.el | 3 ++- lisp/mail/mailabbrev.el | 4 ++-- lisp/mail/mailalias.el | 3 ++- lisp/mail/mailheader.el | 2 +- lisp/mail/metamail.el | 3 ++- lisp/mail/mspools.el | 2 +- lisp/mail/reporter.el | 3 ++- lisp/mail/rfc2368.el | 3 ++- lisp/mail/rfc822.el | 3 ++- lisp/mail/rmail-spam-filter.el | 27 +++++++++++++-------------- lisp/mail/rmail.el | 16 ++++++++-------- lisp/mail/rmailedit.el | 3 ++- lisp/mail/rmailkwd.el | 3 ++- lisp/mail/rmailmsc.el | 2 +- lisp/mail/rmailout.el | 3 ++- lisp/mail/rmailsort.el | 3 ++- lisp/mail/rmailsum.el | 4 ++-- lisp/mail/sendmail.el | 4 ++-- lisp/mail/supercite.el | 3 ++- lisp/mail/uce.el | 3 ++- lisp/mail/undigest.el | 4 ++-- lisp/mail/unrmail.el | 2 +- lisp/mail/vms-pmail.el | 2 +- 164 files changed, 404 insertions(+), 288 deletions(-) diff --git a/lisp/gnus/binhex.el b/lisp/gnus/binhex.el index b662fc391d3..af0669f62aa 100644 --- a/lisp/gnus/binhex.el +++ b/lisp/gnus/binhex.el @@ -1,5 +1,7 @@ ;;; binhex.el --- elisp native binhex decode -;; Copyright (c) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: binhex news diff --git a/lisp/gnus/canlock.el b/lisp/gnus/canlock.el index ae679d9fb7d..bad7ea0409e 100644 --- a/lisp/gnus/canlock.el +++ b/lisp/gnus/canlock.el @@ -1,7 +1,7 @@ ;;; canlock.el --- functions for Cancel-Lock feature -;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Katsumi Yamaoka ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104 diff --git a/lisp/gnus/compface.el b/lisp/gnus/compface.el index ab6ce23362e..874c8bd6222 100644 --- a/lisp/gnus/compface.el +++ b/lisp/gnus/compface.el @@ -1,5 +1,6 @@ ;;; compface.el --- functions for converting X-Face headers -;; Copyright (C) 2002 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/dig.el b/lisp/gnus/dig.el index 6bb2ab91050..ed752e56520 100644 --- a/lisp/gnus/dig.el +++ b/lisp/gnus/dig.el @@ -1,5 +1,7 @@ ;;; dig.el --- Domain Name System dig interface -;; Copyright (c) 2000, 2001, 2003, 2005 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: DNS BIND dig diff --git a/lisp/gnus/dns.el b/lisp/gnus/dns.el index 37a110e4679..01c373ba954 100644 --- a/lisp/gnus/dns.el +++ b/lisp/gnus/dns.el @@ -1,5 +1,6 @@ ;;; dns.el --- Domain Name Service lookups -;; Copyright (C) 2002, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: network diff --git a/lisp/gnus/earcon.el b/lisp/gnus/earcon.el index 051a9799c95..37ccb3baba1 100644 --- a/lisp/gnus/earcon.el +++ b/lisp/gnus/earcon.el @@ -1,6 +1,7 @@ ;;; earcon.el --- Sound effects for messages -;; Copyright (C) 1996, 2000, 2001, 2003 Free Software Foundation +;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Steven L. Baur diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el index a18805952b0..d6dc739b55e 100644 --- a/lisp/gnus/flow-fill.el +++ b/lisp/gnus/flow-fill.el @@ -1,6 +1,7 @@ ;;; flow-fill.el --- interpret RFC2646 "flowed" text -;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: mail diff --git a/lisp/gnus/format-spec.el b/lisp/gnus/format-spec.el index d287af6f780..fc34b50bc11 100644 --- a/lisp/gnus/format-spec.el +++ b/lisp/gnus/format-spec.el @@ -1,5 +1,7 @@ ;;; format-spec.el --- functions for formatting arbitrary formatting strings -;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: tools diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 49126e4bdb5..ea45a139ab0 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -1,6 +1,7 @@ ;;; gnus-agent.el --- unplugged support for Gnus -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 0d8116b00b9..31874a19149 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1,6 +1,7 @@ ;;; gnus-art.el --- article mode commands for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el index 1c279e69a26..54e651c9e9c 100644 --- a/lisp/gnus/gnus-async.el +++ b/lisp/gnus/gnus-async.el @@ -1,6 +1,7 @@ ;;; gnus-async.el --- asynchronous support for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-audio.el b/lisp/gnus/gnus-audio.el index 79e1fcc4905..7f6bd1167d5 100644 --- a/lisp/gnus/gnus-audio.el +++ b/lisp/gnus/gnus-audio.el @@ -1,5 +1,7 @@ ;;; gnus-audio.el --- Sound effects for Gnus -;; Copyright (C) 1996, 2000, 2003 Free Software Foundation + +;; Copyright (C) 1996, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Steven L. Baur ;; Keywords: news, mail, multimedia diff --git a/lisp/gnus/gnus-bcklg.el b/lisp/gnus/gnus-bcklg.el index 54d62f03276..4ae08d2e470 100644 --- a/lisp/gnus/gnus-bcklg.el +++ b/lisp/gnus/gnus-bcklg.el @@ -1,6 +1,7 @@ ;;; gnus-bcklg.el --- backlog functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el index 66217699555..4477e8f579e 100644 --- a/lisp/gnus/gnus-cache.el +++ b/lisp/gnus/gnus-cache.el @@ -1,6 +1,7 @@ ;;; gnus-cache.el --- cache interface for Gnus + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -357,7 +358,7 @@ Returns the list of articles removed." (let ((alist (gnus-agent-load-alist gnus-newsgroup-name))) (unless (cdr (assoc article alist)) (setq gnus-newsgroup-undownloaded - (gnus-add-to-sorted-list + (gnus-add-to-sorted-list gnus-newsgroup-undownloaded article))))) (push article out)) (gnus-summary-update-download-mark article) diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el index ab3612a09f9..c33d224a49c 100644 --- a/lisp/gnus/gnus-cite.el +++ b/lisp/gnus/gnus-cite.el @@ -1,8 +1,7 @@ ;;; gnus-cite.el --- parse citations in articles for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Per Abhiddenware diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el index 32dc8bcf1b6..f523af22750 100644 --- a/lisp/gnus/gnus-cus.el +++ b/lisp/gnus/gnus-cus.el @@ -1,7 +1,7 @@ ;;; gnus-cus.el --- customization commands for Gnus -;; -;; Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Keywords: news diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el index 8e00efb1f0c..a664ff8ba00 100644 --- a/lisp/gnus/gnus-delay.el +++ b/lisp/gnus/gnus-delay.el @@ -1,6 +1,6 @@ ;;; gnus-delay.el --- Delayed posting of articles -;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Kai Großjohann ;; Keywords: mail, news, extensions diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el index 3d6b44c8b7b..09015bfd636 100644 --- a/lisp/gnus/gnus-demon.el +++ b/lisp/gnus/gnus-demon.el @@ -1,7 +1,7 @@ ;;; gnus-demon.el --- daemonic Gnus behaviour -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index c93f8a8ff7c..d9ab81a4b9f 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -1,6 +1,6 @@ ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend -;; Copyright (c) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Copyright (C) 1999, 2000, 2001 Didier Verna. ;; Author: Didier Verna diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el index aa54a7eaedc..665e75b2e86 100644 --- a/lisp/gnus/gnus-dired.el +++ b/lisp/gnus/gnus-dired.el @@ -1,7 +1,7 @@ ;;; gnus-dired.el --- utility functions where gnus and dired meet -;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Authors: Benjamin Rutt , ;; Shenghuo Zhu diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el index 2bc212f6221..c4cd4deddac 100644 --- a/lisp/gnus/gnus-draft.el +++ b/lisp/gnus/gnus-draft.el @@ -1,6 +1,7 @@ ;;; gnus-draft.el --- draft message support for Gnus -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el index 6a66246b700..c5358728d0b 100644 --- a/lisp/gnus/gnus-dup.el +++ b/lisp/gnus/gnus-dup.el @@ -1,6 +1,7 @@ ;;; gnus-dup.el --- suppression of duplicate articles in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-eform.el b/lisp/gnus/gnus-eform.el index cebbb398f21..c133d1541d8 100644 --- a/lisp/gnus/gnus-eform.el +++ b/lisp/gnus/gnus-eform.el @@ -1,6 +1,7 @@ ;;; gnus-eform.el --- a mode for editing forms for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el index f14dac4e5fb..c6ab1939547 100644 --- a/lisp/gnus/gnus-ems.el +++ b/lisp/gnus/gnus-ems.el @@ -1,6 +1,7 @@ ;;; gnus-ems.el --- functions for making Gnus work under different Emacsen -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el index fcbc05cc2e6..94f42efc360 100644 --- a/lisp/gnus/gnus-fun.el +++ b/lisp/gnus/gnus-fun.el @@ -1,5 +1,6 @@ ;;; gnus-fun.el --- various frivolous extension functions to Gnus -;; Copyright (C) 2002, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-gl.el b/lisp/gnus/gnus-gl.el index c1b52435bf9..aac386cefc9 100644 --- a/lisp/gnus/gnus-gl.el +++ b/lisp/gnus/gnus-gl.el @@ -1,7 +1,7 @@ ;;; gnus-gl.el --- an interface to GroupLens for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Brad Miller ;; Keywords: news, score diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 0bfbc46cf5d..9a2516d2c03 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1,6 +1,7 @@ ;;; gnus-group.el --- group mode commands for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el index 3cb4cb61539..8b274a09212 100644 --- a/lisp/gnus/gnus-int.el +++ b/lisp/gnus/gnus-int.el @@ -1,6 +1,7 @@ ;;; gnus-int.el --- backend interface functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el index 9bffd6ebc00..6cdd76647df 100644 --- a/lisp/gnus/gnus-kill.el +++ b/lisp/gnus/gnus-kill.el @@ -1,6 +1,7 @@ ;;; gnus-kill.el --- kill commands for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/gnus-logic.el b/lisp/gnus/gnus-logic.el index 2d7d701c311..288bf3caa92 100644 --- a/lisp/gnus/gnus-logic.el +++ b/lisp/gnus/gnus-logic.el @@ -1,6 +1,7 @@ ;;; gnus-logic.el --- advanced scoring code for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-mh.el b/lisp/gnus/gnus-mh.el index b4c502e9e06..cc36aa64687 100644 --- a/lisp/gnus/gnus-mh.el +++ b/lisp/gnus/gnus-mh.el @@ -1,6 +1,7 @@ ;;; gnus-mh.el --- mh-e interface for Gnus -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/gnus-ml.el b/lisp/gnus/gnus-ml.el index 5a2b3b9ae0a..c2cf1090d97 100644 --- a/lisp/gnus/gnus-ml.el +++ b/lisp/gnus/gnus-ml.el @@ -1,6 +1,7 @@ ;;; gnus-ml.el --- Mailing list minor mode for Gnus -;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Julien Gilles ;; Keywords: news diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el index 9b8d2d87e2e..291145cabfc 100644 --- a/lisp/gnus/gnus-mlspl.el +++ b/lisp/gnus/gnus-mlspl.el @@ -1,7 +1,7 @@ ;;; gnus-mlspl.el --- a group params-based mail splitting mechanism -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Alexandre Oliva ;; Keywords: news, mail diff --git a/lisp/gnus/gnus-move.el b/lisp/gnus/gnus-move.el index 2f5b4853d5b..7accde21db4 100644 --- a/lisp/gnus/gnus-move.el +++ b/lisp/gnus/gnus-move.el @@ -1,6 +1,7 @@ ;;; gnus-move.el --- commands for moving Gnus from one server to another -;; Copyright (C) 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 1317211389d..0614a2304f7 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -1,6 +1,7 @@ ;;; gnus-msg.el --- mail and post interface for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/gnus-nocem.el b/lisp/gnus/gnus-nocem.el index a59c33f5e48..7718e53ea60 100644 --- a/lisp/gnus/gnus-nocem.el +++ b/lisp/gnus/gnus-nocem.el @@ -1,8 +1,7 @@ ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004, 2005 -;; Free Software Foundation, Inc. - +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el index 40ac294d268..90733027cc5 100644 --- a/lisp/gnus/gnus-picon.el +++ b/lisp/gnus/gnus-picon.el @@ -1,7 +1,7 @@ ;;; gnus-picon.el --- displaying pretty icons in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news xpm annotation glyph faces diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el index 286d9e7c772..90ea8556754 100644 --- a/lisp/gnus/gnus-range.el +++ b/lisp/gnus/gnus-range.el @@ -1,7 +1,7 @@ ;;; gnus-range.el --- range and sequence functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index be29e96e102..17e8d5a5f50 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -1,6 +1,7 @@ ;;; gnus-registry.el --- article registry for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Ted Zlatanov ;; Keywords: news diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el index c8c0f30b417..89e45cac052 100644 --- a/lisp/gnus/gnus-salt.el +++ b/lisp/gnus/gnus-salt.el @@ -1,7 +1,7 @@ ;;; gnus-salt.el --- alternate summary mode interfaces for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el index 0fb853b868e..e866f7f32fc 100644 --- a/lisp/gnus/gnus-score.el +++ b/lisp/gnus/gnus-score.el @@ -1,6 +1,7 @@ ;;; gnus-score.el --- scoring code for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/gnus-setup.el b/lisp/gnus/gnus-setup.el index 3b35eddb1fc..f67fe491d82 100644 --- a/lisp/gnus/gnus-setup.el +++ b/lisp/gnus/gnus-setup.el @@ -1,7 +1,7 @@ ;;; gnus-setup.el --- Initialization & Setup for Gnus 5 -;; Copyright (C) 1995, 1996, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Steven L. Baur ;; Keywords: news diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el index 75b2fa12b0a..d790fec9aec 100644 --- a/lisp/gnus/gnus-sieve.el +++ b/lisp/gnus/gnus-sieve.el @@ -1,5 +1,6 @@ ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: NAGY Andras , ;; Simon Josefsson diff --git a/lisp/gnus/gnus-soup.el b/lisp/gnus/gnus-soup.el index 98cc0ea285e..6bcd2c32cce 100644 --- a/lisp/gnus/gnus-soup.el +++ b/lisp/gnus/gnus-soup.el @@ -1,7 +1,7 @@ ;;; gnus-soup.el --- SOUP packet writing support for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el index 84c06975205..784f9605037 100644 --- a/lisp/gnus/gnus-spec.el +++ b/lisp/gnus/gnus-spec.el @@ -1,6 +1,7 @@ ;;; gnus-spec.el --- format spec functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index 08527a5ea44..d7629c26fda 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -1,7 +1,7 @@ ;;; gnus-srvr.el --- virtual server support for Gnus + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 -;; Free Software Foundation, Inc. +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 730406a2487..47b380b19bb 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1,6 +1,7 @@ ;;; gnus-start.el --- startup functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index a61f3df6293..c2f7143a9ca 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -1,6 +1,7 @@ ;;; gnus-sum.el --- summary mode commands for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index 3b2bfacddb0..945665fdcca 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -1,6 +1,7 @@ ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2005 Free Software Foundation, Inc. +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Ilja Weis ;; Lars Magne Ingebrigtsen @@ -436,7 +437,7 @@ If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." (copy-sequence gnus-group-listed-groups)))) (gnus-update-format-specifications nil 'topic) - + (when (or (not gnus-topic-alist) (not gnus-topology-checked-p)) (gnus-topic-check-topology)) diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el index f09445827d1..09753150aa3 100644 --- a/lisp/gnus/gnus-undo.el +++ b/lisp/gnus/gnus-undo.el @@ -1,7 +1,7 @@ ;;; gnus-undo.el --- minor mode for undoing in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 925555e1ff0..6514eb37aa3 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1,6 +1,7 @@ ;;; gnus-util.el --- utility functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 4a7d5fec422..90a2433a3c6 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -1,6 +1,7 @@ ;;; gnus-uu.el --- extract (uu)encoded files in Gnus -;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000, -;; 2001, 2002, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Created: 2 Oct 1993 @@ -1353,7 +1354,7 @@ When called interactively, prompt for REGEXP." (gnus-message 2 "No begin part at the beginning") (sleep-for 2)) (setq state 'middle)))) - + ;; When there are no result-files, then something must be wrong. (if result-files (message "") @@ -1439,7 +1440,7 @@ When called interactively, prompt for REGEXP." ;; We replace certain characters that could make things messy. (setq gnus-uu-file-name (gnus-map-function - mm-file-name-rewrite-functions + mm-file-name-rewrite-functions (file-name-nondirectory (match-string 1)))) (replace-match (concat "begin 644 " gnus-uu-file-name) t t) diff --git a/lisp/gnus/gnus-vm.el b/lisp/gnus/gnus-vm.el index 240d297f3a5..31bd639a7c6 100644 --- a/lisp/gnus/gnus-vm.el +++ b/lisp/gnus/gnus-vm.el @@ -1,7 +1,7 @@ ;;; gnus-vm.el --- vm interface for Gnus -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Per Persson ;; Keywords: news, mail diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el index 9710b10ff2f..5b8ddb32c00 100644 --- a/lisp/gnus/gnus-win.el +++ b/lisp/gnus/gnus-win.el @@ -1,6 +1,7 @@ ;;; gnus-win.el --- window configuration functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 710c2c75025..f621d1088e3 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1,7 +1,7 @@ ;;; gnus.el --- a newsreader for GNU Emacs -;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, -;; 1998, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/hex-util.el b/lisp/gnus/hex-util.el index 4458f42a490..1cc67c2861c 100644 --- a/lisp/gnus/hex-util.el +++ b/lisp/gnus/hex-util.el @@ -1,6 +1,7 @@ ;;; hex-util.el --- Functions to encode/decode hexadecimal string. -;; Copyright (C) 1999, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI ;; Keywords: data diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el index d29a3cf5da7..41ba54f759e 100644 --- a/lisp/gnus/html2text.el +++ b/lisp/gnus/html2text.el @@ -1,4 +1,5 @@ ;;; html2text.el --- a simple html to plain text converter + ;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Joakim Hove diff --git a/lisp/gnus/ietf-drums.el b/lisp/gnus/ietf-drums.el index 4e95b8aad42..98f3d20330f 100644 --- a/lisp/gnus/ietf-drums.el +++ b/lisp/gnus/ietf-drums.el @@ -1,6 +1,7 @@ ;;; ietf-drums.el --- Functions for parsing RFC822bis headers -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el index 7d3fb46154d..062f1be4c94 100644 --- a/lisp/gnus/imap.el +++ b/lisp/gnus/imap.el @@ -1,6 +1,7 @@ ;;; imap.el --- imap library -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: mail diff --git a/lisp/gnus/mail-parse.el b/lisp/gnus/mail-parse.el index 086ab5c4f84..106aedad085 100644 --- a/lisp/gnus/mail-parse.el +++ b/lisp/gnus/mail-parse.el @@ -1,6 +1,7 @@ ;;; mail-parse.el --- Interface functions for parsing mail -;; Copyright (C) 1998, 1999, 2000 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/mail-prsvr.el b/lisp/gnus/mail-prsvr.el index d7e07ff97bb..d990f8dbc54 100644 --- a/lisp/gnus/mail-prsvr.el +++ b/lisp/gnus/mail-prsvr.el @@ -1,5 +1,7 @@ ;;; mail-prsvr.el --- Interface variables for parsing mail -;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 58a3e63ab75..3f3ecc7919f 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el @@ -1,6 +1,7 @@ ;;; mail-source.el --- functions for fetching mail -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el index d044adebdb9..166edb60f7a 100644 --- a/lisp/gnus/mailcap.el +++ b/lisp/gnus/mailcap.el @@ -1,6 +1,7 @@ ;;; mailcap.el --- MIME media types configuration -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: William M. Perry ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index d9e6d878e2f..0266fe95124 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1,6 +1,7 @@ ;;; message.el --- composing mail and news messages -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: mail, news diff --git a/lisp/gnus/messcompat.el b/lisp/gnus/messcompat.el index 3c6af7d9e8d..d7c8f40de26 100644 --- a/lisp/gnus/messcompat.el +++ b/lisp/gnus/messcompat.el @@ -1,7 +1,7 @@ ;;; messcompat.el --- making message mode compatible with mail mode -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: mail, news diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el index 23900d0cbec..ffca7da75bf 100644 --- a/lisp/gnus/mm-bodies.el +++ b/lisp/gnus/mm-bodies.el @@ -1,7 +1,7 @@ ;;; mm-bodies.el --- Functions for decoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index c65d5f80ba4..78b953946f8 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1,6 +1,7 @@ ;;; mm-decode.el --- Functions for decoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el index 43eb619368e..fd6251c37d3 100644 --- a/lisp/gnus/mm-encode.el +++ b/lisp/gnus/mm-encode.el @@ -1,6 +1,7 @@ ;;; mm-encode.el --- Functions for encoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el index 6792d0de0b4..27263d2a18d 100644 --- a/lisp/gnus/mm-extern.el +++ b/lisp/gnus/mm-extern.el @@ -1,5 +1,7 @@ ;;; mm-extern.el --- showing message/external-body -;; Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: message external-body diff --git a/lisp/gnus/mm-partial.el b/lisp/gnus/mm-partial.el index e8dd5596225..1c0c708d2a0 100644 --- a/lisp/gnus/mm-partial.el +++ b/lisp/gnus/mm-partial.el @@ -1,5 +1,7 @@ ;;; mm-partial.el --- showing message/partial -;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: message partial diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index 517263543cd..afed46f2f86 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el @@ -1,5 +1,6 @@ ;;; mm-url.el --- a wrapper of url functions/commands for Gnus -;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 512fee70863..339bd0f746a 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -1,6 +1,7 @@ ;;; mm-util.el --- Utility functions for Mule and low level things -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index 5d8f696fe41..fdb6b7f4585 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -1,5 +1,7 @@ ;;; mm-uu.el --- Return uu stuff as mm handles -;; Copyright (c) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 9b0d8217476..735cc2569c3 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -1,6 +1,7 @@ ;;; mm-view.el --- functions for viewing MIME objects -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el index 11f076c8035..f8c573a7656 100644 --- a/lisp/gnus/mml-sec.el +++ b/lisp/gnus/mml-sec.el @@ -1,5 +1,7 @@ ;;; mml-sec.el --- A package with security functions for MML documents -;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index 788fd80003e..2c37c52e3bc 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -1,5 +1,7 @@ ;;; mml-smime.el --- S/MIME support for MML -;; Copyright (c) 2000, 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: Gnus, MIME, S/MIME, MML diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 4a3a568d34c..16affbd63b9 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -1,6 +1,7 @@ ;;; mml.el --- A package for parsing and validating MML documents -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 8a9cce093de..fc6d9e8921d 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -1,6 +1,7 @@ ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML -;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Sascha Lüdecke , ;; Simon Josefsson (Mailcrypt interface, Gnus glue) diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index d403444e840..b90dfa96338 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -1,6 +1,7 @@ ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP) -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: PGP MIME MML diff --git a/lisp/gnus/nnagent.el b/lisp/gnus/nnagent.el index 257148dcd76..4b8233a4d54 100644 --- a/lisp/gnus/nnagent.el +++ b/lisp/gnus/nnagent.el @@ -1,7 +1,7 @@ ;;; nnagent.el --- offline backend for Gnus -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el index 449a7dbafcc..afdd4d15350 100644 --- a/lisp/gnus/nnbabyl.el +++ b/lisp/gnus/nnbabyl.el @@ -1,7 +1,7 @@ ;;; nnbabyl.el --- rmail mbox access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA diff --git a/lisp/gnus/nndb.el b/lisp/gnus/nndb.el index 4174728f47d..ca5b27cdd1d 100644 --- a/lisp/gnus/nndb.el +++ b/lisp/gnus/nndb.el @@ -1,7 +1,7 @@ ;;; nndb.el --- nndb access for Gnus -;; Copyright (C) 1997, 1998, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Kai Grossjohann diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index 2228b6a2de8..4be4c6f6646 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -1,7 +1,7 @@ ;;; nndiary.el --- A diary backend for Gnus -;; Copyright (C) 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Didier Verna ;; Maintainer: Didier Verna diff --git a/lisp/gnus/nndir.el b/lisp/gnus/nndir.el index 880df5166f9..18e64e83997 100644 --- a/lisp/gnus/nndir.el +++ b/lisp/gnus/nndir.el @@ -1,7 +1,7 @@ ;;; nndir.el --- single directory newsgroup access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el index 4fab99fd84d..70e301b5b00 100644 --- a/lisp/gnus/nndoc.el +++ b/lisp/gnus/nndoc.el @@ -1,6 +1,7 @@ ;;; nndoc.el --- single file access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el index 9a93e5aa072..beea344e0c3 100644 --- a/lisp/gnus/nndraft.el +++ b/lisp/gnus/nndraft.el @@ -1,7 +1,7 @@ ;;; nndraft.el --- draft article access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el index db7a5fcc2aa..33f6a5f4ea5 100644 --- a/lisp/gnus/nneething.el +++ b/lisp/gnus/nneething.el @@ -1,7 +1,7 @@ ;;; nneething.el --- arbitrary file access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el index 07697000eeb..5a29878b5fb 100644 --- a/lisp/gnus/nnfolder.el +++ b/lisp/gnus/nnfolder.el @@ -1,6 +1,7 @@ ;;; nnfolder.el --- mail folder access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson (adding MARKS) ;; ShengHuo Zhu (adding NOV) diff --git a/lisp/gnus/nngateway.el b/lisp/gnus/nngateway.el index d8e3e0a638b..8ddbf9ca13b 100644 --- a/lisp/gnus/nngateway.el +++ b/lisp/gnus/nngateway.el @@ -1,7 +1,7 @@ ;;; nngateway.el --- posting news via mail gateways -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el index e793b5ef8f0..5cc26cb07d9 100644 --- a/lisp/gnus/nnheader.el +++ b/lisp/gnus/nnheader.el @@ -1,8 +1,8 @@ ;;; nnheader.el --- header access macros for Gnus and its backends -;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, -;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, +;; 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 698f7cf9a3e..5a2b7e2f942 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -1,6 +1,7 @@ ;;; nnimap.el --- imap backend for Gnus -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Jim Radford diff --git a/lisp/gnus/nnkiboze.el b/lisp/gnus/nnkiboze.el index dd5951cf536..ee3c804ae8f 100644 --- a/lisp/gnus/nnkiboze.el +++ b/lisp/gnus/nnkiboze.el @@ -1,7 +1,7 @@ ;;; nnkiboze.el --- select virtual news access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/nnlistserv.el b/lisp/gnus/nnlistserv.el index 432a259b78d..2b9d478086d 100644 --- a/lisp/gnus/nnlistserv.el +++ b/lisp/gnus/nnlistserv.el @@ -1,6 +1,7 @@ ;;; nnlistserv.el --- retrieving articles via web mailing list archives -;; Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index de4247dc55e..98563143243 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1,6 +1,7 @@ ;;; nnmail.el --- mail support functions for the Gnus mail backends -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail diff --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el index e3d88396e16..fe25ef9d0a4 100644 --- a/lisp/gnus/nnmbox.el +++ b/lisp/gnus/nnmbox.el @@ -1,7 +1,7 @@ ;;; nnmbox.el --- mail mbox access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el index f73bda68bf0..4c0af4fdcfb 100644 --- a/lisp/gnus/nnmh.el +++ b/lisp/gnus/nnmh.el @@ -1,7 +1,7 @@ ;;; nnmh.el --- mhspool access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el index e6eca8b1559..9bdd08fd3ca 100644 --- a/lisp/gnus/nnml.el +++ b/lisp/gnus/nnml.el @@ -1,6 +1,7 @@ ;;; nnml.el --- mail spool access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson (adding MARKS) ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/nnoo.el b/lisp/gnus/nnoo.el index 73399112102..fcd50c3a767 100644 --- a/lisp/gnus/nnoo.el +++ b/lisp/gnus/nnoo.el @@ -1,7 +1,7 @@ ;;; nnoo.el --- OO Gnus Backends -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -254,7 +254,7 @@ (setcdr bstate (delq defs (cdr bstate))) (pop defs) (while defs - (set (car (pop defs)) nil))))) + (set (car (pop defs)) nil))))) t) (defun nnoo-close (backend) diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 4d43604984e..5018701ee42 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -1,5 +1,6 @@ ;;; nnrss.el --- interfacing with RSS -;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: RSS diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el index 177bb019224..9350a284e3d 100644 --- a/lisp/gnus/nnslashdot.el +++ b/lisp/gnus/nnslashdot.el @@ -1,5 +1,7 @@ ;;; nnslashdot.el --- interfacing with Slashdot -;; Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/nnsoup.el b/lisp/gnus/nnsoup.el index 13a464ab219..94c259b6d96 100644 --- a/lisp/gnus/nnsoup.el +++ b/lisp/gnus/nnsoup.el @@ -1,7 +1,7 @@ ;;; nnsoup.el --- SOUP access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el index 49e9693c32b..228879a4dad 100644 --- a/lisp/gnus/nnspool.el +++ b/lisp/gnus/nnspool.el @@ -1,8 +1,7 @@ ;;; nnspool.el --- spool access for GNU Emacs ;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, -;; 2000, 2002, 2003 -;; Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 2895faf62ef..4998c7a9503 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1,8 +1,8 @@ ;;; nntp.el --- nntp access for Gnus -;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, -;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, +;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -255,7 +255,7 @@ noticing asynchronous data.") (defvar nntp-async-timer nil) (defvar nntp-async-process-list nil) -(defvar nntp-ssl-program +(defvar nntp-ssl-program "openssl s_client -quiet -ssl3 -connect %s:%p" "A string containing commands for SSL connections. Within a string, %s is replaced with the server address and %p with @@ -889,7 +889,7 @@ command whose response triggered the error." (if (numberp article) (int-to-string article) article)))) (deffoo nntp-request-group (group &optional server dont-check) - (nntp-with-open-group + (nntp-with-open-group nil server (when (nntp-send-command "^[245].*\n" "GROUP" group) (let ((entry (nntp-find-connection-entry nntp-server-buffer))) @@ -1156,10 +1156,10 @@ password contained in '~/.nntp-authinfo'." (defun nntp-open-ssl-stream (buffer) (let* ((process-connection-type nil) - (proc (start-process "nntpd" buffer + (proc (start-process "nntpd" buffer shell-file-name shell-command-switch - (format-spec nntp-ssl-program + (format-spec nntp-ssl-program (format-spec-make ?s nntp-address ?p nntp-port-number))))) @@ -1317,7 +1317,7 @@ password contained in '~/.nntp-authinfo'." ;; that the server has closed the connection. This MUST be ;; handled here as the buffer restored by the save-excursion may ;; be the process's former output buffer (i.e. now killed) - (or (and process + (or (and process (memq (process-status process) '(open run))) (nntp-report "Server closed connection")))) @@ -1501,7 +1501,7 @@ password contained in '~/.nntp-authinfo'." (goto-char (point-min)) (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t) (let ((low-limit (string-to-number - (buffer-substring (match-beginning 1) + (buffer-substring (match-beginning 1) (match-end 1))))) (while (and articles (<= (car articles) low-limit)) (setq articles (cdr articles)))))) diff --git a/lisp/gnus/nnultimate.el b/lisp/gnus/nnultimate.el index 7bc7bbf462e..46896640168 100644 --- a/lisp/gnus/nnultimate.el +++ b/lisp/gnus/nnultimate.el @@ -1,6 +1,7 @@ ;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system -;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el index c7e93528a5e..28ef0f5c830 100644 --- a/lisp/gnus/nnvirtual.el +++ b/lisp/gnus/nnvirtual.el @@ -1,6 +1,7 @@ ;;; nnvirtual.el --- virtual newsgroups access for Gnus -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: David Moore ;; Lars Magne Ingebrigtsen diff --git a/lisp/gnus/nnwarchive.el b/lisp/gnus/nnwarchive.el index 8e4c22e8b04..a543c8edb82 100644 --- a/lisp/gnus/nnwarchive.el +++ b/lisp/gnus/nnwarchive.el @@ -1,5 +1,7 @@ ;;; nnwarchive.el --- interfacing with web archives -;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: news egroups mail-archive diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el index 4e1ed36d861..d05520ee1dc 100644 --- a/lisp/gnus/nnweb.el +++ b/lisp/gnus/nnweb.el @@ -1,6 +1,7 @@ ;;; nnweb.el --- retrieving articles via web search engines -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/nnwfm.el b/lisp/gnus/nnwfm.el index 71d622357bf..d759d12f798 100644 --- a/lisp/gnus/nnwfm.el +++ b/lisp/gnus/nnwfm.el @@ -1,5 +1,6 @@ ;;; nnwfm.el --- interfacing with a web forum -;; Copyright (C) 2000 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/lisp/gnus/pgg-def.el b/lisp/gnus/pgg-def.el index 351a336800e..f27afada3fa 100644 --- a/lisp/gnus/pgg-def.el +++ b/lisp/gnus/pgg-def.el @@ -1,6 +1,6 @@ ;;; pgg-def.el --- functions/macros for defining PGG functions -;; Copyright (C) 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Created: 1999/11/02 diff --git a/lisp/gnus/pgg-gpg.el b/lisp/gnus/pgg-gpg.el index 904c0e46878..f012a9d8506 100644 --- a/lisp/gnus/pgg-gpg.el +++ b/lisp/gnus/pgg-gpg.el @@ -1,6 +1,7 @@ ;;; pgg-gpg.el --- GnuPG support for PGG. -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Created: 1999/10/28 diff --git a/lisp/gnus/pgg-parse.el b/lisp/gnus/pgg-parse.el index c65f6a3a822..d0987659b96 100644 --- a/lisp/gnus/pgg-parse.el +++ b/lisp/gnus/pgg-parse.el @@ -1,6 +1,6 @@ ;;; pgg-parse.el --- OpenPGP packet parsing -;; Copyright (C) 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Created: 1999/10/28 diff --git a/lisp/gnus/pgg-pgp.el b/lisp/gnus/pgg-pgp.el index b2add4726d3..88f1d697200 100644 --- a/lisp/gnus/pgg-pgp.el +++ b/lisp/gnus/pgg-pgp.el @@ -1,6 +1,7 @@ ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG. -;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Created: 1999/11/02 diff --git a/lisp/gnus/pgg-pgp5.el b/lisp/gnus/pgg-pgp5.el index cbdb693ef60..ffe467ec044 100644 --- a/lisp/gnus/pgg-pgp5.el +++ b/lisp/gnus/pgg-pgp5.el @@ -1,6 +1,7 @@ ;;; pgg-pgp5.el --- PGP 5.* support for PGG. -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Created: 1999/11/02 diff --git a/lisp/gnus/pgg.el b/lisp/gnus/pgg.el index 8d72fd31502..b61d1ad82ec 100644 --- a/lisp/gnus/pgg.el +++ b/lisp/gnus/pgg.el @@ -1,6 +1,7 @@ ;;; pgg.el --- glue for the various PGP implementations. -;; Copyright (C) 1999, 2000, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Created: 1999/10/28 diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el index 1f109f6d7dd..f021e063fcd 100644 --- a/lisp/gnus/pop3.el +++ b/lisp/gnus/pop3.el @@ -1,8 +1,7 @@ ;;; pop3.el --- Post Office Protocol (RFC 1460) interface -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Richard L. Pieri ;; Maintainer: FSF diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el index d95508123ac..bd0a1b4b5a5 100644 --- a/lisp/gnus/qp.el +++ b/lisp/gnus/qp.el @@ -1,7 +1,7 @@ ;;; qp.el --- Quoted-Printable functions -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: mail, extensions diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el index 9af2fc6327a..2214a1b7b88 100644 --- a/lisp/gnus/rfc1843.el +++ b/lisp/gnus/rfc1843.el @@ -1,5 +1,7 @@ ;;; rfc1843.el --- HZ (rfc1843) decoding -;; Copyright (c) 1998, 1999, 2000, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: news HZ HZ+ mail i18n diff --git a/lisp/gnus/rfc2045.el b/lisp/gnus/rfc2045.el index a1b06b4d939..b3bbe373d9d 100644 --- a/lisp/gnus/rfc2045.el +++ b/lisp/gnus/rfc2045.el @@ -1,6 +1,7 @@ ;;; rfc2045.el --- Functions for decoding rfc2045 headers -;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index ae2904c86fd..84c46e936a3 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -1,7 +1,7 @@ ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko diff --git a/lisp/gnus/rfc2104.el b/lisp/gnus/rfc2104.el index cea9f587ac9..bdacc19ec9b 100644 --- a/lisp/gnus/rfc2104.el +++ b/lisp/gnus/rfc2104.el @@ -1,5 +1,7 @@ ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes -;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: mail diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el index 4c39ba6c7fd..f328f2dbc6a 100644 --- a/lisp/gnus/rfc2231.el +++ b/lisp/gnus/rfc2231.el @@ -1,7 +1,7 @@ ;;; rfc2231.el --- Functions for decoding rfc2231 headers -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/gnus/score-mode.el b/lisp/gnus/score-mode.el index c580256c94e..add14ea6ded 100644 --- a/lisp/gnus/score-mode.el +++ b/lisp/gnus/score-mode.el @@ -1,6 +1,7 @@ ;;; score-mode.el --- mode for editing Gnus score files -;; Copyright (C) 1996, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail diff --git a/lisp/gnus/sha1.el b/lisp/gnus/sha1.el index 8968f1d42d5..99b9aa47bb6 100644 --- a/lisp/gnus/sha1.el +++ b/lisp/gnus/sha1.el @@ -1,6 +1,7 @@ ;;; sha1.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp -;; Copyright (C) 1999, 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI ;; Keywords: SHA1, FIPS 180-1 diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el index 5c0712420a0..dc2016f282e 100644 --- a/lisp/gnus/sieve-manage.el +++ b/lisp/gnus/sieve-manage.el @@ -1,5 +1,6 @@ ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp -;; Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson diff --git a/lisp/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el index 012c58de3b4..31ff5d1e9c9 100644 --- a/lisp/gnus/sieve-mode.el +++ b/lisp/gnus/sieve-mode.el @@ -1,5 +1,6 @@ ;;; sieve-mode.el --- Sieve code editing commands for Emacs -;; Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el index 498a82387cd..28fde926c93 100644 --- a/lisp/gnus/sieve.el +++ b/lisp/gnus/sieve.el @@ -1,5 +1,6 @@ ;;; sieve.el --- Utilities to manage sieve scripts -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el index 42444e74bda..cdd1c8dbc9b 100644 --- a/lisp/gnus/smiley.el +++ b/lisp/gnus/smiley.el @@ -1,6 +1,7 @@ ;;; smiley.el --- displaying smiley faces -;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Love ;; Keywords: news mail multimedia diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el index 059c1819605..485cf177154 100644 --- a/lisp/gnus/smime.el +++ b/lisp/gnus/smime.el @@ -1,5 +1,7 @@ ;;; smime.el --- S/MIME support library -;; Copyright (c) 2000, 2001, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: SMIME X.509 PEM OpenSSL diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el index 8ac235d12f2..50a564885bb 100644 --- a/lisp/gnus/spam-report.el +++ b/lisp/gnus/spam-report.el @@ -1,4 +1,5 @@ ;;; spam-report.el --- Reporting spam + ;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Teodor Zlatanov @@ -95,7 +96,7 @@ undo that change.") (string-match spam-report-gmane-regex gnus-newsgroup-name))) (gnus-message 6 "Reporting spam article %d to spam.gmane.org..." article) (if spam-report-gmane-use-article-number - (spam-report-url-ping + (spam-report-url-ping "spam.gmane.org" (format "/%s:%d" (gnus-group-real-name gnus-newsgroup-name) diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el index 18f16fd0946..436e7cc5fc7 100644 --- a/lisp/gnus/spam-stat.el +++ b/lisp/gnus/spam-stat.el @@ -1,6 +1,6 @@ ;;; spam-stat.el --- detecting spam based on statistics -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Alex Schroeder ;; Keywords: network diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index e22ad1c2fa3..32de2f60e22 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -1,4 +1,5 @@ ;;; spam.el --- Identifying spam + ;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index 92a436ca865..67464395c76 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -1,7 +1,7 @@ ;;; starttls.el --- STARTTLS functions -;; Copyright (C) 1999, 2000, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Author: Simon Josefsson diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el index 5207e96aeae..d1eb6ee40dd 100644 --- a/lisp/gnus/utf7.el +++ b/lisp/gnus/utf7.el @@ -1,5 +1,7 @@ ;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding: iso-8859-1;-*- -;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Jon K Hellan ;; Maintainer: bugs@gnus.org diff --git a/lisp/gnus/uudecode.el b/lisp/gnus/uudecode.el index b4f4b74700f..c1fc56ad8bf 100644 --- a/lisp/gnus/uudecode.el +++ b/lisp/gnus/uudecode.el @@ -1,6 +1,7 @@ ;;; uudecode.el -- elisp native uudecode -;; Copyright (c) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: uudecode news diff --git a/lisp/gnus/webmail.el b/lisp/gnus/webmail.el index 51125897fe4..e9bc074f2cf 100644 --- a/lisp/gnus/webmail.el +++ b/lisp/gnus/webmail.el @@ -1,5 +1,7 @@ ;;; webmail.el --- interface of web mail -;; Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. + +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: hotmail netaddress my-deja netscape diff --git a/lisp/gnus/yenc.el b/lisp/gnus/yenc.el index 0d5ad3905be..37018d2fa19 100644 --- a/lisp/gnus/yenc.el +++ b/lisp/gnus/yenc.el @@ -1,5 +1,6 @@ ;;; yenc.el --- elisp native yenc decoder -;; Copyright (c) 2002 Free Software Foundation, Inc. + +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jesper Harder ;; Keywords: yenc news diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el index c8bb2e729d2..01c52f82046 100644 --- a/lisp/mail/blessmail.el +++ b/lisp/mail/blessmail.el @@ -1,6 +1,6 @@ ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*- -;; Copyright (C) 1994 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 2eea86e7a4a..bb88c447320 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -1,7 +1,7 @@ ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list -;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index e4c0cd10c13..58b6be4f5fc 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -1,6 +1,7 @@ ;;; footnote.el --- footnote support for message mode -*- coding: iso-latin-1;-*- -;; Copyright (C) 1997, 2000 by Free Software Foundation, Inc. +;; Copyright (C) 1997, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Steven L Baur ;; Keywords: mail, news diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index 15b8dd466ad..da5ec4bfda1 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1,7 +1,7 @@ ;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*- -;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Joe Wells ;; Maintainer: FSF diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el index 0540c484a89..3010e85d31b 100644 --- a/lisp/mail/mail-hist.el +++ b/lisp/mail/mail-hist.el @@ -1,6 +1,6 @@ ;;; mail-hist.el --- headers and message body history for outgoing mail -;; Copyright (C) 1994 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Karl Fogel ;; Created: March, 1994 diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el index 3b68506b48a..e76da171fbc 100644 --- a/lisp/mail/mail-utils.el +++ b/lisp/mail/mail-utils.el @@ -1,6 +1,7 @@ ;;; mail-utils.el --- utility functions used both by rmail and rnews -;; Copyright (C) 1985, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail, news diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el index 941dff7ca10..270d2cd6385 100644 --- a/lisp/mail/mailabbrev.el +++ b/lisp/mail/mailabbrev.el @@ -1,7 +1,7 @@ ;;; mailabbrev.el --- abbrev-expansion of mail aliases -;; Copyright (C) 1985, 86, 87, 92, 93, 96, 1997, 2000, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1996, 1997, 2000, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski , now ;; Maintainer: FSF diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 55c284dda7d..56882f04eb5 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -1,6 +1,7 @@ ;;; mailalias.el --- expand and complete mailing address aliases -;; Copyright (C) 1985, 1987, 1995, 1996, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el index e7c4320cc48..1e9a24da341 100644 --- a/lisp/mail/mailheader.el +++ b/lisp/mail/mailheader.el @@ -1,6 +1,6 @@ ;;; mailheader.el --- mail header parsing, merging, formatting -;; Copyright (C) 1996 by Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc. ;; Author: Erik Naggum ;; Keywords: tools, mail, news diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el index 0c5189e53e0..0814f6e008b 100644 --- a/lisp/mail/metamail.el +++ b/lisp/mail/metamail.el @@ -1,6 +1,7 @@ ;;; metamail.el --- Metamail interface for GNU Emacs -;; Copyright (C) 1993, 1996 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1996, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Keywords: mail, news, mime, multimedia diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el index d1a3072eee8..575c233d9a7 100644 --- a/lisp/mail/mspools.el +++ b/lisp/mail/mspools.el @@ -1,6 +1,6 @@ ;;; mspools.el --- show mail spools waiting to be read -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Stephen Eglen ;; Maintainer: Stephen Eglen diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el index 673cb14e255..9e3a2d1a871 100644 --- a/lisp/mail/reporter.el +++ b/lisp/mail/reporter.el @@ -1,6 +1,7 @@ ;;; reporter.el --- customizable bug reporting of lisp programs -;; Copyright (C) 1993,1994,1995,1996,1997,1998 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: 1993-1998 Barry A. Warsaw ;; Maintainer: FSF diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el index d6864b664ed..a21deb394cf 100644 --- a/lisp/mail/rfc2368.el +++ b/lisp/mail/rfc2368.el @@ -3,7 +3,8 @@ ;; Author: Sen Nagata ;; Keywords: mail -;; Copyright (C) 1998, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el index 4c7cfeeaa69..9e57226d7c2 100644 --- a/lisp/mail/rfc822.el +++ b/lisp/mail/rfc822.el @@ -1,6 +1,7 @@ ;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike -;; Copyright (C) 1986, 87, 1990 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1990, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Richard Mlynarik ;; Maintainer: FSF diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index 9cd2123e3c3..20acb87831a 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el @@ -1,7 +1,6 @@ ;;; rmail-spam-filter.el --- spam filter for rmail, the emacs mail reader. -;; Copyright (C) 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Keywords: email, spam, filter, rmail ;; Author: Eli Tziperman @@ -183,7 +182,7 @@ may be either 'this is spam' or 'another spam', use the regexp: 'this is spam\\|another spam' (without the single quotes). To specify that if the contents contain both this and that the message is spam, specify 'this\\&that' in the appropriate spam definition field." - :type '(repeat + :type '(repeat (list :format "%v" (cons :format "%v" :value (from . "") (const :format "" from) @@ -202,7 +201,7 @@ specify 'this\\&that' in the appropriate spam definition field." (string :tag "Contents" "")) (cons :format "%v" :value (action . output-and-delete) (const :format "" action) - (choice :tag "Action selection" + (choice :tag "Action selection" (const :tag "output to spam folder and delete" output-and-delete) (const :tag "delete spam" delete-spam) )) @@ -218,7 +217,7 @@ for interaction with `rsf-bbdb-auto-delete-spam-entries'") (defun check-field (field-symbol message-data definition result) "Check if field-symbol is in `rsf-definitions-alist'. Capture maybe-spam and this-is-a-spam-email in a cons in result, -where maybe-spam is in first and this-is-a-spam-email is in rest. +where maybe-spam is in first and this-is-a-spam-email is in rest. The values are returned by destructively changing result. If FIELD-SYMBOL field does not exist AND is not specified, this may still be spam due to another element... @@ -259,7 +258,7 @@ it from rmail file. Called for each new message retrieved by (save-current-msg) (rsf-saved-bbdb/mail_auto_create_p nil) ) - + ;; make sure bbdb does not create entries for messages while spam ;; filter is scanning the rmail file: (setq rsf-saved-bbdb/mail_auto_create_p 'bbdb/mail_auto_create_p) @@ -291,7 +290,7 @@ it from rmail file. Called for each new message retrieved by ;;; do we want to ignore case in spam definitions: (setq case-fold-search rsf-ignore-case) - + ;; Check for blind CC condition. Set vars such that while ;; loop will be bypassed and spam condition will trigger (if (and rsf-no-blind-cc @@ -339,7 +338,7 @@ it from rmail file. Called for each new message retrieved by ;; start scanning incoming message: ;;--------------------------------- - + ;; Maybe the different fields should also be done in a ;; loop to make the whole thing more flexible ;; if sender field is not specified in message being @@ -352,16 +351,16 @@ it from rmail file. Called for each new message retrieved by ;; next, if spam was not ruled out already, check subject: (check-field 'subject message-subject definition maybe-spam) ;; next, if spam was not ruled out already, check content-type: - (check-field 'content-type message-content-type + (check-field 'content-type message-content-type definition maybe-spam) ;; next, if spam was not ruled out already, check ;; contents: if contents field is not specified, this may ;; still be spam due to another element... - (check-field 'contents + (check-field 'contents (buffer-substring (rmail-msgbeg msg) (rmail-msgend msg)) definition maybe-spam) - + ;; if the search in rsf-definitions-alist found ;; that this email is spam, output the email to the spam ;; rmail file, mark the email for deletion, leave the @@ -378,7 +377,7 @@ it from rmail file. Called for each new message retrieved by (setq num-element (+ num-element 1))) ) ) - + ;; (BK) re-set originally used variables (setq this-is-a-spam-email (rest maybe-spam) maybe-spam (first maybe-spam)) @@ -610,9 +609,9 @@ automatically, no user input is required." (while definitions (setq current (car definitions)) (setq definitions (cdr definitions)) - (setq result + (setq result (append result - (list + (list (list (assoc 'from current) (assoc 'to current) (assoc 'subject current) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 7176376f12a..385ce0f71e6 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1,7 +1,7 @@ ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs -;; Copyright (C) 1985,86,87,88,93,94,95,96,97,98,2000,01,2004,2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail @@ -108,7 +108,7 @@ Please use `rmail-remote-password' instead." :group 'rmail-obsolete) (defcustom rmail-pop-password-required nil - "*Non-nil if a password is required when reading mail from a POP server. + "*Non-nil if a password is required when reading mail from a POP server. Please use rmail-remote-password-required instead." :type 'boolean :group 'rmail-obsolete) @@ -1634,7 +1634,7 @@ is non-nil if the user has supplied the password interactively. (pass (match-string 5 file)) (host (substring file (or (match-end 2) (+ 3 (match-end 1)))))) - + (if (not pass) (when rmail-remote-password-required (setq got-password (not (rmail-have-password))) @@ -1652,19 +1652,19 @@ is non-nil if the user has supplied the password interactively. (or (string-equal proto "pop") (string-equal proto "imap")) supplied-password got-password)))) - + ((string-match "^po:\\([^:]+\\)\\(:\\(.*\\)\\)?" file) (let (got-password supplied-password (proto "pop") (user (match-string 1 file)) (host (match-string 3 file))) - + (when rmail-remote-password-required (setq got-password (not (rmail-have-password))) (setq supplied-password (rmail-get-remote-password nil))) (list file "pop" supplied-password got-password))) - + (t (list file nil nil nil)))) @@ -2614,7 +2614,7 @@ Ask the user whether to add that list name to `mail-mailing-lists'." (let ((mail-followup-to (mail-fetch-field "mail-followup-to" nil t))) (when mail-followup-to (let ((addresses - (split-string + (split-string (mail-strip-quoted-names mail-followup-to) ",[[:space:]]+" t))) (dolist (addr addresses) diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el index 40dba181d5c..75de9810a37 100644 --- a/lisp/mail/rmailedit.el +++ b/lisp/mail/rmailedit.el @@ -1,6 +1,7 @@ ;;; rmailedit.el --- "RMAIL edit mode" Edit the current message -;; Copyright (C) 1985, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el index fc57b2a4d5e..9ccf45348a3 100644 --- a/lisp/mail/rmailkwd.el +++ b/lisp/mail/rmailkwd.el @@ -1,6 +1,7 @@ ;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs -;; Copyright (C) 1985, 1988, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1988, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el index 50626d714ce..798d247a7d2 100644 --- a/lisp/mail/rmailmsc.el +++ b/lisp/mail/rmailmsc.el @@ -1,6 +1,6 @@ ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el index d3baf08c261..a3b46ddaedf 100644 --- a/lisp/mail/rmailout.el +++ b/lisp/mail/rmailout.el @@ -1,6 +1,7 @@ ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file -;; Copyright (C) 1985, 1987, 1993, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1993, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el index 32188657c44..8bb8ab69278 100644 --- a/lisp/mail/rmailsort.el +++ b/lisp/mail/rmailsort.el @@ -1,6 +1,7 @@ ;;; rmailsort.el --- Rmail: sort messages -;; Copyright (C) 1990, 1993, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA ;; Maintainer: FSF diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index e3cb4ce1eb8..84db530c6fc 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -1,7 +1,7 @@ ;;; rmailsum.el --- make summary buffers for the mail reader -;; Copyright (C) 1985, 1993, 1994, 1995, 1996, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 337301ebcfa..08568df93c2 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1,7 +1,7 @@ ;;; sendmail.el --- mail sending commands for Emacs. -*- byte-compile-dynamic: t -*- -;; Copyright (C) 1985, 86, 92, 93, 94, 95, 96, 98, 2000, 2001, 2002, 03, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000, +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el index 5f219510b21..f172f95e661 100644 --- a/lisp/mail/supercite.el +++ b/lisp/mail/supercite.el @@ -1,6 +1,7 @@ ;;; supercite.el --- minor mode for citing mail and news replies -;; Copyright (C) 1993, 1997, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw ;; Maintainer: Glenn Morris diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el index 2a7fedf8493..6dcf67e6d79 100644 --- a/lisp/mail/uce.el +++ b/lisp/mail/uce.el @@ -1,6 +1,7 @@ ;;; uce.el --- facilitate reply to unsolicited commercial email -;; Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: stanislav shalunov ;; Created: 10 Dec 1996 diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el index b19c9a140dc..5588ecf9108 100644 --- a/lisp/mail/undigest.el +++ b/lisp/mail/undigest.el @@ -1,7 +1,7 @@ ;;; undigest.el --- digest-cracking support for the RMAIL mail reader -;; Copyright (C) 1985, 1986, 1994, 1996, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1994, 1996, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el index bcac0cee0d9..76764d21ed7 100644 --- a/lisp/mail/unrmail.el +++ b/lisp/mail/unrmail.el @@ -1,6 +1,6 @@ ;;; unrmail.el --- convert Rmail files to mailbox files -;;; Copyright (C) 1992, 2002 Free Software Foundation, Inc. +;;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el index 881c4d95a61..b53b32be71a 100644 --- a/lisp/mail/vms-pmail.el +++ b/lisp/mail/vms-pmail.el @@ -1,6 +1,6 @@ ;;; vms-pmail.el --- use Emacs as the editor within VMS mail -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Roland B Roberts ;; Maintainer: FSF From 99f3554f006f8487b4fdeeb74465e82c02d6299d Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 19:54:47 +0000 Subject: [PATCH 016/347] Update "copyright years" section. --- admin/FOR-RELEASE | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 58382d56fbf..1a8497a7207 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -96,24 +96,28 @@ you're going to handle. DIRECTORY STATUS IN CHARGE --------- ------ --------- leim working Kenichi Handa +lisp working Thien-Thi Nguyen lisp/calc done Thien-Thi Nguyen lisp/calendar working Glenn Morris -lisp/emacs-lisp working Thien-Thi Nguyen +lisp/emacs-lisp done Thien-Thi Nguyen lisp/emulation done Thien-Thi Nguyen lisp/eshell done Thien-Thi Nguyen -lisp/gnus working Thien-Thi Nguyen +lisp/gnus done Thien-Thi Nguyen lisp/international done Kenichi Handa lisp/language done Kenichi Handa -lisp/mail working Thien-Thi Nguyen +lisp/mail done Thien-Thi Nguyen lisp/mh-e working Bill Wohler lisp/net done Thien-Thi Nguyen -lisp/obsolete working Thien-Thi Nguyen +lisp/obsolete done Thien-Thi Nguyen lisp/play done Thien-Thi Nguyen lisp/progmodes done Nick Roberts lisp/term done Thien-Thi Nguyen -lisp/textmodes working Thien-Thi Nguyen +lisp/textmodes done Thien-Thi Nguyen lisp/toolbar done Thien-Thi Nguyen lisp/url done Thien-Thi Nguyen +src working Thien-Thi Nguyen +src/m working Thien-Thi Nguyen +src/s working Thien-Thi Nguyen ** Check the Emacs manual. From 44766d63addeeaba31d53a8e772c42e606227dbe Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Sat, 6 Aug 2005 20:29:11 +0000 Subject: [PATCH 017/347] 2005-08-06 Michael Kifer * viper.el (viper-emacs-state-mode-list): add recentf-dialog-mode. Change the date of last update. --- lisp/ChangeLog | 5 +++++ lisp/emulation/viper.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7550d1cd739..8eda720103c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-08-06 Michael Kifer + + * viper.el (viper-emacs-state-mode-list): add recentf-dialog-mode. + Change the date of last update. + 2005-08-06 Michael Kifer * viper-cmd.el (viper-harness-minor-mode,viper-exec-delete, diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 52d0fefcd20..bfa730cc434 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -9,7 +9,7 @@ ;; Author: Michael Kifer ;; Keywords: emulations -(defconst viper-version "3.11.5 of July 8, 2005" +(defconst viper-version "3.11.5 of August 6, 2005" "The current version of Viper") ;; This file is part of GNU Emacs. @@ -425,6 +425,7 @@ widget." browse-kill-ring-mode recentf-mode + recentf-dialog-mode occur-mode mh-folder-mode From cb5ccc08d54fb54443204e9cc6f893ae9464b2bd Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 6 Aug 2005 20:37:01 +0000 Subject: [PATCH 018/347] *** empty log message *** --- lisp/ChangeLog | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8eda720103c..1627ef8e09c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,29 +1,29 @@ 2005-08-06 Michael Kifer - - * viper.el (viper-emacs-state-mode-list): add recentf-dialog-mode. + + * viper.el (viper-emacs-state-mode-list): Add recentf-dialog-mode. Change the date of last update. - + 2005-08-06 Michael Kifer - - * viper-cmd.el (viper-harness-minor-mode,viper-exec-delete, - viper-exec-yank,viper-put-back): don't display modification msg if in - the minibuffer. - - * viper-init.el (viper-replace-overlay-cursor-color, - viper-insert-state-cursor-color,viper-vi-state-cursor-color): make - variables frame local. - - * viper-util.el (viper-append-filter-alist): use append instead of + + * viper-cmd.el (viper-harness-minor-mode, viper-exec-delete) + (viper-exec-yank, viper-put-back): Don't display modification msg + if in the minibuffer. + + * viper-init.el (viper-replace-overlay-cursor-color) + (viper-insert-state-cursor-color, viper-vi-state-cursor-color): + Make variables frame local. + + * viper-util.el (viper-append-filter-alist): Use append instead of nconc. - - * viper.el (viper-vi-state-mode-list,viper-emacs-state-mode-list): move - help-mode and completion-list-mode from the first list to the second. - (viper-mode): docstring. - (viper-go-away,viper-non-hook-settings): don't localize - minor-mode-alist in newer emacsen. - Add advice to set-cursor-color. - Don't bind "\C-c\\". - + + * viper.el (viper-vi-state-mode-list) + (viper-emacs-state-mode-list): Move help-mode and + completion-list-mode from the first list to the second. + (viper-mode): Docstring. + (viper-go-away, viper-non-hook-settings): Don't localize + minor-mode-alist in newer Emacsen. Add advice to + set-cursor-color. Don't bind "\C-c\\". + 2005-08-06 Emilio C. Lopes * cmuscheme.el (scheme-trace-command, scheme-untrace-command) From 5113f2c2071f0f950d629f00952c04b087a6f581 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 6 Aug 2005 20:38:32 +0000 Subject: [PATCH 019/347] Remove spurious character. --- lisp/obsolete/float.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/obsolete/float.el b/lisp/obsolete/float.el index bc5e752e013..400956ea232 100644 --- a/lisp/obsolete/float.el +++ b/lisp/obsolete/float.el @@ -1,4 +1,4 @@ -f;;; float.el --- obsolete floating point arithmetic package +;;; float.el --- obsolete floating point arithmetic package ;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. From 07a159411097b5e7d0409271a401dc95f7c11f63 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 6 Aug 2005 21:49:19 +0000 Subject: [PATCH 020/347] *** empty log message *** --- lisp/ChangeLog | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1627ef8e09c..9d85aed289f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2005-08-06 Luc Teirlinck + + * fringe.el (set-fringe-indicators-1, fringe-indicators): Delete. + + * menu-bar.el (menu-bar-options-save): Replace `fringe-indicators' + with `indicate-empty-lines' and `indicate-buffer-boundaries'. + (menu-bar-showhide-fringe-menu): Add new item "Empty line indicators" + running new function `toggle-indicate-empty-lines'. + Rename "Customize" item to "Customize fringe". + Rename "Indicators" item to "Buffer boundaries" and change help echo. + (menu-bar-showhide-fringe-ind-menu): Change several help echos. + Add `menu-bar-showhide-fringe-ind-customize' as "Other (customize)". + Delete "Empty lines only" item. + (menu-bar-showhide-fringe-ind-customize): New function. + (menu-bar-showhide-fringe-ind-mixed) + (menu-bar-showhide-fringe-ind-box) + (menu-bar-showhide-fringe-ind-right) + (menu-bar-showhide-fringe-ind-left) + (menu-bar-showhide-fringe-ind-none): Use `indicate-buffer-boundaries' + instead of `fringe-indicators'. + 2005-08-06 Michael Kifer * viper.el (viper-emacs-state-mode-list): Add recentf-dialog-mode. From 622a878599fda36548525455836f1f6277de9b18 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 6 Aug 2005 21:51:38 +0000 Subject: [PATCH 021/347] (menu-bar-options-save): Replace `fringe-indicators' with `indicate-empty-lines' and `indicate-buffer-boundaries'. (menu-bar-showhide-fringe-menu): Add new item "Empty line indicators" running new function `toggle-indicate-empty-lines'. Rename "Customize" item to "Customize fringe". Rename "Indicators" item to "Buffer boundaries" and change help echo. (menu-bar-showhide-fringe-ind-menu): Change several help echos. Add `menu-bar-showhide-fringe-ind-customize' as "Other (customize)". Delete "Empty lines only" item. (menu-bar-showhide-fringe-ind-customize): New function. (menu-bar-showhide-fringe-ind-mixed) (menu-bar-showhide-fringe-ind-box) (menu-bar-showhide-fringe-ind-right) (menu-bar-showhide-fringe-ind-left) (menu-bar-showhide-fringe-ind-none): Use `indicate-buffer-boundaries' instead of `fringe-indicators'. --- lisp/menu-bar.el | 97 +++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 51 deletions(-) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index b6230189cc5..1cb1814ba53 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -649,8 +649,8 @@ by \"Save Options\" in Custom buffers.") debug-on-quit debug-on-error tooltip-mode menu-bar-mode tool-bar-mode save-place uniquify-buffer-name-style fringe-mode - fringe-indicators case-fold-search - display-time-mode auto-compression-mode + indicate-empty-lines indicate-buffer-boundaries + case-fold-search display-time-mode auto-compression-mode current-language-environment default-input-method ;; Saving `text-mode-hook' is somewhat questionable, ;; as we might get more than we bargain for, if @@ -717,88 +717,92 @@ by \"Save Options\" in Custom buffers.") (frame-visible-p (symbol-value 'speedbar-frame)))))) +(defvar menu-bar-showhide-fringe-menu (make-sparse-keymap "Fringe")) -(defvar menu-bar-showhide-fringe-ind-menu (make-sparse-keymap "Indicators")) +(defvar menu-bar-showhide-fringe-ind-menu + (make-sparse-keymap "Buffer boundaries")) -;; The real definition is in fringe.el. -;; This is to prevent errors in the :radio conditions below. -(setq fringe-indicators nil) - -(defun menu-bar-showhide-fringe-ind-empty () - "Display empty line indicators in the left or right fringe." +(defun menu-bar-showhide-fringe-ind-customize () + "Show customization buffer for `indicate-buffer-boundaries'." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'empty)) + (customize-variable 'indicate-buffer-boundaries)) -(define-key menu-bar-showhide-fringe-ind-menu [empty] - '(menu-item "Empty lines only" menu-bar-showhide-fringe-ind-empty - :help "Show empty line indicators in fringe" - :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'empty)))) +(define-key menu-bar-showhide-fringe-ind-menu [customize] + '(menu-item "Other (customize)" + menu-bar-showhide-fringe-ind-customize + :help "Additional choices available through Custom buffer" + :visible (display-graphic-p))) (defun menu-bar-showhide-fringe-ind-mixed () - "Display top and bottom indicators in opposite fringes, arrow in right." + "Display top and bottom indicators in opposite fringes, arrows in right." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'mixed)) + (customize-set-variable 'indicate-buffer-boundaries + '((t . right) (top . left)))) (define-key menu-bar-showhide-fringe-ind-menu [mixed] '(menu-item "Opposite, arrows right" menu-bar-showhide-fringe-ind-mixed - :help "Show top/bottom indicators in opposite fringes, arrows in right" + :help + "Show top/bottom indicators in opposite fringes, arrows in right" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'mixed)))) + :button (:radio . (eq indicate-buffer-boundaries + '((t . right) (top . left)))))) (defun menu-bar-showhide-fringe-ind-box () "Display top and bottom indicators in opposite fringes." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'box)) + (customize-set-variable 'indicate-buffer-boundaries + '((top . left) (bottom . right)))) (define-key menu-bar-showhide-fringe-ind-menu [box] '(menu-item "Opposite, no arrows" menu-bar-showhide-fringe-ind-box :help "Show top/bottom indicators in opposite fringes, no arrows" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'box)))) + :button (:radio . (eq indicate-buffer-boundaries + '((top . left) (bottom . right)))))) (defun menu-bar-showhide-fringe-ind-right () - "Display fringe indicators in the right fringe." + "Display buffer boundaries and arrows in the right fringe." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'right)) + (customize-set-variable 'indicate-buffer-boundaries 'right)) (define-key menu-bar-showhide-fringe-ind-menu [right] '(menu-item "In right fringe" menu-bar-showhide-fringe-ind-right - :help "Show indicators in right fringe" + :help "Show buffer boundaries and arrows in right fringe" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'right)))) + :button (:radio . (eq indicate-buffer-boundaries 'right)))) (defun menu-bar-showhide-fringe-ind-left () - "Display fringe indicators in the left fringe." + "Display buffer boundaries and arrows in the left fringe." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators 'left)) + (customize-set-variable 'indicate-buffer-boundaries 'left)) (define-key menu-bar-showhide-fringe-ind-menu [left] '(menu-item "In left fringe" menu-bar-showhide-fringe-ind-left - :help "Show indicators in left fringe" + :help "Show buffer boundaries and arrows in left fringe" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators 'left)))) + :button (:radio . (eq indicate-buffer-boundaries 'left)))) (defun menu-bar-showhide-fringe-ind-none () - "Do not display any fringe indicators." + "Do not display any buffer boundary indicators." (interactive) - (require 'fringe) - (customize-set-variable 'fringe-indicators nil)) + (customize-set-variable 'indicate-buffer-boundaries nil)) (define-key menu-bar-showhide-fringe-ind-menu [none] '(menu-item "No indicators" menu-bar-showhide-fringe-ind-none - :help "Hide all fringe indicators" + :help "Hide all buffer boundary indicators and arrows" :visible (display-graphic-p) - :button (:radio . (eq fringe-indicators nil)))) + :button (:radio . (eq indicate-buffer-boundaries nil)))) +(define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind] + (list 'menu-item "Buffer boundaries" menu-bar-showhide-fringe-ind-menu + :visible `(display-graphic-p) + :help "Indicate buffer boundaries in fringe")) - -(defvar menu-bar-showhide-fringe-menu (make-sparse-keymap "Fringe")) +(define-key menu-bar-showhide-fringe-menu [indicate-empty-lines] + (menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines + "Empty line indicators" + "Indicating of empty lines %s" + "Indicate trailing empty lines in fringe")) (defun menu-bar-showhide-fringe-menu-customize () "Show customization buffer for `fringe-mode'." @@ -806,7 +810,7 @@ by \"Save Options\" in Custom buffers.") (customize-variable 'fringe-mode)) (define-key menu-bar-showhide-fringe-menu [customize] - '(menu-item "Customize" menu-bar-showhide-fringe-menu-customize + '(menu-item "Customize fringe" menu-bar-showhide-fringe-menu-customize :help "Detailed customization of fringe" :visible (display-graphic-p))) @@ -815,15 +819,6 @@ by \"Save Options\" in Custom buffers.") (interactive) (customize-set-variable 'fringe-mode nil)) -(define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind] - (list 'menu-item "Indicators" menu-bar-showhide-fringe-ind-menu - :visible `(display-graphic-p) - :help "Select fringe mode")) - -;; The real definition is in fringe.el. -;; This is to prevent errors in the :radio conditions below. -(setq fringe-mode nil) - (define-key menu-bar-showhide-fringe-menu [default] '(menu-item "Default" menu-bar-showhide-fringe-menu-customize-reset :help "Default width fringe on both left and right side" From 00aa417213e1668d4a86514cf5febba3e241f399 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 6 Aug 2005 21:59:02 +0000 Subject: [PATCH 022/347] (set-fringe-indicators-1, fringe-indicators): Delete. --- lisp/fringe.el | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/lisp/fringe.el b/lisp/fringe.el index 1265e8308a0..853716af4d2 100644 --- a/lisp/fringe.el +++ b/lisp/fringe.el @@ -260,43 +260,6 @@ SIDE must be the symbol `left' or `right'." 0) (float (frame-char-width)))) -;; Fake defvar. Real definition using defcustom is below. The fake -;; defvar is necessary because `fringe-indicators' and -;; `set-fringe-indicators-1' mutually use each other. -(defvar fringe-indicators) - -(defun set-fringe-indicators-1 (ignore value) - "Set fringe indicators according to VALUE. -This is usually invoked when setting `fringe-indicators' via customize." - (setq fringe-indicators value) - (setq default-indicate-empty-lines nil) - (setq default-indicate-buffer-boundaries - (cond - ((memq value '(left right t)) - value) - ((eq value 'box) - '((top . left) (bottom . right))) - ((eq value 'mixed) - '((top . left) (t . right))) - ((eq value 'empty) - (setq default-indicate-empty-lines t) - nil) - (t nil)))) - -;;;###autoload -(defcustom fringe-indicators nil - "Visually indicate buffer boundaries and scrolling. -Setting this variable, changes `default-indicate-buffer-boundaries'." - :type '(choice (const :tag "No indicators" nil) - (const :tag "On left" left) - (const :tag "On right" right) - (const :tag "Opposite, no arrows" box) - (const :tag "Opposite, arrows right" mixed) - (const :tag "Empty lines" empty)) - :group 'fringe - :require 'fringe - :set 'set-fringe-indicators-1) - (provide 'fringe) ;;; arch-tag: 6611ef60-0869-47ed-8b93-587ee7d3ff5d From 0d30b33766e277a5bff6eabc9da5afdaebd8b32a Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sat, 6 Aug 2005 22:13:43 +0000 Subject: [PATCH 023/347] Update years in copyright notice; nfc. --- lisp/abbrev.el | 3 ++- lisp/abbrevlist.el | 3 ++- lisp/add-log.el | 4 ++-- lisp/align.el | 3 ++- lisp/allout.el | 3 ++- lisp/ansi-color.el | 3 ++- lisp/apropos.el | 3 ++- lisp/arc-mode.el | 3 ++- lisp/array.el | 3 ++- lisp/autoarg.el | 3 ++- lisp/autoinsert.el | 4 ++-- lisp/autorevert.el | 3 ++- lisp/avoid.el | 3 ++- lisp/battery.el | 4 ++-- lisp/bindings.el | 4 ++-- lisp/bookmark.el | 3 ++- lisp/bs.el | 3 ++- lisp/buff-menu.el | 2 +- lisp/button.el | 2 +- lisp/calculator.el | 3 ++- lisp/case-table.el | 3 ++- lisp/cdl.el | 2 +- lisp/chistory.el | 2 +- lisp/cmuscheme.el | 3 ++- lisp/comint.el | 2 +- lisp/compare-w.el | 3 ++- lisp/complete.el | 4 ++-- lisp/completion.el | 3 ++- lisp/cus-dep.el | 2 +- lisp/cus-edit.el | 4 ++-- lisp/cus-face.el | 3 ++- lisp/cus-start.el | 3 ++- lisp/cus-theme.el | 2 +- lisp/custom.el | 4 ++-- lisp/cvs-status.el | 3 ++- lisp/dabbrev.el | 4 ++-- lisp/delim-col.el | 3 ++- lisp/delsel.el | 3 ++- lisp/descr-text.el | 4 ++-- lisp/desktop.el | 4 ++-- lisp/diff-mode.el | 4 ++-- lisp/diff.el | 3 ++- lisp/dired-aux.el | 4 ++-- lisp/dired-x.el | 3 ++- lisp/dired.el | 2 +- lisp/dirtrack.el | 2 +- lisp/disp-table.el | 3 ++- lisp/dnd.el | 3 +-- lisp/dos-fns.el | 3 ++- lisp/dos-vars.el | 2 +- lisp/dos-w32.el | 2 +- lisp/double.el | 3 ++- lisp/ebuff-menu.el | 3 ++- lisp/echistory.el | 2 +- lisp/ediff-diff.el | 3 ++- lisp/ediff-help.el | 3 ++- lisp/ediff-hook.el | 3 ++- lisp/ediff-init.el | 2 +- lisp/ediff-merg.el | 3 ++- lisp/ediff-mult.el | 3 ++- lisp/ediff-ptch.el | 3 ++- lisp/ediff-util.el | 2 +- lisp/ediff-vers.el | 3 ++- lisp/ediff-wind.el | 3 ++- lisp/ediff.el | 3 ++- lisp/edmacro.el | 3 ++- lisp/ehelp.el | 3 ++- lisp/electric.el | 3 ++- lisp/elide-head.el | 2 +- lisp/emacs-lock.el | 3 ++- lisp/env.el | 3 ++- lisp/expand.el | 3 ++- lisp/facemenu.el | 3 ++- lisp/faces.el | 4 ++-- lisp/ffap.el | 3 ++- lisp/filecache.el | 3 ++- lisp/files.el | 2 +- lisp/filesets.el | 2 +- lisp/find-dired.el | 3 ++- lisp/find-file.el | 3 ++- lisp/find-lisp.el | 3 ++- lisp/finder.el | 3 ++- lisp/flow-ctrl.el | 3 ++- lisp/foldout.el | 2 +- lisp/follow.el | 4 ++-- lisp/font-core.el | 2 +- lisp/font-lock.el | 2 +- lisp/format.el | 3 ++- lisp/forms.el | 3 ++- lisp/frame.el | 4 ++-- lisp/fringe.el | 2 +- lisp/generic-x.el | 3 ++- lisp/gs.el | 3 ++- lisp/help-at-pt.el | 2 +- lisp/help-fns.el | 4 ++-- lisp/help-macro.el | 3 ++- lisp/help-mode.el | 4 ++-- lisp/help.el | 4 ++-- lisp/hexl.el | 3 ++- lisp/hi-lock.el | 3 ++- lisp/hilit-chg.el | 3 ++- lisp/hippie-exp.el | 2 +- lisp/hl-line.el | 3 ++- lisp/ibuf-ext.el | 3 ++- lisp/ibuf-macs.el | 3 ++- lisp/ibuffer.el | 4 ++-- lisp/icomplete.el | 4 ++-- lisp/ido.el | 3 ++- lisp/ielm.el | 2 +- lisp/iimage.el | 2 +- lisp/image-file.el | 3 ++- lisp/image.el | 3 ++- lisp/imenu.el | 4 ++-- lisp/indent.el | 3 ++- lisp/info-look.el | 3 ++- lisp/info-xref.el | 2 +- lisp/info.el | 2 +- lisp/informat.el | 2 +- lisp/isearch.el | 4 ++-- lisp/isearchb.el | 2 +- lisp/iswitchb.el | 4 ++-- lisp/jit-lock.el | 3 ++- lisp/jka-cmpr-hook.el | 3 ++- lisp/jka-compr.el | 3 ++- lisp/kermit.el | 2 +- lisp/kmacro.el | 2 +- lisp/ledit.el | 2 +- lisp/loadhist.el | 3 ++- lisp/loadup.el | 3 ++- lisp/locate.el | 3 ++- lisp/log-edit.el | 3 ++- lisp/log-view.el | 3 ++- lisp/longlines.el | 2 +- lisp/lpr.el | 4 ++-- lisp/ls-lisp.el | 3 ++- lisp/macros.el | 3 ++- lisp/makesum.el | 2 +- lisp/man.el | 4 ++-- lisp/master.el | 2 +- lisp/menu-bar.el | 4 ++-- lisp/midnight.el | 2 +- lisp/minibuf-eldef.el | 3 ++- lisp/misc.el | 2 +- lisp/mouse-copy.el | 2 +- lisp/mouse-drag.el | 3 ++- lisp/mouse-sel.el | 4 ++-- lisp/mouse.el | 4 ++-- lisp/msb.el | 4 ++-- lisp/mwheel.el | 3 ++- lisp/newcomment.el | 3 ++- lisp/novice.el | 4 ++-- lisp/outline.el | 4 ++-- lisp/paren.el | 3 ++- lisp/paths.el | 3 ++- lisp/pcmpl-cvs.el | 3 ++- lisp/pcmpl-gnu.el | 3 ++- lisp/pcmpl-linux.el | 3 ++- lisp/pcmpl-rpm.el | 3 ++- lisp/pcmpl-unix.el | 3 ++- lisp/pcomplete.el | 3 ++- lisp/pcvs-defs.el | 2 +- lisp/pcvs-info.el | 2 +- lisp/pcvs-parse.el | 2 +- lisp/pcvs-util.el | 2 +- lisp/pcvs.el | 2 +- lisp/printing.el | 3 +-- lisp/ps-mule.el | 4 ++-- lisp/ps-print.el | 4 ++-- lisp/recentf.el | 4 ++-- lisp/rect.el | 3 ++- lisp/register.el | 3 ++- lisp/repeat.el | 2 +- lisp/replace.el | 4 ++-- lisp/reposition.el | 3 ++- lisp/resume.el | 2 +- lisp/reveal.el | 3 ++- lisp/rfn-eshadow.el | 3 ++- lisp/rot13.el | 2 +- lisp/s-region.el | 3 ++- lisp/saveplace.el | 3 ++- lisp/scroll-all.el | 2 +- lisp/scroll-bar.el | 4 ++-- lisp/select.el | 3 ++- lisp/server.el | 4 ++-- lisp/ses.el | 2 +- lisp/shadowfile.el | 3 ++- lisp/shell.el | 3 ++- lisp/simple.el | 3 +-- lisp/skeleton.el | 3 ++- lisp/smerge-mode.el | 3 ++- lisp/sort.el | 3 ++- lisp/soundex.el | 2 +- lisp/speedbar.el | 4 ++-- lisp/startup.el | 2 +- lisp/strokes.el | 3 ++- lisp/subr.el | 2 +- lisp/tabify.el | 3 ++- lisp/talk.el | 2 +- lisp/tar-mode.el | 4 ++-- lisp/tempo.el | 3 ++- lisp/term.el | 3 ++- lisp/terminal.el | 3 ++- lisp/thingatpt.el | 4 ++-- lisp/thumbs.el | 2 +- lisp/time-stamp.el | 4 ++-- lisp/time.el | 4 ++-- lisp/timezone.el | 3 ++- lisp/tmm.el | 4 ++-- lisp/tooltip.el | 4 ++-- lisp/type-break.el | 3 ++- lisp/uniquify.el | 4 ++-- lisp/userlock.el | 3 ++- lisp/vc-arch.el | 3 +-- lisp/vc-cvs.el | 4 ++-- lisp/vc-hooks.el | 4 ++-- lisp/vc-mcvs.el | 3 +-- lisp/vc-rcs.el | 4 ++-- lisp/vc-sccs.el | 4 ++-- lisp/vc-svn.el | 3 +-- lisp/vc.el | 4 ++-- lisp/vcursor.el | 3 ++- lisp/version.el | 4 ++-- lisp/view.el | 4 ++-- lisp/vms-patch.el | 3 ++- lisp/vmsproc.el | 2 +- lisp/vt-control.el | 3 ++- lisp/vt100-led.el | 2 +- lisp/w32-fns.el | 3 ++- lisp/w32-vars.el | 2 +- lisp/wdired.el | 2 +- lisp/whitespace.el | 3 ++- lisp/wid-browse.el | 2 +- lisp/wid-edit.el | 3 ++- lisp/widget.el | 3 ++- lisp/windmove.el | 3 ++- lisp/window.el | 4 ++-- lisp/winner.el | 3 ++- lisp/woman.el | 2 +- lisp/x-dnd.el | 3 +-- lisp/xml.el | 3 ++- lisp/xt-mouse.el | 3 ++- 241 files changed, 416 insertions(+), 301 deletions(-) diff --git a/lisp/abbrev.el b/lisp/abbrev.el index cb8f9b69aca..774bb1892b7 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -1,6 +1,7 @@ ;;; abbrev.el --- abbrev mode commands for Emacs -;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: abbrev convenience diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el index a193a92df0f..3be9c257af2 100644 --- a/lisp/abbrevlist.el +++ b/lisp/abbrevlist.el @@ -1,6 +1,7 @@ ;;; abbrevlist.el --- list one abbrev table alphabetically ordered -;; Copyright (C) 1986, 1992 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1992, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Suggested by a previous version by Gildea. ;; Maintainer: FSF diff --git a/lisp/add-log.el b/lisp/add-log.el index 27da19ee602..8ea934084f6 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -1,7 +1,7 @@ ;;; add-log.el --- change log maintenance commands for Emacs -;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: tools diff --git a/lisp/align.el b/lisp/align.el index 5c1e8e7b89a..a481ba11070 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -1,6 +1,7 @@ ;;; align.el --- align text to a specific column, by regexp -;; Copyright (C) 1999, 2000, 2002 Free Sofware Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: convenience languages lisp diff --git a/lisp/allout.el b/lisp/allout.el index 6f5d06cf79e..a64ba4b8f9f 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1,6 +1,7 @@ ;;; allout.el --- extensive outline mode for use alone and with other modes -;; Copyright (C) 1992, 93, 94, 2001, 02, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Ken Manheimer ;; Maintainer: Ken Manheimer diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 31aaef2fcdc..94b6b81e031 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -1,6 +1,7 @@ ;;; ansi-color.el --- translate ANSI escape sequences into faces -;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Alex Schroeder ;; Maintainer: Alex Schroeder diff --git a/lisp/apropos.el b/lisp/apropos.el index 37cb85494ab..fcad5cac0dc 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -1,6 +1,7 @@ ;;; apropos.el --- apropos commands for users and programmers -;; Copyright (C) 1989,94,1995,2001,02,03,04,2005 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1994, 1995, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Joe Wells ;; Rewritten: Daniel Pfeiffer diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 536160ac366..a29ec10d400 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1,6 +1,7 @@ ;;; arc-mode.el --- simple editing of archives -;; Copyright (C) 1995, 1997, 1998, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Morten Welinder ;; Keywords: archives msdog editing major-mode diff --git a/lisp/array.el b/lisp/array.el index 819840c8a1a..4d8b718965f 100644 --- a/lisp/array.el +++ b/lisp/array.el @@ -1,6 +1,7 @@ ;;; array.el --- array editing commands for GNU Emacs -;; Copyright (C) 1987, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author David M. Brown ;; Maintainer: FSF diff --git a/lisp/autoarg.el b/lisp/autoarg.el index ae1d26ecd20..aca22ace5b5 100644 --- a/lisp/autoarg.el +++ b/lisp/autoarg.el @@ -1,6 +1,7 @@ ;;; autoarg.el --- make digit keys supply prefix args -;; Copyright (C) 1998, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Love ;; Created: 1998-09-04 diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index 71fa14014a9..465817d5b81 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -1,7 +1,7 @@ ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files -;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Charlie Martin ;; Adapted-By: Daniel Pfeiffer diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 23156ceda47..ec21488c6d4 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -1,6 +1,7 @@ ;;; autorevert.el --- revert buffers when files on disk change -;; Copyright (C) 1997, 1998, 1999, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Keywords: convenience diff --git a/lisp/avoid.el b/lisp/avoid.el index 032c7260cec..e99d09d6753 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el @@ -1,6 +1,7 @@ ;;; avoid.el --- make mouse pointer stay out of the way of editing -;; Copyright (C) 1993, 1994, 2000, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Boris Goldowsky ;; Keywords: mouse diff --git a/lisp/battery.el b/lisp/battery.el index 2ae6607f8ef..125e037719e 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -1,7 +1,7 @@ ;;; battery.el --- display battery status information -;; Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Ralph Schleicher ;; Keywords: hardware diff --git a/lisp/bindings.el b/lisp/bindings.el index 1e19592500b..0acdb2a4a7b 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1,7 +1,7 @@ ;;; bindings.el --- define standard key bindings and some variables -;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999, 2000, -;; 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999, +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 1f0d671afb4..4ec78468beb 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1,6 +1,7 @@ ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2003 Free Software Foundation +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Karl Fogel ;; Maintainer: Karl Fogel diff --git a/lisp/bs.el b/lisp/bs.el index f8a07337dc1..6f5281fc1e2 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -1,6 +1,7 @@ ;;; bs.el --- menu for selecting and displaying buffers -;; Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Olaf Sylvester ;; Maintainer: Olaf Sylvester ;; Keywords: convenience diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 59188b6ae92..76a74064589 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -1,7 +1,7 @@ ;;; buff-menu.el --- buffer menu main function and support functions -*- coding:utf-8 -*- ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: convenience diff --git a/lisp/button.el b/lisp/button.el index 1b0c009e925..d58e53c2895 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -1,6 +1,6 @@ ;;; button.el --- clickable buttons ;; -;; Copyright (C) 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; ;; Author: Miles Bader ;; Keywords: extensions diff --git a/lisp/calculator.el b/lisp/calculator.el index 4210fad2ec9..b9ba03f657f 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -1,6 +1,7 @@ ;;; calculator.el --- a [not so] simple calculator for Emacs -;; Copyright (C) 1998, 2000, 2001 by Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Eli Barzilay ;; Keywords: tools, convenience diff --git a/lisp/case-table.el b/lisp/case-table.el index 31c26949281..4dfdd0538fb 100644 --- a/lisp/case-table.el +++ b/lisp/case-table.el @@ -1,6 +1,7 @@ ;;; case-table.el --- code to extend the character set and support case tables -;; Copyright (C) 1988, 1994, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/cdl.el b/lisp/cdl.el index 68111eda53e..abd339de9b8 100644 --- a/lisp/cdl.el +++ b/lisp/cdl.el @@ -1,6 +1,6 @@ ;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi) ;; Maintainer: FSF diff --git a/lisp/chistory.el b/lisp/chistory.el index 1704e7a4a1e..c05fd849db4 100644 --- a/lisp/chistory.el +++ b/lisp/chistory.el @@ -1,6 +1,6 @@ ;;; chistory.el --- list command history -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index 8cc467fe0df..ff59304874d 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -1,6 +1,7 @@ ;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el -;; Copyright (C) 1988, 1994, 1997, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Olin Shivers ;; Maintainer: FSF diff --git a/lisp/comint.el b/lisp/comint.el index ab0d41d6735..3f77ea99050 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1,7 +1,7 @@ ;;; comint.el --- general command interpreter in a window stuff ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Olin Shivers ;; Simon Marshall diff --git a/lisp/compare-w.el b/lisp/compare-w.el index 4bbed1e1fa8..5795ce048c9 100644 --- a/lisp/compare-w.el +++ b/lisp/compare-w.el @@ -1,6 +1,7 @@ ;;; compare-w.el --- compare text between windows for Emacs -;; Copyright (C) 1986,1989,1993,1997,2003,2004,2005 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1989, 1993, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: convenience files diff --git a/lisp/complete.el b/lisp/complete.el index dabab4ee6ee..d3ff6c53988 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -1,7 +1,7 @@ ;;; complete.el --- partial completion mechanism plus other goodies -;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie ;; Keywords: abbrev convenience diff --git a/lisp/completion.el b/lisp/completion.el index 5e7285ecddd..ddc556f693b 100644 --- a/lisp/completion.el +++ b/lisp/completion.el @@ -1,6 +1,7 @@ ;;; completion.el --- dynamic word-completion code -;; Copyright (C) 1990, 1993, 1995, 1997, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1993, 1995, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: abbrev convenience diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index 8818ed6ff70..61c597a200e 100644 --- a/lisp/cus-dep.el +++ b/lisp/cus-dep.el @@ -1,6 +1,6 @@ ;;; cus-dep.el --- find customization dependencies ;; -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Keywords: internal diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 4a3088e6f12..832e320c523 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1,7 +1,7 @@ ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages ;; -;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Maintainer: FSF diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 967045b9da4..cd052732b65 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -1,6 +1,7 @@ ;;; cus-face.el --- customization support for faces ;; -;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Keywords: help, faces diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 8094555b145..f9d7bc4730c 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -1,6 +1,7 @@ ;;; cus-start.el --- define customization properties of builtins ;; -;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Keywords: internal diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index 32e01963824..95a0a4b2896 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -1,6 +1,6 @@ ;;; cus-theme.el -- custom theme creation user interface ;; -;; Copyright (C) 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; ;; Author: Alex Schroeder ;; Maintainer: FSF diff --git a/lisp/custom.el b/lisp/custom.el index cfb4373fdab..38b3355c2c3 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -1,7 +1,7 @@ ;;; custom.el --- tools for declaring and initializing options ;; -;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Maintainer: FSF diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el index a70e368ff89..792dcb2ef26 100644 --- a/lisp/cvs-status.el +++ b/lisp/cvs-status.el @@ -1,6 +1,7 @@ ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*- -;; Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs cvs status tree tools diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index 01591e2fdf3..2139e7c5761 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -1,7 +1,7 @@ ;;; dabbrev.el --- dynamic abbreviation package -;; Copyright (C) 1985, 86, 92, 94, 96, 1997, 2000, 01, 03, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1992, 1994, 1996, 1997, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Don Morrison ;; Maintainer: Lars Lindberg diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 1c0c8b77503..50d09a6414b 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -1,6 +1,7 @@ ;;; delim-col.el --- prettify all columns in a region or rectangle -;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre diff --git a/lisp/delsel.el b/lisp/delsel.el index 483c2e2c599..74ef011d477 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -1,6 +1,7 @@ ;;; delsel.el --- delete selection if you insert -;; Copyright (C) 1992, 1997, 1998, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Matthieu Devin ;; Maintainer: FSF diff --git a/lisp/descr-text.el b/lisp/descr-text.el index e206e2c269c..e25d740b89b 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -1,7 +1,7 @@ ;;; descr-text.el --- describe text mode -;; Copyright (c) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Boris Goldowsky ;; Keywords: faces, i18n, Unicode, multilingual diff --git a/lisp/desktop.el b/lisp/desktop.el index 0018780d5d5..57065d2f813 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1,7 +1,7 @@ ;;; desktop.el --- save partial status of Emacs when killed -;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Morten Welinder ;; Maintainter: Lars Hansen diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index f10ac7d57d2..6cd4c843ad1 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -1,7 +1,7 @@ ;;; diff-mode.el --- a mode for viewing/editing context diffs -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: convenience patch diff diff --git a/lisp/diff.el b/lisp/diff.el index bee7277af78..7602ecb0e37 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -1,6 +1,7 @@ ;;; diff.el --- run `diff' in compilation-mode -;; Copyright (C) 1992, 1994, 1996, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: unix, tools diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 617cb38585f..9bcb04ef27b 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1,7 +1,7 @@ ;;; dired-aux.el --- less commonly used parts of dired -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1985, 1986, 1992, 1994, 1998, 2000, 2001, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1992, 1994, 1998, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Sebastian Kremer . ;; Maintainer: FSF diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 006186a562e..074bdc376a4 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -7,7 +7,8 @@ ;; Date: 1994/08/18 19:27:42 ;; Keywords: dired extensions files -;; Copyright (C) 1993, 1994, 1997, 2001, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1997, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/dired.el b/lisp/dired.el index 880d31d9b41..745a2555162 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1,7 +1,7 @@ ;;; dired.el --- directory-browsing commands ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000, -;; 2001, 2003, 2004 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Sebastian Kremer ;; Maintainer: FSF diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el index e9bcab6e4e8..573803bfb98 100644 --- a/lisp/dirtrack.el +++ b/lisp/dirtrack.el @@ -1,6 +1,6 @@ ;;; dirtrack.el --- Directory Tracking by watching the prompt -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Peter Breton ;; Created: Sun Nov 17 1996 diff --git a/lisp/disp-table.el b/lisp/disp-table.el index 0d0f4e4e09a..8e5fa12bad7 100644 --- a/lisp/disp-table.el +++ b/lisp/disp-table.el @@ -1,6 +1,7 @@ ;;; disp-table.el --- functions for dealing with char tables -;; Copyright (C) 1987, 94, 95, 1999, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1994, 1995, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Erik Naggum ;; Based on a previous version by Howard Gayle diff --git a/lisp/dnd.el b/lisp/dnd.el index 9a925550411..1092f4d087f 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -1,7 +1,6 @@ ;;; dnd.el --- drag and drop support. -;; Copyright (C) 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 2005 Free Software Foundation, Inc. ;; Author: Jan Dj,Ad(Brv ;; Maintainer: FSF diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index 920625526e3..bf25ce1f589 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -1,6 +1,7 @@ ;;; dos-fns.el --- MS-Dos specific functions -;; Copyright (C) 1991, 1993, 1995, 1996 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1993, 1995, 1996, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: Morten Welinder ;; Keywords: internal diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el index 8fdff647bed..1909e941c1f 100644 --- a/lisp/dos-vars.el +++ b/lisp/dos-vars.el @@ -1,6 +1,6 @@ ;;; dos-vars.el --- MS-Dos specific user options -;; Copyright (C) 1998 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el index 644b457393f..697f6eb4d5c 100644 --- a/lisp/dos-w32.el +++ b/lisp/dos-w32.el @@ -1,6 +1,6 @@ ;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: Geoff Voelker ;; Keywords: internal diff --git a/lisp/double.el b/lisp/double.el index 137ea510123..fb4947fbd88 100644 --- a/lisp/double.el +++ b/lisp/double.el @@ -1,6 +1,7 @@ ;;; double.el --- support for keyboard remapping with double clicking -;; Copyright (C) 1994, 1997, 1998 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Keywords: i18n diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index 2a89d4ef654..ec5db828a6b 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -1,6 +1,7 @@ ;;; ebuff-menu.el --- electric-buffer-list mode -;; Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Richard Mlynarik ;; Maintainer: FSF diff --git a/lisp/echistory.el b/lisp/echistory.el index e134b16ce6c..3b4b8419bd0 100644 --- a/lisp/echistory.el +++ b/lisp/echistory.el @@ -1,6 +1,6 @@ ;;; echistory.el --- Electric Command History Mode -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index ef859eb9b20..0a3f6920e2b 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -1,6 +1,7 @@ ;;; ediff-diff.el --- diff-related utilities -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el index 87056e3723f..21fe85c415f 100644 --- a/lisp/ediff-help.el +++ b/lisp/ediff-help.el @@ -1,6 +1,7 @@ ;;; ediff-help.el --- Code related to the contents of Ediff help buffers -;; Copyright (C) 1996, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index 8d038a4d93b..c0add7f8f86 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el @@ -1,6 +1,7 @@ ;;; ediff-hook.el --- setup for Ediff's menus and autoloads -;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 8af930ec27e..ae4c7c59c09 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1,7 +1,7 @@ ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 13414747b11..cb93dea3831 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -1,6 +1,7 @@ ;;; ediff-merg.el --- merging utilities -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 1303d65cf2e..2c192c133e2 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -1,6 +1,7 @@ ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff -;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 9176a38c2c9..df781e92b5b 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -1,6 +1,7 @@ ;;; ediff-ptch.el --- Ediff's patch support -;; Copyright (C) 1996, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 70b3f304e03..2e24548dbbe 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1,7 +1,7 @@ ;;; ediff-util.el --- the core commands and utilities of ediff ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2004 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 70069cc2193..9ae720e9bc3 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -1,6 +1,7 @@ ;;; ediff-vers.el --- version control interface to Ediff -;;; Copyright (C) 1995, 96, 97, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 3ac4ee089cd..26ff106088f 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -1,6 +1,7 @@ ;;; ediff-wind.el --- window manipulation utilities -;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer diff --git a/lisp/ediff.el b/lisp/ediff.el index 1bf52b1c59f..35b28a3e550 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -1,6 +1,7 @@ ;;; ediff.el --- a comprehensive visual interface to diff & patch -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 03, 05 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer ;; Created: February 2, 1994 diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 4ab7c7b1029..05df7f6ac39 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -1,6 +1,7 @@ ;;; edmacro.el --- keyboard macro editor -;; Copyright (C) 1993, 1994, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie ;; Maintainer: Dave Gillespie diff --git a/lisp/ehelp.el b/lisp/ehelp.el index 36bbd0329bb..d0dfd8d6bed 100644 --- a/lisp/ehelp.el +++ b/lisp/ehelp.el @@ -1,6 +1,7 @@ ;;; ehelp.el --- bindings for electric-help mode -;; Copyright (C) 1986, 1995, 2000, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1995, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help, extensions diff --git a/lisp/electric.el b/lisp/electric.el index 32fb843e2cb..4c4f70b0939 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -1,6 +1,7 @@ ;;; electric.el --- window maker and Command loop for `electric' modes -;; Copyright (C) 1985, 1986, 1995, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF diff --git a/lisp/elide-head.el b/lisp/elide-head.el index 86e3365c5dd..8be40ce17c3 100644 --- a/lisp/elide-head.el +++ b/lisp/elide-head.el @@ -1,6 +1,6 @@ ;;; elide-head.el --- hide headers in files -;; Copyright (C) 1999 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Love ;; Keywords: outlines tools diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el index 479cc4f2ede..e94be04213c 100644 --- a/lisp/emacs-lock.el +++ b/lisp/emacs-lock.el @@ -1,6 +1,7 @@ ;;; emacs-lock.el --- prevents you from exiting emacs if a buffer is locked -;; Copyright (C) 1994, 1997 Free Software Foundation, Inc +;; Copyright (C) 1994, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc ;; Author: Tom Wurgler ;; Created: 12/8/94 diff --git a/lisp/env.el b/lisp/env.el index 606aa163c87..409765f5ff4 100644 --- a/lisp/env.el +++ b/lisp/env.el @@ -1,6 +1,7 @@ ;;; env.el --- functions to manipulate environment variables -;; Copyright (C) 1991, 1994, 2000, 2001, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: processes, unix diff --git a/lisp/expand.el b/lisp/expand.el index e0ebad49caa..aeb9ec83b14 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -1,6 +1,7 @@ ;;; expand.el --- make abbreviations more usable -;; Copyright (C) 1995, 1996 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Frederic Lepied ;; Maintainer: Frederic Lepied diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 1cda18dda2e..00fb13fe8f9 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -1,6 +1,7 @@ ;;; facemenu.el --- create a face menu for interactively adding fonts to text -;; Copyright (c) 1994, 1995, 1996, 2001, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Boris Goldowsky ;; Keywords: faces diff --git a/lisp/faces.el b/lisp/faces.el index 89830266f61..561fdc95aba 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1,7 +1,7 @@ ;;; faces.el --- Lisp faces -;; Copyright (C) 1992,1993,1994,1995,1996,1998,1999,2000,2001,2002,2004,2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/ffap.el b/lisp/ffap.el index e30b859a588..283f05641ba 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -1,6 +1,7 @@ ;;; ffap.el --- find file (or url) at point -;; Copyright (C) 1995, 96, 97, 2000, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michelangelo Grigni ;; Maintainer: Rajesh Vaidheeswarran diff --git a/lisp/filecache.el b/lisp/filecache.el index 9fccba4b84b..bb45bb392f3 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -4,7 +4,8 @@ ;; Created: Sun Nov 10 1996 ;; Keywords: convenience ;; -;; Copyright (C) 1996, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/files.el b/lisp/files.el index 6479ef3bc92..8850928d94a 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1,7 +1,7 @@ ;;; files.el --- file input and output commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -;; 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/filesets.el b/lisp/filesets.el index 009e6797a4d..1ee126465a5 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -1,6 +1,6 @@ ;;; filesets.el --- handle group of files -;; Copyright (C) 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Thomas Link ;; Maintainer: FSF diff --git a/lisp/find-dired.el b/lisp/find-dired.el index e1b4ce65e71..8347e68c58e 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -1,6 +1,7 @@ ;;; find-dired.el --- run a `find' command and dired the output -;; Copyright (C) 1992, 1994, 1995, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1995, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Roland McGrath , ;; Sebastian Kremer diff --git a/lisp/find-file.el b/lisp/find-file.el index d741ed7d845..b66a5f6de02 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el @@ -4,7 +4,8 @@ ;; Maintainer: FSF ;; Keywords: c, matching, tools -;; Copyright (C) 1994, 1995, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el index 35b24af3d6b..b019fd6ba98 100644 --- a/lisp/find-lisp.el +++ b/lisp/find-lisp.el @@ -5,7 +5,8 @@ ;; Keywords: unix ;; Time-stamp: <2001-07-16 12:42:35 pavel> -;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/finder.el b/lisp/finder.el index 01052101e6d..737bb676a1a 100644 --- a/lisp/finder.el +++ b/lisp/finder.el @@ -1,6 +1,7 @@ ;;; finder.el --- topic & keyword-based code finder -;; Copyright (C) 1992,97,98,1999,2001,2004 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1997, 1998, 1999, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Eric S. Raymond ;; Created: 16 Jun 1992 diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el index 0bfc5c7e92e..0acbe41c6ed 100644 --- a/lisp/flow-ctrl.el +++ b/lisp/flow-ctrl.el @@ -1,6 +1,7 @@ ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control -;; Copyright (C) 1990, 1991, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author Kevin Gallagher ;; Maintainer: FSF diff --git a/lisp/foldout.el b/lisp/foldout.el index 9c6ef395ab5..54fca4eb6f0 100644 --- a/lisp/foldout.el +++ b/lisp/foldout.el @@ -1,6 +1,6 @@ ;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode -;; Copyright (C) 1994 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Kevin Broadey ;; Created: 27 Jan 1994 diff --git a/lisp/follow.el b/lisp/follow.el index 09b408cb452..37a157cc406 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -1,7 +1,7 @@ ;;; follow.el --- synchronize windows showing the same buffer -;; Copyright (C) 1995, 1996, 1997, 1999, 2001, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Anders Lindgren ;; Maintainer: Anders Lindgren diff --git a/lisp/font-core.el b/lisp/font-core.el index 19417720d3a..4af6e1c41f0 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el @@ -1,7 +1,7 @@ ;;; font-core.el --- Core interface to font-lock ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -;; 2002, 2003, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: languages, faces diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 51a4ee72722..feed15f18d7 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1,7 +1,7 @@ ;;; font-lock.el --- Electric font lock mode ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004 2005 Free Software Foundation, Inc. ;; Author: jwz, then rms, then sm ;; Maintainer: FSF diff --git a/lisp/format.el b/lisp/format.el index e676677179b..c43898d78a7 100644 --- a/lisp/format.el +++ b/lisp/format.el @@ -1,6 +1,7 @@ ;;; format.el --- read and save files in multiple formats -;; Copyright (c) 1994, 1995, 1997, 1999, 2004 Free Software Foundation +;; Copyright (C) 1994, 1995, 1997, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Boris Goldowsky diff --git a/lisp/forms.el b/lisp/forms.el index 7b41698cf4f..419a6fa3778 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -1,6 +1,7 @@ ;;; forms.el --- Forms mode: edit a file as a form to fill in -;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Johan Vromans diff --git a/lisp/frame.el b/lisp/frame.el index e416817d185..0a1ffb8a999 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1,7 +1,7 @@ ;;; frame.el --- multi-frame management independent of window systems -;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/fringe.el b/lisp/fringe.el index 853716af4d2..a32d6b5902c 100644 --- a/lisp/fringe.el +++ b/lisp/fringe.el @@ -1,6 +1,6 @@ ;;; fringe.el --- change fringes appearance in various ways -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Maintainer: FSF diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 55afcc73e62..d6f56cfc76c 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1,6 +1,7 @@ ;;; generic-x.el --- A collection of generic modes -;; Copyright (C) 1997, 1998, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Peter Breton ;; Created: Tue Oct 08 1996 diff --git a/lisp/gs.el b/lisp/gs.el index 7a8fb807ccd..8f9414f0e5f 100644 --- a/lisp/gs.el +++ b/lisp/gs.el @@ -1,6 +1,7 @@ ;;; gs.el --- interface to Ghostscript -;; Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el index f3321e437de..fcb431feba9 100644 --- a/lisp/help-at-pt.el +++ b/lisp/help-at-pt.el @@ -1,6 +1,6 @@ ;;; help-at-pt.el --- local help through the keyboard -;; Copyright (C) 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Luc Teirlinck ;; Keywords: help diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 93c34af7a5c..ae7a60cf55e 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -1,7 +1,7 @@ ;;; help-fns.el --- Complex help functions -;; Copyright (C) 1985, 86, 93, 94, 98, 1999, 2000, 01, 02, 03, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help, internal diff --git a/lisp/help-macro.el b/lisp/help-macro.el index cf3e63d8d76..33ee42abe7e 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -1,6 +1,7 @@ ;;; help-macro.el --- makes command line help such as help-for-help -;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Lynn Slater ;; Maintainer: FSF diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 831db8cc0cc..eac7caad0ca 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -1,7 +1,7 @@ ;;; help-mode.el --- `help-mode' used by *Help* buffers -;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help, internal diff --git a/lisp/help.el b/lisp/help.el index bab0592160c..cb634e2bdad 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1,7 +1,7 @@ ;;; help.el --- help commands for Emacs -;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2004, -;; 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help, internal diff --git a/lisp/hexl.el b/lisp/hexl.el index 35423ec0335..20430284a57 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -1,6 +1,7 @@ ;;; hexl.el --- edit a file in a hex dump format using the hexl filter -;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Keith Gabryelski ;; Maintainer: FSF diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index d7aec9112bc..14920cf93c2 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -1,6 +1,7 @@ ;;; hi-lock.el --- minor mode for interactive automatic highlighting -;; Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: David M. Koppelman, koppel@ee.lsu.edu ;; Keywords: faces, minor-mode, matching, display diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index df95766641b..f4b9b71f5e7 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -1,6 +1,7 @@ ;;; hilit-chg.el --- minor mode displaying buffer changes with special face -;; Copyright (C) 1998, 2000, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Richard Sharman ;; Keywords: faces diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index cdbc03bd1f7..1210166305b 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -1,6 +1,6 @@ ;;; hippie-exp.el --- expand text trying various ways to find its expansion -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Anders Holst ;; Last change: 3 March 1998 diff --git a/lisp/hl-line.el b/lisp/hl-line.el index 85617eab680..3dd56f2f239 100644 --- a/lisp/hl-line.el +++ b/lisp/hl-line.el @@ -1,6 +1,7 @@ ;;; hl-line.el --- highlight the current line -;; Copyright (C) 1998, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Love ;; Maintainer: FSF diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 9aef1ed95be..da3ca20e5aa 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -1,6 +1,7 @@ ;;; ibuf-ext.el --- extensions for ibuffer -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Colin Walters ;; Maintainer: John Paul Wallington diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el index aebe923ee85..5274e3173ef 100644 --- a/lisp/ibuf-macs.el +++ b/lisp/ibuf-macs.el @@ -1,6 +1,7 @@ ;;; ibuf-macs.el --- macros for ibuffer -;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Colin Walters ;; Maintainer: John Paul Wallington diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index b8555c4d710..8e32c6bc7ce 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -1,7 +1,7 @@ ;;; ibuffer.el --- operate on buffers like dired -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Colin Walters ;; Maintainer: John Paul Wallington diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 9e9662c1697..bbfb817064d 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -1,7 +1,7 @@ ;;; icomplete.el --- minibuffer completion incremental feedback -;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Ken Manheimer ;; Maintainer: Ken Manheimer diff --git a/lisp/ido.el b/lisp/ido.el index 9d7b4877fe8..7b8e8c726ef 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1,6 +1,7 @@ ;;; ido.el --- interactively do things with buffers and files. -;; Copyright (C) 1996-2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Kim F. Storm ;; Based on: iswitchb by Stephen Eglen diff --git a/lisp/ielm.el b/lisp/ielm.el index 66a1da39066..57354008b1b 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el @@ -1,6 +1,6 @@ ;;; ielm.el --- interaction mode for Emacs Lisp -;; Copyright (C) 1994, 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: David Smith ;; Maintainer: FSF diff --git a/lisp/iimage.el b/lisp/iimage.el index b10679592b3..ace21702a0f 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el @@ -1,6 +1,6 @@ ;;; iimage.el --- Inline image minor mode. -;; Copyright (C) 2004, 2005 Free Software Foundation +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; Author: KOSEKI Yoshinori ;; Maintainer: KOSEKI Yoshinori diff --git a/lisp/image-file.el b/lisp/image-file.el index 6b88b84e19f..94028b740f5 100644 --- a/lisp/image-file.el +++ b/lisp/image-file.el @@ -1,6 +1,7 @@ ;;; image-file.el --- support for visiting image files ;; -;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Miles Bader ;; Keywords: multimedia diff --git a/lisp/image.el b/lisp/image.el index 561e0ac0abf..b45b23db611 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -1,6 +1,7 @@ ;;; image.el --- image API -;; Copyright (C) 1998, 99, 2000, 01, 04 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: multimedia diff --git a/lisp/imenu.el b/lisp/imenu.el index a210b39c604..1a107ed8aea 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -1,7 +1,7 @@ ;;; imenu.el --- framework for mode-specific buffer indexes -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Ake Stenhoff ;; Lars Lindberg diff --git a/lisp/indent.el b/lisp/indent.el index 14488e79a62..9e84dfe13e0 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -1,6 +1,7 @@ ;;; indent.el --- indentation commands for Emacs -;; Copyright (C) 1985, 1995, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/info-look.el b/lisp/info-look.el index a408a7b2388..ad09df777cf 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -1,7 +1,8 @@ ;;; info-look.el --- major-mode-sensitive Info index lookup facility ;; An older version of this was known as libc.el. -;; Copyright (C) 1995,96,97,98,99,2001,03,04,05 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Ralph Schleicher ;; (did not show signs of life (Nov 2001) -stef) diff --git a/lisp/info-xref.el b/lisp/info-xref.el index bffe5681cd0..79dec8419a1 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -1,6 +1,6 @@ ;;; info-xref.el --- check external references in an Info document -;; Copyright (C) 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Kevin Ryde ;; Keywords: docs diff --git a/lisp/info.el b/lisp/info.el index a7f4c494244..78a9e8a08a2 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1,7 +1,7 @@ ;;; info.el --- info package for Emacs ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help diff --git a/lisp/informat.el b/lisp/informat.el index f3688cb3668..c9198d93191 100644 --- a/lisp/informat.el +++ b/lisp/informat.el @@ -1,6 +1,6 @@ ;;; informat.el --- info support functions package for Emacs -;; Copyright (C) 1986 Free Software Foundation, Inc. +;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help diff --git a/lisp/isearch.el b/lisp/isearch.el index 7cc641f4328..56a73a689a5 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1,7 +1,7 @@ ;;; isearch.el --- incremental search minor mode -;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, -;; 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte ;; Maintainer: FSF diff --git a/lisp/isearchb.el b/lisp/isearchb.el index 3665311aaf6..0e7a20a57ec 100644 --- a/lisp/isearchb.el +++ b/lisp/isearchb.el @@ -1,6 +1,6 @@ ;;; isearchb --- a marriage between iswitchb and isearch -;; Copyright (C) 2004 John Wiegley +;; Copyright (C) 2004, 2005 John Wiegley ;; Author: John Wiegley ;; Created: 16 Apr 2004 diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index 408b17c9332..c2e08d3a466 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -1,7 +1,7 @@ ;;; iswitchb.el --- switch between buffers using substrings -;; Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Stephen Eglen ;; Maintainer: Stephen Eglen diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index d98e8791124..2f8fcba91d1 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -1,6 +1,7 @@ ;;; jit-lock.el --- just-in-time fontification -;; Copyright (C) 1998, 2000, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Gerd Moellmann ;; Keywords: faces files diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index 36775a25470..1967a5d6c1d 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -1,6 +1,7 @@ ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el -;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: jka@ece.cmu.edu (Jay K. Adams) ;; Maintainer: FSF diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index db18903e21f..b25d3865668 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -1,6 +1,7 @@ ;;; jka-compr.el --- reading/writing/loading compressed files -;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: jka@ece.cmu.edu (Jay K. Adams) ;; Maintainer: FSF diff --git a/lisp/kermit.el b/lisp/kermit.el index 1b22df1dbe2..73cac8f3bc8 100644 --- a/lisp/kermit.el +++ b/lisp/kermit.el @@ -1,6 +1,6 @@ ;;; kermit.el --- additions to shell mode for use with kermit -;; Copyright (C) 1988 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jeff Norden ;; Maintainer: FSF diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 28e2c17c2a8..6bb1ab6f58d 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -1,6 +1,6 @@ ;;; kmacro.el --- enhanced keyboard macros -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Kim F. Storm ;; Keywords: keyboard convenience diff --git a/lisp/ledit.el b/lisp/ledit.el index cab3c6c7d6c..bf17f3cad4f 100644 --- a/lisp/ledit.el +++ b/lisp/ledit.el @@ -1,6 +1,6 @@ ;;; ledit.el --- Emacs side of ledit interface -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: languages diff --git a/lisp/loadhist.el b/lisp/loadhist.el index bcdf47387da..61c4192387d 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -1,6 +1,7 @@ ;;; loadhist.el --- lisp functions for working with feature groups -;; Copyright (C) 1995, 1998, 2000, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1998, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Eric S. Raymond ;; Maintainer: FSF diff --git a/lisp/loadup.el b/lisp/loadup.el index 26070965994..0d145486cdd 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -1,6 +1,7 @@ ;;; loadup.el --- load up standardly loaded Lisp files for Emacs -;; Copyright (C) 1985, 1986, 1992, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/locate.el b/lisp/locate.el index 4289d3e975c..cbf2e4866ab 100644 --- a/lisp/locate.el +++ b/lisp/locate.el @@ -1,6 +1,7 @@ ;;; locate.el --- interface to the locate command -;; Copyright (C) 1996, 1998, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Peter Breton ;; Keywords: unix files diff --git a/lisp/log-edit.el b/lisp/log-edit.el index a3876df8cce..2b38dcadf52 100644 --- a/lisp/log-edit.el +++ b/lisp/log-edit.el @@ -1,6 +1,7 @@ ;;; log-edit.el --- Major mode for editing CVS commit messages -;; Copyright (C) 1999,2000,2003,2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs cvs commit log diff --git a/lisp/log-view.el b/lisp/log-view.el index 66e8b27c0ff..fbe83d79513 100644 --- a/lisp/log-view.el +++ b/lisp/log-view.el @@ -1,6 +1,7 @@ ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output -;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: rcs sccs cvs log version-control diff --git a/lisp/longlines.el b/lisp/longlines.el index 57e07d1b20a..d51effdb7e2 100644 --- a/lisp/longlines.el +++ b/lisp/longlines.el @@ -1,6 +1,6 @@ ;;; longlines.el --- automatically wrap long lines -;; Copyright (C) 2000, 2001, 2004, 2005 by Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. ;; Authors: Kai Grossjohann ;; Alex Schroeder diff --git a/lisp/lpr.el b/lisp/lpr.el index 5714c746631..c44971e4f30 100644 --- a/lisp/lpr.el +++ b/lisp/lpr.el @@ -1,7 +1,7 @@ ;;; lpr.el --- print Emacs buffer on line printer -;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: unix diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index dee98a87823..feadbb5e2be 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -1,6 +1,7 @@ ;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp -;; Copyright (C) 1992, 1994, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Sebastian Kremer ;; Modified by: Francis J. Wright diff --git a/lisp/macros.el b/lisp/macros.el index 79471ed905c..7075300ba18 100644 --- a/lisp/macros.el +++ b/lisp/macros.el @@ -1,6 +1,7 @@ ;;; macros.el --- non-primitive commands for keyboard macros -;; Copyright (C) 1985, 86, 87, 92, 94, 95, 04 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: abbrev diff --git a/lisp/makesum.el b/lisp/makesum.el index 985012f90d1..41ecb630f96 100644 --- a/lisp/makesum.el +++ b/lisp/makesum.el @@ -1,6 +1,6 @@ ;;; makesum.el --- generate key binding summary for Emacs -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: help diff --git a/lisp/man.el b/lisp/man.el index ed6112e1978..d1b607600a5 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1,7 +1,7 @@ ;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*- -;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw ;; Maintainer: FSF diff --git a/lisp/master.el b/lisp/master.el index bdc5144d63c..adf3e92dcbe 100644 --- a/lisp/master.el +++ b/lisp/master.el @@ -1,6 +1,6 @@ ;;; master.el --- make a buffer the master over another buffer -;; Copyright (C) 1999, 2000, 2001, 2005 Alexander Schroeder +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Alexander Schroeder ;; Author: Alex Schroeder ;; Maintainer: Alex Schroeder diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 1cb1814ba53..0a280309283 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1,7 +1,7 @@ ;;; menu-bar.el --- define a default menu bar -;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: RMS ;; Maintainer: FSF diff --git a/lisp/midnight.el b/lisp/midnight.el index 8bc00b83103..aa93c1b5bab 100644 --- a/lisp/midnight.el +++ b/lisp/midnight.el @@ -1,6 +1,6 @@ ;;; midnight.el --- run something every midnight, e.g., kill old buffers -;;; Copyright (C) 1998, 2004, 2005 Free Software Foundation, Inc. +;;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Sam Steingold ;; Maintainer: Sam Steingold diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el index f3b08be702f..0657baedd5f 100644 --- a/lisp/minibuf-eldef.el +++ b/lisp/minibuf-eldef.el @@ -1,6 +1,7 @@ ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable ;; -;; Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Miles Bader ;; Keywords: convenience diff --git a/lisp/misc.el b/lisp/misc.el index c081a8cd8c4..f906fb0db7b 100644 --- a/lisp/misc.el +++ b/lisp/misc.el @@ -1,6 +1,6 @@ ;;; misc.el --- some nonstandard basic editing commands for Emacs -;; Copyright (C) 1989, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: convenience diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el index 6279d4e1f46..f5034a1dac1 100644 --- a/lisp/mouse-copy.el +++ b/lisp/mouse-copy.el @@ -1,6 +1,6 @@ ;;; mouse-copy.el --- one-click text copy and move -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: John Heidemann ;; Keywords: mouse diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el index 6971bdb9a89..11bacd6b8a2 100644 --- a/lisp/mouse-drag.el +++ b/lisp/mouse-drag.el @@ -1,6 +1,7 @@ ;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling -;; Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Heidemann ;; Keywords: mouse diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el index 1a271a5ab7d..ccd469200be 100644 --- a/lisp/mouse-sel.el +++ b/lisp/mouse-sel.el @@ -1,7 +1,7 @@ ;;; mouse-sel.el --- multi-click selection support for Emacs 19 -;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Mike Williams ;; Keywords: mouse diff --git a/lisp/mouse.el b/lisp/mouse.el index 4fd81ced998..c928e04f8ed 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -1,7 +1,7 @@ ;;; mouse.el --- window system-independent mouse support -;; Copyright (C) 1993, 94, 95, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: hardware, mouse diff --git a/lisp/msb.el b/lisp/msb.el index 945535267ff..8fa63d98051 100644 --- a/lisp/msb.el +++ b/lisp/msb.el @@ -1,7 +1,7 @@ ;;; msb.el --- customizable buffer-selection with multiple menus -;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2003, -;; 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Lars Lindberg ;; Maintainer: FSF diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 27116c75e98..391ce3a5e04 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -1,6 +1,7 @@ ;;; mwheel.el --- Wheel mouse support -;; Copyright (C) 1998, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2001, 2002, 2002, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: William M. Perry ;; Keywords: mouse diff --git a/lisp/newcomment.el b/lisp/newcomment.el index c0ad722c158..78f3824ed23 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -1,6 +1,7 @@ ;;; newcomment.el --- (un)comment regions of buffers -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: code extracted from Emacs-20's simple.el ;; Maintainer: Stefan Monnier diff --git a/lisp/novice.el b/lisp/novice.el index ea17ea642e5..dfaf0b6c6d3 100644 --- a/lisp/novice.el +++ b/lisp/novice.el @@ -1,7 +1,7 @@ ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs -;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal, help diff --git a/lisp/outline.el b/lisp/outline.el index 6b662664b58..213bc34aba7 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -1,7 +1,7 @@ ;;; outline.el --- outline mode commands for Emacs -;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: outlines diff --git a/lisp/paren.el b/lisp/paren.el index f0bf458a3ab..a1cc12712f7 100644 --- a/lisp/paren.el +++ b/lisp/paren.el @@ -1,6 +1,7 @@ ;;; paren.el --- highlight matching paren -;; Copyright (C) 1993, 1996, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: rms@gnu.org ;; Maintainer: FSF diff --git a/lisp/paths.el b/lisp/paths.el index 388da1af8f2..f248eac9242 100644 --- a/lisp/paths.el +++ b/lisp/paths.el @@ -1,6 +1,7 @@ ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*- -;; Copyright (C) 1986, 1988, 1994, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el index 54ab07e6e85..628ad8399ce 100644 --- a/lisp/pcmpl-cvs.el +++ b/lisp/pcmpl-cvs.el @@ -1,6 +1,7 @@ ;;; pcmpl-cvs.el --- functions for dealing with cvs completions -;; Copyright (C) 1999, 2000, 2002 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el index 36713323075..bf7653618b8 100644 --- a/lisp/pcmpl-gnu.el +++ b/lisp/pcmpl-gnu.el @@ -1,6 +1,7 @@ ;;; pcmpl-gnu.el --- completions for GNU project tools -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el index bb77bf00231..02f840bee30 100644 --- a/lisp/pcmpl-linux.el +++ b/lisp/pcmpl-linux.el @@ -1,6 +1,7 @@ ;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el index 50c4906886f..5e9afcf51cb 100644 --- a/lisp/pcmpl-rpm.el +++ b/lisp/pcmpl-rpm.el @@ -1,6 +1,7 @@ ;;; pcmpl-rpm.el --- functions for dealing with rpm completions -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index edbc1b28586..de9c143ae6f 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -1,6 +1,7 @@ ;;; pcmpl-unix.el --- standard UNIX completions -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 3f0ffc54eeb..785c62290c4 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -1,6 +1,7 @@ ;;; pcomplete.el --- programmable completion -;; Copyright (C) 1999, 2000,01,02,03,04 Free Sofware Foundation +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +;; 2005 Free Sofware Foundation, Inc. ;; Author: John Wiegley ;; Keywords: processes abbrev diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el index 1e4c29f5583..3be6cbd9182 100644 --- a/lisp/pcvs-defs.el +++ b/lisp/pcvs-defs.el @@ -1,7 +1,7 @@ ;;; pcvs-defs.el --- variable definitions for PCL-CVS ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el index 0a48fc7d8e7..291e4ae85c4 100644 --- a/lisp/pcvs-info.el +++ b/lisp/pcvs-info.el @@ -1,7 +1,7 @@ ;;; pcvs-info.el --- internal representation of a fileinfo entry ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 1b08473d305..66c791db51c 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -1,7 +1,7 @@ ;;; pcvs-parse.el --- the CVS output parser ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el index 05495d1e264..1c4896435db 100644 --- a/lisp/pcvs-util.el +++ b/lisp/pcvs-util.el @@ -1,7 +1,7 @@ ;;; pcvs-util.el --- utility functions for PCL-CVS -*- byte-compile-dynamic: t -*- ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 34a93a1d659..f5564155ff7 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -1,7 +1,7 @@ ;;; pcvs.el --- a front-end to CVS ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com ;; (Per Cederqvist) ceder@lysator.liu.se diff --git a/lisp/printing.el b/lisp/printing.el index c73242961cf..eabca64f085 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -1,7 +1,6 @@ ;;; printing.el --- printing utilities -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index e57e030c40b..748cfd560b4 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -1,7 +1,7 @@ ;;; ps-mule.el --- provide multi-byte character facility to ps-print -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Kenichi Handa (multi-byte characters) diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 85cc5dda49d..94f1f5839a2 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -1,7 +1,7 @@ ;;; ps-print.el --- print text from the buffer as PostScript -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jim Thompson (was ) ;; Jacques Duthen (was ) diff --git a/lisp/recentf.el b/lisp/recentf.el index dcb962c3f19..524d00d389d 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -1,7 +1,7 @@ ;;; recentf.el --- setup a menu of recently opened files -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: David Ponce ;; Created: July 19 1999 diff --git a/lisp/rect.el b/lisp/rect.el index 08b601c050e..d7ae6592f74 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -1,6 +1,7 @@ ;;; rect.el --- rectangle functions for GNU Emacs -;; Copyright (C) 1985, 1999, 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1999, 2000, 2001, 2002, 2003, 2004 +;; 2005 Free Software Foundation, Inc. ;; Maintainer: Didier Verna ;; Keywords: internal diff --git a/lisp/register.el b/lisp/register.el index 4789047b0af..14d7494633a 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -1,6 +1,7 @@ ;;; register.el --- register commands for Emacs -;; Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/repeat.el b/lisp/repeat.el index b1b8cc40aa8..adaf8a4bb9a 100644 --- a/lisp/repeat.el +++ b/lisp/repeat.el @@ -1,6 +1,6 @@ ;;; repeat.el --- convenient way to repeat the previous command -;; Copyright (C) 1998 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Will Mengarini ;; Created: Mo 02 Mar 98 diff --git a/lisp/replace.el b/lisp/replace.el index 451650401b1..6ce961c28a7 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1,7 +1,7 @@ ;;; replace.el --- replace commands for Emacs -;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/reposition.el b/lisp/reposition.el index 41283ce251a..7a6ea277b02 100644 --- a/lisp/reposition.el +++ b/lisp/reposition.el @@ -1,6 +1,7 @@ ;;; reposition.el --- center a Lisp function or comment on the screen -;; Copyright (C) 1991, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael D. Ernst ;; Created: Jan 1991 diff --git a/lisp/resume.el b/lisp/resume.el index db21a4bab4c..29ce253e4a2 100644 --- a/lisp/resume.el +++ b/lisp/resume.el @@ -1,6 +1,6 @@ ;;; resume.el --- process command line args from within a suspended Emacs job -;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Joe Wells ;; Adapted-By: ESR diff --git a/lisp/reveal.el b/lisp/reveal.el index 402fa7c4f49..41b7c4268c2 100644 --- a/lisp/reveal.el +++ b/lisp/reveal.el @@ -1,6 +1,7 @@ ;;; reveal.el --- Automatically reveal hidden text at point -;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: outlines diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el index 5c7865d864f..9141b5220e8 100644 --- a/lisp/rfn-eshadow.el +++ b/lisp/rfn-eshadow.el @@ -1,6 +1,7 @@ ;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text ;; -;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Miles Bader ;; Keywords: convenience minibuffer diff --git a/lisp/rot13.el b/lisp/rot13.el index 99b34ef9d17..664e2cfadc6 100644 --- a/lisp/rot13.el +++ b/lisp/rot13.el @@ -1,6 +1,6 @@ ;;; rot13.el --- display a buffer in rot13 -;; Copyright (C) 1988,2002 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/s-region.el b/lisp/s-region.el index b28ab222434..06b5bb3f926 100644 --- a/lisp/s-region.el +++ b/lisp/s-region.el @@ -1,6 +1,7 @@ ;;; s-region.el --- set region using shift key -;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Morten Welinder ;; Keywords: terminals diff --git a/lisp/saveplace.el b/lisp/saveplace.el index afb10ede9d5..645b298ee66 100644 --- a/lisp/saveplace.el +++ b/lisp/saveplace.el @@ -1,6 +1,7 @@ ;;; saveplace.el --- automatically save place in files -;; Copyright (C) 1993, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Karl Fogel ;; Maintainer: FSF diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el index 2c0636d69d2..f2a953f7a21 100644 --- a/lisp/scroll-all.el +++ b/lisp/scroll-all.el @@ -1,6 +1,6 @@ ;;; scroll-all.el --- scroll all buffers together minor mode -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Gary D. Foster ;; Keywords: scroll crisp brief lock diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el index 64429ba4da5..1fabb78dc49 100644 --- a/lisp/scroll-bar.el +++ b/lisp/scroll-bar.el @@ -1,7 +1,7 @@ ;;; scroll-bar.el --- window system-independent scroll bar support -;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: hardware diff --git a/lisp/select.el b/lisp/select.el index 46f9fd7fab3..1d8d13208fa 100644 --- a/lisp/select.el +++ b/lisp/select.el @@ -3,7 +3,8 @@ ;; Maintainer: FSF ;; Keywords: internal -;; Copyright (c) 1993, 1994, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Based partially on earlier release by Lucid. ;; This file is part of GNU Emacs. diff --git a/lisp/server.el b/lisp/server.el index 48ff50f3dbc..7256a729de3 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1,7 +1,7 @@ ;;; server.el --- Lisp code for GNU Emacs running as server process -;; Copyright (C) 1986,87,92,94,95,96,97,98,99,2000,01,02,03,2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: William Sommerfeld ;; Maintainer: FSF diff --git a/lisp/ses.el b/lisp/ses.el index f7de1ddb50a..e4124de9fb5 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -1,6 +1,6 @@ ;;; ses.el -- Simple Emacs Spreadsheet -*- coding: utf-8 -*- -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jonathan Yavner ;; Maintainer: Jonathan Yavner diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index 2e5943db0f5..990049afff1 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -1,6 +1,7 @@ ;;; shadowfile.el --- automatic file copying -;; Copyright (C) 1993, 1994, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Boris Goldowsky ;; Keywords: comm files diff --git a/lisp/shell.el b/lisp/shell.el index 2684ee30a65..6b25cf3abde 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -1,6 +1,7 @@ ;;; shell.el --- specialized comint.el for running the shell -;; Copyright (C) 1988, 93, 94, 95, 96, 1997, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Olin Shivers ;; Simon Marshall diff --git a/lisp/simple.el b/lisp/simple.el index 5e5a5c71aaa..affc4dd8ea8 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1,8 +1,7 @@ ;;; simple.el --- basic editing commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/skeleton.el b/lisp/skeleton.el index d0d7a0e96c6..26d6613d1bf 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -1,6 +1,7 @@ ;;; skeleton.el --- Lisp language extension for writing statement skeletons -;; Copyright (C) 1993, 1994, 1995, 1996, 2003 by Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer ;; Maintainer: FSF diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index a40486ffd07..6ffbdc50cf5 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,6 +1,7 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: revision-control merge diff3 cvs conflict diff --git a/lisp/sort.el b/lisp/sort.el index e2fe806c430..6a008b82425 100644 --- a/lisp/sort.el +++ b/lisp/sort.el @@ -1,6 +1,7 @@ ;;; sort.el --- commands to sort text in an Emacs buffer -;; Copyright (C) 1986, 1987, 1994, 1995, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1994, 1995, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Howie Kaye ;; Maintainer: FSF diff --git a/lisp/soundex.el b/lisp/soundex.el index 2ed79b29455..58ba1872503 100644 --- a/lisp/soundex.el +++ b/lisp/soundex.el @@ -1,6 +1,6 @@ ;;; soundex.el --- implement Soundex algorithm -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Christian Plaunt ;; Maintainer: FSF diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 188304bce74..12d25ed7ee0 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -1,7 +1,7 @@ ;;; speedbar.el --- quick access to files and tags in a frame -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2005 -;; Free Software Foundation +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam ;; Version: 0.11a diff --git a/lisp/startup.el b/lisp/startup.el index b2afdb744c1..61b56e7babf 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1,7 +1,7 @@ ;;; startup.el --- process Emacs shell arguments ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/strokes.el b/lisp/strokes.el index a35a5d6f161..925ef360254 100644 --- a/lisp/strokes.el +++ b/lisp/strokes.el @@ -1,6 +1,7 @@ ;;; strokes.el --- control Emacs through mouse strokes -;; Copyright (C) 1997, 2000, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: David Bakhash ;; Maintainer: FSF diff --git a/lisp/subr.el b/lisp/subr.el index c0405f46011..4704dd1e99e 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1,7 +1,7 @@ ;;; subr.el --- basic lisp subroutines for Emacs ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/tabify.el b/lisp/tabify.el index 78ee80bee1b..84809839883 100644 --- a/lisp/tabify.el +++ b/lisp/tabify.el @@ -1,6 +1,7 @@ ;;; tabify.el --- tab conversion commands for Emacs -;; Copyright (C) 1985, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/talk.el b/lisp/talk.el index d2436e59ff2..6ef86736cae 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -1,6 +1,6 @@ ;;; talk.el --- allow several users to talk to each other through Emacs -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: comm, frames diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 7da14387738..4362e97af0b 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -1,7 +1,7 @@ ;;; tar-mode.el --- simple editing of tar files from GNU emacs -;; Copyright (C) 1990,91,93,94,95,96,97,98,99,2000,01,2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski ;; Maintainer: FSF diff --git a/lisp/tempo.el b/lisp/tempo.el index 282885e2d65..4939715a31c 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -1,6 +1,7 @@ ;;; tempo.el --- Flexible template insertion -;; Copyright (C) 1994, 1995, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: David K}gedal ;; Created: 16 Feb 1994 diff --git a/lisp/term.el b/lisp/term.el index 22159ff3a5e..9d6ee5a4e93 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -1,6 +1,7 @@ ;;; term.el --- general command interpreter in a window stuff -;;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Per Bothner ;; Maintainer: Dan Nicolaescu , Per Bothner diff --git a/lisp/terminal.el b/lisp/terminal.el index d9ba5d3f728..75d0c7acbd7 100644 --- a/lisp/terminal.el +++ b/lisp/terminal.el @@ -1,6 +1,7 @@ ;;; terminal.el --- terminal emulator for GNU Emacs -;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Richard Mlynarik ;; Maintainer: FSF diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index eee7b853743..c76a3bf2d70 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -1,7 +1,7 @@ ;;; thingatpt.el --- get the `thing' at point -;; Copyright (C) 1991,92,93,94,95,96,97,1998,2000 -;; Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000 +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Mike Williams ;; Maintainer: FSF diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 0d6e9a5ac44..0fa448d4d7a 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -1,6 +1,6 @@ ;;; thumbs.el --- Thumbnails previewer for images files -;; Copyright 2004, 2005 Free Software Foundation, Inc +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; Author: Jean-Philippe Theberge ;; Keywords: Multimedia diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el index 5b763d2f0ff..0f3aeb06895 100644 --- a/lisp/time-stamp.el +++ b/lisp/time-stamp.el @@ -1,7 +1,7 @@ ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs -;; Copyright 1989, 1993, 1994, 1995, 1997, 2000, 2001 -;;; Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/time.el b/lisp/time.el index a6a4d771a2c..2481d9966e1 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -1,7 +1,7 @@ ;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*- -;; Copyright (C) 1985, 86, 87, 93, 94, 96, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/timezone.el b/lisp/timezone.el index 692e2a682ce..7093aec22a4 100644 --- a/lisp/timezone.el +++ b/lisp/timezone.el @@ -1,6 +1,7 @@ ;;; timezone.el --- time zone package for GNU Emacs -;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Masanobu Umeda ;; Maintainer: umerin@mse.kyutech.ac.jp diff --git a/lisp/tmm.el b/lisp/tmm.el index a55b11b17f6..f73e3fa0980 100644 --- a/lisp/tmm.el +++ b/lisp/tmm.el @@ -1,7 +1,7 @@ ;;; tmm.el --- text mode access to menu-bar -;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Ilya Zakharevich ;; Maintainer: FSF diff --git a/lisp/tooltip.el b/lisp/tooltip.el index c8991c07e54..59f07df0089 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -1,7 +1,7 @@ ;;; tooltip.el --- show tooltip windows -;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Gerd Moellmann ;; Keywords: help c mouse tools diff --git a/lisp/type-break.el b/lisp/type-break.el index 4545351f5a9..9c49a5b6672 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -1,6 +1,7 @@ ;;; type-break.el --- encourage rests from typing at appropriate intervals -;; Copyright (C) 1994, 95, 97, 2000, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1997, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: Noah Friedman diff --git a/lisp/uniquify.el b/lisp/uniquify.el index 9e241a55f8b..cc08ab70836 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -1,7 +1,7 @@ ;;; uniquify.el --- unique buffer names dependent on file name -;; Copyright (c) 1989, 1995, 1996, 1997, 2001, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1989, 1995, 1996, 1997, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Dick King ;; Maintainer: FSF diff --git a/lisp/userlock.el b/lisp/userlock.el index 5e2f337db07..37ff1f13ba2 100644 --- a/lisp/userlock.el +++ b/lisp/userlock.el @@ -1,6 +1,7 @@ ;;; userlock.el --- handle file access contention between multiple users -;; Copyright (C) 1985, 1986 Free Software Foundation, inc. +;; Copyright (C) 1985, 1986, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index d59e7143179..79056c4c947 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -1,7 +1,6 @@ ;;; vc-arch.el --- VC backend for the Arch version-control system -;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 16759351407..cf661f62768 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -1,7 +1,7 @@ ;;; vc-cvs.el --- non-resident support for CVS version-control -;; Copyright (C) 1995,98,99,2000,2001,02,2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 5e8bf4f523c..5872e2f1990 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -1,7 +1,7 @@ ;;; vc-hooks.el --- resident support for version-control -;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index e324cb7eb1c..271cd01cbfb 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -1,7 +1,6 @@ ;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system -;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el index e591baf3a26..e301804cf17 100644 --- a/lisp/vc-rcs.el +++ b/lisp/vc-rcs.el @@ -1,7 +1,7 @@ ;;; vc-rcs.el --- support for RCS version-control -;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el index c4a48274e36..e4d14d8ae70 100644 --- a/lisp/vc-sccs.el +++ b/lisp/vc-sccs.el @@ -1,7 +1,7 @@ ;;; vc-sccs.el --- support for SCCS version-control -;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +;; 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 9e0b3414a04..de34fa847e2 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -1,7 +1,6 @@ ;;; vc-svn.el --- non-resident support for Subversion version-control -;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier diff --git a/lisp/vc.el b/lisp/vc.el index d4ece57a3d6..a0b6ffa0ad8 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1,7 +1,7 @@ ;;; vc.el --- drive a version-control system from within Emacs -;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, -;; 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: FSF (see below for full credits) ;; Maintainer: Andre Spiegel diff --git a/lisp/vcursor.el b/lisp/vcursor.el index 89f30cf7232..11ac28ae14a 100644 --- a/lisp/vcursor.el +++ b/lisp/vcursor.el @@ -1,6 +1,7 @@ ;;; vcursor.el --- manipulate an alternative ("virtual") cursor -;; Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1996, 1998, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Peter Stephenson ;; Maintainer: FSF diff --git a/lisp/version.el b/lisp/version.el index 9dcde773c01..62d367e2f79 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -1,7 +1,7 @@ ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- -;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001 -;;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/view.el b/lisp/view.el index c327dcdaa36..80c6207f275 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -1,7 +1,7 @@ ;;; view.el --- peruse file or buffer without editing -;; Copyright (C) 1985, 1989, 1994, 1995, 1997, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1989, 1994, 1995, 1997, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: Inge Frick diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el index 886b8572e77..b591c0d56f2 100644 --- a/lisp/vms-patch.el +++ b/lisp/vms-patch.el @@ -1,6 +1,7 @@ ;;; vms-patch.el --- override parts of files.el for VMS -;; Copyright (C) 1986, 1992 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1992, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: vms diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el index 3c4df12c8bb..aa96560ee48 100644 --- a/lisp/vmsproc.el +++ b/lisp/vmsproc.el @@ -1,6 +1,6 @@ ;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs -;; Copyright (C) 1986, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Mukesh Prasad ;; Maintainer: FSF diff --git a/lisp/vt-control.el b/lisp/vt-control.el index ed65c93290f..61d8ec32a7b 100644 --- a/lisp/vt-control.el +++ b/lisp/vt-control.el @@ -1,6 +1,7 @@ ;;; vt-control.el --- Common VTxxx control functions -;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Rob Riepel ;; Maintainer: Rob Riepel diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el index 805746dd495..0238962082e 100644 --- a/lisp/vt100-led.el +++ b/lisp/vt100-led.el @@ -1,6 +1,6 @@ ;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones -;; Copyright (C) 1988 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 1e7f7b3e154..6d936c44dc8 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -1,6 +1,7 @@ ;;; w32-fns.el --- Lisp routines for Windows NT -;; Copyright (C) 1994, 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Geoff Voelker ;; Keywords: internal diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el index 8e998b9968d..1b4ea8ee60b 100644 --- a/lisp/w32-vars.el +++ b/lisp/w32-vars.el @@ -1,6 +1,6 @@ ;;; w32-vars.el --- MS-Windows specific user options -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jason Rumney ;; Keywords: internal diff --git a/lisp/wdired.el b/lisp/wdired.el index c22a8dff633..ef20ea6f9a2 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -1,6 +1,6 @@ ;;; wdired.el --- Rename files editing their names in dired buffers -;; Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; Filename: wdired.el ;; Author: Juan León Lahoz García diff --git a/lisp/whitespace.el b/lisp/whitespace.el index ac31a4d820b..d3ae080e485 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -1,6 +1,7 @@ ;;; whitespace.el --- warn about and clean bogus whitespaces in the file -;; Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Rajesh Vaidheeswarran ;; Keywords: convenience diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el index 17fe9c24214..c8a34140f69 100644 --- a/lisp/wid-browse.el +++ b/lisp/wid-browse.el @@ -1,6 +1,6 @@ ;;; wid-browse.el --- functions for browsing widgets ;; -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Keywords: extensions diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 8889fbb0488..1198eff55ba 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -1,6 +1,7 @@ ;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*- ;; -;; Copyright (C) 1996,97,1999,2000,01,02,2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Maintainer: FSF diff --git a/lisp/widget.el b/lisp/widget.el index f6c8efa6374..8e9b0977c05 100644 --- a/lisp/widget.el +++ b/lisp/widget.el @@ -1,6 +1,7 @@ ;;; widget.el --- a library of user interface components ;; -;; Copyright (C) 1996, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Keywords: help, extensions, faces, hypermedia diff --git a/lisp/windmove.el b/lisp/windmove.el index 785a7538a69..dabaeb9ebc3 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -1,6 +1,7 @@ ;;; windmove.el --- directional window-selection routines ;; -;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Hovav Shacham (hovav@cs.stanford.edu) ;; Created: 17 October 1998 diff --git a/lisp/window.el b/lisp/window.el index c31b3149556..a0820bb7cf6 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1,7 +1,7 @@ ;;; window.el --- GNU Emacs window commands aside from those written in C -;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000, 2001, 2002, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal diff --git a/lisp/winner.el b/lisp/winner.el index af72bea14d2..0fbd0221e49 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -1,6 +1,7 @@ ;;; winner.el --- Restore old window configurations -;; Copyright (C) 1997, 1998, 2001, 2004 Free Software Foundation. Inc. +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation. Inc. ;; Author: Ivar Rummelhoff ;; Created: 27 Feb 1997 diff --git a/lisp/woman.el b/lisp/woman.el index 9ad3b50e381..5ecc4744305 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1,6 +1,6 @@ ;;; woman.el --- browse UN*X manual pages `wo (without) man' -;; Copyright (C) 2000, 2002, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Francis J. Wright ;; Maintainer: Francis J. Wright diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 0a4017a7b7c..612e033c4cb 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -1,7 +1,6 @@ ;;; x-dnd.el --- drag and drop support for X. -;; Copyright (C) 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. ;; Author: Jan Dj,Ad(Brv ;; Maintainer: FSF diff --git a/lisp/xml.el b/lisp/xml.el index 53cf850b983..90ba5baf9b8 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -1,6 +1,7 @@ ;;; xml.el --- XML parser -;; Copyright (C) 2000, 01, 03, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Emmanuel Briot ;; Maintainer: Mark A. Hershberger diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index e8b0cee00e4..80927647fbb 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -1,6 +1,7 @@ ;;; xt-mouse.el --- support the mouse when emacs run in an xterm -;; Copyright (C) 1994, 2000, 2001, 2005 Free Software Foundation +;; Copyright (C) 1994, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Keywords: mouse, terminals From 2a205424e771703217ce8c6b4252d810d3310cd2 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 00:57:10 +0000 Subject: [PATCH 024/347] Munge comment associated w/ last change to describe intent; nfc. --- src/ChangeLog | 4 ++-- src/floatfns.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9ff58e7f5a8..aa73da64547 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,7 @@ 2005-08-06 Thien-Thi Nguyen - * floatfns.c (Fexpt): Use floats for negative - exponent (computing a root). Reported by D Goel. + * floatfns.c (Fexpt): Use floats for negative exponent. + Reported by D Goel. 2005-08-02 Richard M. Stallman diff --git a/src/floatfns.c b/src/floatfns.c index cbcc0bfe520..0f91b80370a 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -461,7 +461,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg2); if (INTEGERP (arg1) /* common lisp spec */ && INTEGERP (arg2) /* don't promote, if both are ints, and */ - && 0 <= XINT (arg2)) /* we are not computing the -ARG2 root */ + && 0 <= XINT (arg2)) /* we are sure the result is not fractional */ { /* this can be improved by pre-calculating */ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; From ff2b1744feefe3f1284f400ecab4740e43081bc8 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sun, 7 Aug 2005 01:05:10 +0000 Subject: [PATCH 025/347] *** empty log message *** --- lisp/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9d85aed289f..cfadc22b26e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2005-08-06 Luc Teirlinck + * wid-edit.el (widget-choice-value-create): Unconditionally + respect user choice. Set :explicit-choice back to nil when no + longer needed. + (widget-choice-action): Unconditionally respect user choice. + Eliminate :explicit-choice-value. + * fringe.el (set-fringe-indicators-1, fringe-indicators): Delete. * menu-bar.el (menu-bar-options-save): Replace `fringe-indicators' From 25e3656c19c56dafbe51690ff47920a9f3e9c368 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sun, 7 Aug 2005 01:07:33 +0000 Subject: [PATCH 026/347] (widget-choice-value-create): Unconditionally respect user choice. Set :explicit-choice back to nil when no longer needed. (widget-choice-action): Unconditionally respect user choice. Eliminate :explicit-choice-value. --- lisp/wid-edit.el | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 1198eff55ba..9c391ab1176 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -1956,13 +1956,14 @@ the earlier input." (args (widget-get widget :args)) (explicit (widget-get widget :explicit-choice)) current) - (if (and explicit (equal value (widget-get widget :explicit-choice-value))) + (if explicit (progn ;; If the user specified the choice for this value, - ;; respect that choice as long as the value is the same. + ;; respect that choice. (widget-put widget :children (list (widget-create-child-value widget explicit value))) - (widget-put widget :choice explicit)) + (widget-put widget :choice explicit) + (widget-put widget :explicit-choice nil)) (while args (setq current (car args) args (cdr args)) @@ -2048,13 +2049,10 @@ when he invoked the menu." (setq this-explicit t) (widget-choose tag (reverse choices) event)))) (when current - ;; If this was an explicit user choice, - ;; record the choice, and the record the value it was made for. - ;; widget-choice-value-create will respect this choice, - ;; as long as the value is the same. + ;; If this was an explicit user choice, record the choice, + ;; so that widget-choice-value-create will respect it. (when this-explicit - (widget-put widget :explicit-choice current) - (widget-put widget :explicit-choice-value (widget-get widget :value))) + (widget-put widget :explicit-choice current)) (widget-value-set widget (widget-default-get current)) (widget-setup) (widget-apply widget :notify widget event))) From b908093d26f9e68e5058caddf918c9420908286a Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 09:52:28 +0000 Subject: [PATCH 027/347] Update years in copyright notice; nfc. --- src/m/7300.h | 2 +- src/m/acorn.h | 2 +- src/m/alliant-2800.h | 2 +- src/m/alliant.h | 3 ++- src/m/alpha.h | 3 ++- src/m/altos.h | 3 ++- src/m/amdahl.h | 3 ++- src/m/amdx86-64.h | 2 +- src/m/apollo.h | 3 ++- src/m/arm.h | 2 +- src/m/att3b.h | 2 +- src/m/aviion.h | 3 ++- src/m/celerity.h | 3 ++- src/m/clipper.h | 3 ++- src/m/cnvrgnt.h | 2 +- src/m/convex.h | 3 ++- src/m/cydra5.h | 3 ++- src/m/delta88k.h | 3 ++- src/m/dpx2.h | 3 ++- src/m/dual.h | 3 ++- src/m/elxsi.h | 3 ++- src/m/ews4800.h | 3 ++- src/m/gould-np1.h | 2 +- src/m/hp800.h | 2 +- src/m/hp9000s300.h | 2 +- src/m/i860.h | 3 ++- src/m/ia64.h | 2 +- src/m/ibm370aix.h | 3 ++- src/m/ibmps2-aix.h | 2 +- src/m/ibmrs6000.h | 2 +- src/m/ibmrt-aix.h | 3 ++- src/m/ibmrt.h | 2 +- src/m/ibms390.h | 3 ++- src/m/intel386.h | 2 +- src/m/iris4d.h | 2 +- src/m/irist.h | 3 ++- src/m/isi-ov.h | 3 ++- src/m/m68k.h | 3 ++- src/m/macppc.h | 3 ++- src/m/masscomp.h | 2 +- src/m/mega68.h | 2 +- src/m/mg1.h | 2 +- src/m/mips-siemens.h | 3 ++- src/m/mips.h | 3 ++- src/m/news.h | 3 ++- src/m/next.h | 2 +- src/m/nh3000.h | 2 +- src/m/nh4000.h | 2 +- src/m/ns16000.h | 2 +- src/m/ns32000.h | 3 ++- src/m/nu.h | 2 +- src/m/orion.h | 2 +- src/m/orion105.h | 2 +- src/m/pfa50.h | 3 ++- src/m/plexus.h | 2 +- src/m/powermac.h | 2 +- src/m/powerpcle.h | 2 +- src/m/pyramid.h | 3 ++- src/m/sequent-ptx.h | 3 ++- src/m/sequent.h | 3 ++- src/m/sparc.h | 2 +- src/m/sps7.h | 3 ++- src/m/sr2k.h | 2 +- src/m/stride.h | 3 ++- src/m/sun1.h | 3 ++- src/m/sun2.h | 3 ++- src/m/sun386.h | 2 +- src/m/symmetry.h | 3 ++- src/m/tad68k.h | 2 +- src/m/tahoe.h | 2 +- src/m/targon31.h | 3 ++- src/m/tek4300.h | 2 +- src/m/tekxd88.h | 2 +- src/m/template.h | 3 ++- src/m/tower32.h | 2 +- src/m/tower32v3.h | 2 +- src/m/ustation.h | 3 ++- src/m/vax.h | 3 ++- src/m/wicat.h | 2 +- src/m/windowsnt.h | 3 ++- src/m/xps100.h | 3 ++- 81 files changed, 123 insertions(+), 81 deletions(-) diff --git a/src/m/7300.h b/src/m/7300.h index fa95b3d9c4e..bb261c9188a 100644 --- a/src/m/7300.h +++ b/src/m/7300.h @@ -1,5 +1,5 @@ /* machine description file for AT&T UNIX PC model 7300 - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Modified for this machine by mtxinu!rtech!gonzo!daveb This file is part of GNU Emacs. diff --git a/src/m/acorn.h b/src/m/acorn.h index 66978329d75..399fb7c9249 100644 --- a/src/m/acorn.h +++ b/src/m/acorn.h @@ -1,5 +1,5 @@ /* Machine description file for Acorn RISCiX machines. - Copyright (C) 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h index cf0afd90bb5..b59322e3d0c 100644 --- a/src/m/alliant-2800.h +++ b/src/m/alliant-2800.h @@ -1,5 +1,5 @@ /* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800. - Copyright (C) 1990, 2002 Free Software Foundation, Inc. + Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/alliant.h b/src/m/alliant.h index a32e514271d..cbc5734ab31 100644 --- a/src/m/alliant.h +++ b/src/m/alliant.h @@ -1,5 +1,6 @@ /* alliant.h Alliant machine running system version 2 or 3. - Copyright (C) 1985, 1986, 1987, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Note that for version 1 of the Alliant system you should use alliant1.h instead of this file. Use alliant4.h for version 4. diff --git a/src/m/alpha.h b/src/m/alpha.h index aff6182270f..41fefaf20fd 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -1,5 +1,6 @@ /* machine description file For the alpha chip. - Copyright (C) 1994, 1997, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 1997, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/altos.h b/src/m/altos.h index e3cf0898773..743752d99ec 100644 --- a/src/m/altos.h +++ b/src/m/altos.h @@ -1,5 +1,6 @@ /* altos machine description file Altos 3068 Unix System V Release 2 - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/amdahl.h b/src/m/amdahl.h index 8b32a2e64d1..89d4b6cb6f7 100644 --- a/src/m/amdahl.h +++ b/src/m/amdahl.h @@ -1,5 +1,6 @@ /* amdahl machine description file - Copyright (C) 1987, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 61b18dcc319..2d7d86ce7c3 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -1,5 +1,5 @@ /* machine description file for AMD x86-64. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/apollo.h b/src/m/apollo.h index 8fa91c004c5..4aa62b0b209 100644 --- a/src/m/apollo.h +++ b/src/m/apollo.h @@ -1,5 +1,6 @@ /* machine description file for Apollo machine. - Copyright (C) 1985, 1986, 1994, 2002, Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/arm.h b/src/m/arm.h index 1ebcf3be4a4..358445e0649 100644 --- a/src/m/arm.h +++ b/src/m/arm.h @@ -1,5 +1,5 @@ /* Machine description file for ARM-based non-RISCiX machines. - Copyright (C) 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/att3b.h b/src/m/att3b.h index 949e6b1d01b..757b47d3f37 100644 --- a/src/m/att3b.h +++ b/src/m/att3b.h @@ -1,5 +1,5 @@ /* Machine-dependent configuration for GNU Emacs for AT&T 3b machines. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86 diff --git a/src/m/aviion.h b/src/m/aviion.h index 13a262423b0..b9a2932ef07 100644 --- a/src/m/aviion.h +++ b/src/m/aviion.h @@ -1,5 +1,6 @@ /* machine description file for Data General AViiON. - Copyright (C) 1985, 1986, 1991, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1991, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/celerity.h b/src/m/celerity.h index 0b0bb020122..639d680afdb 100644 --- a/src/m/celerity.h +++ b/src/m/celerity.h @@ -1,5 +1,6 @@ /* machine description file for Celerity. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/clipper.h b/src/m/clipper.h index 5da09e02fb8..af9f67d8a37 100644 --- a/src/m/clipper.h +++ b/src/m/clipper.h @@ -1,5 +1,6 @@ /* machine description file for clipper - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h index cb344f98f7f..48727bedbe3 100644 --- a/src/m/cnvrgnt.h +++ b/src/m/cnvrgnt.h @@ -1,5 +1,5 @@ /* machine description file for convergent S series. - Copyright (C) 1989, 2002 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/convex.h b/src/m/convex.h index 97b291743dc..b7fcc71b1c3 100644 --- a/src/m/convex.h +++ b/src/m/convex.h @@ -1,5 +1,6 @@ /* machine description file for Convex (all models). - Copyright (C) 1987, 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/cydra5.h b/src/m/cydra5.h index e2813dc2a4b..9806fc30a47 100644 --- a/src/m/cydra5.h +++ b/src/m/cydra5.h @@ -1,5 +1,6 @@ /* machine description file for Cydrome's CYDRA 5 mini super computer - Copyright (C) 1988, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/delta88k.h b/src/m/delta88k.h index ab0a48a4e31..517a0f1744b 100644 --- a/src/m/delta88k.h +++ b/src/m/delta88k.h @@ -1,5 +1,6 @@ /* Machine description file for Motorola System V/88 machines - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/dpx2.h b/src/m/dpx2.h index 7a24c3940d3..8d1ceb3db06 100644 --- a/src/m/dpx2.h +++ b/src/m/dpx2.h @@ -1,5 +1,6 @@ /* machine description for Bull DPX/2 range - Copyright (C) 1985, 1986, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/dual.h b/src/m/dual.h index 253c12bec52..134a5e7720e 100644 --- a/src/m/dual.h +++ b/src/m/dual.h @@ -1,5 +1,6 @@ /* machine description file for Dual machines using unisoft port. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/elxsi.h b/src/m/elxsi.h index f8de3609690..f702dcf0de2 100644 --- a/src/m/elxsi.h +++ b/src/m/elxsi.h @@ -1,5 +1,6 @@ /* machine description file for Elxsi machine (running enix). - Copyright (C) 1986, 1992, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 1992, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Adapted by John Salmon This file is part of GNU Emacs. diff --git a/src/m/ews4800.h b/src/m/ews4800.h index dcb46bf83d8..b377bdeddaa 100644 --- a/src/m/ews4800.h +++ b/src/m/ews4800.h @@ -1,5 +1,6 @@ /* m- file for NEC EWS4800 RISC series. - Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h index 4a267865085..1c784f28f4e 100644 --- a/src/m/gould-np1.h +++ b/src/m/gould-np1.h @@ -1,5 +1,5 @@ /* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1) - Copyright (C) 1986 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/hp800.h b/src/m/hp800.h index 64243f4be31..2f661989a15 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -1,5 +1,5 @@ /* machine description file for hp9000 series 800 machines. - Copyright (C) 1987, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h index 8886aec204c..e0b3a5ce5c3 100644 --- a/src/m/hp9000s300.h +++ b/src/m/hp9000s300.h @@ -1,5 +1,5 @@ /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD. - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/i860.h b/src/m/i860.h index 66ca2b8fa66..0ecf9e62087 100644 --- a/src/m/i860.h +++ b/src/m/i860.h @@ -1,5 +1,6 @@ /* machine description file for i860. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ia64.h b/src/m/ia64.h index 33d843c773f..af790946afa 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h @@ -1,5 +1,5 @@ /* machine description file for the IA-64 architecture. - Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by David Mosberger This file is part of GNU Emacs. diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h index b958656c3e4..3d954ae9d19 100644 --- a/src/m/ibm370aix.h +++ b/src/m/ibm370aix.h @@ -1,5 +1,6 @@ /* m/ file for IBM 370 running AIX. - Copyright (C) 1993, 1994, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h index d2202d65472..539de924d17 100644 --- a/src/m/ibmps2-aix.h +++ b/src/m/ibmps2-aix.h @@ -1,5 +1,5 @@ /* machine description file for ibm ps/2 aix386. - Copyright (C) 1989, 2002 Free Software Foundation, Inc. + Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index b76d03bc0b7..9559f1ae62a 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -1,5 +1,5 @@ /* R2 AIX machine/system dependent defines - Copyright (C) 1988, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h index b9ea0e6208f..44bfd77c1d0 100644 --- a/src/m/ibmrt-aix.h +++ b/src/m/ibmrt-aix.h @@ -1,5 +1,6 @@ /* RTPC AIX machine/system dependent defines - Copyright (C) 1988, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h index 1388a46b001..f6c23d9d919 100644 --- a/src/m/ibmrt.h +++ b/src/m/ibmrt.h @@ -1,5 +1,5 @@ /* RTPC machine dependent defines - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ibms390.h b/src/m/ibms390.h index af7fbb8dfbf..323ef33f633 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -1,5 +1,6 @@ /* machine description file template. - Copyright (C) 1985, 1986, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/intel386.h b/src/m/intel386.h index c63dae7af0b..238015fd345 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h @@ -1,5 +1,5 @@ /* Machine description file for intel 386. - Copyright (C) 1987, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/iris4d.h b/src/m/iris4d.h index a13a6f8c2ff..93fe2062674 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h @@ -1,5 +1,5 @@ /* machine description file for Iris-4D machines. Use with s/irix*.h. - Copyright (C) 1987, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/irist.h b/src/m/irist.h index 71726977b23..b40ffb5dff9 100644 --- a/src/m/irist.h +++ b/src/m/irist.h @@ -1,6 +1,7 @@ /* machine description file for Silicon Graphics Iris 2500 Turbos; also possibly for non-turbo Irises with system release 2.5. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h index 9b35f03ea70..416335d1bff 100644 --- a/src/m/isi-ov.h +++ b/src/m/isi-ov.h @@ -1,5 +1,6 @@ /* machine description file for ISI 68000's - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/m68k.h b/src/m/m68k.h index 9fdcf1511b8..7b2ffa81351 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h @@ -1,5 +1,6 @@ /* Machine description file for generic Motorola 68k. - Copyright (C) 1985, 1995, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/macppc.h b/src/m/macppc.h index 36022af3e52..9e4297df3b7 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -1,5 +1,6 @@ /* machine description file For the powerpc Macintosh. - Copyright (C) 1994, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/masscomp.h b/src/m/masscomp.h index 4582e29b6bd..01fddc751f1 100644 --- a/src/m/masscomp.h +++ b/src/m/masscomp.h @@ -1,5 +1,5 @@ /* machine description file for Masscomp 5000 series running RTU, ucb universe. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/mega68.h b/src/m/mega68.h index ba7ee6b48d4..ef1623ca460 100644 --- a/src/m/mega68.h +++ b/src/m/mega68.h @@ -1,5 +1,5 @@ /* machine description file for Megatest 68000's. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/mg1.h b/src/m/mg1.h index 47d34f43768..4e4b3525d6e 100644 --- a/src/m/mg1.h +++ b/src/m/mg1.h @@ -1,5 +1,5 @@ /* machine description file for Whitechapel Computer Works MG1 (ns16000 based). - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. MG-1 version by L.M.McLoughlin This file is part of GNU Emacs. diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h index f00790210c9..fc1a8a2e0d6 100644 --- a/src/m/mips-siemens.h +++ b/src/m/mips-siemens.h @@ -1,5 +1,6 @@ /* m- file for Mips machines. - Copyright (C) 1987,1992,1993,95,2002,03 Free Software Foundation, Inc. + Copyright (C) 1987, 1992, 1993, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file contains some changes for our SVR4 based SINIX-Mips 5.4. I hope this is helpful to port the emacs to our RM?00 series and diff --git a/src/m/mips.h b/src/m/mips.h index e868423642c..28a35e02677 100644 --- a/src/m/mips.h +++ b/src/m/mips.h @@ -1,5 +1,6 @@ /* m- file for Mips machines. - Copyright (C) 1987, 1992, 1999, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/news.h b/src/m/news.h index 1d2585c09a0..dec413c3f9e 100644 --- a/src/m/news.h +++ b/src/m/news.h @@ -1,5 +1,6 @@ /* machine description file for Sony's NEWS workstations, NEWS-OS 3.0. - Copyright (C) 1985, 1986, 1989, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1989, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/next.h b/src/m/next.h index 2f2952e10f4..dfb3cd11cbf 100644 --- a/src/m/next.h +++ b/src/m/next.h @@ -1,5 +1,5 @@ /* Configuration file for the NeXT machine. - Copyright (C) 1990, 2002 Free Software Foundation, Inc. + Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nh3000.h b/src/m/nh3000.h index 7be5c5dc7db..42255473020 100644 --- a/src/m/nh3000.h +++ b/src/m/nh3000.h @@ -1,7 +1,7 @@ /* machine description for Harris Night Hawk Series 1200 and Series 3000 MC68030-based systems (FPP on these is custom). These systems are also known as "ecx" and "gcx". - Copyright (C) 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nh4000.h b/src/m/nh4000.h index 3d8794b2802..04068f0c065 100644 --- a/src/m/nh4000.h +++ b/src/m/nh4000.h @@ -1,6 +1,6 @@ /* machine description for Harris NightHawk 88k based machines (includes nh4000 and nh5000 machines). - Copyright (C) 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ns16000.h b/src/m/ns16000.h index 07fff86502b..49f514ced06 100644 --- a/src/m/ns16000.h +++ b/src/m/ns16000.h @@ -1,5 +1,5 @@ /* machine description file for ns16000. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ns32000.h b/src/m/ns32000.h index 9a135fe2d9f..858630b74ab 100644 --- a/src/m/ns32000.h +++ b/src/m/ns32000.h @@ -1,5 +1,6 @@ /* machine description file for National Semiconductor 32000, running Genix. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/nu.h b/src/m/nu.h index 8ca03155314..1e5518e451f 100644 --- a/src/m/nu.h +++ b/src/m/nu.h @@ -1,5 +1,5 @@ /* machine description file for TI Nu machines using system V. - Copyright (C) 1986 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/orion.h b/src/m/orion.h index e4fa8529664..a73b357d50f 100644 --- a/src/m/orion.h +++ b/src/m/orion.h @@ -1,5 +1,5 @@ /* machine description file for HLH Orion. - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/orion105.h b/src/m/orion105.h index d0adaba70ec..e75a8e67a84 100644 --- a/src/m/orion105.h +++ b/src/m/orion105.h @@ -1,5 +1,5 @@ /* machine description file for HLH Orion 1/05 (Clipper). - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Lee McLoughlin This file is part of GNU Emacs. diff --git a/src/m/pfa50.h b/src/m/pfa50.h index be430d25fdc..50e79b623ca 100644 --- a/src/m/pfa50.h +++ b/src/m/pfa50.h @@ -1,5 +1,6 @@ /* Machine description file for PFU A-series. - Copyright (C) 1988, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/plexus.h b/src/m/plexus.h index a2f6cc545a0..10826a70bc2 100644 --- a/src/m/plexus.h +++ b/src/m/plexus.h @@ -1,5 +1,5 @@ /* machine description file for the Plexus running System V.2. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/powermac.h b/src/m/powermac.h index c41003ae61c..14b2e110734 100644 --- a/src/m/powermac.h +++ b/src/m/powermac.h @@ -1,5 +1,5 @@ /* Machine description file for Apple Power Macintosh - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h index 34096a37d18..1dfd2df25b4 100644 --- a/src/m/powerpcle.h +++ b/src/m/powerpcle.h @@ -1,5 +1,5 @@ /* machine description file for PowerPC. - Copyright (C) 1987, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/pyramid.h b/src/m/pyramid.h index 7e0db61ec59..12010087a58 100644 --- a/src/m/pyramid.h +++ b/src/m/pyramid.h @@ -1,5 +1,6 @@ /* machine description file for pyramid. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h index 57d255a861e..3c22639e3b2 100644 --- a/src/m/sequent-ptx.h +++ b/src/m/sequent-ptx.h @@ -1,5 +1,6 @@ /* machine description file for SEQUENT machines running DYNIX/ptx - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sequent.h b/src/m/sequent.h index 7c572f54f68..f082880b4fc 100644 --- a/src/m/sequent.h +++ b/src/m/sequent.h @@ -1,5 +1,6 @@ /* machine description file for SEQUENT BALANCE machines - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sparc.h b/src/m/sparc.h index 6926aced07b..20ec53c1344 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -1,5 +1,5 @@ /* machine description file for Sun 4 SPARC. - Copyright (C) 1987, 2002 Free Software Foundation, Inc. + Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sps7.h b/src/m/sps7.h index 3bd0c94bccd..422d2470aaa 100644 --- a/src/m/sps7.h +++ b/src/m/sps7.h @@ -1,5 +1,6 @@ /* machine description file for Bull SPS-7. - Copyright (C) 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sr2k.h b/src/m/sr2k.h index 83dbf4941ff..875f428dc1f 100644 --- a/src/m/sr2k.h +++ b/src/m/sr2k.h @@ -1,5 +1,5 @@ /* machine description file for Hitachi SR2001/SR2201 machines. - Copyright (C) 1996, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/stride.h b/src/m/stride.h index f176a7642a7..ff900d49b38 100644 --- a/src/m/stride.h +++ b/src/m/stride.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Stride Micro System-V.2.2 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun1.h b/src/m/sun1.h index 7ab81218705..810bad7fd58 100644 --- a/src/m/sun1.h +++ b/src/m/sun1.h @@ -1,5 +1,6 @@ /* machine description file for Sun 68000's - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun2.h b/src/m/sun2.h index 452fdfc7c01..9df032049e3 100644 --- a/src/m/sun2.h +++ b/src/m/sun2.h @@ -1,7 +1,8 @@ /* machine description file for Sun 68000's OPERATING SYSTEM version 2. Note that "sun2.h" refers to the operating system version, not the CPU model number. See the MACHINES file for details. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/sun386.h b/src/m/sun386.h index 782e10925ef..5970f90b98b 100644 --- a/src/m/sun386.h +++ b/src/m/sun386.h @@ -2,7 +2,7 @@ "sun2.h", but since that file is heavily cpu-specific, it was easier not to include it. - Copyright (C) 1988 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/symmetry.h b/src/m/symmetry.h index 262d6474757..4954f596442 100644 --- a/src/m/symmetry.h +++ b/src/m/symmetry.h @@ -1,5 +1,6 @@ /* machine description file for SEQUENT SYMMETRY machines - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tad68k.h b/src/m/tad68k.h index 4c904aaf569..b8b3859f407 100644 --- a/src/m/tad68k.h +++ b/src/m/tad68k.h @@ -1,5 +1,5 @@ /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tahoe.h b/src/m/tahoe.h index 988624839b4..47db3f93deb 100644 --- a/src/m/tahoe.h +++ b/src/m/tahoe.h @@ -1,5 +1,5 @@ /* machine description file for tahoe. - Copyright (C) 1985, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/targon31.h b/src/m/targon31.h index 08ecb681bd9..5ac18648387 100644 --- a/src/m/targon31.h +++ b/src/m/targon31.h @@ -1,5 +1,6 @@ /* targon31 machine description file - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tek4300.h b/src/m/tek4300.h index 164df72210a..a84135291cb 100644 --- a/src/m/tek4300.h +++ b/src/m/tek4300.h @@ -1,5 +1,5 @@ /* machine description file for tek4300. - Copyright (C) 1988, 2002 Free Software Foundation, Inc. + Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h index 7af3dab6a07..4db981a8096 100644 --- a/src/m/tekxd88.h +++ b/src/m/tekxd88.h @@ -1,7 +1,7 @@ /* Configuration file for the Tektronix XD88 running UTekV 3.2e, contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 1/15/93. You probably need to use gnu make (version 3.63 or higher.) - Copyright (C) 1993, 2002 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/template.h b/src/m/template.h index c088efff81a..c7ce2c2cb1f 100644 --- a/src/m/template.h +++ b/src/m/template.h @@ -1,5 +1,6 @@ /* machine description file template. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tower32.h b/src/m/tower32.h index c5f34d065ea..cd4ab96de11 100644 --- a/src/m/tower32.h +++ b/src/m/tower32.h @@ -1,5 +1,5 @@ /* machine description file for the NCR Tower 32 running System V.2. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h index 927dfca93d9..2c1e55c0023 100644 --- a/src/m/tower32v3.h +++ b/src/m/tower32v3.h @@ -1,5 +1,5 @@ /* machine description file for the NCR Tower 32 running System V.3. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/ustation.h b/src/m/ustation.h index e7068f3cd86..c62d37d6429 100644 --- a/src/m/ustation.h +++ b/src/m/ustation.h @@ -1,5 +1,6 @@ /* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30). - Copyright (C) 1986, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/vax.h b/src/m/vax.h index 22fda95abc5..d414d6b57e7 100644 --- a/src/m/vax.h +++ b/src/m/vax.h @@ -1,5 +1,6 @@ /* machine description file for vax. - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/wicat.h b/src/m/wicat.h index bd8fcefe99c..78842f32a43 100644 --- a/src/m/wicat.h +++ b/src/m/wicat.h @@ -1,5 +1,5 @@ /* machine description file for WICAT machines. - Copyright (C) 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h index 39c7baa9de6..cf48ca8aa88 100644 --- a/src/m/windowsnt.h +++ b/src/m/windowsnt.h @@ -1,6 +1,7 @@ /* Machine description file for Windows NT. - Copyright (C) 1993, 1994, 2002 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/m/xps100.h b/src/m/xps100.h index c6e54710bd6..3a851aa9ebd 100644 --- a/src/m/xps100.h +++ b/src/m/xps100.h @@ -1,7 +1,8 @@ /* xps100.h for the Honeywell XPS100 running UNIX System V.2 Mark J. Hewitt (mjh@uk.co.kernel) - Copyright (C) 1985, 1986, 2002 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. From 9074d3d501e3ba88747f51815635ac674ca40ff1 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 10:17:09 +0000 Subject: [PATCH 028/347] Update "copyright years" section. --- admin/FOR-RELEASE | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 1a8497a7207..2135a3d0abe 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -96,7 +96,8 @@ you're going to handle. DIRECTORY STATUS IN CHARGE --------- ------ --------- leim working Kenichi Handa -lisp working Thien-Thi Nguyen +lib-src working Thien-Thi Nguyen +lisp done Thien-Thi Nguyen lisp/calc done Thien-Thi Nguyen lisp/calendar working Glenn Morris lisp/emacs-lisp done Thien-Thi Nguyen @@ -115,9 +116,10 @@ lisp/term done Thien-Thi Nguyen lisp/textmodes done Thien-Thi Nguyen lisp/toolbar done Thien-Thi Nguyen lisp/url done Thien-Thi Nguyen +lwlib working Thien-Thi Nguyen src working Thien-Thi Nguyen -src/m working Thien-Thi Nguyen -src/s working Thien-Thi Nguyen +src/m done Thien-Thi Nguyen +src/s done Thien-Thi Nguyen ** Check the Emacs manual. From 92b47a4a991a7b30f5eda49fcab4f29aa9ca288e Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 10:56:27 +0000 Subject: [PATCH 029/347] Update years in copyright notice; nfc. --- lib-src/Makefile.in | 4 ++-- lib-src/cvtmail.c | 3 ++- lib-src/digest-doc.c | 3 ++- lib-src/ebrowse.c | 4 ++-- lib-src/emacsclient.c | 4 ++-- lib-src/emacstool.c | 3 ++- lib-src/etags.c | 5 +++-- lib-src/fakemail.c | 3 ++- lib-src/getopt.c | 5 +++-- lib-src/getopt1.c | 4 ++-- lib-src/getopt_.h | 4 ++-- lib-src/getopt_int.h | 4 ++-- lib-src/gettext.h | 3 ++- lib-src/grep-changelog | 3 ++- lib-src/hexl.c | 2 +- lib-src/make-docfile.c | 4 ++-- lib-src/makefile.w32-in | 3 ++- lib-src/movemail.c | 3 ++- lib-src/ntlib.c | 2 +- lib-src/ntlib.h | 2 +- lib-src/pop.c | 3 ++- lib-src/pop.h | 3 ++- lib-src/profile.c | 3 ++- lib-src/rcs-checkin | 3 ++- lib-src/rcs2log | 4 ++-- lib-src/sorted-doc.c | 4 ++-- lib-src/test-distrib.c | 4 ++-- lib-src/update-game-score.c | 2 +- lib-src/vcdiff | 4 ++-- lisp/Makefile.in | 2 +- lisp/makefile.w32-in | 3 ++- lwlib/lwlib-Xlw.c | 3 ++- lwlib/lwlib-Xm.c | 4 ++-- lwlib/lwlib-Xm.h | 3 ++- lwlib/xlwmenu.c | 2 +- lwlib/xlwmenu.h | 2 +- lwlib/xlwmenuP.h | 3 ++- src/s/aix3-1.h | 3 ++- src/s/bsd4-1.h | 3 ++- src/s/bsd4-2.h | 3 ++- src/s/bsd4-3.h | 3 ++- src/s/cxux.h | 2 +- src/s/cygwin.h | 3 ++- src/s/darwin.h | 2 +- src/s/dgux.h | 3 ++- src/s/dgux4.h | 2 +- src/s/dgux5-4-3.h | 2 +- src/s/dgux5-4r2.h | 2 +- src/s/freebsd.h | 4 ++-- src/s/gnu-linux.h | 3 ++- src/s/gnu.h | 3 ++- src/s/hpux.h | 3 ++- src/s/iris3-5.h | 3 ++- src/s/iris3-6.h | 3 ++- src/s/irix3-3.h | 3 ++- src/s/lynxos.h | 3 ++- src/s/ms-w32.h | 3 ++- src/s/msdos.h | 3 ++- src/s/newsos5.h | 3 ++- src/s/nextstep.h | 3 ++- src/s/ptx.h | 3 ++- src/s/riscix1-1.h | 2 +- src/s/riscix12.h | 2 +- src/s/rtu.h | 3 ++- src/s/sco4.h | 3 ++- src/s/sco5.h | 2 +- src/s/template.h | 3 ++- src/s/umax.h | 3 ++- src/s/unipl5-2.h | 3 ++- src/s/usg5-0.h | 3 ++- src/s/usg5-2-2.h | 3 ++- src/s/usg5-2.h | 3 ++- src/s/usg5-3.h | 3 ++- src/s/usg5-4.h | 3 ++- src/s/vms.h | 2 +- src/s/xenix.h | 3 ++- 76 files changed, 138 insertions(+), 91 deletions(-) diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 6fa89e728c6..274bbabe29f 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -1,6 +1,6 @@ # Makefile for lib-src subdirectory in GNU Emacs. -# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c index 4dd6bb20a68..562c5522ed9 100644 --- a/lib-src/cvtmail.c +++ b/lib-src/cvtmail.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1985, 1994 Free Software Foundation +/* Copyright (C) 1985, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c index 9db4a190803..d3df334841e 100644 --- a/lib-src/digest-doc.c +++ b/lib-src/digest-doc.c @@ -1,7 +1,8 @@ /* Give this program DOC-mm.nn.oo as standard input and it outputs to standard output a file of nroff output containing the doc strings. - Copyright (C) 1987, 1994, 2001 Free Software Foundation Inc. + Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index bc323fbbbd8..49e353cf536 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -1,7 +1,7 @@ /* ebrowse.c --- parsing files for the ebrowse C++ browser - Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, - 2000, 2001, 2002 Free Software Foundation Inc. + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 75fa9ebe8e7..034d5c9faa9 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1,6 +1,6 @@ /* Client process that communicates with GNU Emacs acting as server. - Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c index f0e9ad8c1f6..b883b442bd9 100644 --- a/lib-src/emacstool.c +++ b/lib-src/emacstool.c @@ -1,5 +1,6 @@ /* - Copyright (C) 1986, 1988, 1990, 1991 Free Software Foundation, Inc. + Copyright (C) 1986, 1988, 1990, 1991, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/etags.c b/lib-src/etags.c index 2f273771a96..fe4fa84f4c5 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -1,6 +1,7 @@ /* Tags file maker to go with GNU Emacs -*- coding: latin-1 -*- - Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2001, 2002, 2004 - Free Software Foundation, Inc. and Ken Arnold + Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. and Ken Arnold This file is not considered part of GNU Emacs. diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c index cf6c1ff334d..de1e2cbf858 100644 --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c @@ -1,5 +1,6 @@ /* sendmail-like interface to /bin/mail for system V, - Copyright (C) 1985, 1994, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/getopt.c b/lib-src/getopt.c index 8cbe6e1a1da..70fd4186261 100644 --- a/lib-src/getopt.c +++ b/lib-src/getopt.c @@ -2,8 +2,9 @@ NOTE: getopt is now part of the C library, so if you don't know what "Keep this file name-space clean" means, talk to drepper@gnu.org before changing it! - Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004 - Free Software Foundation, Inc. + Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, + 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c index 40c1d1695d3..8aa9b183578 100644 --- a/lib-src/getopt1.c +++ b/lib-src/getopt1.c @@ -1,6 +1,6 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004 - Free Software Foundation, Inc. + Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, + 1998, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h index 2c2c1d458ef..fbd45d42aab 100644 --- a/lib-src/getopt_.h +++ b/lib-src/getopt_.h @@ -1,6 +1,6 @@ /* Declarations for getopt. - Copyright (C) 1989-1994,1996-1999,2001,2003,2004 - Free Software Foundation, Inc. + Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, + 2001, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h index 6d47d2f0b8c..f59ab32ce28 100644 --- a/lib-src/getopt_int.h +++ b/lib-src/getopt_int.h @@ -1,6 +1,6 @@ /* Internal declarations for getopt. - Copyright (C) 1989-1994,1996-1999,2001,2003,2004 - Free Software Foundation, Inc. + Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, + 2001, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/lib-src/gettext.h b/lib-src/gettext.h index ba484b3d1d9..658fa17fcb8 100644 --- a/lib-src/gettext.h +++ b/lib-src/gettext.h @@ -1,5 +1,6 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004, + 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog index 04468535e02..45bf841ae59 100755 --- a/lib-src/grep-changelog +++ b/lib-src/grep-changelog @@ -1,6 +1,7 @@ #! /usr/bin/perl -# Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 05e0658e566..0dfdddf468f 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -1,5 +1,5 @@ /* Convert files for Emacs Hexl mode. - Copyright (C) 1989 Free Software Foundation, Inc + Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 6c0816ed98a..537eafec7f5 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -1,6 +1,6 @@ /* Generate doc-string file for GNU Emacs from source files. - Copyright (C) 1985, 86, 92, 93, 94, 97, 1999, 2000, 01, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 48ce5a2f80f..bfda0f25d5f 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -1,5 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. -# Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lib-src/movemail.c b/lib-src/movemail.c index f82bebd4f2b..e8f1122e943 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -1,6 +1,7 @@ /* movemail foo bar -- move file foo to file bar, locking file foo the way /bin/mail respects. - Copyright (C) 1986, 92, 93, 94, 96, 1999 Free Software Foundation, Inc. + Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index c346ccd908b..caaf521206b 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c @@ -1,5 +1,5 @@ /* Utility and Unix shadow routines for GNU Emacs support programs on NT. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index b1cb97dabda..07e730567f7 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h @@ -1,5 +1,5 @@ /* Utility and Unix shadow routines for GNU Emacs support programs on NT. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/pop.c b/lib-src/pop.c index 30a4233d417..9bc73e90a54 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -1,5 +1,6 @@ /* pop.c: client routines for talking to a POP3-protocol post-office server - Copyright (c) 1991, 1993, 1996, 1997, 1999 Free Software Foundation, Inc. + Copyright (C) 1991, 1993, 1996, 1997, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Written by Jonathan Kamens, jik@security.ov.com. This file is part of GNU Emacs. diff --git a/lib-src/pop.h b/lib-src/pop.h index 5267ec97eb4..eed24a89934 100644 --- a/lib-src/pop.h +++ b/lib-src/pop.h @@ -1,5 +1,6 @@ /* pop.h: Header file for the "pop.c" client POP3 protocol. - Copyright (c) 1991,1993 Free Software Foundation, Inc. + Copyright (C) 1991, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Written by Jonathan Kamens, jik@security.ov.com. This file is part of GNU Emacs. diff --git a/lib-src/profile.c b/lib-src/profile.c index 7bc7186c259..615a43d912c 100644 --- a/lib-src/profile.c +++ b/lib-src/profile.c @@ -1,5 +1,6 @@ /* profile.c --- generate periodic events for profiling of Emacs Lisp code. - Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. + Copyright (C) 1992, 1994, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Author: Boaz Ben-Zvi diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin index 2a7de0f2f11..beee6ce29f7 100755 --- a/lib-src/rcs-checkin +++ b/lib-src/rcs-checkin @@ -2,7 +2,8 @@ # This script accepts any number of file arguments and checks them into RCS. -# Copyright (C) 1993, 1994, 1995, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 05864c2ad26..4e7c6c1bb1b 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -55,7 +55,7 @@ Report bugs to .' Id='$Id$' # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, -# 2004 Free Software Foundation, Inc. +# 2004, 2005 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ Id='$Id$' # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -Copyright='Copyright (C) 2004 Free Software Foundation, Inc. +Copyright='Copyright (C) 2005 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 120a510f006..cb04be26842 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c @@ -1,8 +1,8 @@ /* Give this program DOC-mm.nn.oo as standard input and it outputs to standard output a file of texinfo input containing the doc strings. - Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001 - Free Software Foundation Inc. + Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c index 0bbc6806d71..0d3587af8da 100644 --- a/lib-src/test-distrib.c +++ b/lib-src/test-distrib.c @@ -1,7 +1,7 @@ /* test-distrib.c --- testing distribution of nonprinting chars - Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001 - Free Software Foundation Inc. + Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index d9d20b8525d..46d0d8b0600 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -1,5 +1,5 @@ /* update-game-score.c --- Update a score file - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lib-src/vcdiff b/lib-src/vcdiff index 8e1722d43ba..a57811a7f6d 100755 --- a/lib-src/vcdiff +++ b/lib-src/vcdiff @@ -3,8 +3,8 @@ # Enhanced sccs diff utility for use with vc mode. # This version is more compatible with rcsdiff(1). # -# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 1174519af9a..a7ef180b18e 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -1,5 +1,5 @@ # Maintenance productions for the Lisp directory -# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 8c6007af558..6d3cacecc6a 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -1,5 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. -# Copyright (c) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index e5d9ebbd0f3..40091e7b69b 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c @@ -1,6 +1,7 @@ /* The lwlib interface to "xlwmenu" menus. Copyright (C) 1992 Lucid, Inc. - Copyright (C) 1994, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 27118d8ab92..32abbca7601 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -1,6 +1,6 @@ /* The lwlib interface to Motif widgets. - Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. Copyright (C) 1992 Lucid, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h index c5a1fbe9155..d6069fad2d8 100644 --- a/lwlib/lwlib-Xm.h +++ b/lwlib/lwlib-Xm.h @@ -1,5 +1,6 @@ /* The lwlib interface to Motif widgets. - Copyright (C) 1994, 2000 Free Software Foundation, Inc. + Copyright (C) 1994, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Copyright (C) 1992 Lucid, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 09d11c8b683..f1ee1b68e9b 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1,6 +1,6 @@ /* Implements a lightweight menubar widget. Copyright (C) 1992 Lucid, Inc. - Copyright (C) 2002, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h index e896617a69e..93703358ccb 100644 --- a/lwlib/xlwmenu.h +++ b/lwlib/xlwmenu.h @@ -1,5 +1,5 @@ /* Interface of a lightweight menubar widget. - Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h index a25307b6ff3..ca2b7dc6a1a 100644 --- a/lwlib/xlwmenuP.h +++ b/lwlib/xlwmenuP.h @@ -1,5 +1,6 @@ /* Internals of a lightweight menubar widget. - Copyright (C) 1999, 2000, 2002, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h index 8fe7bd8fa24..eedfe3d15be 100644 --- a/src/s/aix3-1.h +++ b/src/s/aix3-1.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on IBM AIX version 3.1 - Copyright (C) 1985, 1986, 1990, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h index 7316841e212..f36bc016ca8 100644 --- a/src/s/bsd4-1.h +++ b/src/s/bsd4-1.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.1. - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h index 386ab1bbbe5..f4e60b0fdbd 100644 --- a/src/s/bsd4-2.h +++ b/src/s/bsd4-2.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.2 - Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h index bbb2715bdf7..37d6a63e984 100644 --- a/src/s/bsd4-3.h +++ b/src/s/bsd4-3.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on bsd 4.3 - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/cxux.h b/src/s/cxux.h index 2af6d006095..118d93d579c 100644 --- a/src/s/cxux.h +++ b/src/s/cxux.h @@ -1,5 +1,5 @@ /* Header file for Harris CXUX. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/cygwin.h b/src/s/cygwin.h index ac977b8cb52..921cff35bc7 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -1,7 +1,8 @@ /* Template for system description header files. This file describes the parameters that system description files should define or not. - Copyright (C) 1985, 1986, 1992, 1999, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/darwin.h b/src/s/darwin.h index fea5b4c282d..fad445d7557 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -1,5 +1,5 @@ /* System description header file for Darwin (Mac OS X). - Copyright (C) 2001, 02, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux.h b/src/s/dgux.h index fb01b539f27..82956a900d9 100644 --- a/src/s/dgux.h +++ b/src/s/dgux.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX version 4.32 upto and including 5.4.1. - Copyright (C) 1994, 1999 Free Software Foundation, Inc. + Copyright (C) 1994, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux4.h b/src/s/dgux4.h index d866d63e6ce..35834ad4da2 100644 --- a/src/s/dgux4.h +++ b/src/s/dgux4.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX Release 4.10 and above. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h index a95420595a1..7ec88a435eb 100644 --- a/src/s/dgux5-4-3.h +++ b/src/s/dgux5-4-3.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX version 5.4 Release 3.00 and above. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h index c2c7461a204..3f059c32c24 100644 --- a/src/s/dgux5-4r2.h +++ b/src/s/dgux5-4r2.h @@ -1,6 +1,6 @@ /* Definitions file for GNU Emacs running on Data General's DG/UX 5.4 Release 2.xx systems. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/freebsd.h b/src/s/freebsd.h index dc26eb9f399..83949fd2819 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -1,8 +1,8 @@ /* System description header for FreeBSD systems. This file describes the parameters that system description files should define or not. - Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 2563496af5c..f87dcaded1b 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -1,5 +1,6 @@ /* This file is the configuration file for Linux-based GNU systems - Copyright (C) 1985, 86, 92, 94, 96, 1999, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/gnu.h b/src/s/gnu.h index 79e5a88a7b9..0da816c32d3 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on the GNU Hurd. - Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/hpux.h b/src/s/hpux.h index 665b1f3063d..30ade71bf20 100644 --- a/src/s/hpux.h +++ b/src/s/hpux.h @@ -1,6 +1,7 @@ /* Definitions file for GNU Emacs running on HPUX release 7.0. Based on AT&T System V.2. - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h index 8815bb56f39..a3b6c8ad0ad 100644 --- a/src/s/iris3-5.h +++ b/src/s/iris3-5.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics 3.5 - Copyright (C) 1987, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h index 64187428c29..1d8b96cc23f 100644 --- a/src/s/iris3-6.h +++ b/src/s/iris3-6.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6. - Copyright (C) 1987, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h index 60dd6d49c79..a613779913a 100644 --- a/src/s/irix3-3.h +++ b/src/s/irix3-3.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3. - Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/lynxos.h b/src/s/lynxos.h index 55de8cba6f9..614735d290d 100644 --- a/src/s/lynxos.h +++ b/src/s/lynxos.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on LynxOS-3.0.1 - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index c4697db34db..b1989318fba 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -1,5 +1,6 @@ /* System description file for Windows NT. - Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/msdos.h b/src/s/msdos.h index 5a0cbba5959..9469b33227f 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -1,6 +1,7 @@ /* System description file for MS-DOS - Copyright (C) 1993, 1996, 1997, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/newsos5.h b/src/s/newsos5.h index c674bfc559d..d2bed2189be 100644 --- a/src/s/newsos5.h +++ b/src/s/newsos5.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2 - Copyright (C) 1992, 1994 Free Software Foundation, Inc. + Copyright (C) 1992, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/nextstep.h b/src/s/nextstep.h index 9253e6acffc..0c0b01c10bd 100644 --- a/src/s/nextstep.h +++ b/src/s/nextstep.h @@ -1,5 +1,6 @@ /* Configuration file for the NeXTstep system. - Copyright (C) 1990, 1995 Free Software Foundation, Inc. + Copyright (C) 1990, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/ptx.h b/src/s/ptx.h index e490ba659a2..1411dee70d8 100644 --- a/src/s/ptx.h +++ b/src/s/ptx.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x - Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h index ccfa5704b85..aee5d6ddc58 100644 --- a/src/s/riscix1-1.h +++ b/src/s/riscix1-1.h @@ -1,5 +1,5 @@ /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3) - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/riscix12.h b/src/s/riscix12.h index b0e00e780cc..625b667d7b5 100644 --- a/src/s/riscix12.h +++ b/src/s/riscix12.h @@ -1,5 +1,5 @@ /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3) - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/rtu.h b/src/s/rtu.h index 92afbaf6328..b2d0c16e59a 100644 --- a/src/s/rtu.h +++ b/src/s/rtu.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe. - Copyright (C) 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/sco4.h b/src/s/sco4.h index 757eb0b57b0..627007e9a52 100644 --- a/src/s/sco4.h +++ b/src/s/sco4.h @@ -1,5 +1,6 @@ /* System description file for SCO 3.2v4. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/sco5.h b/src/s/sco5.h index e490a91b608..9fbbf072a12 100644 --- a/src/s/sco5.h +++ b/src/s/sco5.h @@ -1,5 +1,5 @@ /* System description file for SCO 3.2v5. - Copyright (C) 1996, 2002 Free Software Foundation, Inc. + Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/template.h b/src/s/template.h index 5ef1049164d..0610e16473a 100644 --- a/src/s/template.h +++ b/src/s/template.h @@ -1,7 +1,8 @@ /* Template for system description header files. This file describes the parameters that system description files should define or not. - Copyright (C) 1985, 1986, 1992, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/umax.h b/src/s/umax.h index 1741b1d04e3..f4923f33053 100644 --- a/src/s/umax.h +++ b/src/s/umax.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on UMAX 4.2 - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h index 05d162239a8..cca703adb82 100644 --- a/src/s/unipl5-2.h +++ b/src/s/unipl5-2.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h index 21b469dcd55..5f9943f8477 100644 --- a/src/s/usg5-0.h +++ b/src/s/usg5-0.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V.0 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h index dff90efb225..b090f3c32b6 100644 --- a/src/s/usg5-2-2.h +++ b/src/s/usg5-2-2.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h index 0da477276fd..e63bddfc060 100644 --- a/src/s/usg5-2.h +++ b/src/s/usg5-2.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0 - Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h index 285bae670df..12259936928 100644 --- a/src/s/usg5-3.h +++ b/src/s/usg5-3.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 3 - Copyright (C) 1987, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index 4edda95b39c..b8c2f8d9fa2 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running on AT&T's System V Release 4 - Copyright (C) 1987, 1990, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/vms.h b/src/s/vms.h index 9afd69b8539..e3c9dc725c0 100644 --- a/src/s/vms.h +++ b/src/s/vms.h @@ -1,5 +1,5 @@ /* system description header for VMS - Copyright (C) 1986 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/s/xenix.h b/src/s/xenix.h index 763a10956ff..e67b897faff 100644 --- a/src/s/xenix.h +++ b/src/s/xenix.h @@ -1,5 +1,6 @@ /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2 - Copyright (C) 1988, 1999 Free Software Foundation, Inc. + Copyright (C) 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. From 0b5538bd8587cfa6a9c90ff7d0c4699654dbabc6 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 12:33:19 +0000 Subject: [PATCH 030/347] Update years in copyright notice; nfc. --- src/Makefile.in | 4 ++-- src/abbrev.c | 4 ++-- src/atimer.c | 2 +- src/atimer.h | 2 +- src/blockinput.h | 3 ++- src/buffer.c | 5 +++-- src/buffer.h | 2 +- src/bytecode.c | 4 ++-- src/callint.c | 4 ++-- src/callproc.c | 2 +- src/casefiddle.c | 4 ++-- src/casetab.c | 3 ++- src/ccl.c | 2 +- src/charset.c | 2 +- src/charset.h | 2 +- src/cm.c | 3 ++- src/cm.h | 3 ++- src/cmds.c | 4 ++-- src/coding.c | 2 +- src/coding.h | 2 +- src/commands.h | 3 ++- src/composite.c | 2 +- src/composite.h | 2 +- src/cxux-crt0.s | 2 +- src/data.c | 4 ++-- src/dired.c | 4 ++-- src/dispextern.h | 4 ++-- src/dispnew.c | 5 +++-- src/disptab.h | 2 +- src/doc.c | 4 ++-- src/doprnt.c | 2 +- src/dosfns.c | 4 ++-- src/dosfns.h | 4 ++-- src/ecrt0.c | 3 ++- src/editfns.c | 5 +++-- src/emacs.c | 4 ++-- src/epaths.in | 4 ++-- src/eval.c | 2 +- src/fileio.c | 5 +++-- src/filelock.c | 4 ++-- src/filemode.c | 3 ++- src/firstfile.c | 2 +- src/floatfns.c | 3 ++- src/fns.c | 5 +++-- src/fontset.c | 2 +- src/fontset.h | 1 + src/frame.c | 4 ++-- src/frame.h | 3 ++- src/fringe.c | 5 +++-- src/getloadavg.c | 4 ++-- src/getpagesize.h | 3 ++- src/gmalloc.c | 3 ++- src/gtkutil.c | 3 +-- src/gtkutil.h | 3 +-- src/image.c | 4 ++-- src/indent.c | 2 +- src/indent.h | 3 ++- src/insdel.c | 4 ++-- src/intervals.c | 3 ++- src/intervals.h | 3 ++- src/keyboard.c | 5 +++-- src/keyboard.h | 3 ++- src/keymap.c | 5 +++-- src/keymap.h | 2 +- src/lastfile.c | 2 +- src/lisp.h | 2 +- src/lread.c | 5 +++-- src/mac.c | 3 ++- src/macfns.c | 2 +- src/macgui.h | 3 ++- src/macmenu.c | 3 ++- src/macros.c | 3 ++- src/macros.h | 2 +- src/macterm.c | 3 ++- src/macterm.h | 3 ++- src/makefile.w32-in | 3 ++- src/marker.c | 3 ++- src/md5.c | 3 ++- src/md5.h | 3 ++- src/mem-limits.h | 3 ++- src/minibuf.c | 4 ++-- src/mktime.c | 3 ++- src/msdos.c | 4 ++-- src/msdos.h | 3 ++- src/prefix-args.c | 2 +- src/print.c | 5 +++-- src/process.c | 5 +++-- src/process.h | 3 ++- src/puresize.h | 2 +- src/ralloc.c | 3 ++- src/regex.c | 3 ++- src/regex.h | 3 ++- src/region-cache.c | 4 ++-- src/region-cache.h | 3 ++- src/scroll.c | 3 ++- src/search.c | 4 ++-- src/sheap.c | 3 +-- src/sound.c | 3 ++- src/strftime.c | 4 ++-- src/sunfns.c | 3 ++- src/syntax.c | 3 ++- src/syntax.h | 3 ++- src/sysdep.c | 2 +- src/sysselect.h | 2 +- src/syssignal.h | 3 ++- src/systime.h | 3 ++- src/systty.h | 3 ++- src/syswait.h | 3 ++- src/term.c | 4 ++-- src/termcap.c | 4 ++-- src/termchar.h | 3 ++- src/termhooks.h | 3 ++- src/terminfo.c | 3 ++- src/termopts.h | 3 ++- src/textprop.c | 4 ++-- src/tparam.c | 3 ++- src/uaf.h | 2 +- src/undo.c | 4 ++-- src/unexaix.c | 3 ++- src/unexalpha.c | 3 ++- src/unexapollo.c | 3 ++- src/unexconvex.c | 3 ++- src/unexcw.c | 3 +-- src/unexec.c | 3 ++- src/unexelf.c | 4 ++-- src/unexenix.c | 3 ++- src/unexmacosx.c | 2 +- src/unexmips.c | 3 ++- src/unexnext.c | 3 ++- src/unexsni.c | 4 ++-- src/unexsunos4.c | 3 ++- src/unexw32.c | 2 +- src/vm-limit.c | 3 ++- src/w16select.c | 3 ++- src/w32.c | 3 ++- src/w32.h | 2 +- src/w32bdf.c | 2 +- src/w32bdf.h | 2 +- src/w32console.c | 3 ++- src/w32fns.c | 4 ++-- src/w32gui.h | 2 +- src/w32heap.c | 2 +- src/w32heap.h | 2 +- src/w32inevt.c | 3 ++- src/w32inevt.h | 2 +- src/w32menu.c | 3 ++- src/w32proc.c | 3 ++- src/w32reg.c | 3 ++- src/w32select.c | 3 ++- src/w32term.c | 4 ++-- src/w32term.h | 3 ++- src/w32xfns.c | 3 ++- src/widget.c | 3 ++- src/widget.h | 2 +- src/widgetprv.h | 2 +- src/window.c | 2 +- src/window.h | 4 ++-- src/xdisp.c | 5 +++-- src/xfaces.c | 4 ++-- src/xfns.c | 2 +- src/xmenu.c | 4 ++-- src/xrdb.c | 3 ++- src/xselect.c | 4 ++-- src/xsmfns.c | 2 +- src/xterm.c | 2 +- src/xterm.h | 4 ++-- 166 files changed, 296 insertions(+), 218 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 88b71d4d1e2..d9c77bf00b5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,6 @@ # Makefile for GNU Emacs. -# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 01, 03, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/src/abbrev.c b/src/abbrev.c index 8cb87f2c884..84054892910 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -1,6 +1,6 @@ /* Primitives for word-abbrev mode. - Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001,02,03,04 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.c b/src/atimer.c index 9ac6d529b99..f8ed1b265ec 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -1,5 +1,5 @@ /* Asynchronous timers. - Copyright (C) 2000, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/atimer.h b/src/atimer.h index 5057eb2be24..d5ad9c674d5 100644 --- a/src/atimer.h +++ b/src/atimer.h @@ -1,5 +1,5 @@ /* Asynchronous timers. - Copyright (C) 2000, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/blockinput.h b/src/blockinput.h index 36559715533..0eaebbe34df 100644 --- a/src/blockinput.h +++ b/src/blockinput.h @@ -1,5 +1,6 @@ /* blockinput.h - interface to blocking complicated interrupt-driven input. - Copyright (C) 1989, 1993, 2004 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.c b/src/buffer.c index 7b306b103df..30626f11a24 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,6 +1,7 @@ /* Buffer manipulation primitives for GNU Emacs. - Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, - 2000, 01, 02, 03, 04, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, + 1995, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/buffer.h b/src/buffer.h index 5ea889dfe6d..2387af65a47 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1,6 +1,6 @@ /* Header file for the buffer manipulation primitives. Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/bytecode.c b/src/bytecode.c index 3069e0a6ac3..918ebdd550b 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1,6 +1,6 @@ /* Execution of byte code produced by bytecomp.el. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callint.c b/src/callint.c index 10db39ddce4..5979e495ac3 100644 --- a/src/callint.c +++ b/src/callint.c @@ -1,6 +1,6 @@ /* Call a Lisp function interactively. - Copyright (C) 1985, 86, 93, 94, 95, 1997, 2000, 02, 03, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/callproc.c b/src/callproc.c index b78fae1d075..47930819c07 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1,6 +1,6 @@ /* Synchronous subprocess invocation for GNU Emacs. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casefiddle.c b/src/casefiddle.c index b063ef7510a..454d184b99b 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -1,6 +1,6 @@ /* GNU Emacs case conversion functions. - Copyright (C) 1985,94,97,98,99, 2001, 2002, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 1997, 1998, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/casetab.c b/src/casetab.c index 448a236f565..874bb7599f0 100644 --- a/src/casetab.c +++ b/src/casetab.c @@ -1,5 +1,6 @@ /* GNU Emacs routines to deal with case tables. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ccl.c b/src/ccl.c index 9fb097d55df..562215218bc 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1,7 +1,7 @@ /* CCL (Code Conversion Language) interpreter. Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. Licensed to the Free Software Foundation. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/charset.c b/src/charset.c index e7b6897ea98..3676c9b8a71 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1,7 +1,7 @@ /* Basic multilingual character support. Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/charset.h b/src/charset.h index 43791baf0c5..a5cdca21bbb 100644 --- a/src/charset.h +++ b/src/charset.h @@ -1,7 +1,7 @@ /* Header for multibyte character handler. Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cm.c b/src/cm.c index 41567be2018..354097b39e4 100644 --- a/src/cm.c +++ b/src/cm.c @@ -1,5 +1,6 @@ /* Cursor motion subroutines for GNU Emacs. - Copyright (C) 1985, 1995 Free Software Foundation, Inc. + Copyright (C) 1985, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. based primarily on public domain code written by Chris Torek This file is part of GNU Emacs. diff --git a/src/cm.h b/src/cm.h index 5f806993346..a2ae6116e5d 100644 --- a/src/cm.h +++ b/src/cm.h @@ -1,5 +1,6 @@ /* Cursor motion calculation definitions for GNU Emacs - Copyright (C) 1985, 1989 Free Software Foundation, Inc. + Copyright (C) 1985, 1989, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cmds.c b/src/cmds.c index 7940f3cf216..cc5bd90cca7 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -1,6 +1,6 @@ /* Simple built-in editing commands. - Copyright (C) 1985, 93, 94, 95, 96, 97, 1998, 2001, 02, 03 - Free Software Foundation, Inc. + Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/coding.c b/src/coding.c index a4f03c70d96..794f49495fb 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1,7 +1,7 @@ /* Coding system handler (conversion, detection, and etc). Copyright (C) 1995,97,1998,2002,2003 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001,2002,2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/coding.h b/src/coding.h index b9ea4597005..1ea1dafd54b 100644 --- a/src/coding.h +++ b/src/coding.h @@ -1,7 +1,7 @@ /* Header for coding system handler. - Copyright (C) 2004, 2005 Free Software Foundation, Inc. Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/commands.h b/src/commands.h index 9486467e2fe..7ad593577ad 100644 --- a/src/commands.h +++ b/src/commands.h @@ -1,5 +1,6 @@ /* Definitions needed by most editing commands. - Copyright (C) 1985, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/composite.c b/src/composite.c index fecbe8020f6..daa6dceb3c6 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1,7 +1,7 @@ /* Composite sequence support. Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/composite.h b/src/composite.h index 9dfe597631e..26cf13d27d4 100644 --- a/src/composite.h +++ b/src/composite.h @@ -1,7 +1,7 @@ /* Header for composite sequence handler. Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s index 615837eaeb4..71076eb8b5f 100644 --- a/src/cxux-crt0.s +++ b/src/cxux-crt0.s @@ -1,6 +1,6 @@ /* * External symbol setup file for GNU Emacs on CX/UX - * Copyright (C) 1990 Free Software Foundation, Inc. + * Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. * * This file is part of GNU Emacs. * diff --git a/src/data.c b/src/data.c index 5fcfc66e59e..c0c797da266 100644 --- a/src/data.c +++ b/src/data.c @@ -1,6 +1,6 @@ /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter. - Copyright (C) 1985,86,88,93,94,95,97,98,99, 2000, 2001, 03, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dired.c b/src/dired.c index 55f96d28888..edf666d2a5f 100644 --- a/src/dired.c +++ b/src/dired.c @@ -1,6 +1,6 @@ /* Lisp functions for making directory listings. - Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispextern.h b/src/dispextern.h index af599792c63..d6537bcd67a 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1,6 +1,6 @@ /* Interface definitions for display code. - Copyright (C) 1985,93,94,97,98,99, 2000,01,02,03, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dispnew.c b/src/dispnew.c index 6d0faf14f76..642573b652c 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1,6 +1,7 @@ /* Updating of data structures for redisplay. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/disptab.h b/src/disptab.h index 30b2a7a7486..41f4bcbfdbf 100644 --- a/src/disptab.h +++ b/src/disptab.h @@ -1,5 +1,5 @@ /* Things for GLYPHS and glyph tables. - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/doc.c b/src/doc.c index 6d8b625affe..6d54aeceacd 100644 --- a/src/doc.c +++ b/src/doc.c @@ -1,6 +1,6 @@ /* Record indices of function doc strings stored in a file. - Copyright (C) 1985, 86,93,94,95,97,98,99,2000,04 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/doprnt.c b/src/doprnt.c index 1cfc5aecee6..5d824038faf 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -1,7 +1,7 @@ /* Output like sprintf to a buffer of specified size. Also takes args differently: pass one pointer to an array of strings in addition to the format string which is separate. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.c b/src/dosfns.c index 6192836e970..c256595cc13 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -1,7 +1,7 @@ /* MS-DOS specific Lisp utilities. Coded by Manabu Higashida, 1991. Major changes May-July 1993 Morten Welinder (only 10% original code left) - Copyright (C) 1991, 1993, 1996, 1997, 1998, 2001 - Free Software Foundation, Inc. + Copyright (C) 1991, 1993, 1996, 1997, 1998, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/dosfns.h b/src/dosfns.h index 594c3d980c6..40aaf524e23 100644 --- a/src/dosfns.h +++ b/src/dosfns.h @@ -2,8 +2,8 @@ Coded by Manabu Higashida, 1991. Modified by Morten Welinder, 1993-1994. - Copyright (C) 1991, 1994, 1995, 1997, 1999 - Free Software Foundation, Inc. + Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ecrt0.c b/src/ecrt0.c index 95b69b11c01..5ee24dfae8c 100644 --- a/src/ecrt0.c +++ b/src/ecrt0.c @@ -1,5 +1,6 @@ /* C code startup routine. - Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/editfns.c b/src/editfns.c index 05888fd4843..da4533d2537 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1,6 +1,7 @@ /* Lisp functions pertaining to editing. - Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/emacs.c b/src/emacs.c index ae9eb4decb7..87aee828420 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1,6 +1,6 @@ /* Fully extensible Emacs, running on Unix, intended for GNU. - Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/epaths.in b/src/epaths.in index be91cb485ae..ee965cb7615 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -1,6 +1,6 @@ /* Hey Emacs, this is -*- C -*- code! */ -/* Copyright (C) 1993, 1995, 1997, 1999, 2001 - Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/eval.c b/src/eval.c index 56fe670f1b1..a867d00150e 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1,6 +1,6 @@ /* Evaluator for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001, - 2002, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fileio.c b/src/fileio.c index d09b4789639..53ae967e285 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,6 +1,7 @@ /* File IO for GNU Emacs. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/filelock.c b/src/filelock.c index de348f61a90..fc6839f5f88 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -1,6 +1,6 @@ /* Lock files for editing. - Copyright (C) 1985, 86, 87, 93, 94, 96, 98, 1999, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/filemode.c b/src/filemode.c index 130cbace773..6257c6a7664 100644 --- a/src/filemode.c +++ b/src/filemode.c @@ -1,5 +1,6 @@ /* filemode.c -- make a string describing file modes - Copyright (C) 1985, 1990, 1993 Free Software Foundation, Inc. + Copyright (C) 1985, 1990, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/firstfile.c b/src/firstfile.c index cf6dbf3e888..b16f3a3dc44 100644 --- a/src/firstfile.c +++ b/src/firstfile.c @@ -1,5 +1,5 @@ /* Mark beginning of data space to dump as pure, for GNU Emacs. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/floatfns.c b/src/floatfns.c index 0f91b80370a..79574e0a69b 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -1,5 +1,6 @@ /* Primitive operations on floating point for GNU Emacs Lisp interpreter. - Copyright (C) 1988, 1993, 1994, 1999, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fns.c b/src/fns.c index aefc61b7d94..60a98fd5709 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1,6 +1,7 @@ /* Random utility Lisp functions. - Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fontset.c b/src/fontset.c index 27295715eaf..130ab402cc7 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1,7 +1,7 @@ /* Fontset handler. - Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fontset.h b/src/fontset.h index 7d2def16cfc..3a4932af6c0 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -1,6 +1,7 @@ /* Header for fontset handler. Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/frame.c b/src/frame.c index 84920a97b8c..d423138fc9a 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,6 +1,6 @@ /* Generic frame functions. - Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2003, 2004, 2005 - Free Software Foundation. + Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/frame.h b/src/frame.h index a2f5fc2fde5..b6da35ed23a 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1,5 +1,6 @@ /* Define frame-object for GNU Emacs. - Copyright (C) 1993, 1994, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/fringe.c b/src/fringe.c index 082aabc37a1..f9120d4c74b 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1,6 +1,7 @@ /* Fringe handling (split from xdisp.c). - Copyright (C) 1985,86,87,88,93,94,95,97,98,99,2000,01,02,03,04 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, + 1998, 1999, 2000, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/getloadavg.c b/src/getloadavg.c index 191f7d4244f..a2ae9bc310b 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c @@ -1,6 +1,6 @@ /* Get the system load averages. - Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994, 1995, 1997, 2003 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995, + 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. Bugs can be reported to bug-gnulib@gnu.org. diff --git a/src/getpagesize.h b/src/getpagesize.h index 20f19279cd0..ed47f80b0e0 100644 --- a/src/getpagesize.h +++ b/src/getpagesize.h @@ -1,5 +1,6 @@ /* Emulate getpagesize on systems that lack it. - Copyright (C) 1986, 1992, 1995, 2001 Free Software Foundation, Inc. + Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gmalloc.c b/src/gmalloc.c index 08de77df0e0..55aedb7801b 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -5,7 +5,8 @@ /* The malloc headers and source files from the C library follow here. */ /* Declarations for `malloc' and friends. - Copyright 1990, 91, 92, 93, 95, 96, 99 Free Software Foundation, Inc. + Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Written May 1989 by Mike Haertel. This library is free software; you can redistribute it and/or diff --git a/src/gtkutil.c b/src/gtkutil.c index 1cb1004f576..d8835c2b5fd 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1,6 +1,5 @@ /* Functions for creating and updating GTK widgets. - Copyright (C) 2003 - Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/gtkutil.h b/src/gtkutil.h index 08ba9ee1314..48060533a57 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h @@ -1,6 +1,5 @@ /* Definitions and headers for GTK widgets. - Copyright (C) 2003 - Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/image.c b/src/image.c index 928ec0437aa..98190d3381c 100644 --- a/src/image.c +++ b/src/image.c @@ -1,6 +1,6 @@ /* Functions for image support on window system. - Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04 - Free Software Foundation. + Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.c b/src/indent.c index 3864057472c..8809c563186 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1,6 +1,6 @@ /* Indentation functions. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/indent.h b/src/indent.h index 39db7b8cf5f..6026be827e8 100644 --- a/src/indent.h +++ b/src/indent.h @@ -1,5 +1,6 @@ /* Definitions for interface to indent.c - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/insdel.c b/src/insdel.c index 49ff949ca4a..fd416037241 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -1,6 +1,6 @@ /* Buffer insertion/deletion and gap motion for GNU Emacs. - Copyright (C) 1985, 86,93,94,95,97,98, 1999, 2000, 01, 2003, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.c b/src/intervals.c index cb60061fdce..e9d87a10b78 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1,5 +1,6 @@ /* Code for doing intervals. - Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/intervals.h b/src/intervals.h index 0d3e50ff694..3dc06d2333e 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -1,5 +1,6 @@ /* Definitions and global variables for intervals. - Copyright (C) 1993, 1994, 2000, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keyboard.c b/src/keyboard.c index 194e52d2700..e9a51bbeeb4 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1,6 +1,7 @@ /* Keyboard and mouse input; editor command loop. - Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, - 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, + 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keyboard.h b/src/keyboard.h index f5be3f28cf4..afda1c00a92 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -1,5 +1,6 @@ /* Declarations useful when processing input. - Copyright (C) 1985, 1986, 1987, 1993 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keymap.c b/src/keymap.c index 49151a395fb..9a3d9f288f2 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1,6 +1,7 @@ /* Manipulation of keymaps - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000, - 2001, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/keymap.h b/src/keymap.h index 4fcbffbed5a..bcf14abcd89 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -1,5 +1,5 @@ /* Functions to manipulate keymaps. - Copyright (C) 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lastfile.c b/src/lastfile.c index d03dc2c8346..a229d94fd6a 100644 --- a/src/lastfile.c +++ b/src/lastfile.c @@ -1,5 +1,5 @@ /* Mark end of data space to dump as pure, for GNU Emacs. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lisp.h b/src/lisp.h index f6a4e6ae9c6..375e0e9cb9b 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1,6 +1,6 @@ /* Fundamental definitions for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/lread.c b/src/lread.c index 2a9a8c060cc..bbe421c0eb5 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1,6 +1,7 @@ /* Lisp parsing and input streams. - Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, 1998, - 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/mac.c b/src/mac.c index 5558cbb797e..0d8c99ffb1e 100644 --- a/src/mac.c +++ b/src/mac.c @@ -1,5 +1,6 @@ /* Unix emulation routines for GNU Emacs on the Mac OS. - Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macfns.c b/src/macfns.c index daa1767fd52..160eb1f7774 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1,5 +1,5 @@ /* Graphical user interface functions for Mac OS. - Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macgui.h b/src/macgui.h index ca55bad7a8c..9591b7a8e3d 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -1,5 +1,6 @@ /* Definitions and headers for communication on the Mac OS. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macmenu.c b/src/macmenu.c index c7ee0dfaf21..a68ff04e405 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -1,5 +1,6 @@ /* Menu support for GNU Emacs on the for Mac OS. - Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.c b/src/macros.c index 6f854018d6a..8167e274dab 100644 --- a/src/macros.c +++ b/src/macros.c @@ -1,5 +1,6 @@ /* Keyboard macros. - Copyright (C) 1985, 1986, 1993, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macros.h b/src/macros.h index d9b99b9984e..7acd46dc2ed 100644 --- a/src/macros.h +++ b/src/macros.h @@ -1,5 +1,5 @@ /* Definitions for keyboard macro interpretation in GNU Emacs. - Copyright (C) 1985 Free Software Foundation, Inc. + Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macterm.c b/src/macterm.c index 6fddcade274..fd76e164d49 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -1,5 +1,6 @@ /* Implementation of GUI terminal on the Mac OS. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/macterm.h b/src/macterm.h index 71cd4db82c0..a4af9381867 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -1,5 +1,6 @@ /* Display module for Mac OS. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/makefile.w32-in b/src/makefile.w32-in index a4084046fac..1ee232949d9 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -1,5 +1,6 @@ # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. -# Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/src/marker.c b/src/marker.c index d6029c79c9d..11b077761e5 100644 --- a/src/marker.c +++ b/src/marker.c @@ -1,5 +1,6 @@ /* Markers: examining, setting and deleting. - Copyright (C) 1985, 1997, 1998, 2003 Free Software Foundation, Inc. + Copyright (C) 1985, 1997, 1998, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/md5.c b/src/md5.c index 039213fd76b..4f055447eac 100644 --- a/src/md5.c +++ b/src/md5.c @@ -1,6 +1,7 @@ /* Functions to compute MD5 message digest of files or memory blocks. according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of the GNU Emacs. The GNU C Library is free software; you can redistribute it and/or diff --git a/src/md5.h b/src/md5.h index 229da8daa8d..adcc6bf48f6 100644 --- a/src/md5.h +++ b/src/md5.h @@ -1,6 +1,7 @@ /* Declaration of functions and data types used for MD5 sum computing library functions. - Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. The GNU C Library is free software; you can redistribute it and/or diff --git a/src/mem-limits.h b/src/mem-limits.h index aac8a396172..d7ac6a3e366 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -1,5 +1,6 @@ /* Includes for memory limit warnings. - Copyright (C) 1990, 93, 94, 95, 1996, 2004 Free Software Foundation, Inc. + Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/minibuf.c b/src/minibuf.c index 1d2d7372a4a..096e02c0034 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1,6 +1,6 @@ /* Minibuffer input and completion. - Copyright (C) 1985,86,93,94,95,96,97,98,99,2000,01,03,04,05 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/mktime.c b/src/mktime.c index c61f1463564..025f54d95c2 100644 --- a/src/mktime.c +++ b/src/mktime.c @@ -1,5 +1,6 @@ /* Convert a `struct tm' to a time_t value. - Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Contributed by Paul Eggert (eggert@twinsun.com). NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/src/msdos.c b/src/msdos.c index 6dec71e0a32..145d9599fca 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1,6 +1,6 @@ /* MS-DOS specific C utilities. -*- coding: raw-text -*- - Copyright (C) 1993, 94, 95, 96, 97, 1999, 2000, 01, 2003 - Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/msdos.h b/src/msdos.h index 7f2f013fd13..b6c6aca1493 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -1,5 +1,6 @@ /* MS-DOS specific C utilities, interface. - Copyright (C) 1993, 2001 Free Software Foundation, Inc. + Copyright (C) 1993, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/prefix-args.c b/src/prefix-args.c index 5cfe6e4a095..ee1ee7e7c7f 100644 --- a/src/prefix-args.c +++ b/src/prefix-args.c @@ -1,5 +1,5 @@ /* prefix-args.c - echo each argument, prefixed by a string. - Copyright (C) 1992 Free Software Foundation, Inc. + Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/print.c b/src/print.c index 6150ff2efe6..65c48b6d82b 100644 --- a/src/print.c +++ b/src/print.c @@ -1,6 +1,7 @@ /* Lisp object printing and output streams. - Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, - 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.c b/src/process.c index 389c6b06e93..c683e7b8516 100644 --- a/src/process.c +++ b/src/process.c @@ -1,6 +1,7 @@ /* Asynchronous subprocess control for GNU Emacs. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1998, 1999, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, + 1996, 1998, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/process.h b/src/process.h index a58b08a197e..cadc9b7031c 100644 --- a/src/process.h +++ b/src/process.h @@ -1,5 +1,6 @@ /* Definitions for asynchronous process control in GNU Emacs. - Copyright (C) 1985, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/puresize.h b/src/puresize.h index 5e51ae3b1ba..767c88bb807 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -1,5 +1,5 @@ /* How much read-only Lisp storage a dumped Emacs needs. - Copyright (C) 1993, 2002 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/ralloc.c b/src/ralloc.c index 824fb536fc1..35a8cb9c58a 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1,5 +1,6 @@ /* Block-relocating memory allocator. - Copyright (C) 1993, 1995, 2000 Free Software Foundation, Inc. + Copyright (C) 1993, 1995, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/regex.c b/src/regex.c index c82bdb0edd9..fd18864110b 100644 --- a/src/regex.c +++ b/src/regex.c @@ -2,7 +2,8 @@ 0.12. (Implements POSIX draft P1003.2/D11.2, except for some of the internationalization features.) - Copyright (C) 1993,94,95,96,97,98,99,2000,04 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/regex.h b/src/regex.h index 89532b7ee9f..557700dc93d 100644 --- a/src/regex.h +++ b/src/regex.h @@ -1,7 +1,8 @@ /* Definitions for data structures and routines for the regular expression library, version 0.12. - Copyright (C) 1985,89,90,91,92,93,95,2000 Free Software Foundation, Inc. + Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/region-cache.c b/src/region-cache.c index 22eac35ca86..d49278eb886 100644 --- a/src/region-cache.c +++ b/src/region-cache.c @@ -1,6 +1,6 @@ /* Caching facts about regions of the buffer, for optimization. - Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/region-cache.h b/src/region-cache.h index 5c27d00740f..51d2ceb1e62 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -1,5 +1,6 @@ /* Header file: Caching facts about regions of the buffer, for optimization. - Copyright (C) 1985, 1986, 1993, 1995 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/scroll.c b/src/scroll.c index 48a50e59983..6e633d4e60b 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,5 +1,6 @@ /* Calculate what line insertion or deletion to do, and do it, - Copyright (C) 1985, 1986, 1990, 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/search.c b/src/search.c index 23807ffd520..aa7f6fda699 100644 --- a/src/search.c +++ b/src/search.c @@ -1,6 +1,6 @@ /* String search routines for GNU Emacs. - Copyright (C) 1985, 86,87,93,94,97,98, 1999, 2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sheap.c b/src/sheap.c index b7f01d448a8..635c3dc0144 100644 --- a/src/sheap.c +++ b/src/sheap.c @@ -1,8 +1,7 @@ /* simulate sbrk() with an array in .bss, for unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code - Copyright (C) 2004 - Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sound.c b/src/sound.c index 93e456cbc48..1e6a17d0275 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,5 +1,6 @@ /* sound.c -- sound support. - Copyright (C) 1998, 1999, 2001 Free Software Foundation. + Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/strftime.c b/src/strftime.c index 41566ec868e..88a54b7bee4 100644 --- a/src/strftime.c +++ b/src/strftime.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,2003 - Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. Bugs can be reported to bug-gnulib@gnu.org. diff --git a/src/sunfns.c b/src/sunfns.c index 6a16e6cc08f..8de639b7480 100644 --- a/src/sunfns.c +++ b/src/sunfns.c @@ -1,5 +1,6 @@ /* Functions for Sun Windows menus and selection buffer. - Copyright (C) 1987, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is probably totally obsolete. In any case, the FSF is unwilling to support it. We agreed to include it in our distribution diff --git a/src/syntax.c b/src/syntax.c index 0b649ac0342..0071dcebd80 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1,5 +1,6 @@ /* GNU Emacs routines to deal with syntax tables; also word and list parsing. - Copyright (C) 1985, 87, 93, 94, 95, 97, 1998, 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syntax.h b/src/syntax.h index 581b4a783e0..c29e26c20b5 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -1,5 +1,6 @@ /* Declarations having to do with GNU Emacs syntax tables. - Copyright (C) 1985, 93, 94, 97, 1998 Free Software Foundation, Inc. + Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysdep.c b/src/sysdep.c index 8e8d02b844e..e63ee904f14 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1,6 +1,6 @@ /* Interfaces to system-dependent kernel and library entries. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/sysselect.h b/src/sysselect.h index 0030e737bc2..d57527f9ed1 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -1,5 +1,5 @@ /* sysselect.h - System-dependent definitions for the select function. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syssignal.h b/src/syssignal.h index dd13e3764aa..6a5cd39bde9 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -1,5 +1,6 @@ /* syssignal.h - System-dependent definitions for signals. - Copyright (C) 1993, 1999 Free Software Foundation, Inc. + Copyright (C) 1993, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systime.h b/src/systime.h index cf2bc0b084b..12d8d406d8e 100644 --- a/src/systime.h +++ b/src/systime.h @@ -1,5 +1,6 @@ /* systime.h - System-dependent definitions for time manipulations. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/systty.h b/src/systty.h index b322ca60087..af9f5e3aa88 100644 --- a/src/systty.h +++ b/src/systty.h @@ -1,5 +1,6 @@ /* systty.h - System-dependent definitions for terminals. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/syswait.h b/src/syswait.h index 78057e3fed4..37d59d68ac5 100644 --- a/src/syswait.h +++ b/src/syswait.h @@ -1,5 +1,6 @@ /* Define wait system call interface for Emacs. - Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/term.c b/src/term.c index 658cc97d804..c92219f8fe7 100644 --- a/src/term.c +++ b/src/term.c @@ -1,6 +1,6 @@ /* Terminal control module for terminals described by TERMCAP - Copyright (C) 1985, 86, 87, 93, 94, 95, 98, 2000, 2001, 2002, 2005 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1998, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termcap.c b/src/termcap.c index 5f2fa55556a..2f6f324eada 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -1,6 +1,6 @@ /* Work-alike for termcap, plus extra features. - Copyright (C) 1985, 86, 93, 94, 95, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/termchar.h b/src/termchar.h index 3a3c9978dd6..04583b9309c 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -1,5 +1,6 @@ /* Flags and parameters describing terminal's characteristics. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termhooks.h b/src/termhooks.h index 395e179ff49..641d21bdc06 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -1,6 +1,7 @@ /* Hooks by which low level terminal operations can be made to call other routines. - Copyright (C) 1985,86,93,94,2003 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/terminfo.c b/src/terminfo.c index 8f040d10c68..5c0aa1ccf05 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -1,5 +1,6 @@ /* Interface from Emacs to terminfo. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/termopts.h b/src/termopts.h index 9d241f64678..eaac0557cdb 100644 --- a/src/termopts.h +++ b/src/termopts.h @@ -1,5 +1,6 @@ /* Flags and parameters describing user options for handling the terminal. - Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/textprop.c b/src/textprop.c index ec75c6907ae..fa9b0e498c5 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1,6 +1,6 @@ /* Interface code for dealing with text properties. - Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/tparam.c b/src/tparam.c index e05f01f4911..e593589d5cb 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -1,5 +1,6 @@ /* Merge parameters into a termcap entry string. - Copyright (C) 1985, 87, 93, 95, 2000 Free Software Foundation, Inc. + Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/uaf.h b/src/uaf.h index 71ae7267147..7863c41227e 100644 --- a/src/uaf.h +++ b/src/uaf.h @@ -1,5 +1,5 @@ /* GNU Emacs VMS UAF definition file. - Copyright (C) 1986 Free Software Foundation, Inc. + Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/undo.c b/src/undo.c index 13ee40130a9..9839906ca7e 100644 --- a/src/undo.c +++ b/src/undo.c @@ -1,6 +1,6 @@ /* undo handling for GNU Emacs. - Copyright (C) 1990, 1993, 1994, 2000, 2002, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1990, 1993, 1994, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexaix.c b/src/unexaix.c index 4c9f2727e88..071f09898ed 100644 --- a/src/unexaix.c +++ b/src/unexaix.c @@ -1,5 +1,6 @@ /* Dump an executable image. - Copyright (C) 1985, 1986, 1987, 1988, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexalpha.c b/src/unexalpha.c index aa32f411fcb..069c39b398b 100644 --- a/src/unexalpha.c +++ b/src/unexalpha.c @@ -1,6 +1,7 @@ /* Unexec for DEC alpha. schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf). - Copyright (C) 1994, 2000 Free Software Foundation, Inc. + Copyright (C) 1994, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexapollo.c b/src/unexapollo.c index d9bff963695..f1481d684a3 100644 --- a/src/unexapollo.c +++ b/src/unexapollo.c @@ -1,5 +1,6 @@ /* unexapollo.c -- COFF File UNEXEC for GNU Emacs on Apollo SR10.x - Copyright (C) 1988, 1994 Free Software Foundation, Inc. + Copyright (C) 1988, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexconvex.c b/src/unexconvex.c index cbd1dd29fda..6f05e4ae938 100644 --- a/src/unexconvex.c +++ b/src/unexconvex.c @@ -7,7 +7,8 @@ think about it, or about whether other Emacs maintenance might break it. - Copyright (C) 1985, 1986, 1988 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexcw.c b/src/unexcw.c index 77d5866136b..cfd87781a16 100644 --- a/src/unexcw.c +++ b/src/unexcw.c @@ -1,8 +1,7 @@ /* unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code - Copyright (C) 2004 - Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexec.c b/src/unexec.c index bf231b00626..ebf813306da 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1985,86,87,88,92,93,94 Free Software Foundation, Inc. +/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexelf.c b/src/unexelf.c index 9e8b827a754..ee563b36a97 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1985,86,87,88,90,92,1999,2000,01,2003 - Free Software Foundation, Inc. +/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexenix.c b/src/unexenix.c index 94ac3eb821d..159c0b2f6d8 100644 --- a/src/unexenix.c +++ b/src/unexenix.c @@ -6,7 +6,8 @@ we don't plan to think about it, or about whether other Emacs maintenance might break it. - Copyright (C) 1988, 1994 Free Software Foundation, Inc. + Copyright (C) 1988, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmacosx.c b/src/unexmacosx.c index a191c0721e5..9db9622f6f5 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -1,5 +1,5 @@ /* Dump Emacs in Mach-O format for use on Mac OS X. - Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexmips.c b/src/unexmips.c index 53b40f62742..212f7ed5926 100644 --- a/src/unexmips.c +++ b/src/unexmips.c @@ -6,7 +6,8 @@ we don't plan to think about it, or about whether other Emacs maintenance might break it. - Copyright (C) 1988, 1994 Free Software Foundation, Inc. + Copyright (C) 1988, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexnext.c b/src/unexnext.c index 2a0b66bc868..b374dd8e9b8 100644 --- a/src/unexnext.c +++ b/src/unexnext.c @@ -1,5 +1,6 @@ /* Dump Emacs in macho format. - Copyright (C) 1990, 1993 Free Software Foundation, Inc. + Copyright (C) 1990, 1993, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Written by Bradley Taylor (btaylor@next.com). This file is part of GNU Emacs. diff --git a/src/unexsni.c b/src/unexsni.c index 0c67af899d5..d6b3ae68969 100644 --- a/src/unexsni.c +++ b/src/unexsni.c @@ -1,6 +1,6 @@ /* Unexec for Siemens machines running Sinix (modified SVR4). - Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexsunos4.c b/src/unexsunos4.c index 9ad06b6adaf..5e221050f36 100644 --- a/src/unexsunos4.c +++ b/src/unexsunos4.c @@ -1,5 +1,6 @@ /* Unexec for Sunos 4 using shared libraries. - Copyright (C) 1990, 1994, 1999 Free Software Foundation, Inc. + Copyright (C) 1990, 1994, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/unexw32.c b/src/unexw32.c index 5380ca5c8f7..bc462c18a10 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -1,5 +1,5 @@ /* unexec for GNU Emacs on Windows NT. - Copyright (C) 1994, 2005 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/vm-limit.c b/src/vm-limit.c index 1840eb61c0c..0c12dec9b04 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -1,5 +1,6 @@ /* Functions for memory limit warnings. - Copyright (C) 1990, 1992 Free Software Foundation, Inc. + Copyright (C) 1990, 1992, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w16select.c b/src/w16select.c index 406f0a1b884..b0c30eb58d8 100644 --- a/src/w16select.c +++ b/src/w16select.c @@ -1,5 +1,6 @@ /* 16-bit Windows Selection processing for emacs on MS-Windows - Copyright (C) 1996, 1997, 2001 Free Software Foundation. + Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32.c b/src/w32.c index 25283c3b4c6..c7f6e3172f9 100644 --- a/src/w32.c +++ b/src/w32.c @@ -1,5 +1,6 @@ /* Utility and Unix shadow routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1994, 1995, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32.h b/src/w32.h index 622a2256f0f..2981e5bb979 100644 --- a/src/w32.h +++ b/src/w32.h @@ -2,7 +2,7 @@ #define EMACS_W32_H /* Support routines for the NT version of Emacs. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32bdf.c b/src/w32bdf.c index e8612c7b5d6..10780f2f0c9 100644 --- a/src/w32bdf.c +++ b/src/w32bdf.c @@ -1,5 +1,5 @@ /* Implementation of BDF font handling on the Microsoft W32 API. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32bdf.h b/src/w32bdf.h index ca8a5f368cb..9d3d306d56f 100644 --- a/src/w32bdf.h +++ b/src/w32bdf.h @@ -1,5 +1,5 @@ /* Definitions and header for handling BDF fonts on the Microsoft W32 API. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32console.c b/src/w32console.c index 0ebda179667..a81591fb96f 100644 --- a/src/w32console.c +++ b/src/w32console.c @@ -1,5 +1,6 @@ /* Terminal hooks for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1992, 1999 Free Software Foundation, Inc. + Copyright (C) 1992, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32fns.c b/src/w32fns.c index dc8d5998765..93469418137 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1,6 +1,6 @@ /* Graphical user interface functions for the Microsoft W32 API. - Copyright (C) 1989, 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 04 - Free Software Foundation, Inc. + Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32gui.h b/src/w32gui.h index 1fd145cd026..644adcea924 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -1,5 +1,5 @@ /* Definitions and headers for communication on the Microsoft W32 API. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.c b/src/w32heap.c index 7de08bb2b4e..a0c50da5506 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -1,5 +1,5 @@ /* Heap management routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32heap.h b/src/w32heap.h index 259d0bf9ede..1b3b815b115 100644 --- a/src/w32heap.h +++ b/src/w32heap.h @@ -1,5 +1,5 @@ /* Heap management routines (including unexec) for GNU Emacs on Windows NT. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.c b/src/w32inevt.c index cc7c5e1e612..ffa2cd0989a 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -1,5 +1,6 @@ /* Input event support for Emacs on the Microsoft W32 API. - Copyright (C) 1992, 1993, 1995 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 1995, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32inevt.h b/src/w32inevt.h index f811c96c313..e0a9428720f 100644 --- a/src/w32inevt.h +++ b/src/w32inevt.h @@ -1,5 +1,5 @@ /* Input routines for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32menu.c b/src/w32menu.c index 0e4902b6ce4..75c55ef4f85 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1,5 +1,6 @@ /* Menu support for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1986,88,93,94,96,98,1999,2003 Free Software Foundation, Inc. + Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32proc.c b/src/w32proc.c index 7e344985f4e..628a763c675 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -1,5 +1,6 @@ /* Process support for GNU Emacs on the Microsoft W32 API. - Copyright (C) 1992, 95, 99, 2000, 01, 04 Free Software Foundation, Inc. + Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32reg.c b/src/w32reg.c index a70835ac303..40d84df3d14 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -1,5 +1,6 @@ /* Emulate the X Resource Manager through the registry. - Copyright (C) 1990, 1993, 1994 Free Software Foundation. + Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32select.c b/src/w32select.c index db29c078149..3556c62a35f 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -1,5 +1,6 @@ /* Selection processing for Emacs on the Microsoft W32 API. - Copyright (C) 1993, 1994, 2004 Free Software Foundation. + Copyright (C) 1993, 1994, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.c b/src/w32term.c index 796a341ae0c..8f52b5178d0 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1,6 +1,6 @@ /* Implementation of GUI terminal on the Microsoft W32 API. - Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32term.h b/src/w32term.h index cc305485f1f..fb4983bf4c7 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -1,5 +1,6 @@ /* Definitions and headers for communication on the Microsoft W32 API. - Copyright (C) 1995, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/w32xfns.c b/src/w32xfns.c index ba705d9498d..46a71b942c7 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c @@ -1,5 +1,6 @@ /* Functions taken directly from X sources for use with the Microsoft W32 API. - Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999 Free Software Foundation. + Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.c b/src/widget.c index fdd927cb175..0386890d93b 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1,5 +1,6 @@ /* The emacs frame widget. - Copyright (C) 1992, 1993, 2000 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widget.h b/src/widget.h index 174a6a720de..00d743234c0 100644 --- a/src/widget.h +++ b/src/widget.h @@ -1,5 +1,5 @@ /* The emacs frame widget public header file. - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/widgetprv.h b/src/widgetprv.h index ce087e825cb..2027b4f602d 100644 --- a/src/widgetprv.h +++ b/src/widgetprv.h @@ -1,5 +1,5 @@ /* The emacs frame widget private header file. - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.c b/src/window.c index 7d5d8d835ba..ccc3cdfa761 100644 --- a/src/window.c +++ b/src/window.c @@ -1,7 +1,7 @@ /* Window creation, deletion and examination for GNU Emacs. Does not include redisplay. Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/window.h b/src/window.h index 99274e04ad1..df359f37db2 100644 --- a/src/window.h +++ b/src/window.h @@ -1,6 +1,6 @@ /* Window definitions for GNU Emacs. - Copyright (C) 1985,86,93,95,97,98,99, 2000,01,03,04 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xdisp.c b/src/xdisp.c index d7de7dbe826..8cb4b38211f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1,6 +1,7 @@ /* Display generation from window structure and buffer text. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, + 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xfaces.c b/src/xfaces.c index e4a18a27bbc..bf8e0026749 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1,6 +1,6 @@ /* xfaces.c -- "Face" primitives. - Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation. + Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xfns.c b/src/xfns.c index 9c3965d7e2b..0bcf458b042 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1,6 +1,6 @@ /* Functions for the X window system. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation. + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xmenu.c b/src/xmenu.c index bcc0e57bcdb..184ff2c8c47 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1,6 +1,6 @@ /* X Communication module for terminals which understand the X protocol. - Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2003, 2004, - 2005 Free Software Foundation, Inc. + Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xrdb.c b/src/xrdb.c index 248e5eba64d..822fb6e2624 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -1,5 +1,6 @@ /* Deal with the X Resource Manager. - Copyright (C) 1990, 1993, 1994, 2000, 2001 Free Software Foundation. + Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xselect.c b/src/xselect.c index a424259416b..4db86c1cc5a 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1,6 +1,6 @@ /* X Selection processing for Emacs. - Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004 - Free Software Foundation. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xsmfns.c b/src/xsmfns.c index 9a94adbb997..4285dd76718 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -1,6 +1,6 @@ /* Session management module for systems which understand the X Session management protocol. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.c b/src/xterm.c index ab46a7700e3..35c12938fc0 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1,6 +1,6 @@ /* X Communication module for terminals which understand the X protocol. Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/src/xterm.h b/src/xterm.h index df444bfea7b..386b297fb8f 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -1,6 +1,6 @@ /* Definitions and headers for communication with X protocol. - Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000,01,02,03,04 - Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. From f38be8010a5d26ce7386fe8d8b3fec4c01671df0 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 7 Aug 2005 12:46:16 +0000 Subject: [PATCH 031/347] Update "copyright years" section. --- admin/FOR-RELEASE | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 2135a3d0abe..19656cabdde 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -96,7 +96,7 @@ you're going to handle. DIRECTORY STATUS IN CHARGE --------- ------ --------- leim working Kenichi Handa -lib-src working Thien-Thi Nguyen +lib-src done Thien-Thi Nguyen lisp done Thien-Thi Nguyen lisp/calc done Thien-Thi Nguyen lisp/calendar working Glenn Morris @@ -116,10 +116,11 @@ lisp/term done Thien-Thi Nguyen lisp/textmodes done Thien-Thi Nguyen lisp/toolbar done Thien-Thi Nguyen lisp/url done Thien-Thi Nguyen -lwlib working Thien-Thi Nguyen -src working Thien-Thi Nguyen +lwlib done Thien-Thi Nguyen +src done Thien-Thi Nguyen src/m done Thien-Thi Nguyen src/s done Thien-Thi Nguyen +vms done Thien-Thi Nguyen ** Check the Emacs manual. From d2a2c17f0f3735238953df26f42b4d18cb04bf4d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 7 Aug 2005 15:42:42 +0000 Subject: [PATCH 032/347] Sync with Tramp 2.0.50. --- lisp/ChangeLog | 54 +++++++ lisp/net/tramp-ftp.el | 4 +- lisp/net/tramp-smb.el | 22 +-- lisp/net/tramp-uu.el | 2 +- lisp/net/tramp.el | 335 +++++++++++++++++++++--------------------- lisp/net/trampver.el | 4 +- man/ChangeLog | 10 ++ man/tramp.texi | 206 +++++++++++++------------- man/trampver.texi | 2 +- 9 files changed, 344 insertions(+), 295 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cfadc22b26e..c70ccb0d7ff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,57 @@ +2005-08-07 Michael Albinus + + Sync with Tramp 2.0.50. + + * tramp.el: Remove defvar of `last-coding-system-used' in the + XEmacs case; not necessary anymore. + (tramp-user-regexp): Allow "@" as part of user name. + (tramp-handle-set-visited-file-modtime) + (tramp-handle-insert-file-contents) + (tramp-handle-write-region): No special handling for + `last-coding-system-used, because this is done in + `tramp-accept-process-output' now. + (tramp-accept-process-output): New defun. + (tramp-process-one-action, tramp-process-one-multi-action) + (tramp-wait-for-regexp, tramp-wait-for-output) + (tramp-discard-garbage-erase-buffer): Call it. Reported by David + Howells . + (clear-visited-file-modtime): Defadvice removed. The check for + unset buffer's modtime does not need to be based on + `tramp-buffer-file-attributes'. Suggested by RMS. + (tramp-message): Insert "\n" if not being at beginning of line. + (tramp-find-shell): Use `tramp-barf-if-no-shell-prompt' for code + sequence with same logic. + (tramp-completion-handle-expand-file-name): Discard call of + `tramp-drop-volume-letter'. It is not necessary, and there have + been problems with (expand-file-name "~/.netrc" "/") in ange-ftp. + Reported by Richard G. Bielawski + . + (tramp-do-copy-or-rename-file-out-of-band): Transfer message + should always be visible. + (tramp-handle-insert-directory, tramp-setup-complete) + (tramp-set-process-query-on-exit-flag) + (tramp-append-tramp-buffers): Pacify byte-compiler. + (tramp-bug): Delete non-existing variables from list. Apply + `tramp-load-report-modules' as pre-hook. Mask + `tramp-password-prompt-regexp', `tramp-shell-prompt-pattern' and + `shell-prompt-pattern' because of non-7bit characters. Reported + by Sebastian Luque . + (tramp-reporter-dump-variable, tramp-load-report-modules): New + defuns. + (tramp-match-string-list): Remove function. + (tramp-wait-for-regexp): Remove call of that function. Suggested + by Kim F. Storm . + (tramp-set-auto-save-file-modes): Use octal integer code #o600 + instead of octal character code ?\600. The latter resulted in a + syntax error with XEmacs. + + * tramp-smb.el: Remove defvar of `last-coding-system-used' in the + XEmacs case; not necessary anymore. + (tramp-smb-handle-write-region): No special handling for + `last-coding-system-used, because this is done in + `tramp-accept-process-output' now. + (tramp-smb-wait-for-output): Call `tramp-accept-process-output'. + 2005-08-06 Luc Teirlinck * wid-edit.el (widget-choice-value-create): Unconditionally diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el index 05beeb246e1..53cc392ad7a 100644 --- a/lisp/net/tramp-ftp.el +++ b/lisp/net/tramp-ftp.el @@ -1,8 +1,8 @@ -;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP and EFS -*- coding: iso-8859-1; -*- +;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP -*- coding: iso-8859-1; -*- ;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -;; Author: Michael Albinus +;; Author: Michael Albinus ;; Keywords: comm, processes ;; This file is part of GNU Emacs. diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 74e2796fdef..5644e081e6c 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -46,11 +46,6 @@ (defalias 'warnings 'identity) ; Pacify Emacs byte-compiler (byte-compiler-options (warnings (- unused-vars)))))) -;; XEmacs byte-compiler raises warning abouts `last-coding-system-used'. -(eval-when-compile - (unless (boundp 'last-coding-system-used) - (defvar last-coding-system-used nil))) - ;; Define SMB method ... (defcustom tramp-smb-method "smb" "*Method to connect SAMBA and M$ SMB servers." @@ -598,13 +593,6 @@ Catches errors for shares like \"C$/\", which are common in Microsoft Windows." (let ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname t)) (curbuf (current-buffer)) - ;; We use this to save the value of `last-coding-system-used' - ;; after writing the tmp file. At the end of the function, - ;; we set `last-coding-system-used' to this saved value. - ;; This way, any intermediary coding systems used while - ;; talking to the remote shell or suchlike won't hose this - ;; variable. This approach was snarfed from ange-ftp.el. - coding-system-used tmpfil) ;; Write region into a tmp file. (setq tmpfil (tramp-make-temp-file)) @@ -616,9 +604,6 @@ Catches errors for shares like \"C$/\", which are common in Microsoft Windows." (if confirm ; don't pass this arg unless defined for backward compat. (list start end tmpfil append 'no-message lockname confirm) (list start end tmpfil append 'no-message lockname))) - ;; Now, `last-coding-system-used' has the right value. Remember it. - (when (boundp 'last-coding-system-used) - (setq coding-system-used last-coding-system-used)) (tramp-smb-maybe-open-connection user host share) (tramp-message-for-buffer @@ -636,10 +621,7 @@ Catches errors for shares like \"C$/\", which are common in Microsoft Windows." (error "Buffer has changed from `%s' to `%s'" curbuf (current-buffer))) (when (eq visit t) - (set-visited-file-modtime)) - ;; Make `last-coding-system-used' have the right value. - (when (boundp 'last-coding-system-used) - (setq last-coding-system-used coding-system-used)))))) + (set-visited-file-modtime)))))) ;; Internal file name functions @@ -1000,7 +982,7 @@ Returns nil if an error message has appeared." (while (and (not found) (not err)) ;; Accept pending output. - (accept-process-output proc) + (tramp-accept-process-output proc) ;; Search for prompt. (goto-char (point-min)) diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el index bbfd44c9999..e1e22af3cab 100644 --- a/lisp/net/tramp-uu.el +++ b/lisp/net/tramp-uu.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -;; Author: Kai Gro,A_(Bjohann +;; Author: Kai Gro,A_(Bjohann ;; Keywords: comm, terminals ;; This file is free software; you can redistribute it and/or modify diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 19794976f7f..e3ad3959591 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4,7 +4,8 @@ ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005 Free Software Foundation, Inc. -;; Author: kai.grossjohann@gmx.net +;; Author: Kai Gro,A_(Bjohann +;; Michael Albinus ;; Keywords: comm, processes ;; This file is part of GNU Emacs. @@ -147,11 +148,6 @@ Nil means to use a separate filename syntax for Tramp.") (when (boundp 'byte-compile-not-obsolete-var) (setq byte-compile-not-obsolete-var 'directory-sep-char))) -;; XEmacs byte-compiler raises warning abouts `last-coding-system-used'. -(eval-when-compile - (unless (boundp 'last-coding-system-used) - (defvar last-coding-system-used nil))) - ;;; User Customizable Internal Variables: (defgroup tramp nil @@ -1031,7 +1027,7 @@ Derived from `tramp-postfix-multi-hop-format'." :type 'regexp) (defcustom tramp-user-regexp - "[^:@/ \t]*" + "[^:/ \t]*" "*Regexp matching user names." :group 'tramp :type 'regexp) @@ -1914,7 +1910,9 @@ This function expects to be called from the tramp buffer only!" tramp-current-multi-method tramp-current-method tramp-current-user tramp-current-host)) (goto-char (point-max)) - (tramp-insert-with-face + (unless (bolp) + (insert "\n")) + (tramp-insert-with-face 'italic (concat "# " (apply #'format fmt-string args) "\n")))))) @@ -2370,16 +2368,13 @@ target of the symlink differ." (buffer-name))) (if time-list (tramp-run-real-handler 'set-visited-file-modtime (list time-list)) - (let ((f (buffer-file-name)) - (coding-system-used nil)) + (let ((f (buffer-file-name))) (with-parsed-tramp-file-name f nil (let* ((attr (file-attributes f)) ;; '(-1 65535) means file doesn't exists yet. (modtime (or (nth 5 attr) '(-1 65535)))) ;; We use '(0 0) as a don't-know value. See also ;; `tramp-handle-file-attributes-with-ls'. - (when (boundp 'last-coding-system-used) - (setq coding-system-used last-coding-system-used)) (if (not (equal modtime '(0 0))) (tramp-run-real-handler 'set-visited-file-modtime (list modtime)) (save-excursion @@ -2392,9 +2387,7 @@ target of the symlink differ." (setq attr (buffer-substring (point) (progn (end-of-line) (point))))) (setq tramp-buffer-file-attributes attr)) - (when (boundp 'last-coding-system-used) - (setq last-coding-system-used coding-system-used)) - nil))))) + nil))))) ;; CCC continue here @@ -2412,7 +2405,7 @@ of." ;; recorded last modification time. (if (or (not (buffer-file-name)) (eq (visited-file-modtime) 0)) - t + t (let ((f (buffer-file-name))) (with-parsed-tramp-file-name f nil (let* ((attr (file-attributes f)) @@ -2447,12 +2440,6 @@ of." ;; if and only if that agrees with the buffer's record. (t (equal mt '(-1 65535)))))))))) -(defadvice clear-visited-file-modtime (after tramp activate) - "Set `tramp-buffer-file-attributes' back to nil. -Tramp uses this variable as an emulation for the actual modtime of the file, -if the remote host can't provide the modtime." - (setq tramp-buffer-file-attributes nil)) - (defun tramp-handle-set-file-modes (filename mode) "Like `set-file-modes' for tramp files." (with-parsed-tramp-file-name filename nil @@ -3137,8 +3124,7 @@ be a local filename. The method used must be an out-of-band method." tramp-current-method method tramp-current-user user tramp-current-host host) - (tramp-message - 5 "Transferring %s to file %s..." filename newname) + (message "Transferring %s to %s..." filename newname) ;; Use rcp-like program for file transfer. (let ((p (apply 'start-process (buffer-name trampbuf) trampbuf @@ -3147,8 +3133,7 @@ be a local filename. The method used must be an out-of-band method." (tramp-process-actions p multi-method method user host tramp-actions-copy-out-of-band)) (kill-buffer trampbuf) - (tramp-message - 5 "Transferring %s to file %s...done" filename newname) + (message "Transferring %s to %s...done" filename newname) ;; Set the mode. (unless keep-date @@ -3319,7 +3304,7 @@ This is like `dired-recursive-delete-directory' for tramp files." (filename switches &optional wildcard full-directory-p) "Like `insert-directory' for tramp files." (if (and (boundp 'ls-lisp-use-insert-directory-program) - (not ls-lisp-use-insert-directory-program)) + (not (symbol-value 'ls-lisp-use-insert-directory-program))) (tramp-run-real-handler 'insert-directory (list filename switches wildcard full-directory-p)) ;; For the moment, we assume that the remote "ls" program does not @@ -3505,7 +3490,7 @@ the result will be a local, non-Tramp, filename." ;; Remote commands. (defvar tramp-async-proc nil - "Global variable keeping asyncronous process object. + "Global variable keeping asynchronous process object. Used in `tramp-handle-shell-command'") (defun tramp-handle-shell-command (command &optional output-buffer error-buffer) @@ -3762,7 +3747,6 @@ This will break if COMMAND prints a newline, followed by the value of 'insert-file-contents) 'file-local-copy))) (file-local-copy filename))) - (coding-system-used nil) (result nil)) (when visit (setq buffer-file-name filename) @@ -3772,15 +3756,10 @@ This will break if COMMAND prints a newline, followed by the value of multi-method method user host 9 "Inserting local temp file `%s'..." local-copy) (setq result (insert-file-contents local-copy nil beg end replace)) - ;; Now `last-coding-system-used' has right value. Remember it. - (when (boundp 'last-coding-system-used) - (setq coding-system-used last-coding-system-used)) (tramp-message-for-buffer multi-method method user host 9 "Inserting local temp file `%s'...done" local-copy) (delete-file local-copy) - (when (boundp 'last-coding-system-used) - (setq last-coding-system-used coding-system-used)) (list (expand-file-name filename) (second result)))))) @@ -3845,7 +3824,7 @@ This will break if COMMAND prints a newline, followed by the value of ;; (string= lockname filename)) ;; (error ;; "tramp-handle-write-region: LOCKNAME must be nil or equal FILENAME")) - ;; XEmacs takes a coding system as the sevent argument, not `confirm' + ;; XEmacs takes a coding system as the seventh argument, not `confirm' (when (and (not (featurep 'xemacs)) confirm (file-exists-p filename)) (unless (y-or-n-p (format "File %s exists; overwrite anyway? " @@ -3859,13 +3838,6 @@ This will break if COMMAND prints a newline, followed by the value of (loc-dec (tramp-get-local-decoding multi-method method user host)) (trampbuf (get-buffer-create "*tramp output*")) (modes (file-modes filename)) - ;; We use this to save the value of `last-coding-system-used' - ;; after writing the tmp file. At the end of the function, - ;; we set `last-coding-system-used' to this saved value. - ;; This way, any intermediary coding systems used while - ;; talking to the remote shell or suchlike won't hose this - ;; variable. This approach was snarfed from ange-ftp.el. - coding-system-used tmpfil) ;; Write region into a tmp file. This isn't really needed if we ;; use an encoding function, but currently we use it always @@ -3887,9 +3859,6 @@ This will break if COMMAND prints a newline, followed by the value of ;; the backup file. This case `save-buffer' handles ;; permissions. (when modes (set-file-modes tmpfil modes)) - ;; Now, `last-coding-system-used' has the right value. Remember it. - (when (boundp 'last-coding-system-used) - (setq coding-system-used last-coding-system-used)) ;; This is a bit lengthy due to the different methods possible for ;; file transfer. First, we check whether the method uses an rcp ;; program. If so, we call it. Otherwise, both encoding and @@ -3991,9 +3960,6 @@ This will break if COMMAND prints a newline, followed by the value of ;; We must pass modtime explicitely, because filename can be different ;; from (buffer-file-name), f.e. if `file-precious-flag' is set. (nth 5 (file-attributes filename)))) - ;; Make `last-coding-system-used' have the right value. - (when (boundp 'last-coding-system-used) - (setq last-coding-system-used coding-system-used)) (when (or (eq visit t) (eq visit nil) (stringp visit)) @@ -4301,7 +4267,7 @@ necessary anymore." (symbol-function 'PC-expand-many-files)) (defun PC-expand-many-files (name) (if (tramp-tramp-file-p name) - (expand-many-files name) + (funcall (symbol-function 'expand-many-files) name) (tramp-save-PC-expand-many-files name)))) ;; Why isn't eval-after-load sufficient? @@ -4825,12 +4791,11 @@ User may be nil." (defun tramp-completion-handle-expand-file-name (name &optional dir) "Like `expand-file-name' for tramp files." (let ((fullname (concat (or dir default-directory) name))) - (tramp-drop-volume-letter - (if (tramp-completion-mode fullname) - (tramp-run-real-handler - 'expand-file-name (list name dir)) - (tramp-completion-run-real-handler - 'expand-file-name (list name dir)))))) + (if (tramp-completion-mode fullname) + (tramp-run-real-handler + 'expand-file-name (list name dir)) + (tramp-completion-run-real-handler + 'expand-file-name (list name dir))))) ;;; Internal Functions: @@ -5127,12 +5092,9 @@ file exists and nonzero exit status otherwise." (tramp-send-command multi-method method user host (concat "PS1='$ ' exec " shell)) ; - (unless (tramp-wait-for-regexp - (get-buffer-process (current-buffer)) - 60 (format "\\(\\(%s\\)\\|\\(%s\\)\\)\\'" - tramp-shell-prompt-pattern shell-prompt-pattern)) - (pop-to-buffer (buffer-name)) - (error "Couldn't find remote `%s' prompt" shell)) + (tramp-barf-if-no-shell-prompt + (get-buffer-process (current-buffer)) + 60 "Couldn't find remote `%s' prompt" shell) (tramp-message 9 "Setting remote shell prompt...") ;; Douglas Gray Stephens says that we @@ -5331,7 +5293,7 @@ The terminal type can be configured with `tramp-terminal-type'." (tramp-message 9 "Waiting 60s for prompt from remote shell") (with-timeout (60 (throw 'tramp-action 'timeout)) (while (not found) - (accept-process-output p 1) + (tramp-accept-process-output p 1) (goto-char (point-min)) (setq todo actions) (while todo @@ -5368,7 +5330,7 @@ The terminal type can be configured with `tramp-terminal-type'." (tramp-message 9 "Waiting 60s for prompt from remote shell") (with-timeout (60 (throw 'tramp-action 'timeout)) (while (not found) - (accept-process-output p 1) + (tramp-accept-process-output p 1) (setq todo actions) (goto-char (point-min)) (while todo @@ -5757,6 +5719,14 @@ character." ;; Utility functions. +(defun tramp-accept-process-output + (&optional process timeout timeout-msecs) + "Like `accept-process-output' for Tramp processes. +This is needed in order to hide `last-coding-system-used', which is set +for process communication also." + (let (last-coding-system-used) + (accept-process-output process timeout timeout-msecs))) + (defun tramp-wait-for-regexp (proc timeout regexp) "Wait for a REGEXP to appear from process PROC within TIMEOUT seconds. Expects the output of PROC to be sent to the current buffer. Returns @@ -5773,20 +5743,18 @@ nil." timeout)) (with-timeout (timeout) (while (not found) - (accept-process-output proc 1) + (tramp-accept-process-output proc 1) (unless (memq (process-status proc) '(run open)) (error "Process has died")) (goto-char (point-min)) - (setq found (when (re-search-forward regexp nil t) - (tramp-match-string-list))))))) + (setq found (re-search-forward regexp nil t)))))) (t (while (not found) - (accept-process-output proc 1) + (tramp-accept-process-output proc 1) (unless (memq (process-status proc) '(run open)) (error "Process has died")) (goto-char (point-min)) - (setq found (when (re-search-forward regexp nil t) - (tramp-match-string-list)))))) + (setq found (re-search-forward regexp nil t))))) (when tramp-debug-buffer (append-to-buffer (tramp-get-debug-buffer tramp-current-multi-method tramp-current-method @@ -6399,7 +6367,7 @@ Sends COMMAND, then waits 30 seconds for shell prompt." timeout)) (with-timeout (timeout) (while (not found) - (accept-process-output proc 1) + (tramp-accept-process-output proc 1) (unless (memq (process-status proc) '(run open)) (error "Process has died")) (goto-char (point-max)) @@ -6407,7 +6375,7 @@ Sends COMMAND, then waits 30 seconds for shell prompt." (setq found (looking-at end-of-output)))))) (t (while (not found) - (accept-process-output proc 1) + (tramp-accept-process-output proc 1) (unless (memq (process-status proc) '(run open)) (error "Process has died")) (goto-char (point-max)) @@ -6444,18 +6412,6 @@ Sends COMMAND, then waits 30 seconds for shell prompt." ;; Return value is whether end-of-output sentinel was found. found)) -(defun tramp-match-string-list (&optional string) - "Returns list of all match strings. -That is, (list (match-string 0) (match-string 1) ...), according to the -number of matches." - (let* ((nmatches (/ (length (match-data)) 2)) - (i (- nmatches 1)) - (res nil)) - (while (>= i 0) - (setq res (cons (match-string i string) res)) - (setq i (- i 1))) - res)) - (defun tramp-send-command-and-check (multi-method method user host command &optional subshell) "Run COMMAND and check its exit status. @@ -6556,7 +6512,7 @@ MULTI-METHOD, METHOD, USER, and HOST specify the connection." If `tramp-discard-garbage' is nil, just erase buffer." (if (not tramp-discard-garbage) (erase-buffer) - (while (prog1 (erase-buffer) (accept-process-output p 0.25)) + (while (prog1 (erase-buffer) (tramp-accept-process-output p 0.25)) (when tramp-debug-buffer (save-excursion (set-buffer (tramp-get-debug-buffer multi-method method user host)) @@ -6993,7 +6949,7 @@ as default." ;; auto-saved file belonging to another original file. This could ;; be a security threat. (set-file-modes buffer-auto-save-file-name - (or (file-modes bfn) ?\600))))) + (or (file-modes bfn) #o600))))) (unless (or (> emacs-major-version 21) (and (featurep 'xemacs) @@ -7130,10 +7086,11 @@ it does the right thing." "Specify if query is needed for process when Emacs is exited. If the second argument flag is non-nil, Emacs will query the user before exiting if process is running." + (funcall (if (fboundp 'set-process-query-on-exit-flag) - (set-process-query-on-exit-flag process flag) - (funcall (symbol-function 'process-kill-without-query) - process flag))) + (symbol-function 'set-process-query-on-exit-flag) + (symbol-function 'process-kill-without-query)) + process flag)) ;; ------------------------------------------------------------ @@ -7213,20 +7170,19 @@ Only works for Bourne-like shells." ;; CCC: This check is now also really awful; we should search all ;; of the filename format, not just the prefix. (when (string-match "\\[" tramp-prefix-format) -(defadvice file-expand-wildcards (around tramp-fix activate) - (let ((name (ad-get-arg 0))) - (if (tramp-tramp-file-p name) - ;; If it's a Tramp file, dissect it and look if wildcards - ;; need to be expanded at all. - (let ((v (tramp-dissect-file-name name))) - (if (string-match "[[*?]" (tramp-file-name-localname v)) - (let ((res ad-do-it)) - (setq ad-return-value (or res (list name)))) - (setq ad-return-value (list name)))) - ;; If it is not a Tramp file, just run the original function. - (let ((res ad-do-it)) - (setq ad-return-value (or res (list name))))))) -) + (defadvice file-expand-wildcards (around tramp-fix activate) + (let ((name (ad-get-arg 0))) + (if (tramp-tramp-file-p name) + ;; If it's a Tramp file, dissect it and look if wildcards + ;; need to be expanded at all. + (let ((v (tramp-dissect-file-name name))) + (if (string-match "[[*?]" (tramp-file-name-localname v)) + (let ((res ad-do-it)) + (setq ad-return-value (or res (list name)))) + (setq ad-return-value (list name)))) + ;; If it is not a Tramp file, just run the original function. + (let ((res ad-do-it)) + (setq ad-return-value (or res (list name)))))))) ;; Tramp version is useful in a number of situations. @@ -7246,69 +7202,74 @@ Only works for Bourne-like shells." (interactive) (require 'reporter) (catch 'dont-send - (let ((reporter-prompt-for-summary-p t)) + (let ((reporter-prompt-for-summary-p t)) (reporter-submit-bug-report tramp-bug-report-address ; to-address (format "tramp (%s)" tramp-version) ; package name and version - `(;; Current state - tramp-ls-command - tramp-test-groks-nt - tramp-file-exists-command - tramp-current-multi-method - tramp-current-method - tramp-current-user - tramp-current-host + (delq nil + `(;; Current state + tramp-ls-command + tramp-test-groks-nt + tramp-file-exists-command + tramp-current-multi-method + tramp-current-method + tramp-current-user + tramp-current-host - ;; System defaults - tramp-auto-save-directory ; vars to dump - tramp-default-method - tramp-rsh-end-of-line - tramp-default-password-end-of-line - tramp-remote-path - tramp-login-prompt-regexp - tramp-password-prompt-regexp - tramp-wrong-passwd-regexp - tramp-yesno-prompt-regexp - tramp-yn-prompt-regexp - tramp-terminal-prompt-regexp - tramp-temp-name-prefix - tramp-file-name-structure - tramp-file-name-regexp - tramp-multi-file-name-structure - tramp-multi-file-name-hop-structure - tramp-multi-methods - tramp-multi-connection-function-alist - tramp-methods - tramp-end-of-output - tramp-coding-commands - tramp-actions-before-shell - tramp-actions-copy-out-of-band - tramp-multi-actions - tramp-terminal-type - tramp-shell-prompt-pattern - tramp-chunksize - ,(when (boundp 'tramp-backup-directory-alist) - 'tramp-backup-directory-alist) - ,(when (boundp 'tramp-bkup-backup-directory-info) - 'tramp-bkup-backup-directory-info) + ;; System defaults + tramp-auto-save-directory ; vars to dump + tramp-default-method + tramp-rsh-end-of-line + tramp-default-password-end-of-line + tramp-remote-path + tramp-login-prompt-regexp + ;; Mask non-7bit characters + (tramp-password-prompt-regexp . tramp-reporter-dump-variable) + tramp-wrong-passwd-regexp + tramp-yesno-prompt-regexp + tramp-yn-prompt-regexp + tramp-terminal-prompt-regexp + tramp-temp-name-prefix + tramp-file-name-structure + tramp-file-name-regexp + tramp-multi-file-name-structure + tramp-multi-file-name-hop-structure + tramp-multi-methods + tramp-multi-connection-function-alist + tramp-methods + tramp-end-of-output + tramp-coding-commands + tramp-actions-before-shell + tramp-actions-copy-out-of-band + tramp-multi-actions + tramp-terminal-type + ;; Mask non-7bit characters + (tramp-shell-prompt-pattern . tramp-reporter-dump-variable) + tramp-chunksize + ,(when (boundp 'tramp-backup-directory-alist) + 'tramp-backup-directory-alist) + ,(when (boundp 'tramp-bkup-backup-directory-info) + 'tramp-bkup-backup-directory-info) - ;; Non-tramp variables of interest - shell-prompt-pattern - backup-by-copying - backup-by-copying-when-linked - backup-by-copying-when-mismatch - ,(when (boundp 'backup-by-copying-when-privileged-mismatch) - 'backup-by-copying-when-privileged-mismatch) - ,(when (boundp 'password-cache) - 'password-cache) - ,(when (boundp 'password-cache-expiry) - 'password-cache-expiry) - ,(when (boundp 'backup-directory-alist) - 'backup-directory-alist) - ,(when (boundp 'bkup-backup-directory-info) - 'bkup-backup-directory-info) - file-name-handler-alist) - nil ; pre-hook + ;; Non-tramp variables of interest + ;; Mask non-7bit characters + (shell-prompt-pattern . tramp-reporter-dump-variable) + backup-by-copying + backup-by-copying-when-linked + backup-by-copying-when-mismatch + ,(when (boundp 'backup-by-copying-when-privileged-mismatch) + 'backup-by-copying-when-privileged-mismatch) + ,(when (boundp 'password-cache) + 'password-cache) + ,(when (boundp 'password-cache-expiry) + 'password-cache-expiry) + ,(when (boundp 'backup-directory-alist) + 'backup-directory-alist) + ,(when (boundp 'bkup-backup-directory-info) + 'bkup-backup-directory-info) + file-name-handler-alist)) + + 'tramp-load-report-modules ; pre-hook 'tramp-append-tramp-buffers ; post-hook "\ Enter your bug report in this message, including as much detail as you @@ -7327,8 +7288,43 @@ report. --bug report follows this line-- ")))) -(defun tramp-append-tramp-buffers () - "Append Tramp buffers into the bug report." +(defun tramp-reporter-dump-variable (varsym mailbuf) + "Pretty-print the value of the variable in symbol VARSYM. +Used for non-7bit chars in strings." + (let* ((reporter-eval-buffer (symbol-value 'reporter-eval-buffer)) + (val (with-current-buffer reporter-eval-buffer + (symbol-value varsym)))) + + ;; There are characters to be masked. + (when (and (boundp 'mm-7bit-chars) + (string-match + (concat "[^" (symbol-value 'mm-7bit-chars) "]") val)) + (with-current-buffer reporter-eval-buffer + (set varsym (concat "(base64-decode-string \"" + (base64-encode-string val) + "\")")))) + + ;; Dump variable. + (funcall (symbol-function 'reporter-dump-variable) varsym mailbuf) + + ;; Remove string quotation. + (forward-line -1) + (when (looking-at + (concat "\\(^.*\\)" "\"" ;; \1 " + "\\((base64-decode-string \\)" "\\\\" ;; \2 \ + "\\(\".*\\)" "\\\\" ;; \3 \ + "\\(\")\\)" "\"$")) ;; \4 " + (replace-match "\\1\\2\\3\\4") + (beginning-of-line) + (insert " ;; variable encoded due to non-printable characters\n")) + (forward-line 1) + + ;; Reset VARSYM to old value. + (with-current-buffer reporter-eval-buffer + (set varsym val)))) + +(defun tramp-load-report-modules () + "Load needed modules for reporting." ;; We load message.el and mml.el from Gnus. (if (featurep 'xemacs) @@ -7338,9 +7334,12 @@ report. (require 'message nil 'noerror) (require 'mml nil 'noerror)) (when (functionp 'message-mode) - (funcall 'message-mode)) + (funcall (symbol-function 'message-mode))) (when (functionp 'mml-mode) - (funcall 'mml-mode t)) + (funcall (symbol-function 'mml-mode) t))) + +(defun tramp-append-tramp-buffers () + "Append Tramp buffers into the bug report." (when (and (eq major-mode 'message-mode) @@ -7394,10 +7393,10 @@ Therefore, the contents of files might be included in the debug buffer(s).") (goto-char (point-max)) (insert "\n\n") (dolist (buffer buffer-list) - (mml-insert-empty-tag - 'part 'type "text/plain" 'encoding "base64" - 'disposition "attachment" 'buffer (buffer-name buffer) - 'description (buffer-name buffer))) + (funcall (symbol-function 'mml-insert-empty-tag) + 'part 'type "text/plain" 'encoding "base64" + 'disposition "attachment" 'buffer (buffer-name buffer) + 'description (buffer-name buffer))) (set-buffer-modified-p nil)) ;; Don't send. Delete the message buffer. diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 0feb93af987..2ba9f7b3249 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -4,7 +4,7 @@ ;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -;; Author: Kai.Grossjohann@CS.Uni-Dortmund.DE +;; Author: Kai Gro,A_(Bjohann ;; Keywords: comm, processes ;; This file is part of GNU Emacs. @@ -30,7 +30,7 @@ ;; are auto-frobbed from configure.ac, so you should edit that file and run ;; "autoconf && ./configure" to change them. -(defconst tramp-version "2.0.49" +(defconst tramp-version "2.0.50" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org" diff --git a/man/ChangeLog b/man/ChangeLog index ddb84cb91be..f0119913494 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,13 @@ +2005-08-07 Michael Albinus + + Sync with Tramp 2.0.50. + + * tramp.texi: Use @option{} consequently for method names. + (Inline methods, External transfer methods): Remove references to + Cygwin. + (Issues with Cygwin ssh): Explain trouble with Cygwin's ssh + implementation. + 2005-08-06 Eli Zaretskii * mule.texi (Coding Systems): Rephrase the paragraph about diff --git a/man/tramp.texi b/man/tramp.texi index 756b467157c..9fef1d037b0 100644 --- a/man/tramp.texi +++ b/man/tramp.texi @@ -218,10 +218,10 @@ How file names, directories and localnames are mangled and managed @chapter An overview of @value{tramp} @cindex overview -After the installation of @value{tramp} into your @value{emacsname}, you -will be able to access files on remote machines as though they were -local. Access to the remote file system for editing files, version -control, and @command{dired} are transparently enabled. +After the installation of @value{tramp} into your @value{emacsname}, +you will be able to access files on remote machines as though they +were local. Access to the remote file system for editing files, +version control, and @code{dired} are transparently enabled. Your access to the remote machine can be with the @command{rsh}, @command{rlogin}, @command{telnet} programs or with any similar @@ -289,9 +289,9 @@ Communication with this process happens through an goes into a buffer. @item -The remote host may prompt for a login name (for @command{telnet}). The -login name is given in the file name, so @value{tramp} sends the login name and -a newline. +The remote host may prompt for a login name (for @command{telnet}). +The login name is given in the file name, so @value{tramp} sends the +login name and a newline. @item The remote host may prompt for a password or pass phrase (for @@ -365,7 +365,6 @@ you are finished, you type @kbd{C-x C-s} to save the buffer. Again, @value{tramp} transfers the file contents to the remote host either inline or out-of-band. This is the reverse of what happens when reading the file. - @end itemize I hope this has provided you with a basic overview of what happens @@ -653,7 +652,6 @@ easy to implement, so I haven't got around to it, yet. @item @option{sshx} @cindex method sshx @cindex sshx method -@cindex Cygwin (with sshx method) As you would expect, this is similar to @option{ssh}, only a little different. Whereas @option{ssh} opens a normal interactive shell on @@ -674,9 +672,9 @@ in without such questions. This is also useful for Windows users where @command{ssh}, when invoked from an @value{emacsname} buffer, tells them that it is not allocating a pseudo tty. When this happens, the login shell is wont -to not print any shell prompt, which confuses @value{tramp} mightily. For -reasons unknown, some Windows ports for @command{ssh} (maybe the -Cygwin one) require the doubled @samp{-t} option. +to not print any shell prompt, which confuses @value{tramp} mightily. +For reasons unknown, some Windows ports for @command{ssh} require the +doubled @samp{-t} option. This supports the @samp{-p} kludge. @@ -817,7 +815,6 @@ This method supports the @samp{-p} hack. @cindex scpx method @cindex scp (with scpx method) @cindex ssh (with scpx method) -@cindex Cygwin (with scpx method) As you would expect, this is similar to @option{scp}, only a little different. Whereas @option{scp} opens a normal interactive shell on @@ -832,7 +829,6 @@ This is also useful for Windows users where @command{ssh}, when invoked from an @value{emacsname} buffer, tells them that it is not allocating a pseudo tty. When this happens, the login shell is wont to not print any shell prompt, which confuses @value{tramp} mightily. -Maybe this applies to the Cygwin port of SSH. This method supports the @samp{-p} hack. @@ -1025,7 +1021,7 @@ For example: '("sshf" tramp-multi-connect-rlogin "ssh %h -l %u -p 4400%n")) @end lisp -Now you can use an @code{sshf} hop which connects to port 4400 instead of +Now you can use an @option{sshf} hop which connects to port 4400 instead of the standard port. @@ -1074,16 +1070,16 @@ Another consideration with the selection of transfer methods is the environment you will use them in and, especially when used over the Internet, the security implications of your preferred method. -The @command{rsh} and @command{telnet} methods send your password as -plain text as you log in to the remote machine, as well as transferring -the files in such a way that the content can easily be read from other -machines. +The @option{rsh} and @option{telnet} methods send your password as +plain text as you log in to the remote machine, as well as +transferring the files in such a way that the content can easily be +read from other machines. If you need to connect to remote systems that are accessible from the -Internet, you should give serious thought to using @command{ssh} based +Internet, you should give serious thought to using @option{ssh} based methods to connect. These provide a much higher level of security, -making it a non-trivial exercise for someone to obtain your password or -read the content of the files you are editing. +making it a non-trivial exercise for someone to obtain your password +or read the content of the files you are editing. @subsection Which method is the right one for me? @@ -1101,28 +1097,29 @@ methods might be more efficient, but I guess that most people will want to edit mostly small files. I guess that these days, most people can access a remote machine by -using @code{ssh}. So I suggest that you use the @code{ssh} method. -So, type @kbd{C-x C-f +using @command{ssh}. So I suggest that you use the @option{ssh} +method. So, type @kbd{C-x C-f @value{prefix}ssh@value{postfixsinglehop}root@@otherhost@value{postfix}/etc/motd @key{RET}} to edit the @file{/etc/motd} file on the other host. -If you can't use @code{ssh} to log in to the remote host, then select a -method that uses a program that works. For instance, Windows users -might like the @code{plink} method which uses the PuTTY implementation -of @code{ssh}. Or you use Kerberos and thus like @code{krlogin}. +If you can't use @option{ssh} to log in to the remote host, then +select a method that uses a program that works. For instance, Windows +users might like the @option{plink} method which uses the PuTTY +implementation of @command{ssh}. Or you use Kerberos and thus like +@option{krlogin}. For the special case of editing files on the local host as another -user, see the @code{su} or @code{sudo} method. It offers shortened -syntax for the @samp{root} account, like +user, see the @option{su} or @option{sudo} methods. They offer +shortened syntax for the @samp{root} account, like @file{@value{prefix}su@value{postfixsinglehop}@value{postfix}/etc/motd}. -People who edit large files may want to consider @code{scp} instead of -@code{ssh}, or @code{pscp} instead of @code{plink}. These out-of-band -methods are faster than inline methods for large files. Note, however, -that out-of-band methods suffer from some limitations. Please try -first whether you really get a noticeable speed advantage from using an -out-of-band method! Maybe even for large files, inline methods are -fast enough. +People who edit large files may want to consider @option{scp} instead +of @option{ssh}, or @option{pscp} instead of @option{plink}. These +out-of-band methods are faster than inline methods for large files. +Note, however, that out-of-band methods suffer from some limitations. +Please try first whether you really get a noticeable speed advantage +from using an out-of-band method! Maybe even for large files, inline +methods are fast enough. @node Customizing Methods @@ -1365,16 +1362,16 @@ the remote host such that it behaves like @value{tramp} expects. This might be inconvenient because you have to invest a lot of effort into shell setup before you can begin to use @value{tramp}. -The package, therefore, pursues a combined approach. It tries to figure -out some of the more common setups, and only requires you to avoid -really exotic stuff. For example, it looks through a list of +The package, therefore, pursues a combined approach. It tries to +figure out some of the more common setups, and only requires you to +avoid really exotic stuff. For example, it looks through a list of directories to find some programs on the remote host. And also, it knows that it is not obvious how to check whether a file exists, and -therefore it tries different possibilities. (On some hosts and shells, -the command @code{test -e} does the trick, on some hosts the shell -builtin doesn't work but the program @code{/usr/bin/test -e} or -@code{/bin/test -e} works. And on still other hosts, @code{ls -d} is -the right way to do this.) +therefore it tries different possibilities. (On some hosts and +shells, the command @command{test -e} does the trick, on some hosts +the shell builtin doesn't work but the program @command{/usr/bin/test +-e} or @command{/bin/test -e} works. And on still other hosts, +@command{ls -d} is the right way to do this.) Below you find a discussion of a few things that @value{tramp} does not deal with, and that you therefore have to set up correctly. @@ -1409,11 +1406,11 @@ different user. The default value of @code{shell-prompt-pattern}, which is reported to work well in many circumstances. -@item @code{tset} and other questions +@item @command{tset} and other questions @cindex Unix command tset @cindex tset Unix command -Some people invoke the @code{tset} program from their shell startup +Some people invoke the @command{tset} program from their shell startup scripts which asks the user about the terminal type of the shell. Maybe some shells ask other questions when they are started. @value{tramp} does not know how to answer these questions. There are two approaches @@ -1443,20 +1440,21 @@ This weird effect was actually reported by a @value{tramp} user! @item Non-Bourne commands in @file{.profile} After logging in to the remote host, @value{tramp} issues the command -@code{exec /bin/sh}. (Actually, the command is slightly different.) -When @code{/bin/sh} is executed, it reads some init files, such as -@file{~/.shrc} or @file{~/.profile}. +@command{exec /bin/sh}. (Actually, the command is slightly +different.) When @command{/bin/sh} is executed, it reads some init +files, such as @file{~/.shrc} or @file{~/.profile}. Now, some people have a login shell which is not @code{/bin/sh} but a Bourne-ish shell such as bash or ksh. Some of these people might put -their shell setup into the files @code{~/.shrc} or @code{~/.profile}. +their shell setup into the files @file{~/.shrc} or @file{~/.profile}. This way, it is possible for non-Bourne constructs to end up in those -files. Then, @code{exec /bin/sh} might cause the Bourne shell to barf -on those constructs. +files. Then, @command{exec /bin/sh} might cause the Bourne shell to +barf on those constructs. -As an example, imagine somebody putting @code{export FOO=bar} into the -file @file{~/.profile}. The standard Bourne shell does not understand -this syntax and will emit a syntax error when it reaches this line. +As an example, imagine somebody putting @command{export FOO=bar} into +the file @file{~/.profile}. The standard Bourne shell does not +understand this syntax and will emit a syntax error when it reaches +this line. Another example is the tilde (@code{~}) character, say when adding @file{~/bin} to @code{$PATH}. Many Bourne shells will not expand this @@ -1467,8 +1465,8 @@ What can you do about this? Well, one possibility is to make sure that everything in @file{~/.shrc} and @file{~/.profile} on all remote hosts is Bourne-compatible. In the -above example, instead of @code{export FOO=bar}, you might use -@code{FOO=bar; export FOO} instead. +above example, instead of @command{export FOO=bar}, you might use +@command{FOO=bar; export FOO} instead. The other possibility is to put your non-Bourne shell setup into some other files. For example, bash reads the file @file{~/.bash_profile} @@ -1476,14 +1474,15 @@ instead of @file{~/.profile}, if the former exists. So bash aficionados just rename their @file{~/.profile} to @file{~/.bash_profile} on all remote hosts, and Bob's your uncle. -The @value{tramp} developers would like to circumvent this problem, so if you -have an idea about it, please tell us. However, we are afraid it is not -that simple: before saying @code{exec /bin/sh}, @value{tramp} does not know -which kind of shell it might be talking to. It could be a Bourne-ish -shell like ksh or bash, or it could be a csh derivative like tcsh, or -it could be zsh, or even rc. If the shell is Bourne-ish already, then -it might be prudent to omit the @code{exec /bin/sh} step. But how to -find out if the shell is Bourne-ish? +The @value{tramp} developers would like to circumvent this problem, so +if you have an idea about it, please tell us. However, we are afraid +it is not that simple: before saying @command{exec /bin/sh}, +@value{tramp} does not know which kind of shell it might be talking +to. It could be a Bourne-ish shell like ksh or bash, or it could be a +csh derivative like tcsh, or it could be zsh, or even rc. If the +shell is Bourne-ish already, then it might be prudent to omit the +@command{exec /bin/sh} step. But how to find out if the shell is +Bourne-ish? @end table @@ -1630,38 +1629,44 @@ This section needs a lot of work! Please help. @cindex method sshx with Cygwin @cindex sshx method with Cygwin -If you use the Cygwin installation of ssh (you have to explicitly select -it in the installer), then it should work out of the box to just select -@code{sshx} as the connection method. You can find information about -setting up Cygwin in their FAQ at @uref{http://cygwin.com/faq/}. +The recent Cygwin installation of @command{ssh} works only with a +Cygwinized @value{emacsname}. You can check it by typing @kbd{M-x +eshell}, and starting @kbd{ssh test.machine}. The problem is evident +if you see a message like this: + +@example +Pseudo-terminal will not be allocated because stdin is not a terminal. +@end example + +Older @command{ssh} versions of Cygwin are told to cooperate with +@value{tramp} selecting @option{sshx} as the connection method. You +can find information about setting up Cygwin in their FAQ at +@uref{http://cygwin.com/faq/}. @cindex method scpx with Cygwin @cindex scpx method with Cygwin -If you wish to use the @code{scpx} connection method, then you might -have the problem that @value{emacsname} calls @code{scp} with a +If you wish to use the @option{scpx} connection method, then you might +have the problem that @value{emacsname} calls @command{scp} with a Windows filename such as @code{c:/foo}. The Cygwin version of -@code{scp} does not know about Windows filenames and interprets this +@command{scp} does not know about Windows filenames and interprets this as a remote filename on the host @code{c}. -One possible workaround is to write a wrapper script for @code{scp} +One possible workaround is to write a wrapper script for @option{scp} which converts the Windows filename to a Cygwinized filename. -I guess that another workaround is to run @value{emacsname} under -Cygwin, or to run a Cygwinized @value{emacsname}. - @cindex Cygwin and ssh-agent @cindex SSH_AUTH_SOCK and @value{emacsname} on Windows -If you want to use either @code{ssh} based method on Windows, then you -might encounter problems with @code{ssh-agent}. Using this program, -you can avoid typing the pass-phrase every time you log in. However, -if you start @value{emacsname} from a desktop shortcut, then the -environment variable @code{SSH_AUTH_SOCK} is not set and so -@value{emacsname} and thus @value{tramp} and thus @code{ssh} and -@code{scp} started from @value{tramp} cannot communicate with -@code{ssh-agent}. It works better to start @value{emacsname} from +If you want to use either @option{ssh} based method on Windows, then +you might encounter problems with @command{ssh-agent}. Using this +program, you can avoid typing the pass-phrase every time you log in. +However, if you start @value{emacsname} from a desktop shortcut, then +the environment variable @code{SSH_AUTH_SOCK} is not set and so +@value{emacsname} and thus @value{tramp} and thus @command{ssh} and +@command{scp} started from @value{tramp} cannot communicate with +@command{ssh-agent}. It works better to start @value{emacsname} from the shell. -If anyone knows how to start @code{ssh-agent} under Windows in such a +If anyone knows how to start @command{ssh-agent} under Windows in such a way that desktop shortcuts can profit, please holler. I don't really know anything at all about Windows@dots{} @@ -2108,10 +2113,10 @@ remote host. There's this @file{~/.sh_history} file on the remote host which keeps growing and growing. What's that? -Sometimes, @value{tramp} starts @code{ksh} on the remote host for tilde -expansion. Maybe @code{ksh} saves the history by default. @value{tramp} -tries to turn off saving the history, but maybe you have to help. For -example, you could put this in your @file{.kshrc}: +Sometimes, @value{tramp} starts @command{ksh} on the remote host for +tilde expansion. Maybe @command{ksh} saves the history by default. +@value{tramp} tries to turn off saving the history, but maybe you have +to help. For example, you could put this in your @file{.kshrc}: @example if [ -f $HOME/.sh_history ] ; then @@ -2316,18 +2321,18 @@ effect while preserving the @value{tramp} file name information. @itemize @bullet @item The uuencode method does not always work. -Due to the design of @value{tramp}, the encoding and decoding programs need to -read from stdin and write to stdout. On some systems, @code{uudecode -o --} will read stdin and write the decoded file to stdout, on other -systems @code{uudecode -p} does the same thing. But some systems have -uudecode implementations which cannot do this at all---it is not -possible to call these uudecode implementations with suitable parameters -so that they write to stdout. +Due to the design of @value{tramp}, the encoding and decoding programs +need to read from stdin and write to stdout. On some systems, +@command{uudecode -o -} will read stdin and write the decoded file to +stdout, on other systems @command{uudecode -p} does the same thing. +But some systems have uudecode implementations which cannot do this at +all---it is not possible to call these uudecode implementations with +suitable parameters so that they write to stdout. Of course, this could be circumvented: the @code{begin foo 644} line could be rewritten to put in some temporary file name, then -@code{uudecode} could be called, then the temp file could be printed and -deleted. +@command{uudecode} could be called, then the temp file could be +printed and deleted. But I have decided that this is too fragile to reliably work, so on some systems you'll have to do without the uuencode methods. @@ -2368,13 +2373,12 @@ to the files @file{.../xemacs-packages/lisp/tramp/auto-autoloads.el*}. In case of unified filenames, all @value{emacsname} download sites are added to @code{tramp-default-method-alist} with default method -@code{ftp} @xref{Default Method}. These settings shouldn't be touched +@option{ftp} @xref{Default Method}. These settings shouldn't be touched for proper working of the @value{emacsname} package system. The syntax for unified filenames is described in the @value{tramp} manual for @value{emacsothername}. @end ifset - @end itemize @node Concept Index diff --git a/man/trampver.texi b/man/trampver.texi index 33a0aacbb9e..a77ae82d49b 100644 --- a/man/trampver.texi +++ b/man/trampver.texi @@ -4,7 +4,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.0.49 +@set trampver 2.0.50 @c Other flags from configuration @set prefix /usr/local From 3ae9c96ab9b35ea93589911c350af1d353bafd20 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:35:09 +0000 Subject: [PATCH 033/347] (set_terminal_modes): If no TS_termcap_modes string, output newlines to scroll the old screen contents off the screen. --- src/term.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/term.c b/src/term.c index c92219f8fe7..76cf2e2c6f0 100644 --- a/src/term.c +++ b/src/term.c @@ -449,7 +449,17 @@ set_terminal_modes () { if (FRAME_TERMCAP_P (XFRAME (selected_frame))) { - OUTPUT_IF (TS_termcap_modes); + if (TS_termcap_modes) + OUTPUT (TS_termcap_modes); + else + { + /* Output enough newlines to scroll all the old screen contents + off the screen, so it won't be overwritten and lost. */ + int i; + for (i = 0; i < FRAME_LINES (XFRAME (selected_frame)); i++) + putchar ('\n'); + } + OUTPUT_IF (TS_cursor_visible); OUTPUT_IF (TS_keypad_mode); losecursor (); From 780a7814436dd62e3a1e8a888fde43fb899dcfdc Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:36:12 +0000 Subject: [PATCH 034/347] (syms_of_fns): Add `emacs' to features. --- src/fns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fns.c b/src/fns.c index 60a98fd5709..1e26ec9a392 100644 --- a/src/fns.c +++ b/src/fns.c @@ -5833,7 +5833,7 @@ syms_of_fns () DEFVAR_LISP ("features", &Vfeatures, doc: /* A list of symbols which are the features of the executing emacs. Used by `featurep' and `require', and altered by `provide'. */); - Vfeatures = Qnil; + Vfeatures = Fcons (intern ("emacs"), Qnil); Qsubfeatures = intern ("subfeatures"); staticpro (&Qsubfeatures); From e09b9180d525e04497271f23cb7fc99fea21421e Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:38:36 +0000 Subject: [PATCH 035/347] (endif): Convert -script into -scriptload. (standard_args): Add -scriptload. Allow -basic-display with one dash. --- src/emacs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/emacs.c b/src/emacs.c index 87aee828420..985a3eae96f 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1153,9 +1153,9 @@ main (argc, argv if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args)) { noninteractive = 1; /* Set batch mode. */ - /* Convert --script to -l, un-skip it, and sort again so that -l will be - handled in proper sequence. */ - argv[skip_args - 1] = "-l"; + /* Convert --script to --scriptload, un-skip it, and sort again + so that it will be handled in proper sequence. */ + argv[skip_args - 1] = "-scriptload"; skip_args -= 2; sort_args (argc, argv); } @@ -1834,7 +1834,7 @@ struct standard_args standard_args[] = { "-itype", 0, 15, 0 }, { "-iconic", "--iconic", 15, 0 }, { "-D", "--basic-display", 12, 0}, - { "--basic-display", 0, 12, 0}, + { "-basic-display", 0, 12, 0}, { "-bg", "--background-color", 10, 1 }, { "-background", 0, 10, 1 }, { "-fg", "--foreground-color", 10, 1 }, @@ -1868,6 +1868,7 @@ struct standard_args standard_args[] = { "-directory", 0, 0, 1 }, { "-l", "--load", 0, 1 }, { "-load", 0, 0, 1 }, + { "-scriptload", "--scriptload", 0, 1 }, { "-f", "--funcall", 0, 1 }, { "-funcall", 0, 0, 1 }, { "-eval", "--eval", 0, 1 }, From 44edd521a0d425ea79433bf170233a2b0084820b Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:42:38 +0000 Subject: [PATCH 036/347] (Fframe_or_buffer_changed_p): Take an arg so it can be used with various state vectors. --- src/ChangeLog | 13 ++++++++ src/dispnew.c | 88 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 76 insertions(+), 25 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index aa73da64547..a44fc3aaa48 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,16 @@ +2005-08-07 Richard M. Stallman + + * dispnew.c (Fframe_or_buffer_changed_p): Take an arg + so it can be used with various state vectors. + + * emacs.c (endif): Convert -script into -scriptload. + (standard_args): Add -scriptload. Allow -basic-display with one dash. + + * fns.c (syms_of_fns): Add `emacs' to features. + + * term.c (set_terminal_modes): If no TS_termcap_modes string, + output newlines to scroll the old screen contents off the screen. + 2005-08-06 Thien-Thi Nguyen * floatfns.c (Fexpt): Use floats for negative exponent. diff --git a/src/dispnew.c b/src/dispnew.c index 642573b652c..a5057273bfe 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6463,68 +6463,106 @@ usage: (sit-for SECONDS &optional NODISP OLD-NODISP) */) /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the session's frames, frame names, buffers, buffer-read-only flags, and - buffer-modified-flags, and a trailing sentinel (so we don't need to - add length checks). */ + buffer-modified-flags. */ static Lisp_Object frame_and_buffer_state; DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, - Sframe_or_buffer_changed_p, 0, 0, 0, + Sframe_or_buffer_changed_p, 0, 1, 0, doc: /* Return non-nil if the frame and buffer state appears to have changed. -The state variable is an internal vector containing all frames and buffers, +VARIABLE is a variable name whose value is either nil or a state vector +that will be updated to contain all frames and buffers, aside from buffers whose names start with space, -along with the buffers' read-only and modified flags, which allows a fast -check to see whether the menu bars might need to be recomputed. +along with the buffers' read-only and modified flags. This allows a fast +check to see whether buffer menus might need to be recomputed. If this function returns non-nil, it updates the internal vector to reflect -the current state. */) - () +the current state. + +If VARIABLE is nil, an internal variable is used. Users should not +pass nil for VARIABLE. */) + (variable) + Lisp_Object variable; { - Lisp_Object tail, frame, buf; - Lisp_Object *vecp; + Lisp_Object state, tail, frame, buf; + Lisp_Object *vecp, *end; int n; - vecp = XVECTOR (frame_and_buffer_state)->contents; + if (! NILP (variable)) + { + CHECK_SYMBOL (variable); + state = Fsymbol_value (variable); + if (! VECTORP (state)) + goto changed; + } + else + state = frame_and_buffer_state; + + vecp = XVECTOR (state)->contents; + end = vecp + XVECTOR (state)->size; + FOR_EACH_FRAME (tail, frame) { + if (vecp == end) + goto changed; if (!EQ (*vecp++, frame)) goto changed; + if (vecp == end) + goto changed; if (!EQ (*vecp++, XFRAME (frame)->name)) goto changed; } - /* Check that the buffer info matches. - No need to test for the end of the vector - because the last element of the vector is lambda - and that will always cause a mismatch. */ + /* Check that the buffer info matches. */ for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) { buf = XCDR (XCAR (tail)); /* Ignore buffers that aren't included in buffer lists. */ if (SREF (XBUFFER (buf)->name, 0) == ' ') continue; + if (vecp == end) + goto changed; if (!EQ (*vecp++, buf)) goto changed; + if (vecp == end) + goto changed; if (!EQ (*vecp++, XBUFFER (buf)->read_only)) goto changed; + if (vecp == end) + goto changed; if (!EQ (*vecp++, Fbuffer_modified_p (buf))) goto changed; } + if (vecp == end) + goto changed; /* Detect deletion of a buffer at the end of the list. */ if (EQ (*vecp, Qlambda)) return Qnil; + + /* Come here if we decide the data has changed. */ changed: - /* Start with 1 so there is room for at least one lambda at the end. */ + /* Count the size we will need. + Start with 1 so there is room for at least one lambda at the end. */ n = 1; FOR_EACH_FRAME (tail, frame) n += 2; for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) n += 3; - /* Reallocate the vector if it's grown, or if it's shrunk a lot. */ - if (n > XVECTOR (frame_and_buffer_state)->size - || n + 20 < XVECTOR (frame_and_buffer_state)->size / 2) + /* Reallocate the vector if data has grown to need it, + or if it has shrunk a lot. */ + if (! VECTORP (state) + || n > XVECTOR (state)->size + || n + 20 < XVECTOR (state)->size / 2) /* Add 20 extra so we grow it less often. */ - frame_and_buffer_state = Fmake_vector (make_number (n + 20), Qlambda); - vecp = XVECTOR (frame_and_buffer_state)->contents; + { + state = Fmake_vector (make_number (n + 20), Qlambda); + if (! NILP (variable)) + Fset (variable, state); + else + frame_and_buffer_state = state; + } + + /* Record the new data in the (possibly reallocated) vector. */ + vecp = XVECTOR (state)->contents; FOR_EACH_FRAME (tail, frame) { *vecp++ = frame; @@ -6542,12 +6580,12 @@ the current state. */) } /* Fill up the vector with lambdas (always at least one). */ *vecp++ = Qlambda; - while (vecp - XVECTOR (frame_and_buffer_state)->contents - < XVECTOR (frame_and_buffer_state)->size) + while (vecp - XVECTOR (state)->contents + < XVECTOR (state)->size) *vecp++ = Qlambda; /* Make sure we didn't overflow the vector. */ - if (vecp - XVECTOR (frame_and_buffer_state)->contents - > XVECTOR (frame_and_buffer_state)->size) + if (vecp - XVECTOR (state)->contents + > XVECTOR (state)->size) abort (); return Qt; } From 8b6a95513d11162055cf1cdf7eb9a4a2ade5f1c3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 7 Aug 2005 17:47:48 +0000 Subject: [PATCH 037/347] (Fexpt): Undo previous change. --- src/ChangeLog | 2 ++ src/floatfns.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a44fc3aaa48..e9ade1c6dfd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2005-08-07 Richard M. Stallman + * floatfns.c (Fexpt): Undo previous change. + * dispnew.c (Fframe_or_buffer_changed_p): Take an arg so it can be used with various state vectors. diff --git a/src/floatfns.c b/src/floatfns.c index 79574e0a69b..57bece2708b 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -461,8 +461,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg1); CHECK_NUMBER_OR_FLOAT (arg2); if (INTEGERP (arg1) /* common lisp spec */ - && INTEGERP (arg2) /* don't promote, if both are ints, and */ - && 0 <= XINT (arg2)) /* we are sure the result is not fractional */ + && INTEGERP (arg2)) /* don't promote, if both are ints */ { /* this can be improved by pre-calculating */ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; From bcc7dd61345b60c5a16ef3caaa96a878d1edbd45 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 7 Aug 2005 23:56:33 +0000 Subject: [PATCH 038/347] Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-515 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 104) - Update from CVS 2005-08-05 Daiki Ueno * lisp/gnus/mml2015.el (mml2015-pgg-sign): Make sure micalg is correct. * lisp/gnus/pgg-parse.el (pgg-parse-hash-algorithm-alist): Add SHA-2. 2005-08-06 Romain Francoise * lisp/gnus/message.el: Fix typo in docstring. 2005-07-16 Romain Francoise * lisp/gnus/gnus-uu.el (gnus-uu-save-article): Use `message-make-date' instead of `current-time-string' as the latter creates a time string that is not RFC 2822 compliant (it lacks the zone). --- lisp/gnus/ChangeLog | 16 ++++++++++++++++ lisp/gnus/gnus-uu.el | 2 +- lisp/gnus/message.el | 2 +- lisp/gnus/mml2015.el | 17 +++++++++++++---- lisp/gnus/pgg-parse.el | 3 ++- 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9f5ee5e1e33..a7b215718b0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,13 @@ +2005-08-05 Daiki Ueno + + * mml2015.el (mml2015-pgg-sign): Make sure micalg is correct. + + * pgg-parse.el (pgg-parse-hash-algorithm-alist): Add SHA-2. + +2005-08-06 Romain Francoise + + * message.el: Fix typo in docstring. + 2005-08-05 Katsumi Yamaoka * mm-bodies.el (mm-encode-body): Use coding system rather than @@ -104,6 +114,12 @@ * mm-uu.el (mm-uu-copy-to-buffer): Use with-current-buffer. +2005-07-16 Romain Francoise + + * gnus-uu.el (gnus-uu-save-article): Use `message-make-date' + instead of `current-time-string' as the latter creates a time + string that is not RFC 2822 compliant (it lacks the zone). + 2005-07-16 Lars Magne Ingebrigtsen * gnus-msg.el (gnus-button-mailto): Remove diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 90a2433a3c6..a2f3f353a05 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -837,7 +837,7 @@ When called interactively, prompt for REGEXP." (erase-buffer) (insert (format "Date: %s\nFrom: %s\nSubject: %s Digest\n\n" - (current-time-string) name name)) + (message-make-date) name name)) (when (and message-forward-as-mime gnus-uu-digest-buffer) (insert "<#part type=message/rfc822>\nSubject: Topics\n\n")) (insert "Topics:\n"))) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 0266fe95124..7c55b7cc72f 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1443,7 +1443,7 @@ no, only reply back to the author." :type 'boolean) (defcustom message-user-fqdn nil - "*Domain part of Messsage-Ids." + "*Domain part of Message-Ids." :version "22.1" :group 'message-headers :link '(custom-manual "(message)News Headers") diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index b90dfa96338..590e9276a0f 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -642,7 +642,8 @@ (autoload 'pgg-decrypt-region "pgg") (autoload 'pgg-verify-region "pgg") (autoload 'pgg-sign-region "pgg") - (autoload 'pgg-encrypt-region "pgg")) + (autoload 'pgg-encrypt-region "pgg") + (autoload 'pgg-parse-armor "pgg-parse")) (defun mml2015-pgg-decrypt (handle ctl) (catch 'error @@ -810,15 +811,23 @@ (let ((pgg-errors-buffer mml2015-result-buffer) (boundary (mml-compute-boundary cont)) (pgg-default-user-id (or (message-options-get 'mml-sender) - pgg-default-user-id))) + pgg-default-user-id)) + entry) (unless (pgg-sign-region (point-min) (point-max)) (pop-to-buffer mml2015-result-buffer) (error "Sign error")) (goto-char (point-min)) (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" boundary)) - ;;; FIXME: what is the micalg? - (insert "\tmicalg=pgp-sha1; protocol=\"application/pgp-signature\"\n") + (if (setq entry (assq 2 (pgg-parse-armor + (with-current-buffer pgg-output-buffer + (buffer-string))))) + (setq entry (assq 'hash-algorithm (cdr entry)))) + (insert (format "\tmicalg=%s; " + (if (cdr entry) + (downcase (format "pgp-%s" (cdr entry))) + "pgp-sha1"))) + (insert "protocol=\"application/pgp-signature\"\n") (insert (format "\n--%s\n" boundary)) (goto-char (point-max)) (insert (format "\n--%s\n" boundary)) diff --git a/lisp/gnus/pgg-parse.el b/lisp/gnus/pgg-parse.el index d0987659b96..26b48e2f141 100644 --- a/lisp/gnus/pgg-parse.el +++ b/lisp/gnus/pgg-parse.el @@ -58,7 +58,8 @@ (cons (sexp :tag "Number") (sexp :tag "Type")))) (defcustom pgg-parse-hash-algorithm-alist - '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2)) + '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2) (8 . SHA256) (9 . SHA384) + (10 . SHA512)) "Alist of the assigned number to the cryptographic hash algorithm." :group 'pgg-parse :type '(repeat From b499789ca4bc09fc61a6746cb15193a6378f231d Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 8 Aug 2005 00:20:19 +0000 Subject: [PATCH 039/347] (Info-dir-remove-duplicates): Avoid case folding in loop; instead, keep downcased strings for comparison. --- lisp/ChangeLog | 6 ++++++ lisp/info.el | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c70ccb0d7ff..6347844b6ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-08-08 Thien-Thi Nguyen + + * info.el (Info-dir-remove-duplicates): Avoid case folding + in loop; instead, keep downcased strings for comparison. + Suggested by Helmut Eller. + 2005-08-07 Michael Albinus Sync with Tramp 2.0.50. diff --git a/lisp/info.el b/lisp/info.el index 78a9e8a08a2..b97ad624d2d 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1157,8 +1157,9 @@ a case-insensitive match is tried." (goto-char start) (while (re-search-forward "^* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)" limit 'move) - (let ((x (match-string 1))) - (if (member-ignore-case x seen) + ;; Fold case straight away; `member-ignore-case' here wasteful. + (let ((x (downcase (match-string 1)))) + (if (member x seen) (delete-region (match-beginning 0) (progn (re-search-forward "^[^ \t]" nil t) (match-beginning 0))) From aa41b0bf0ed597dd1adac28530a12872dbf9ac26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 8 Aug 2005 15:01:35 +0000 Subject: [PATCH 040/347] * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that should not be there, causing menu display errors in GTK 2.6.9. --- src/gtkutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gtkutil.c b/src/gtkutil.c index d8835c2b5fd..7f2e411b933 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2606,7 +2606,7 @@ xg_modify_menubar_widgets (menubar, f, val, deep_p, xg_update_menubar (menubar, f, &list, list, 0, val->contents, select_cb, highlight_cb, cl_data); - if (deep_p); + if (deep_p) { widget_value *cur; From 9346901076ec60827a70372faf5ba791423a3bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 8 Aug 2005 15:02:39 +0000 Subject: [PATCH 041/347] * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that should not be there, causing menu display errors with GTK 2.6.9. --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index e9ade1c6dfd..a35daab6728 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-08-08 Jan Dj,Ad(Brv + + * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that + should not be there, causing menu display errors with GTK 2.6.9. + 2005-08-07 Richard M. Stallman * floatfns.c (Fexpt): Undo previous change. From b3ff69c1c08e64f59b681bd3d28cc106a92b7a00 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 8 Aug 2005 17:50:20 +0000 Subject: [PATCH 042/347] Fix reference to ~/.emacs.d. --- etc/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index 71975e02e56..518c075c20f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1757,7 +1757,7 @@ This was actually done in Emacs-21.1, and was not documented. evaluate a Scheme expression but no Scheme subprocess is running. *** If a file `.emacs_NAME' (where NAME is the name of the Scheme interpreter) -exists in the user's home directory or in `user-emacs-directory', its +exists in the user's home directory or in ~/.emacs.d, its contents are sent to the Scheme subprocess upon startup. *** There are new commands to instruct the Scheme interpreter to trace From 28a205fe6dbda9b80840078b481c9e695e7441dd Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 8 Aug 2005 17:53:51 +0000 Subject: [PATCH 043/347] (scheme-start-file): Replace reference to `user-emacs-directory' by "~/.emacs.d/". --- lisp/cmuscheme.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index ff59304874d..19088e6b070 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -272,7 +272,7 @@ order. Return nil if no start file found." (start-file (concat "~/" name))) (if (file-exists-p start-file) start-file - (let ((start-file (concat user-emacs-directory name))) + (let ((start-file (concat "~/.emacs.d/" name))) (and (file-exists-p start-file) start-file))))) (defun scheme-send-region (start end) @@ -349,7 +349,7 @@ With a prefix argument switch off tracing of procedure PROC." (when (= (length proc) 0) (error "Invalid procedure name")) (comint-send-string (scheme-proc) - (format + (format (if untrace scheme-untrace-command scheme-trace-command) proc)) (comint-send-string (scheme-proc) "\n")) @@ -367,10 +367,10 @@ For Scheme 48 and Scsh use \",expand %s\"." (if current-form (progn (comint-send-string (scheme-proc) - (format + (format scheme-macro-expand-command current-form)) - (comint-send-string (scheme-proc) "\n")) + (comint-send-string (scheme-proc) "\n")) (error "Not at a form")))) (defun scheme-form-at-point () @@ -506,7 +506,7 @@ for a minimal, simple implementation. Feel free to extend it.") "Return the current Scheme process, starting one if necessary. See variable `scheme-buffer'." (unless (and scheme-buffer - (get-buffer scheme-buffer) + (get-buffer scheme-buffer) (comint-check-proc scheme-buffer)) (scheme-interactively-start-process)) (or (scheme-get-process) From c59e5c82c87b44f04c79b0a747ab1d0543558cdb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 8 Aug 2005 18:00:19 +0000 Subject: [PATCH 044/347] (inferior-scheme-mode-hook, inferior-scheme-mode, scheme-prev-l/c-dir/file): Fix typos in docstrings. --- lisp/cmuscheme.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el index 19088e6b070..82d39fd2c00 100644 --- a/lisp/cmuscheme.el +++ b/lisp/cmuscheme.el @@ -26,7 +26,7 @@ ;;; Commentary: -;; This is a customisation of comint-mode (see comint.el) +;; This is a customization of comint-mode (see comint.el) ;; ;; Written by Olin Shivers (olin.shivers@cs.cmu.edu). With bits and pieces ;; lifted from scheme.el, shell.el, clisp.el, newclisp.el, cobol.el, et al.. @@ -106,7 +106,7 @@ ;;;============================================================================ (defcustom inferior-scheme-mode-hook nil - "*Hook for customising inferior-scheme mode." + "*Hook for customizing inferior-scheme mode." :type 'hook :group 'cmuscheme) @@ -172,7 +172,7 @@ The following commands are available: A Scheme process can be fired up with M-x run-scheme. -Customisation: Entry to this mode runs the hooks on comint-mode-hook and +Customization: Entry to this mode runs the hooks on comint-mode-hook and inferior-scheme-mode-hook (in that order). You can send text to the inferior Scheme process from other buffers containing @@ -201,7 +201,7 @@ C-M-q does Tab on each line starting within following expression. Paragraphs are separated only by blank lines. Semicolons start comments. If you accidentally suspend your process, use \\[comint-continue-subjob] to continue it." - ;; Customise in inferior-scheme-mode-hook + ;; Customize in inferior-scheme-mode-hook (setq comint-prompt-regexp "^[^>\n]*>+ *") ; OK for cscheme, oaklisp, T,... (scheme-mode-variables) (setq mode-line-process '(":%s")) @@ -432,8 +432,8 @@ Used by these commands to determine defaults." (defvar scheme-prev-l/c-dir/file nil "Caches the last (directory . file) pair. Caches the last pair used in the last `scheme-load-file' or -`scheme-compile-file' command. Used for determining the default in the -next one.") +`scheme-compile-file' command. Used for determining the default +in the next one.") (defun scheme-load-file (file-name) "Load a Scheme file FILE-NAME into the inferior Scheme process." @@ -525,7 +525,7 @@ command to run." (save-window-excursion (run-scheme (read-string "Run Scheme: " scheme-program-name)))) -;;; Do the user's customisation... +;;; Do the user's customization... (defcustom cmuscheme-load-hook nil "This hook is run when cmuscheme is loaded in. From 0c737c20507a1d5f8463b65b77f5bb69087a876f Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 8 Aug 2005 18:08:22 +0000 Subject: [PATCH 045/347] *** empty log message *** --- lisp/ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6347844b6ad..5dd36bd9319 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2005-08-08 Juanma Barranquero + + * cmuscheme.el (inferior-scheme-mode-hook, inferior-scheme-mode) + (scheme-prev-l/c-dir/file): Fix typos in docstrings. + +2005-08-08 Emilio C. Lopes + + * cmuscheme.el (scheme-start-file): Replace reference to + `user-emacs-directory' by "~/.emacs.d/". + 2005-08-08 Thien-Thi Nguyen * info.el (Info-dir-remove-duplicates): Avoid case folding From 98605c6f539f2ce5651b7f8c4333a4be95b3ce9a Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Mon, 8 Aug 2005 21:47:42 +0000 Subject: [PATCH 046/347] *** empty log message *** --- lisp/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5dd36bd9319..862a1d81288 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2005-08-08 Luc Teirlinck + + * cus-start.el (all): Add `overflow-newline-into-fringe'. + 2005-08-08 Juanma Barranquero * cmuscheme.el (inferior-scheme-mode-hook, inferior-scheme-mode) From 48d707c5cd3d7b7fb1ff5f80e35dcac926504b8a Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Mon, 8 Aug 2005 21:48:35 +0000 Subject: [PATCH 047/347] (all): Add `overflow-newline-into-fringe'. --- lisp/cus-start.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/cus-start.el b/lisp/cus-start.el index f9d7bc4730c..9d562a3ef3d 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -172,6 +172,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (mouse-highlight mouse (choice (const :tag "disabled" nil) (const :tag "always shown" t) (other :tag "hidden by keypress" 1))) + ;; fringe.c + (overflow-newline-into-fringe fringe boolean "22.1") ;; indent.c (indent-tabs-mode fill boolean) ;; keyboard.c From e3854e654976977f47ca45a018d9eaedb5ef02ac Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 00:56:37 +0000 Subject: [PATCH 048/347] No more contact with Henry Kautz. --- lisp/textmodes/refbib.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index 55e6b9db515..afea0c20c5e 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el @@ -3,6 +3,7 @@ ;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Henry Kautz +;; Maintainer: FSF ;; Keywords: bib, tex ;; This file is part of GNU Emacs. From 83047ee3fe97982bba066d6123a21b41e35edde0 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:51:22 +0000 Subject: [PATCH 049/347] (while-no-input): Return t if there is input. --- lisp/subr.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/subr.el b/lisp/subr.el index 4704dd1e99e..f97a2e40f71 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1833,14 +1833,14 @@ is allowed once again." (defmacro while-no-input (&rest body) "Execute BODY only as long as there's no pending input. If input arrives, that ends the execution of BODY, -and `while-no-input' returns nil. If BODY finishes, -`while-no-input' returns whatever value BODY produced." +and `while-no-input' returns t. Quitting makes it return nil. +If BODY finishes, `while-no-input' returns whatever value BODY produced." (declare (debug t) (indent 0)) (let ((catch-sym (make-symbol "input"))) `(with-local-quit (catch ',catch-sym (let ((throw-on-input ',catch-sym)) - (when (sit-for 0 0 t) + (or (not (sit-for 0 0 t)) ,@body)))))) (defmacro combine-after-change-calls (&rest body) From 9a84ddd8b5e7d6c646a8defd9b3a54a83e9ca76e Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:51:55 +0000 Subject: [PATCH 050/347] (icomplete-exhibit): Adapt to new while-no-input calling convention. --- lisp/icomplete.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/icomplete.el b/lisp/icomplete.el index bbfb817064d..085c111d856 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -243,13 +243,15 @@ and `minibuffer-setup-hook'." ;; embarking on computing completions: (sit-for icomplete-compute-delay))) (let ((text (while-no-input - (icomplete-completions - (field-string) - minibuffer-completion-table - minibuffer-completion-predicate - (not minibuffer-completion-confirm)))) + (list + (icomplete-completions + (field-string) + minibuffer-completion-table + minibuffer-completion-predicate + (not minibuffer-completion-confirm))))) (buffer-undo-list t)) - (if text (insert text))))))) + ;; Do nothing if while-no-input was aborted. + (if (consp text) (insert (car text)))))))) ;;;_ > icomplete-completions (name candidates predicate require-match) (defun icomplete-completions (name candidates predicate require-match) From 0bf41002b4961675f3947920fef1de09e151a46a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:52:15 +0000 Subject: [PATCH 051/347] (xml-att-def-re): Add defvar. --- lisp/xml.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/xml.el b/lisp/xml.el index 90ba5baf9b8..5fdb6f33b18 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -185,6 +185,7 @@ If PARSE-NS is non-nil, then QNAMES are expanded." (defvar xml-name-re) (defvar xml-entity-value-re) +(defvar xml-att-def-re) (let* ((start-chars (concat "[:alpha:]:_")) (name-chars (concat "-[:digit:]." start-chars)) ;;[3] S ::= (#x20 | #x9 | #xD | #xA)+ From d3c1cf729fa76099983df6dd72734a08f9692535 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:52:39 +0000 Subject: [PATCH 052/347] (Info-insert-dir): Use insert-buffer-substring. --- lisp/info.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/info.el b/lisp/info.el index b97ad624d2d..4fdae4b6321 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1028,7 +1028,7 @@ a case-insensitive match is tried." ;; Insert the entire original dir file as a start; note that we've ;; already saved its default directory to use as the default ;; directory for the whole concatenation. - (insert-buffer buffer) + (insert-buffer-substring buffer) ;; Look at each of the other buffers one by one. (dolist (other others) From af4210a7e9aa050971e20c745d77ac3a18c73967 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:53:00 +0000 Subject: [PATCH 053/347] (ada-procedure-start-regexp, ada-package-start-regexp): Add defvars. --- lisp/find-file.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/find-file.el b/lisp/find-file.el index b66a5f6de02..db03adce29f 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el @@ -944,6 +944,9 @@ and the name of the file passed in." ;; bind with (setq ff-pre-load-hook 'ff-which-function-are-we-in) ;; +(defvar ada-procedure-start-regexp) +(defvar ada-package-start-regexp) + (defun ff-which-function-are-we-in () "Return the name of the function whose definition/declaration point is in. Also remember that name in `ff-function-name'." From 9890a22957398e465a918d07d37904bccf69138a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:53:19 +0000 Subject: [PATCH 054/347] (gnus-summary-buffer, gnus-article-buffer): Add defvars. --- lisp/ffap.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/ffap.el b/lisp/ffap.el index 283f05641ba..d408918558a 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -1712,6 +1712,9 @@ Only intended for interactive use." (local-set-key "\M-l" 'ffap-gnus-next) (local-set-key "\M-m" 'ffap-gnus-menu)) +(defvar gnus-summary-buffer) +(defvar gnus-article-buffer) + (defun ffap-gnus-wrapper (form) ; used by both commands below (and (eq (current-buffer) (get-buffer gnus-summary-buffer)) (gnus-summary-select-article)) ; get article of current line From 784f861953ad50be90c71c6fe8fdeeb34a0ee969 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:53:39 +0000 Subject: [PATCH 055/347] (Helper-return-blurb): Add defvar. --- lisp/ebuff-menu.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index ec5db828a6b..2ee90192ea3 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -126,6 +126,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. (recenter -1)))) (electric-buffer-update-highlight)) +(defvar Helper-return-blurb) + (put 'Electric-buffer-menu-mode 'mode-class 'special) (defun Electric-buffer-menu-mode () "Major mode for editing a list of buffers. From 603715b0614809501af80a8888cf4f3c90f3e97d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:53:54 +0000 Subject: [PATCH 056/347] (c-mode-map, fortran-mode-map): Add defvars. --- lisp/completion.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/completion.el b/lisp/completion.el index ddc556f693b..4b0f6cac9a6 100644 --- a/lisp/completion.el +++ b/lisp/completion.el @@ -2348,6 +2348,9 @@ TYPE is the type of the wrapper to be added. Can be :before or :under." 'use-completion-under-or-before-point))) ;; C mode diffs. + +(defvar c-mode-map) + (defun completion-c-mode-hook () (def-completion-wrapper electric-c-semi :separator) (define-key c-mode-map "+" 'completion-separator-self-insert-command) @@ -2359,6 +2362,9 @@ TYPE is the type of the wrapper to be added. Can be :before or :under." (add-hook 'c-mode-hook 'completion-c-mode-hook)) ;; FORTRAN mode diffs. (these are defined when fortran is called) + +(defvar fortran-mode-map) + (defun completion-setup-fortran-mode () (define-key fortran-mode-map "+" 'completion-separator-self-insert-command) (define-key fortran-mode-map "-" 'completion-separator-self-insert-command) From 08dcfdf600a6bde303f264938b39204d4830a0f6 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:54:39 +0000 Subject: [PATCH 057/347] (Info-current-file): Add defvar. (bookmark-jump-noselect): Use with-no-warnings. --- lisp/bookmark.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 4ec78468beb..da8a4e2b809 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -993,6 +993,8 @@ In Info, return the current node." (insert string))) +(defvar Info-current-file) + (defun bookmark-buffer-file-name () "Return the current buffer's file in a way useful for bookmarks. For example, if this is a Info buffer, return the Info file's name." @@ -1102,7 +1104,8 @@ be retrieved from a VC backend, else return nil." ;; Info nodes must be visited with care. (progn (require 'info) - (Info-find-node file info-node)) + (with-no-warnings + (Info-find-node file info-node))) ;; Else no Info. Can do an ordinary find-file: (set-buffer (find-file-noselect file)) (goto-char place)) From f373470debdd17410474b52b177941a569b64794 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:55:00 +0000 Subject: [PATCH 058/347] (auto-revert-tail-mode): Use make-local-variable, not make-variable-buffer-local. --- lisp/autorevert.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/autorevert.el b/lisp/autorevert.el index ec21488c6d4..9892dca2d41 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -340,7 +340,7 @@ Use `auto-revert-mode' for changes other than appends!" ;; else we might reappend our own end when we save (add-hook 'before-save-hook (lambda () (auto-revert-tail-mode 0)) nil t) (or (local-variable-p 'auto-revert-tail-pos) ; don't lose prior position - (set (make-variable-buffer-local 'auto-revert-tail-pos) + (set (make-local-variable 'auto-revert-tail-pos) (save-restriction (widen) (1- (point-max))))) ;; let auto-revert-mode set up the mechanism for us if it isn't already (or auto-revert-mode From c8f0dac9e369d3371c2cb82a98f8cc6cc0b6e306 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:55:25 +0000 Subject: [PATCH 059/347] (ansi-color-make-extent, ansi-color-set-extent-face): Use fboundp, not functionp. --- lisp/ansi-color.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 94b6b81e031..c329bab5788 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -486,7 +486,7 @@ For XEmacs, we create a temporary face and return it." OBJECT defaults to the current buffer. XEmacs uses `make-extent', Emacs uses `make-overlay'. XEmacs can use a buffer or a string for OBJECT, Emacs requires OBJECT to be a buffer." - (if (functionp 'make-extent) + (if (fboundp 'make-extent) (make-extent from to object) ;; In Emacs, the overlay might end at the process-mark in comint ;; buffers. In that case, new text will be inserted before the @@ -511,7 +511,7 @@ property." (defun ansi-color-set-extent-face (extent face) "Set the `face' property of EXTENT to FACE. XEmacs uses `set-extent-face', Emacs uses `overlay-put'." - (if (functionp 'set-extent-face) + (if (fboundp 'set-extent-face) (set-extent-face extent face) (overlay-put extent 'face face))) From 300ee850a481a5d80c33bc433f4f0865461f71b6 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:55:43 +0000 Subject: [PATCH 060/347] (ada-prj-display-page): Use with-no-warnings. --- lisp/progmodes/ada-prj.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el index d9bfb891ee3..91adf1ed187 100644 --- a/lisp/progmodes/ada-prj.el +++ b/lisp/progmodes/ada-prj.el @@ -477,7 +477,8 @@ connect to the target when working with cross-environments" t) (widget-insert "\n\n") (widget-setup) - (beginning-of-buffer) + (with-no-warnings + (beginning-of-buffer)) ) From 47ef2dea2700fd9c90b7de48b73921b75c476a43 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:56:24 +0000 Subject: [PATCH 061/347] (gametree-mode): Use make-local-variable, not make-variable-buffer-local. --- lisp/play/gametree.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el index b2e9fb9f971..9e80024c90b 100644 --- a/lisp/play/gametree.el +++ b/lisp/play/gametree.el @@ -574,9 +574,9 @@ Useful to postal and email chess (and, it is hoped, also checkers, go, shogi, etc.) players, it is a slightly modified version of Outline mode. \\{gametree-mode-map}" -(auto-fill-mode 0) -(make-variable-buffer-local 'write-contents-hooks) -(add-hook 'write-contents-hooks 'gametree-save-and-hack-layout)) + (auto-fill-mode 0) + (make-local-variable 'write-contents-hooks) + (add-hook 'write-contents-hooks 'gametree-save-and-hack-layout)) ;;;; Key bindings From 5daebfbb6986a35b41ee3e6d7680572d70655088 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:56:45 +0000 Subject: [PATCH 062/347] (run-dig): Renamed from `dig'. --- lisp/net/net-utils.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index 042dce66aa3..043c18fc0df 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -461,7 +461,7 @@ If your system's ping continues until interrupted, you can try setting ))) ;;;###autoload -(defun dig (host) +(defun run-dig (host) "Run dig program." (interactive (list From 134c6d58a9effc5322f9f3fe51e9e1a5bfac7185 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:57:09 +0000 Subject: [PATCH 063/347] (reporter-dump-state): Use insert-buffer-substring. --- lisp/mail/reporter.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el index 9e3a2d1a871..058d0a83f23 100644 --- a/lisp/mail/reporter.el +++ b/lisp/mail/reporter.el @@ -264,7 +264,7 @@ dumped." varlist) (lisp-indent-line) (insert ")\n")) - (insert-buffer elbuf)) + (insert-buffer-substring elbuf)) (error (insert "State could not be dumped due to the following error:\n\n" (format "%s" fault) From c7c93bd96e9eac1b18353c87cbe039f118a3c908 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:57:30 +0000 Subject: [PATCH 064/347] (mail-yank-original): Use with-no-warnings. --- lisp/mail/sendmail.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 08568df93c2..f2dec757520 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1432,7 +1432,9 @@ and don't delete any header fields." ;; delete that window to save screen space. ;; t means don't alter other frames. (delete-windows-on original t) - (insert-buffer original) + (with-no-warnings + ;; We really want this to set mark. + (insert-buffer original)) (set-text-properties (point) (mark t) nil)) (if (consp arg) nil From 67d28657d0544b0ecca810ec958c3e0ef701b064 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:57:57 +0000 Subject: [PATCH 065/347] (lucid-menubar-map, lucid-failing-menubar) (recompute-lucid-menubar): Add defvars. --- lisp/emacs-lisp/lmenu.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el index 168d6fde1f4..68d3a3de9a9 100644 --- a/lisp/emacs-lisp/lmenu.el +++ b/lisp/emacs-lisp/lmenu.el @@ -32,8 +32,10 @@ ;; Arrange to use current-menubar to set up part of the menu bar. (defvar current-menubar) +(defvar lucid-menubar-map) +(defvar lucid-failing-menubar) -(setq recompute-lucid-menubar 'recompute-lucid-menubar) +(defvar recompute-lucid-menubar 'recompute-lucid-menubar) (defun recompute-lucid-menubar () (define-key lucid-menubar-map [menu-bar] (condition-case nil From 48b194fdd2212661a1e9879881a6accd9f4c508d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 02:59:34 +0000 Subject: [PATCH 066/347] *** empty log message *** --- etc/TODO | 3 +++ lisp/ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/etc/TODO b/etc/TODO index 6949a1818c9..e9540c2b6ba 100644 --- a/etc/TODO +++ b/etc/TODO @@ -273,6 +273,9 @@ to the FSF. ** Provide portable undumping using mmap (per gerd design). +** Make byte-compile avoid binding an expanded defsubst's args +when the body only calls primitives. + ** Use the XIE X extension, if available, for image display. ** Make monochrome images display using the foreground and background diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 862a1d81288..758b4e37a64 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,46 @@ +2005-08-08 Richard M. Stallman + + * emacs-lisp/lmenu.el (lucid-menubar-map, lucid-failing-menubar) + (recompute-lucid-menubar): Add defvars. + + * mail/sendmail.el (mail-yank-original): Use with-no-warnings. + + * mail/reporter.el (reporter-dump-state): Use insert-buffer-substring. + + * net/net-utils.el (run-dig): Renamed from `dig'. + + * play/gametree.el (gametree-mode): Use make-local-variable, + not make-variable-buffer-local. + + * progmodes/ada-prj.el (ada-prj-display-page): Use with-no-warnings. + + * ansi-color.el (ansi-color-make-extent) + (ansi-color-set-extent-face): Use fboundp, not functionp. + + * autorevert.el (auto-revert-tail-mode): Use make-local-variable, + not make-variable-buffer-local. + + * bookmark.el (Info-current-file): Add defvar. + (bookmark-jump-noselect): Use with-no-warnings. + + * completion.el (c-mode-map, fortran-mode-map): Add defvars. + + * ebuff-menu.el (Helper-return-blurb): Add defvar. + + * ffap.el (gnus-summary-buffer, gnus-article-buffer): Add defvars. + + * find-file.el (ada-procedure-start-regexp) + (ada-package-start-regexp): Add defvars. + + * info.el (Info-insert-dir): Use insert-buffer-substring. + + * xml.el (xml-att-def-re): Add defvar. + + * icomplete.el (icomplete-exhibit): Adapt to new while-no-input + calling convention. + + * subr.el (while-no-input): Return t if there is input. + 2005-08-08 Luc Teirlinck * cus-start.el (all): Add `overflow-newline-into-fringe'. From 5a9807a8bda5980633db765300dad40ee3aed2c6 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Tue, 9 Aug 2005 07:37:25 +0000 Subject: [PATCH 067/347] (Fexpt): Use floats for negative exponent. --- src/ChangeLog | 4 ++++ src/floatfns.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a35daab6728..256b720eace 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-08-09 Thien-Thi Nguyen + + * floatfns.c (Fexpt): Use floats for negative exponent. + 2005-08-08 Jan Dj,Ad(Brv * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that diff --git a/src/floatfns.c b/src/floatfns.c index 57bece2708b..79574e0a69b 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -461,7 +461,8 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg1); CHECK_NUMBER_OR_FLOAT (arg2); if (INTEGERP (arg1) /* common lisp spec */ - && INTEGERP (arg2)) /* don't promote, if both are ints */ + && INTEGERP (arg2) /* don't promote, if both are ints, and */ + && 0 <= XINT (arg2)) /* we are sure the result is not fractional */ { /* this can be improved by pre-calculating */ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; From 185cff95450bac41a0e590d558c7be152e732790 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 08:43:02 +0000 Subject: [PATCH 068/347] Replace `info' with upper-case `Info' where appropriate. (info-title-1, info-title-2, info-title-3, info-title-4) (info-menu-header): Move up face definitions. (info-menu-star): Rename from `info-menu-5'. (Info-fontify-node): Replace `info-menu-5' with `info-menu-star'. (Info-fontify-visited-nodes): Fix docstring. (Info-hide-note-references): Fix docstring. (Info-up, Info-next-reference, Info-prev-reference): Put cursor on menu items in the same way as on cross-references. (info-apropos): Fix sorting order and formatting to be like in the stand-alone Info browser. Display error messages for 1 sec. (Info-mode-map): Move down `c' key binding. Bind `^' to `Info-up'. (Info-mode-menu): Remove item for `Info-search-case-sensitively' from the menu bar. (Info-insert-dir): Restore point after calling `insert-buffer-substring'. --- lisp/info.el | 211 +++++++++++++++++++++++++++------------------------ 1 file changed, 111 insertions(+), 100 deletions(-) diff --git a/lisp/info.el b/lisp/info.el index 4fdae4b6321..2d03190b606 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -25,7 +25,7 @@ ;;; Commentary: -;; Note that nowadays we expect info files to be made using makeinfo. +;; Note that nowadays we expect Info files to be made using makeinfo. ;; In particular we make these assumptions: ;; - a menu item MAY contain colons but not colon-space ": " ;; - a menu item ending with ": " (but not ":: ") is an index entry @@ -44,20 +44,20 @@ (defvar Info-history nil - "Stack of info nodes user has visited. + "Stack of Info nodes user has visited. Each element of the stack is a list (FILENAME NODENAME BUFFERPOS).") (defvar Info-history-forward nil - "Stack of info nodes user has visited with `Info-history-back' command. + "Stack of Info nodes user has visited with `Info-history-back' command. Each element of the stack is a list (FILENAME NODENAME BUFFERPOS).") (defvar Info-history-list nil - "List of all info nodes user has visited. + "List of all Info nodes user has visited. Each element of the list is a list (FILENAME NODENAME).") (defcustom Info-enable-edit nil "*Non-nil means the \\\\[Info-edit] command in Info can edit the current node. -This is convenient if you want to write info files by hand. +This is convenient if you want to write Info files by hand. However, we recommend that you not do this. It is better to write a Texinfo file and generate the Info file from that, because that gives you a printed manual as well." @@ -76,11 +76,57 @@ The Lisp code is executed when the node is selected.") "Face for Info node names." :group 'info) -(defface info-menu-5 +(defface info-title-1 + '((((type tty pc) (class color) (background light)) + :foreground "green" :weight bold) + (((type tty pc) (class color) (background dark)) + :foreground "yellow" :weight bold) + (t :height 1.2 :inherit info-title-2)) + "Face for info titles at level 1." + :group 'info) +;; backward-compatibility alias +(put 'Info-title-1-face 'face-alias 'info-title-1) + +(defface info-title-2 + '((((type tty pc) (class color)) :foreground "lightblue" :weight bold) + (t :height 1.2 :inherit info-title-3)) + "Face for info titles at level 2." + :group 'info) +;; backward-compatibility alias +(put 'Info-title-2-face 'face-alias 'info-title-2) + +(defface info-title-3 + '((((type tty pc) (class color)) :weight bold) + (t :height 1.2 :inherit info-title-4)) + "Face for info titles at level 3." + :group 'info) +;; backward-compatibility alias +(put 'Info-title-3-face 'face-alias 'info-title-3) + +(defface info-title-4 + '((((type tty pc) (class color)) :weight bold) + (t :weight bold :inherit variable-pitch)) + "Face for info titles at level 4." + :group 'info) +;; backward-compatibility alias +(put 'Info-title-4-face 'face-alias 'info-title-4) + +(defface info-menu-header + '((((type tty pc)) + :underline t + :weight bold) + (t + :inherit variable-pitch + :weight bold)) + "Face for headers in Info menus." + :group 'info) + +(defface info-menu-star '((((class color)) :foreground "red1") (t :underline t)) "Face for every third `*' in an Info menu." :group 'info) +(put 'info-menu-5 'face-alias 'info-menu-star) (defface info-xref '((((min-colors 88) @@ -101,7 +147,7 @@ The Lisp code is executed when the node is selected.") :group 'info) (defcustom Info-fontify-visited-nodes t - "*Non-nil means to fontify visited nodes in a different face." + "*Non-nil to fontify references to visited nodes in `info-xref-visited' face." :version "22.1" :type 'boolean :group 'info) @@ -165,6 +211,7 @@ These directories are searched after those in `Info-directory-list'." (defcustom Info-scroll-prefer-subnodes nil "*If non-nil, \\\\[Info-scroll-up] in a menu visits subnodes. + If this is non-nil, and you scroll far enough in a node that its menu appears on the screen, the next \\\\[Info-scroll-up] moves to a subnode indicated by the following menu item. This means @@ -180,7 +227,8 @@ when you hit the end of the current node." (defcustom Info-hide-note-references t "*If non-nil, hide the tag and section reference in *note and * menu items. If value is non-nil but not `hide', also replaces the \"*note\" with \"see\". -If value is non-nil but not t or `hide', the reference section is still shown." +If value is non-nil but not t or `hide', the reference section is still shown. +`nil' completely disables this feature." :version "22.1" :type '(choice (const :tag "No hiding" nil) (const :tag "Replace tag and hide reference" t) @@ -190,7 +238,7 @@ If value is non-nil but not t or `hide', the reference section is still shown." (defcustom Info-refill-paragraphs nil "*If non-nil, attempt to refill paragraphs with hidden references. -This refilling may accidentally remove explicit line breaks in the info +This refilling may accidentally remove explicit line breaks in the Info file, so be prepared for a few surprises if you enable this feature." :version "22.1" :type 'boolean @@ -247,7 +295,7 @@ Can also be t when using `Info-on-current-buffer'.") (defvar Info-current-subfile nil "Info subfile that is actually in the *info* buffer now. -nil if current info file is not split into subfiles.") +nil if current Info file is not split into subfiles.") (defvar Info-current-node nil "Name of node that Info is now looking at, or nil.") @@ -357,7 +405,7 @@ be last in the list.") (not (file-directory-p filename)))) (defun info-insert-file-contents (filename &optional visit) - "Insert the contents of an info file in the current buffer. + "Insert the contents of an Info file in the current buffer. Do the right thing if the file has been compressed or zipped." (let* ((tail Info-suffix-list) (lfn (if (fboundp 'msdos-long-file-names) @@ -632,12 +680,12 @@ just return nil (no error)." filename))) (defun Info-find-node (filename nodename &optional no-going-back) - "Go to an info node specified as separate FILENAME and NODENAME. + "Go to an Info node specified as separate FILENAME and NODENAME. NO-GOING-BACK is non-nil if recovering from an error in this function; it says do not attempt further (recursive) error recovery." (info-initialize) (setq filename (Info-find-file filename)) - ;; Go into info buffer. + ;; Go into Info buffer. (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*")) ;; Record the node we are leaving. (if (and Info-current-file (not no-going-back)) @@ -647,7 +695,7 @@ it says do not attempt further (recursive) error recovery." (Info-find-node-2 filename nodename no-going-back)) (defun Info-on-current-buffer (&optional nodename) - "Use the `Info-mode' to browse the current info buffer. + "Use the `Info-mode' to browse the current Info buffer. If a prefix arg is provided, it queries for the NODENAME which else defaults to \"Top\"." (interactive @@ -665,7 +713,7 @@ else defaults to \"Top\"." ;; makeinfo-buffer) out of the way of normal operations. ;; (defun Info-revert-find-node (filename nodename) - "Go to an info node FILENAME and NODENAME, re-reading disk contents. + "Go to an Info node FILENAME and NODENAME, re-reading disk contents. When *info* is already displaying FILENAME and NODENAME, the window position is preserved, if possible." (pop-to-buffer "*info*") @@ -1028,7 +1076,7 @@ a case-insensitive match is tried." ;; Insert the entire original dir file as a start; note that we've ;; already saved its default directory to use as the default ;; directory for the whole concatenation. - (insert-buffer-substring buffer) + (goto-char (prog1 (point) (insert-buffer-substring buffer))) ;; Look at each of the other buffers one by one. (dolist (other others) @@ -1287,7 +1335,7 @@ any double quotes or backslashes must be escaped (\\\",\\\\)." (set-buffer-modified-p nil))) (defun Info-select-node () - "Select the info node that point is in." + "Select the Info node that point is in." ;; Bind this in case the user sets it to nil. (let ((case-fold-search t)) (save-excursion @@ -1343,20 +1391,20 @@ any double quotes or backslashes must be escaped (\\\",\\\\)." ") " (or Info-current-node "")))))) -;; Go to an info node specified with a filename-and-nodename string +;; Go to an Info node specified with a filename-and-nodename string ;; of the sort that is found in pointers in nodes. ;; Don't autoload this function: the correct entry point for other packages ;; to use is `info'. --Stef ;; ;;;###autoload (defun Info-goto-node (nodename &optional fork) - "Go to info node named NODENAME. Give just NODENAME or (FILENAME)NODENAME. + "Go to Info node named NODENAME. Give just NODENAME or (FILENAME)NODENAME. If NODENAME is of the form (FILENAME)NODENAME, the node is in the Info file FILENAME; otherwise, NODENAME should be in the current Info file (or one of its sub-files). Completion is available, but only for node names in the current Info file. If FORK is non-nil (interactively with a prefix arg), show the node in -a new info buffer. +a new Info buffer. If FORK is a string, it is the name to use for the new buffer." (interactive (list (Info-read-node-name "Go to node: ") current-prefix-arg)) (info-initialize) @@ -1402,7 +1450,7 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)." ;; include it. (and (or (null (file-name-extension file)) (string-match suffix file)) - ;; But exclude subfiles of split info files. + ;; But exclude subfiles of split Info files. (not (string-match "-[0-9]+\\'" file)) ;; And exclude backup files. (not (string-match "~\\'" file)) @@ -1822,7 +1870,7 @@ If SAME-FILE is non-nil, do not move to a different Info file." (concat "\n\\* +\\(" (regexp-quote old-node) ":\\|[^:]+: +" (regexp-quote old-node) "\\)")) nil t)) - (beginning-of-line) + (progn (beginning-of-line) (if (looking-at "^\\* ") (forward-char 2))) (goto-char p) (Info-restore-point Info-history)))) @@ -2011,7 +2059,7 @@ Table of contents is created from the tree structure of menus." "Follow cross reference named FOOTNOTENAME to the node it refers to. FOOTNOTENAME may be an abbreviation of the reference name. If FORK is non-nil (interactively with a prefix arg), show the node in -a new info buffer. If FORK is a string, it is the name to use for the +a new Info buffer. If FORK is a string, it is the name to use for the new buffer." (interactive (let ((completion-ignore-case t) @@ -2222,7 +2270,7 @@ Because of ambiguities, this should be concatenated with something like The menu item should one of those listed in the current node's menu. Completion is allowed, and the default menu item is the one point is on. If FORK is non-nil (interactively with a prefix arg), show the node in -a new info buffer. If FORK is a string, it is the name to use for the +a new Info buffer. If FORK is a string, it is the name to use for the new buffer." (interactive (let ((completions '()) @@ -2547,7 +2595,9 @@ parent node." (if (looking-at "\\* Menu:") (if recur (error "No cross references in this node") - (Info-next-reference t))))) + (Info-next-reference t)) + (if (looking-at "^\\* ") + (forward-char 2))))) (defun Info-prev-reference (&optional recur) "Move cursor to the previous cross-reference or menu item in the node." @@ -2566,7 +2616,9 @@ parent node." (if (looking-at "\\* Menu:") (if recur (error "No cross references in this node") - (Info-prev-reference t))))) + (Info-prev-reference t)) + (if (looking-at "^\\* ") + (forward-char 2))))) (defvar Info-index-nodes nil "Alist of cached index node names of visited Info files. @@ -2800,25 +2852,29 @@ Build a menu of the possible matches." (goto-char (point-min)) (re-search-forward "\\* Menu: *\n" nil t) (while (re-search-forward "\\*.*: *(\\([^)]+\\))" nil t) - (add-to-list 'manuals (match-string 1))) - (dolist (manual manuals) + (setq manuals (cons (match-string 1) manuals))) + (dolist (manual (nreverse manuals)) (message "Searching %s" manual) - (if (setq nodes (Info-index-nodes (Info-find-file manual))) - (condition-case nil + (condition-case err + (if (setq nodes (Info-index-nodes (Info-find-file manual))) (save-excursion (Info-find-node manual (car nodes)) (while (progn (goto-char (point-min)) (while (re-search-forward pattern nil t) - (add-to-list 'matches - (list manual - (match-string-no-properties 1) - (match-string-no-properties 2) - (match-string-no-properties 3)))) + (setq matches + (cons (list manual + (match-string-no-properties 1) + (match-string-no-properties 2) + (match-string-no-properties 3)) + matches))) (setq nodes (cdr nodes) node (car nodes))) - (Info-goto-node node))) - (error nil))))) + (Info-goto-node node)))) + (error + (message "%s" (if (eq (car-safe err) 'error) + (nth 1 err) err)) + (sit-for 1 t))))) (Info-goto-node (concat "(" current-file ")" current-node)) (setq Info-history ohist Info-history-list ohist-list) @@ -2828,8 +2884,8 @@ Build a menu of the possible matches." (with-current-buffer (get-buffer-create " *info-apropos*") (erase-buffer) (insert "\n\^_\nFile: apropos, Node: Index, Up: (dir)\n") - (insert "* Menu: \nNodes whose indices contain \"" string "\"\n\n") - (dolist (entry matches) + (insert "* Menu: \nNodes whose indices contain `" string "':\n\n") + (dolist (entry (nreverse matches)) (insert (format "* %-38s (%s)%s.%s\n" (concat (nth 1 entry) " [" (nth 0 entry) "]:") @@ -3002,7 +3058,6 @@ if point is in a menu item description, follow that menu item." (define-key Info-mode-map "<" 'Info-top-node) (define-key Info-mode-map ">" 'Info-final-node) (define-key Info-mode-map "b" 'beginning-of-buffer) - (define-key Info-mode-map "c" 'Info-copy-current-node-name) (define-key Info-mode-map "d" 'Info-directory) (define-key Info-mode-map "e" 'Info-edit) (define-key Info-mode-map "f" 'Info-follow-reference) @@ -3024,8 +3079,11 @@ if point is in a menu item description, follow that menu item." (define-key Info-mode-map "t" 'Info-top-node) (define-key Info-mode-map "T" 'Info-toc) (define-key Info-mode-map "u" 'Info-up) - ;; For consistency with dired-copy-filename-as-kill. + ;; `w' for consistency with `dired-copy-filename-as-kill'. (define-key Info-mode-map "w" 'Info-copy-current-node-name) + (define-key Info-mode-map "c" 'Info-copy-current-node-name) + ;; `^' for consistency with `dired-up-directory'. + (define-key Info-mode-map "^" 'Info-up) (define-key Info-mode-map "," 'Info-index-next) (define-key Info-mode-map "\177" 'Info-scroll-down) (define-key Info-mode-map [mouse-2] 'Info-mouse-follow-nearest-node) @@ -3040,7 +3098,7 @@ if point is in a menu item description, follow that menu item." (easy-menu-define Info-mode-menu Info-mode-map - "Menu for info files." + "Menu for Info files." '("Info" ["Up" Info-up :active (Info-check-pointer "up") :help "Go up in the Info tree"] @@ -3062,8 +3120,6 @@ if point is in a menu item description, follow that menu item." ("Reference" ["You should never see this" report-emacs-bug t]) ["Search..." Info-search :help "Search for regular expression in this Info file"] - ["Search Case-Sensitively..." Info-search-case-sensitively - :help "Search for regular expression case sensitively"] ["Search Next" Info-search-next :help "Search for another occurrence of regular expression"] ["Go to Node..." Info-goto-node @@ -3175,12 +3231,12 @@ if point is in a menu item description, follow that menu item." (defun Info-copy-current-node-name (&optional arg) - "Put the name of the current info node into the kill ring. -The name of the info file is prepended to the node name in parentheses. + "Put the name of the current Info node into the kill ring. +The name of the Info file is prepended to the node name in parentheses. With a zero prefix arg, put the name inside a function call to `info'." (interactive "P") (unless Info-current-node - (error "No current info node")) + (error "No current Info node")) (let ((node (concat "(" (file-name-nondirectory (or (and (stringp Info-current-file) Info-current-file) @@ -3246,7 +3302,7 @@ Moving within a node: \\[beginning-of-buffer] Go to beginning of node. Advanced commands: -\\[Info-copy-current-node-name] Put name of current info node in the kill ring. +\\[Info-copy-current-node-name] Put name of current Info node in the kill ring. \\[clone-buffer] Select a new cloned Info buffer in another window. \\[Info-edit] Edit contents of selected node. 1 .. 9 Pick first ... ninth item in node's menu. @@ -3356,7 +3412,7 @@ which returns to Info mode for browsing. Allowed only if variable `Info-enable-edit' is non-nil." (interactive) (or Info-enable-edit - (error "Editing info nodes is not enabled")) + (error "Editing Info nodes is not enabled")) (Info-edit-mode) (message "%s" (substitute-command-keys "Editing: Type \\\\[Info-cease-edit] to return to info"))) @@ -3418,7 +3474,7 @@ in the first element of the returned list (which is treated specially in "\\( <[0-9]+>\\)?:\\s *\\(.*\\)\\." "\\(?:[ \t\n]+(line +\\([0-9]+\\))\\)?")) (info-file "emacs")) ;default - ;; Determine which info file this command is documented in. + ;; Determine which Info file this command is documented in. (if (get command 'info-file) (setq info-file (get command 'info-file)) ;; If it doesn't say explicitly, test its name against @@ -3527,51 +3583,6 @@ the variable `Info-file-list-for-emacs'." (t (Info-goto-emacs-command-node command))))) -(defface info-title-1 - '((((type tty pc) (class color) (background light)) - :foreground "green" :weight bold) - (((type tty pc) (class color) (background dark)) - :foreground "yellow" :weight bold) - (t :height 1.2 :inherit info-title-2)) - "Face for info titles at level 1." - :group 'info) -;; backward-compatibility alias -(put 'Info-title-1-face 'face-alias 'info-title-1) - -(defface info-title-2 - '((((type tty pc) (class color)) :foreground "lightblue" :weight bold) - (t :height 1.2 :inherit info-title-3)) - "Face for info titles at level 2." - :group 'info) -;; backward-compatibility alias -(put 'Info-title-2-face 'face-alias 'info-title-2) - -(defface info-title-3 - '((((type tty pc) (class color)) :weight bold) - (t :height 1.2 :inherit info-title-4)) - "Face for info titles at level 3." - :group 'info) -;; backward-compatibility alias -(put 'Info-title-3-face 'face-alias 'info-title-3) - -(defface info-title-4 - '((((type tty pc) (class color)) :weight bold) - (t :weight bold :inherit variable-pitch)) - "Face for info titles at level 4." - :group 'info) -;; backward-compatibility alias -(put 'Info-title-4-face 'face-alias 'info-title-4) - -(defface info-menu-header - '((((type tty pc)) - :underline t - :weight bold) - (t - :inherit variable-pitch - :weight bold)) - "Face for headers in Info menus." - :group 'info) - (defun Info-escape-percent (string) "Double all occurrences of `%' in STRING. @@ -3868,7 +3879,7 @@ Preserve text properties." (if (and (<= n 9) (zerop (% n 3))) ; visual aids to help with 1-9 keys (put-text-property (match-beginning 0) (1+ (match-beginning 0)) - 'font-lock-face 'info-menu-5))) + 'font-lock-face 'info-menu-star))) (when not-fontified-p (add-text-properties (match-beginning 1) (match-end 1) @@ -3962,7 +3973,7 @@ Preserve text properties." ;;; Speedbar support: ;; These functions permit speedbar to display the "tags" in the -;; current info node. +;; current Info node. (eval-when-compile (require 'speedbar)) (defvar Info-speedbar-key-map nil @@ -4004,7 +4015,7 @@ Preserve text properties." ;;; Info hierarchy display method ;;;###autoload (defun Info-speedbar-browser () - "Initialize speedbar to display an info node browser. + "Initialize speedbar to display an Info node browser. This will add a speedbar major display mode." (interactive) (require 'speedbar) @@ -4145,7 +4156,7 @@ BUFFER is the buffer speedbar is requesting buttons for." "^No `.*' in index$" "^No cross-reference named" "^No cross.references in this node$" - "^No current info node$" + "^No current Info node$" "^No menu in this node$" "^No more items in menu$" "^No more nodes$" @@ -4172,7 +4183,7 @@ BUFFER is the buffer speedbar is requesting buttons for." (defun Info-restore-desktop-buffer (desktop-buffer-file-name desktop-buffer-name desktop-buffer-misc) - "Restore an info buffer specified in a desktop file." + "Restore an Info buffer specified in a desktop file." (let ((first (nth 0 desktop-buffer-misc)) (second (nth 1 desktop-buffer-misc))) (when (and first second) From ab7cd850aa160ffd633070840a56e28408069823 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 08:44:41 +0000 Subject: [PATCH 069/347] (Help-P): Replace `Prev' with `Previous'. (Help-M, Help-Xref): Add S-TAB. (Help-FOO): Update `u' command. (Help-Xref): Move info about Mouse-2 from `Help-Int'. Update info about visibility of xref parts. (Help-Int): Fix `m' command. Rename `Info-last' to `Info-history-back'. Add `Info-history-forward'. (Advanced): Fix `g*' and `M-n' commands. (Info Search): Add `index-apropos' in stand-alone browser. Add isearch commands. (Emacs Info Variables): Remove `Info-fontify'. Add `Info-mode-hook'. Update face names. Add `Info-fontify-maximum-menu-size', `Info-fontify-visited-nodes', `Info-isearch-search'. --- man/info.texi | 169 +++++++++++++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 72 deletions(-) diff --git a/man/info.texi b/man/info.texi index e6c508b4b49..8ff66f1ee37 100644 --- a/man/info.texi +++ b/man/info.texi @@ -14,8 +14,8 @@ This file describes how to use Info, the on-line, menu-driven GNU documentation system. -Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. +Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -238,7 +238,7 @@ line says that this is node @samp{Help} in the file @file{info}. (look at it now) says that the @samp{Next} node after this one is the node called @samp{Help-P}. An advanced Info command lets you go to any node whose name you know. In the stand-alone Info reader program, -the header line shows the names of this node and the info file as +the header line shows the names of this node and the Info file as well. In Emacs, the header line is duplicated in a special typeface, and the duplicate remains at the top of the window all the time even if you scroll through the node. @@ -284,7 +284,7 @@ node, @samp{Help-^L}. If you read this in Emacs, you will see an @samp{Info} item in the menu bar, close to its right edge. Clicking the mouse on the @samp{Info} menu-bar item opens a menu of commands which include -@samp{Next} and @samp{Prev} (and also some others which you didn't yet +@samp{Next} and @samp{Previous} (and also some others which you didn't yet learn about). This all probably seems insultingly simple so far, but @emph{please @@ -671,10 +671,12 @@ mistake. Another way to move to the menu subtopic lines and between them is to type @key{TAB}. Each time you type a @key{TAB}, you move to the -next subtopic line. To move to a previous subtopic line, type -@kbd{M-@key{TAB}}---that is, press and hold the @key{META} key and then -press @key{TAB}. (On some keyboards, the @key{META} key might be labeled -@samp{Alt}.) +next subtopic line. To move to a previous subtopic line in the +stand-alone reader, type @kbd{M-@key{TAB}}---that is, press and hold +the @key{META} key and then press @key{TAB}. (On some keyboards, the +@key{META} key might be labeled @samp{Alt}.) In Emacs Info, type +@kbd{S-@key{TAB}} to move to a previous subtopic line (press and hold +the @key{Shift} key and then press @key{TAB}). Once you move cursor to a subtopic line, press @key{RET} to go to that subtopic's node. @@ -727,7 +729,8 @@ usually used to ``stay on the same level but go backwards''. @code{Info-up}). That puts you at the @emph{front} of the node---to get back to where you were reading you have to type some @key{SPC}s. (Some Info readers, such as the one built into Emacs, put you at the -same place where you were reading in @samp{Help-M}.) +menu subtopic line which points to the subnode that the @kbd{u} command +brought you from.) Another way to go Up is to click @kbd{Mouse-2} on the @samp{Up} pointer shown in the header line (provided that you have a mouse). @@ -785,8 +788,14 @@ to cancel the @kbd{f}. type a @kbd{Control-g} and see how the @samp{f} gives up. @end format - The @key{TAB} and @kbd{M-@key{TAB}} key, which move between menu -items in a menu, also move between cross references outside of menus. + The @key{TAB}, @kbd{M-@key{TAB}} and @kbd{S-@key{TAB}} keys, +which move between menu items in a menu, also move between cross +references outside of menus. + + Clicking @kbd{Mouse-2} on or near a cross reference also follows the +reference. You can see that the cross reference is mouse-sensitive by +moving the mouse pointer to the reference and watching how the +underlying text and the mouse pointer change in response. Sometimes a cross reference (or a node) can lead to another file (in other words another ``manual''), or, on occasion, even a file on a @@ -795,36 +804,22 @@ stand-alone Info avoid using remote links). Such a cross reference looks like this: @xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU Documentation Format}. (After following this link, type @kbd{l} to get back to this node.) Here the name @samp{texinfo} -between parentheses (shown in the stand-alone version) refers to the -file name. This file name appears in cross references and node names -if it differs from the current file. In Emacs, the file name is -hidden (along with other text). (Use @kbd{M-x visible-mode} to show -or hide it.) +between parentheses refers to the file name. This file name appears +in cross references and node names if it differs from the current +file, so you can always know that you are going to be switching to +another manual and which one. - The remainder of this node applies only to the Emacs version. If -you use the stand-alone version, you can type @kbd{n} immediately. - - To some users, switching manuals is a much bigger switch than -switching sections. These users like to know that they are going to -be switching to another manual (and which one) before actually doing -so, especially given that, if one does not notice, Info commands like -@kbd{t} (see the next node) can have confusing results. - - If you put your mouse over the cross reference and if the cross -reference leads to a different manual, then the information appearing -in a separate box (tool tip) or in the echo area, will mention the -file the cross reference will carry you to (between parentheses). -This is also true for menu subtopic names. If you have a mouse, just -leave it over the @samp{Overview} cross reference above and watch what -happens. - - If you always like to have that information available without having -to move your mouse over the cross reference, set -@code{Info-hide-note-references} to a value other than @code{t} -(@pxref{Emacs Info Variables}). You might also want to do that if you -have a lot of cross references to files on remote machines and have -non-permanent or slow access, since otherwise you might not be able to -distinguish between local and remote links. +However, Emacs normally hides some other text in cross-references. +If you put your mouse over the cross reference, then the information +appearing in a separate box (tool tip) or in the echo area will show +the full cross-reference including the file name and the node name of +the cross reference. If you have a mouse, just leave it over the +cross reference @xref{Top,, Overview of Texinfo, texinfo, Texinfo: +The GNU Documentation Format}, and watch what happens. If you +always like to have that information visible without having to move +your mouse over the cross reference, use @kbd{M-x visible-mode}, or +set @code{Info-hide-note-references} to a value other than @code{t} +(@pxref{Emacs Info Variables}). @format >> Now type @kbd{n} to learn more commands. @@ -845,8 +840,9 @@ This allows Info readers to go to the exact line of an entry, not just the start of the containing node.) You can get to the index from the main menu of the file with the -@kbd{m} command; then you can use the @kbd{m} command again in the -index node to go to the node that describes the topic you want. +@kbd{m} command and the name of the index node; then you can use the +@kbd{m} command again in the index node to go to the node that +describes the topic you want. There is also a short-cut Info command, @kbd{i}, which does all of that for you. It searches the index for a given topic (a string) and @@ -854,8 +850,8 @@ goes to the node which is listed in the index for that topic. @xref{Info Search}, for a full explanation. @kindex l @r{(Info mode)} -@findex Info-last -@cindex going back in Info mode +@findex Info-history-back +@cindex going back in Info history If you have been moving around to different nodes and wish to retrace your steps, the @kbd{l} command (@kbd{l} for @dfn{last}) will do that, one node-step at a time. As you move from node to node, Info @@ -863,7 +859,7 @@ records the nodes where you have been in a special history list. The @kbd{l} command revisits nodes in the history list; each successive @kbd{l} command moves one step back through the history. - In Emacs, @kbd{l} runs the command @code{Info-last}. + In Emacs, @kbd{l} runs the command @code{Info-history-back}. @format >> Try typing @kbd{p p n} and then three @kbd{l}'s, pausing in between @@ -875,6 +871,13 @@ where @emph{you} last were, whereas @kbd{p} always moves to the node which the header says is the @samp{Previous} node (from this node, the @samp{Prev} link leads to @samp{Help-Xref}). +@kindex r @r{(Info mode)} +@findex Info-history-forward +@cindex going forward in Info history + You can use the @kbd{r} command (@code{Info-history-forward} in Emacs) +to revisit nodes in the history list in the forward direction, so that +@kbd{r} will return you to the node you came from by typing @kbd{l}. + @kindex d @r{(Info mode)} @findex Info-directory @cindex go to Directory node @@ -898,11 +901,6 @@ This is useful if you want to browse the manual's main menu, or select some specific top-level menu item. The Emacs command run by @kbd{t} is @code{Info-top-node}. - Clicking @kbd{Mouse-2} on or near a cross reference also follows the -reference. You can see that the cross reference is mouse-sensitive by -moving the mouse pointer to the reference and watching how the -underlying text and the mouse pointer change in response. - @format >> Now type @kbd{n} to see the last node of the course. @end format @@ -935,7 +933,7 @@ Documentation Format}. * Menus:: How to add to or create menus in Info nodes. * Cross-refs:: How to add cross-references to Info nodes. * Tags:: How to make tags tables for Info files. -* Checking:: Checking an Info File +* Checking:: Checking an Info File. * Emacs Info Variables:: Variables modifying the behavior of Emacs Info. @end menu @@ -969,7 +967,7 @@ the node @samp{Top} in the Info file @file{dir}. Likewise, The node name @samp{*} specifies the whole file. So you can look at all of the current file by typing @kbd{g*@key{RET}} or all of any -other file with @kbd{g(@var{filename})@key{RET}}. +other file with @kbd{g(@var{filename})*@key{RET}}. @subheading @kbd{1}--@kbd{9} choose a menu subtopic by its number @@ -1017,7 +1015,7 @@ current node. @findex clone-buffer @cindex multiple Info buffers If you are reading Info in Emacs, you can select a new independent -Info buffer in another window by typing @kbd{M-n}. The new buffer +Info buffer in the same window by typing @kbd{M-n}. The new buffer starts out as an exact copy of the old one, but you will be able to move independently between nodes in the two buffers. (In Info mode, @kbd{M-n} runs the Emacs command @code{clone-buffer}.) @@ -1028,6 +1026,11 @@ m} and @kbd{C-u g} go to a new node in exactly the same way that @kbd{m} and @kbd{g} do, but they do so in a new Info buffer which they select in another window. + Another way to produce new Info buffers in Emacs is to use a numeric +prefix argument for the @kbd{C-h i} command (@code{info}) which +switches to the Info buffer with that number. Thus, @kbd{C-u 2 C-h i} +switches to the buffer @samp{*info*<2>}, creating it if necessary. + @node Info Search, Add, Advanced, Expert Info @comment node-name, next, previous, up @section How to search Info documents for specific subjects @@ -1083,10 +1086,12 @@ you type inside Emacs to run the command bound to @kbd{C-f}. In Emacs, @kbd{i} runs the command @code{Info-index}. @findex info-apropos +@findex index-apropos If you don't know what manual documents something, try the @kbd{M-x -info-apropos} command. It prompts for a string and then looks up that -string in all the indices of all the Info documents installed on your -system. +info-apropos} command in Emacs, or the @kbd{M-x index-apropos} command +in the stand-alone reader. It prompts for a string and then looks up +that string in all the indices of all the Info documents installed on +your system. @kindex s @r{(Info mode)} @findex Info-search @@ -1095,10 +1100,10 @@ It switches to the next node if and when that is necessary. You type @kbd{s} followed by the string to search for, terminated by @key{RET}. To search for the same string again, just @kbd{s} followed by @key{RET} will do. The file's nodes are scanned in the order -they are in in the file, which has no necessary relationship to the +they are in the file, which has no necessary relationship to the order that they may be in the tree structure of menus and @samp{next} pointers. But normally the two orders are not very different. In any -case, you can always do a @kbd{b} to find out what node you have +case, you can always look at the echo area to find out what node you have reached, if the header is not visible (this can happen, because @kbd{s} puts your cursor at the occurrence of the string, not at the beginning of the node). @@ -1109,6 +1114,15 @@ compatibility with other GNU packages that use @kbd{M-s} for a similar kind of search command. Both @kbd{s} and @kbd{M-s} run in Emacs the command @code{Info-search}. +@kindex C-s @r{(Info mode)} +@kindex C-r @r{(Info mode)} +@findex isearch + Instead of using @kbd{s} in Emacs Info and in the stand-alone Info, +you can use an incremental search started with @kbd{C-s} or @kbd{C-r}. +It can search through multiple Info nodes. @xref{Incremental Search,,, +emacs, The GNU Emacs Manual}. In Emacs, this behavior is enabled only +if the variable @code{Info-isearch-search} is non-@code{nil} +(@pxref{Emacs Info Variables}). @node Add, Menus, Info Search, Expert Info @comment node-name, next, previous, up @@ -1245,9 +1259,9 @@ the nodes in a file to form a connected structure. In fact, this file has two connected components. You are in one of them, which is under the node @samp{Top}; the other contains the node @samp{Help} which the @kbd{h} command goes to. In fact, since there is no garbage -collector, nothing terrible happens if a substructure is not pointed -to, but such a substructure is rather useless since nobody can -ever find out that it exists. +collector on the node graph, nothing terrible happens if a substructure +is not pointed to, but such a substructure is rather useless since nobody +can ever find out that it exists. @node Cross-refs, Tags, Menus, Expert Info @comment node-name, next, previous, up @@ -1328,7 +1342,7 @@ manner. @comment node-name, next, previous, up @section Tags Tables for Info Files -@cindex tags tables in info files +@cindex tags tables in Info files You can speed up the access to nodes of a large Info file by giving it a tags table. Unlike the tags table for a program, the tags table for an Info file lives inside the file itself and is used @@ -1408,22 +1422,30 @@ initialize it, or @code{Info-default-directory-list} if there is no @env{INFOPATH} variable in the environment. If you wish to customize the Info directory search list for both Emacs -info and stand-alone Info, it is best to set the @env{INFOPATH} +Info and stand-alone Info, it is best to set the @env{INFOPATH} environment variable, since that applies to both programs. @item Info-additional-directory-list A list of additional directories to search for Info documentation files. These directories are not searched for merging the @file{dir} file. -@item Info-fontify -When set to a non-@code{nil} value, enables highlighting of Info -files. The default is @code{t}. You can change how the highlighting -looks by customizing the faces @code{info-node}, @code{info-xref}, -@code{info-header-xref}, @code{info-header-node}, @code{info-menu-5}, -@code{info-menu-header}, and @code{info-title-@var{n}-face} (where -@var{n} is the level of the section, a number between 1 and 4). To -customize a face, type @kbd{M-x customize-face @key{RET} @var{face} -@key{RET}}, where @var{face} is one of the face names listed here. +@item Info-mode-hook +Hooks run when @code{Info-mode} is called. By default, it contains +the hook @code{turn-on-font-lock} which enables highlighting of Info +files. You can change how the highlighting looks by customizing the +faces @code{info-node}, @code{info-xref}, @code{info-xref-visited}, +@code{info-header-xref}, @code{info-header-node}, @code{info-menu-header}, +@code{info-menu-star}, and @code{info-title-@var{n}} (where @var{n} +is the level of the section, a number between 1 and 4). To customize +a face, type @kbd{M-x customize-face @key{RET} @var{face} @key{RET}}, +where @var{face} is one of the face names listed here. + +@item Info-fontify-maximum-menu-size +Maximum size of menu to fontify if @code{font-lock-mode} is non-@code{nil}. + +@item Info-fontify-visited-nodes +If non-@code{nil}, menu items and cross-references pointing to visited +nodes are displayed in the @code{info-xref-visited} face. @item Info-use-header-line If non-@code{nil}, Emacs puts in the Info buffer a header line showing @@ -1449,6 +1471,9 @@ subnode indicated by the following menu item. Setting this option to program, which visits the first subnode from the menu only when you hit the end of the current node. The default is @code{nil}. +@item Info-isearch-search +If non-@code{nil}, isearch in Info searches through multiple nodes. + @item Info-enable-active-nodes When set to a non-@code{nil} value, allows Info to execute Lisp code associated with nodes. The Lisp code is executed when the node is From 196a121b68b432440dc8a9558b7479e71b8f7a68 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 08:45:02 +0000 Subject: [PATCH 070/347] *** empty log message *** --- lisp/ChangeLog | 20 ++++++++++++++++++++ man/ChangeLog | 18 +++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 758b4e37a64..ef3ddfa1ec9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,23 @@ +2005-08-09 Juri Linkov + + * info.el: Replace `info' with upper-case `Info' + where appropriate. + (info-title-1, info-title-2, info-title-3, info-title-4) + (info-menu-header): Move up face definitions. + (info-menu-star): Rename from `info-menu-5'. + (Info-fontify-node): Replace `info-menu-5' with `info-menu-star'. + (Info-fontify-visited-nodes): Fix docstring. + (Info-hide-note-references): Fix docstring. + (Info-up, Info-next-reference, Info-prev-reference): Put cursor on + menu items in the same way as on cross-references. + (info-apropos): Fix sorting order and formatting to be like in the + stand-alone Info browser. Display error messages for 1 sec. + (Info-mode-map): Move down `c' key binding. Bind `^' to `Info-up'. + (Info-mode-menu): Remove item for `Info-search-case-sensitively' + from the menu bar. + (Info-insert-dir): Restore point after calling + `insert-buffer-substring'. + 2005-08-08 Richard M. Stallman * emacs-lisp/lmenu.el (lucid-menubar-map, lucid-failing-menubar) diff --git a/man/ChangeLog b/man/ChangeLog index f0119913494..0baae8e1187 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,20 @@ +2005-08-09 Juri Linkov + + * info.texi (Help-P): Replace `Prev' with `Previous'. + (Help-M, Help-Xref): Add S-TAB. + (Help-FOO): Update `u' command. + (Help-Xref): Move info about Mouse-2 from `Help-Int'. + Update info about visibility of xref parts. + (Help-Int): Fix `m' command. Rename `Info-last' to + `Info-history-back'. Add `Info-history-forward'. + (Advanced): Fix `g*' and `M-n' commands. + (Info Search): Add `index-apropos' in stand-alone browser. + Add isearch commands. + (Emacs Info Variables): Remove `Info-fontify'. + Add `Info-mode-hook'. Update face names. + Add `Info-fontify-maximum-menu-size', + `Info-fontify-visited-nodes', `Info-isearch-search'. + 2005-08-07 Michael Albinus Sync with Tramp 2.0.50. @@ -132,7 +149,6 @@ * mh-e.texi (Copying): * trouble.texi (Checklist): Update FSF's address. ->>>>>>> 1.631 2005-07-03 Richard M. Stallman * flymake.texi (Example -- Configuring a tool called directly): From 177a0809c6522f167a8238aa42ed8c2c271388d8 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 9 Aug 2005 11:00:42 +0000 Subject: [PATCH 071/347] (r2b-convert-record, r2b-convert-buffer): Improve argument/docstring consistency. Doc fixes. (r2b-variables, r2bv-address, r2bv-annote, r2bv-author,r2bv-booktitle, r2bv-date, r2bv-decade, r2bv-editor,r2bv-entry-kind, r2bv-institution, r2bv-journal, r2bv-keywords,r2bv-kn, r2bv-month, r2bv-note, r2bv-number, r2bv-ordering,r2bv-organization, r2bv-pages, r2bv-primary-author,r2bv-publisher, r2bv-school, r2bv-title, r2bv-title-first-word, r2bv-tr, r2bv-type, r2bv-volume, r2bv-where, r2bv-year): Defvar at compile time. --- lisp/textmodes/refbib.el | 88 +++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index afea0c20c5e..99e2b780999 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el @@ -222,37 +222,49 @@ This is in addition to the `r2b-capitalize-title-stop-words'.") (defvar r2b-error-found nil) +(eval-when-compile + (defvar r2b-variables) (defvar r2bv-address) (defvar r2bv-annote) + (defvar r2bv-author) (defvar r2bv-booktitle) (defvar r2bv-date) + (defvar r2bv-decade) (defvar r2bv-editor) (defvar r2bv-entry-kind) + (defvar r2bv-institution) (defvar r2bv-journal) (defvar r2bv-keywords) + (defvar r2bv-kn) (defvar r2bv-month) (defvar r2bv-note) + (defvar r2bv-number) (defvar r2bv-ordering) (defvar r2bv-organization) + (defvar r2bv-pages) (defvar r2bv-primary-author) (defvar r2bv-publisher) + (defvar r2bv-school) (defvar r2bv-title) (defvar r2bv-title-first-word) + (defvar r2bv-tr) (defvar r2bv-type) (defvar r2bv-volume) + (defvar r2bv-where) (defvar r2bv-year)) + (setq r2b-variables '( - r2b-error-found - r2bv-author - r2bv-primary-author - r2bv-date - r2bv-year - r2bv-decade - r2bv-month - r2bv-title - r2bv-title-first-word - r2bv-editor - r2bv-annote - r2bv-tr - r2bv-address - r2bv-institution - r2bv-keywords - r2bv-booktitle - r2bv-journal - r2bv-volume - r2bv-number - r2bv-pages - r2bv-booktitle - r2bv-kn - r2bv-publisher - r2bv-organization - r2bv-school - r2bv-type - r2bv-where - r2bv-note - r2bv-ordering - )) + r2b-error-found + r2bv-author + r2bv-primary-author + r2bv-date + r2bv-year + r2bv-decade + r2bv-month + r2bv-title + r2bv-title-first-word + r2bv-editor + r2bv-annote + r2bv-tr + r2bv-address + r2bv-institution + r2bv-keywords + r2bv-booktitle + r2bv-journal + r2bv-volume + r2bv-number + r2bv-pages + r2bv-booktitle + r2bv-kn + r2bv-publisher + r2bv-organization + r2bv-school + r2bv-type + r2bv-where + r2bv-note + r2bv-ordering + )) (defun r2b-clear-variables () "Set all global vars used by r2b to nil." @@ -633,14 +645,14 @@ but not a publisher." ) -(defun r2b-convert-record (output-name) - "Transform current bib entry and append to buffer OUTPUT; -do \"M-x r2b-help\" for more info." +(defun r2b-convert-record (output) + "Transform current bib entry and append to buffer OUTPUT. +Do `\\[r2b-help]' for more info." (interactive (list (read-string "Output to buffer: " r2b-out-buf-name))) (let (rec-end rec-begin not-done) - (setq r2b-out-buf-name output-name) - (setq r2b-out-buf (get-buffer-create output-name)) + (setq r2b-out-buf-name output) + (setq r2b-out-buf (get-buffer-create output)) (setq r2b-in-buf (current-buffer)) (set-buffer r2b-out-buf) (goto-char (point-max)) @@ -670,9 +682,9 @@ do \"M-x r2b-help\" for more info." )) -(defun r2b-convert-buffer (output-name) +(defun r2b-convert-buffer (output) "Transform current buffer and append to buffer OUTPUT. -Do `M-x r2b-help' for more info." +Do `\\[r2b-help]' for more info." (interactive (list (read-string "Output to buffer: " r2b-out-buf-name))) (save-excursion @@ -683,7 +695,7 @@ Do `M-x r2b-help' for more info." (goto-char (point-min)) (message "Working, please be patient...") (sit-for 0) - (while (r2b-convert-record output-name) t) + (while (r2b-convert-record output) t) (message "Done, results in %s, errors in %s" r2b-out-buf-name r2b-log-name) ) From a165d05e5d1de743e41b33f6e1d402952024a488 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 9 Aug 2005 11:23:33 +0000 Subject: [PATCH 072/347] *** empty log message *** --- lisp/ChangeLog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef3ddfa1ec9..1be3c4b7c5f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2005-08-09 Juanma Barranquero + + * textmodes/refbib.el (r2b-convert-record, r2b-convert-buffer): + Improve argument/docstring consistency. Doc fixes. + (r2b-variables, r2bv-address, r2bv-annote, r2bv-author) + (r2bv-booktitle, r2bv-date, r2bv-decade, r2bv-editor) + (r2bv-entry-kind, r2bv-institution, r2bv-journal, r2bv-keywords) + (r2bv-kn, r2bv-month, r2bv-note, r2bv-number, r2bv-ordering) + (r2bv-organization, r2bv-pages, r2bv-primary-author) + (r2bv-publisher, r2bv-school, r2bv-title, r2bv-title-first-word) + (r2bv-tr, r2bv-type, r2bv-volume, r2bv-where, r2bv-year): + Defvar at compile time. + 2005-08-09 Juri Linkov * info.el: Replace `info' with upper-case `Info' From f98dd4f8bd568237a559b33f2cfdbefa08d30cb6 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:24:05 +0000 Subject: [PATCH 073/347] *** empty log message *** --- etc/NEWS | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index 518c075c20f..0935d2066da 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3614,6 +3614,25 @@ binding of VARIABLE (a symbol) in buffer BUFFER. If VARIABLE does not have a buffer-local binding in buffer BUFFER, it returns the default value of VARIABLE instead. +*** The function `frame-or-buffer-changed-p' now lets you maintain +various status records in parallel. + +It take a variable (a symbol) as argument. If the variable is non-nil, +then its value should be a vector installed previously by +`frame-or-buffer-changed-p'. If the frame names, buffer names, buffer +order, or their read-only or modified flags have changed, since the +time the vector's contents were recorded by a previous call to +`frame-or-buffer-changed-p', then the function returns t. Otherwise +it returns nil. + +On the first call to `frame-or-buffer-changed-p', the variable's +value should be nil. `frame-or-buffer-changed-p' stores a suitable +vector into the variable and returns t. + +If the variable is itself nil, then `frame-or-buffer-changed-p' uses, +for compatibility, an internal variable which exists only for this +purpose. + ** Local variables lists: +++ @@ -3881,7 +3900,8 @@ using the text properties (esp. the face) of the prompt string. *** (while-no-input BODY...) runs BODY, but only so long as no input arrives. If the user types or clicks anything, BODY stops as if a quit had occurred. `while-no-input' returns the value of BODY, if BODY -finishes. It returns nil if BODY was aborted. +finishes. It returns nil if BODY was aborted by a quit, and t if +BODY was aborted by arrival of input. ** Minibuffer changes: From e194bbb5c7fc94a74f98b4a1fdd76c0006b7f908 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:24:48 +0000 Subject: [PATCH 074/347] Delete autoload for c-guess-basic-syntax. --- lisp/align.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/lisp/align.el b/lisp/align.el index a481ba11070..2cbc43e38d3 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -384,9 +384,6 @@ The possible settings for `align-region-separate' are: regexp function))))))) "The `type' form for any `align-rules-list' variable.") -(unless (functionp 'c-guess-basic-syntax) - (autoload 'c-guess-basic-syntax "cc-engine")) - (defcustom align-rules-list `((lisp-second-arg (regexp . "\\(^\\s-+[^( \t\n]\\|(\\(\\S-+\\)\\s-+\\)\\S-+\\(\\s-+\\)") From 949eb6b06e00fd6750cf00bd2acba9e3cf94444d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:25:35 +0000 Subject: [PATCH 075/347] (send-invisible): Identify buffer, if not selected. --- lisp/comint.el | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/comint.el b/lisp/comint.el index 3f77ea99050..589aba9321a 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1935,15 +1935,21 @@ The string is sent using `comint-input-sender'. Security bug: your string can still be temporarily recovered with \\[view-lossage]; `clear-this-command-keys' can fix that." (interactive "P") ; Defeat snooping via C-x ESC ESC - (let ((proc (get-buffer-process (current-buffer)))) + (let ((proc (get-buffer-process (current-buffer))) + (prefix + (if (eq (window-buffer (selected-window)) (current-buffer)) + "" + (format "(In buffer %s) " + (current-buffer))))) (if proc - (let ((str (read-passwd (or prompt "Non-echoed text: ")))) + (let ((str (read-passwd (concat prefix + (or prompt "Non-echoed text: "))))) (if (stringp str) (progn (comint-snapshot-last-prompt) (funcall comint-input-sender proc str)) (message "Warning: text will be echoed"))) - (error "Current buffer has no process")))) + (error "Buffer %s has no process" (current-buffer))))) (defun comint-watch-for-password-prompt (string) "Prompt in the minibuffer for password and send without echoing. From a335c7d56451f7d273f0d9498f0054db0eb8e516 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:26:13 +0000 Subject: [PATCH 076/347] Use (featurep 'xemacs). --- lisp/ediff-init.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index ae4c7c59c09..5bffea1ec4b 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -559,24 +559,24 @@ See the documentation string of `ediff-focus-on-regexp-matches' for details.") ;; Highlighting -(defcustom ediff-before-flag-bol (if ediff-xemacs-p (make-glyph "->>") "->>") +(defcustom ediff-before-flag-bol (if (featurep 'xemacs) (make-glyph "->>") "->>") "*Flag placed before a highlighted block of differences, if block starts at beginning of a line." :type 'string :tag "Region before-flag at beginning of line" :group 'ediff) -(defcustom ediff-after-flag-eol (if ediff-xemacs-p (make-glyph "<<-") "<<-") +(defcustom ediff-after-flag-eol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") "*Flag placed after a highlighted block of differences, if block ends at end of a line." :type 'string :tag "Region after-flag at end of line" :group 'ediff) -(defcustom ediff-before-flag-mol (if ediff-xemacs-p (make-glyph "->>") "->>") +(defcustom ediff-before-flag-mol (if (featurep 'xemacs) (make-glyph "->>") "->>") "*Flag placed before a highlighted block of differences, if block starts in mid-line." :type 'string :tag "Region before-flag in the middle of line" :group 'ediff) -(defcustom ediff-after-flag-mol (if ediff-xemacs-p (make-glyph "<<-") "<<-") +(defcustom ediff-after-flag-mol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") "*Flag placed after a highlighted block of differences, if block ends in mid-line." :type 'string :tag "Region after-flag in the middle of line" @@ -1464,7 +1464,7 @@ This default should work without changes." :group 'ediff) ;; needed to simulate frame-char-width in XEmacs. -(defvar ediff-H-glyph (if ediff-xemacs-p (make-glyph "H"))) +(defvar ediff-H-glyph (if (featurep 'xemacs) (make-glyph "H"))) ;; Temporary file used for refining difference regions in buffer A. From f4c49513ecebd4be3e02b70c09ee37b7af20acd4 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:27:18 +0000 Subject: [PATCH 077/347] (isearch-repeat): When changing direction, mark search successful. --- lisp/isearch.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/isearch.el b/lisp/isearch.el index 56a73a689a5..f3fc51778e9 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1147,7 +1147,8 @@ Use `isearch-exit' to quit without signaling." (funcall isearch-wrap-function) (goto-char (if isearch-forward (point-min) (point-max))))))) ;; C-s in reverse or C-r in forward, change direction. - (setq isearch-forward (not isearch-forward))) + (setq isearch-forward (not isearch-forward) + isearch-success t)) (setq isearch-barrier (point)) ; For subsequent \| if regexp. From a7384d3dc10a20c87888c6f67b1fc3622dc9db60 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:28:26 +0000 Subject: [PATCH 078/347] (menu-bar-file-menu): Rename some menu items and improve help strings. --- lisp/menu-bar.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 0a280309283..cbfc78fb95f 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -99,13 +99,13 @@ A large number or nil slows down menu responsiveness." :help "Open a new frame")) (define-key menu-bar-file-menu [one-window] - '(menu-item "Unsplit Windows" delete-other-windows + '(menu-item "Remove Splits" delete-other-windows :enable (not (one-window-p t nil)) - :help "Make selected window fill its frame")) + :help "Selected window grows to fill the whole frame")) (define-key menu-bar-file-menu [split-window] '(menu-item "Split Window" split-window-vertically - :help "Split selected window in two")) + :help "Split selected window in two windows")) (define-key menu-bar-file-menu [separator-window] '(menu-item "--")) @@ -159,12 +159,12 @@ A large number or nil slows down menu responsiveness." (current-buffer)))))) :help "Re-read current buffer from its file")) (define-key menu-bar-file-menu [write-file] - '(menu-item "Save Buffer As..." write-file + '(menu-item "Save As..." write-file :enable (not (window-minibuffer-p (frame-selected-window menu-updating-frame))) :help "Write current buffer to another file")) (define-key menu-bar-file-menu [save-buffer] - '(menu-item "Save (current buffer)" save-buffer + '(menu-item "Save" save-buffer :enable (and (buffer-modified-p) (buffer-file-name) (not (window-minibuffer-p @@ -175,9 +175,9 @@ A large number or nil slows down menu responsiveness." '(menu-item "--")) (define-key menu-bar-file-menu [kill-buffer] - '(menu-item "Close (current buffer)" kill-this-buffer + '(menu-item "Close" kill-this-buffer :enable (kill-this-buffer-enabled-p) - :help "Discard current buffer")) + :help "Discard (kill) current buffer")) (define-key menu-bar-file-menu [insert-file] '(menu-item "Insert File..." insert-file :enable (not (window-minibuffer-p @@ -194,7 +194,7 @@ A large number or nil slows down menu responsiveness." (frame-selected-window menu-updating-frame))) :help "Read an existing file into an Emacs buffer")) (define-key menu-bar-file-menu [new-file] - '(menu-item "New File..." find-file + '(menu-item "Visit New File..." find-file :enable (not (window-minibuffer-p (frame-selected-window menu-updating-frame))) :help "Read or create a file and edit it")) From 882effdb17c9755edd6f064be58d87d5b8911d9b Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:29:18 +0000 Subject: [PATCH 079/347] (occur-engine): Initial *Occur* output not undoable. --- lisp/replace.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/replace.el b/lisp/replace.el index 6ce961c28a7..ea1bd53e688 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1061,6 +1061,8 @@ See also `multi-occur'." title-face prefix-face match-face keep-props) (with-current-buffer out-buf (let ((globalcount 0) + ;; Don't generate undo entries for creation of the initial contents. + (buffer-undo-list t) (coding nil)) ;; Map over all the buffers (dolist (buf buffers) From 0f0cef08e6f9fc6cf771bea57cf8edd3c3dfc44d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:29:43 +0000 Subject: [PATCH 080/347] (command-line-1): Implement -scriptload. --- lisp/startup.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lisp/startup.el b/lisp/startup.el index 61b56e7babf..ca71ef43137 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1635,6 +1635,13 @@ normal otherwise." (setq file file-ex)) (load file nil t))) + ((member argi '("-scriptload")) + (let* ((file (command-line-normalize-file-name + (or argval (pop command-line-args-left)))) + ;; Take file from default dir. + (file-ex (expand-file-name file))) + (load file-ex nil t t))) + ((equal argi "-insert") (setq tem (or argval (pop command-line-args-left))) (or (stringp tem) From 56b3b16bc224784152e80e08ec60947a858c8b25 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:30:12 +0000 Subject: [PATCH 081/347] Comment change. --- lisp/startup.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/startup.el b/lisp/startup.el index ca71ef43137..8dac582e452 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1635,6 +1635,8 @@ normal otherwise." (setq file file-ex)) (load file nil t))) + ;; This is used to handle -script. It's not clear + ;; we need to document it. ((member argi '("-scriptload")) (let* ((file (command-line-normalize-file-name (or argval (pop command-line-args-left)))) From cdbcbc6a795bb7bacd9c1a6d9234d171605bfcd4 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:30:36 +0000 Subject: [PATCH 082/347] (calendar-mode-map): Bind < and > usefully. --- lisp/calendar/calendar.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index ada15878f13..3e075b9d6bd 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -2205,9 +2205,11 @@ movement commands will not work correctly." calendar-mode-map global-map) (setq l (cdr l)))) (define-key calendar-mode-map "-" 'negative-argument) + (define-key calendar-mode-map ">" 'scroll-calendar-right) (define-key calendar-mode-map "\C-x>" 'scroll-calendar-right) (define-key calendar-mode-map [prior] 'scroll-calendar-right-three-months) (define-key calendar-mode-map "\ev" 'scroll-calendar-right-three-months) + (define-key calendar-mode-map "<" 'scroll-calendar-left) (define-key calendar-mode-map "\C-x<" 'scroll-calendar-left) (define-key calendar-mode-map [next] 'scroll-calendar-left-three-months) (define-key calendar-mode-map "\C-v" 'scroll-calendar-left-three-months) From 92c4954ea60a1b170a26854349bcc36633c5f35d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:31:39 +0000 Subject: [PATCH 083/347] (Scroll Calendar): Document < and > in calendar. --- man/calendar.texi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/man/calendar.texi b/man/calendar.texi index 293905ca544..63da45939f7 100644 --- a/man/calendar.texi +++ b/man/calendar.texi @@ -235,9 +235,9 @@ the months on it. Scrolling the calendar means moving the strip horizontally, so that new months become visible in the window. @table @kbd -@item C-x < +@item < Scroll calendar one month forward (@code{scroll-calendar-left}). -@item C-x > +@item > Scroll calendar one month backward (@code{scroll-calendar-right}). @item C-v @itemx @key{NEXT} @@ -249,15 +249,15 @@ Scroll calendar three months backward (@code{scroll-calendar-right-three-months}). @end table -@kindex C-x < @r{(Calendar mode)} +@kindex < @r{(Calendar mode)} @findex scroll-calendar-left -@kindex C-x > @r{(Calendar mode)} +@kindex > @r{(Calendar mode)} @findex scroll-calendar-right The most basic calendar scroll commands scroll by one month at a time. This means that there are two months of overlap between the -display before the command and the display after. @kbd{C-x <} scrolls +display before the command and the display after. @kbd{<} scrolls the calendar contents one month to the left; that is, it moves the -display forward in time. @kbd{C-x >} scrolls the contents to the +display forward in time. @kbd{>} scrolls the contents to the right, which moves backwards in time. @kindex C-v @r{(Calendar mode)} From ce08e7d4c24867cd8257541a6791c41e35837d58 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:35:42 +0000 Subject: [PATCH 084/347] (Comparing Files): Clarify compare-windows. --- man/files.texi | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/man/files.texi b/man/files.texi index bc217de7b18..5e6805d6496 100644 --- a/man/files.texi +++ b/man/files.texi @@ -2918,15 +2918,19 @@ recent backup. If you specify the name of a backup file, of. @findex compare-windows - The command @kbd{M-x compare-windows} compares the text in the current -window with that in the next window. Comparison starts at point in each -window, and each starting position is pushed on the mark ring in its -respective buffer. Then point moves forward in each window, a character -at a time, until a mismatch between the two windows is reached. Then -the command is finished. Another invocation of this command with -points on mismatching positions tries to skip non-matching text and -move points forward, until a match between the two windows is reached. -For more information about windows in Emacs, @ref{Windows}. + The command @kbd{M-x compare-windows} compares the text in the +current window with that in the next window. (For more information +about windows in Emacs, @ref{Windows}.) Comparison starts at point in +each window, after pushing each initial point value on the mark ring +in its respective buffer. Then it moves point forward in each window, +one character at a time, until it reaches characters that don't match. +Then the command exits. + + If point in the two windows is followed by non-matching text when +the command starts, it tries heuristically to advance up to matching +text in the two windows, and then exits. So if you use @kbd{M-x +compare-windows} repeatedly, each time it either skips one matching +range or finds the start of another. @vindex compare-ignore-case @vindex compare-ignore-whitespace From 369a47a4fc42e79d2fde1c2bca380db4b79fd77d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:36:58 +0000 Subject: [PATCH 085/347] (map-y-or-n-p): Reorder the options and rename some of them to be more self-explanatory. --- lisp/emacs-lisp/map-ynp.el | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index e4b6f1ddce0..84c7ae58ced 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -103,15 +103,18 @@ Returns the number of actions taken." (let ((object (if help (capitalize (nth 0 help)))) (objects (if help (capitalize (nth 1 help)))) (action (if help (capitalize (nth 2 help))))) - (setq map `(("Yes" . act) ("No" . skip) ("Quit" . exit) - (,(if help (concat action " " object " And Quit") - "Do it and Quit") . act-and-exit) + (setq map `(("Yes" . act) ("No" . skip) + ,@(mapcar (lambda (elt) + (cons (with-syntax-table + text-mode-syntax-table + (capitalize (nth 2 elt))) + (vector (nth 1 elt)))) + action-alist) + (,(if help (concat action " This But No More") + "Do This But No More") . act-and-exit) (,(if help (concat action " All " objects) "Do All") . automatic) - ,@(mapcar (lambda (elt) - (cons (capitalize (nth 2 elt)) - (vector (nth 1 elt)))) - action-alist)) + ("No For All" . exit)) use-menus t mouse-event last-nonmenu-event)) (setq user-keys (if action-alist From 4caf4844d9591fc723f0919eb7a834bd3e84e515 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:37:32 +0000 Subject: [PATCH 086/347] (eshell): Avoid warnings about eshell-mode. --- lisp/eshell/eshell.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 8c13b485cc2..ce9641026c7 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -374,11 +374,10 @@ buffer selected (or created)." ;; `same-window-buffer-names', which is done when Eshell is loaded (assert (and buf (buffer-live-p buf))) (pop-to-buffer buf) - (unless (fboundp 'eshell-mode) + (if (fboundp 'eshell-mode) + (unless (eq major-mode 'eshell-mode) + (eshell-mode)) (error "`eshell-auto' must be loaded before Eshell can be used")) - (unless (eq major-mode 'eshell-mode) - (eshell-mode)) - (assert (eq major-mode 'eshell-mode)) buf)) (defun eshell-return-exits-minibuffer () From 9c6f79c2f219bf0dc80dc2afcd2bcf15db1ce7ac Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:38:10 +0000 Subject: [PATCH 087/347] (rmail-ignored-headers): Don't hide mime-version: and content-type: headers. --- lisp/mail/rmail.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 385ce0f71e6..c9c8e58b8ee 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -251,13 +251,13 @@ It is useful to set this variable in the site customization file.") "\\|^x400-received:\\|^x400-mts-identifier:\\|^x400-content-type:" "\\|^\\(resent-\\|\\)message-id:\\|^summary-line:\\|^resent-date:" "\\|^nntp-posting-host:\\|^path:\\|^x-char.*:\\|^x-face:\\|^face:" - "\\|^x-mailer:\\|^delivered-to:\\|^lines:\\|^mime-version:" + "\\|^x-mailer:\\|^delivered-to:\\|^lines:" "\\|^content-transfer-encoding:\\|^x-coding-system:" "\\|^return-path:\\|^errors-to:\\|^return-receipt-to:" "\\|^x-sign:\\|^x-beenthere:\\|^x-mailman-version:\\|^x-mailman-copy:" "\\|^precedence:\\|^list-help:\\|^list-post:\\|^list-subscribe:" "\\|^list-id:\\|^list-unsubscribe:\\|^list-archive:" - "\\|^content-type:\\|^content-length:" + "\\|^content-length:" "\\|^x-attribution:\\|^x-disclaimer:\\|^x-trace:" "\\|^x-complaints-to:\\|^nntp-posting-date:\\|^user-agent" "\\|^importance:\\|^envelope-to:\\|^delivery-date" From 1eb6c5b8c6fa28f072e938aba2a0920995d1daf7 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:39:01 +0000 Subject: [PATCH 088/347] (sc-ask, sc-no-blank-line-or-header): Avoid warnings. --- lisp/mail/supercite.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el index f172f95e661..a180c6c67ce 100644 --- a/lisp/mail/supercite.el +++ b/lisp/mail/supercite.el @@ -643,8 +643,8 @@ the list should be unique." (prog1 quit-flag (setq quit-flag nil))) (progn (message "%s%s" p (single-key-description event)) - (and (fboundp 'deallocate-event) - (deallocate-event event)) + (if (fboundp 'deallocate-event) + (deallocate-event event)) (setq quit-flag nil) (signal 'quit '()))) (let ((char @@ -659,8 +659,8 @@ the list should be unique." ((setq elt (rassq char alist)) (message "%s%s" p (car elt)) (setq p (cdr elt))) - ((and (fboundp 'button-release-event-p) - (button-release-event-p event)) ; ignore them + ((if (fboundp 'button-release-event-p) + (button-release-event-p event)) ; ignore them nil) (t (message "%s%s" p (single-key-description event)) @@ -670,8 +670,8 @@ the list should be unique." (discard-input) (if (eq p prompt) (setq p (concat "Try again. " prompt))))))) - (and (fboundp 'deallocate-event) - (deallocate-event event)) + (if (fboundp 'deallocate-event) + (deallocate-event event)) p)) (defun sc-scan-info-alist (alist) @@ -1517,7 +1517,8 @@ non-nil." (progn (forward-line -1) (or (= (point) (mail-header-end)) (and (eq major-mode 'mh-letter-mode) - (mh-in-header-p))))) + (with-no-warnings + (mh-in-header-p)))))) (progn (forward-line) (let ((kill-lines-magic t)) (kill-line)))))) From 4f047c58a263746a165daaee0a759f563c965b87 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:39:24 +0000 Subject: [PATCH 089/347] (c-guess-basic-syntax): Add autoload. --- lisp/progmodes/cc-engine.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index d9f0d088319..71dc39a56e9 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -5599,6 +5599,7 @@ brace." containing-sexp paren-state)) ))) +;;;###autoload (defun c-guess-basic-syntax () "Return the syntactic context of the current line. This function does not do any hidden buffer changes." From ce56d46ac7e10e9ff069a895c2023959e89719d4 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:40:22 +0000 Subject: [PATCH 090/347] (idlwave-system-variables-alist) (idlwave-system-class-info, idlwave-executive-commands-alist): Use defvar. --- lisp/progmodes/idlw-rinfo.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/idlw-rinfo.el b/lisp/progmodes/idlw-rinfo.el index 962292b740a..367de774bcf 100644 --- a/lisp/progmodes/idlw-rinfo.el +++ b/lisp/progmodes/idlw-rinfo.el @@ -1899,7 +1899,7 @@ ) "1850 builtin routines with 7685 keywords for IDL version 6.1.") -(setq idlwave-system-variables-alist +(defvar idlwave-system-variables-alist '( ("C" (link "sysvars7.html#wp997337")) ("CPU" (tags ("HW_VECTOR") ("VECTOR_ENABLE") ("HW_NCPU") ("TPOOL_NTHREADS") ("TPOOL_MIN_ELTS") ("TPOOL_MAX_ELTS")) (link "sysvars6.html#wp1014201")) @@ -1932,7 +1932,7 @@ ("Z" (tags ("TITLE" . 997839) ("TYPE" . 997842) ("STYLE" . 997742) ("TICKS" . 999577) ("TICKLEN" . 1012793) ("THICK" . 997798) ("RANGE" . 997713) ("CRANGE" . 997670) ("S" . 997736) ("MARGIN" . 997689) ("OMARGIN" . 997702) ("WINDOW" . 997845) ("REGION" . 997724) ("CHARSIZE" . 1012787) ("MINOR" . 997699) ("TICKV" . 997833) ("TICKNAME" . 997811) ("GRIDSTYLE" . 998134) ("TICKFORMAT" . 997801) ("TICKINTERVAL" . 997808) ("TICKLAYOUT" . 1012924) ("TICKUNITS" . 1012962)) (link "sysvars7.html#wp997657")))) -(setq idlwave-system-class-info +(defvar idlwave-system-class-info '( ("IDLgrContour" (tags "IDLGRCOMPONENT_TOP" "IDLGRCOMPONENTVERSION" "HIDE" "PARENT" "IDLGRCOMPONENT_BOTTOM" "IDLGRGRAPHIC_TOP" "IDLGRGRAPHICVERSION" "ALPHACHANNEL" "CLIP_PLANES" "COLOR" "DEPTH_TEST_DISABLE" "DEPTH_TEST_FUNCTION" "DEPTH_WRITE_DISABLE" "GRAPHICFLAGS" "PALETTE" "XCOORD_CONV" "YCOORD_CONV" "ZCOORD_CONV" "XRANGE" "YRANGE" "ZRANGE" "GRAPHIC_DATA_OBJECT" "IDLGRGRAPHIC_BOTTOM" "IDLGRCONTOUR_TOP" "IDLGRCONTOURVERSION" "AM_PM" "ANISOTROPY" "DATA_FORMAT" "DATA" "DAYS_OF_WEEK" "GEOM_FORMAT" "GEOM" "CONTOURFLAGS" "C_COLOR" "C_FILLPATTERN" "C_LABEL_INTERVAL" "C_LABEL_NOGAPS" "C_LABEL_OBJECTS" "C_LABEL_SHOW" "C_LINESTYLE" "C_THICK" "C_USE_LABEL_COLOR" "C_USE_LABEL_ORIENTATION" "C_VALUE" "LABEL_DEFAULTS" "LABEL_FONT" "LABEL_FORMAT" "LABEL_FRMTDATA" "LABEL_UNITS" "LABEL_UNIT_CODE" "MAXVAL" "MINVAL" "MONTHS" "NLEVELS" "POLYGONS" "SHADERANGE" "SHADING" "TICKINTERVAL" "TICKLEN" "PRECISIONDATA" "PRECISIONGEOM" "PRECISIONGRAPH" "LEVELINFO" "CFILL1" "DEPTHOFFSET" "MAPINFO" "IDLGRCONTOUR_BOTTOM") (inherits "IDLitComponent") (link "objects_gr43.html")) ("IDLgrAxis" (tags "IDLGRCOMPONENT_TOP" "IDLGRCOMPONENTVERSION" "HIDE" "PARENT" "IDLGRCOMPONENT_BOTTOM" "IDLGRGRAPHIC_TOP" "IDLGRGRAPHICVERSION" "ALPHACHANNEL" "CLIP_PLANES" "COLOR" "DEPTH_TEST_DISABLE" "DEPTH_TEST_FUNCTION" "DEPTH_WRITE_DISABLE" "GRAPHICFLAGS" "PALETTE" "XCOORD_CONV" "YCOORD_CONV" "ZCOORD_CONV" "XRANGE" "YRANGE" "ZRANGE" "GRAPHIC_DATA_OBJECT" "IDLGRGRAPHIC_BOTTOM" "IDLGRAXIS_TOP" "IDLGRAXISVERSION" "AM_PM" "AXIS_TYPE" "CALCFLAGS" "DAYS_OF_WEEK" "DIRECTION" "AXISFLAGS" "GRIDSTYLE" "LOCATION" "MAJOR" "MINOR" "MONTHS" "OUTRANGE" "RANGE" "SUBTICKLEN" "TEXTALIGNMENTS" "TEXTBASELINE" "TEXTUPDIR" "THICK" "TICKDIR" "TICKFORMAT" "ARRAY_TICKFORMAT" "TICKFRMTDATA" "TICKINTERVAL" "TICKLAYOUT" "TICKLEN" "TICKTEXT" "TICKUNITCODES" "TICKUNITS" "TICKVALUES" "TITLE" "CURRENT_LEVEL" "LEVEL_DATA" "STEPRANGEUNITS" "STEPRANGE" "IDLGRAXIS_BOTTOM") (inherits "IDLitComponent") (link "objects_gr3.html")) @@ -2014,7 +2014,7 @@ ("IDLjavaObject" (link "objects_misc28.html")))) -(setq idlwave-executive-commands-alist '( +(defvar idlwave-executive-commands-alist '( ("RESET_SESSION" . "symbols8.html") ("TRACE" . "symbols15.html") ("RNEW" . "symbols10.html") From c4ae5fdde85caa29b894955bba1369aa042945c3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:41:11 +0000 Subject: [PATCH 091/347] (idlwave-xemacs-hack-mouse-track): Avoid warnings. --- lisp/progmodes/idlw-shell.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 7c1324c94af..3d6076cd52d 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -2761,13 +2761,14 @@ Runs to the last statement and then steps 1 statement. Use the .out command." t) (defun idlwave-xemacs-hack-mouse-track (event) - (let ((oldfunc (symbol-function 'default-mouse-track-event-is-with-button))) - (unwind-protect - (progn - (fset 'default-mouse-track-event-is-with-button - 'idlwave-default-mouse-track-event-is-with-button) - (mouse-track event)) - (fset 'default-mouse-track-event-is-with-button oldfunc)))) + (if (featurep 'xemacs) + (let ((oldfunc (symbol-function 'default-mouse-track-event-is-with-button))) + (unwind-protect + (progn + (fset 'default-mouse-track-event-is-with-button + 'idlwave-default-mouse-track-event-is-with-button) + (mouse-track event)) + (fset 'default-mouse-track-event-is-with-button oldfunc))))) ;;; End terrible hack section (defun idlwave-shell-mouse-print (event) From c56509c06c0b9e6a1a4b19c69e1ac8fab88c2367 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:42:05 +0000 Subject: [PATCH 092/347] (idlwave-toolbar, idlwave-toolbar-is-possible): Add defvars. --- lisp/progmodes/idlw-toolbar.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el index 9592acb607d..08dd08335bb 100644 --- a/lisp/progmodes/idlw-toolbar.el +++ b/lisp/progmodes/idlw-toolbar.el @@ -44,6 +44,9 @@ (list 'image :type 'xpm :data image))) (defvar default-toolbar) +(defvar idlwave-toolbar) +(defvar idlwave-toolbar-is-possible) + (if (not (or (and (featurep 'xemacs) ; This is XEmacs (featurep 'xpm) ; need xpm (featurep 'toolbar)) ; ... and the toolbar From 8d68e9b54192a5276c4de27fd18fb750be6955f4 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:42:54 +0000 Subject: [PATCH 093/347] (sql-interactive-mode-map): Use fboundp. (sql-read-passwd): Use read-passwd. --- lisp/progmodes/sql.el | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 129137c32fd..7e259dfb6e4 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -736,10 +736,11 @@ Used by `sql-rename-buffer'.") (defvar sql-interactive-mode-map (let ((map (make-sparse-keymap))) - (if (functionp 'set-keymap-parent) + (if (fboundp 'set-keymap-parent) (set-keymap-parent map comint-mode-map); Emacs - (set-keymap-parents map (list comint-mode-map))); XEmacs - (if (functionp 'set-keymap-name) + (if (fboundp 'set-keymap-parents) + (set-keymap-parents map (list comint-mode-map)))); XEmacs + (if (fboundp 'set-keymap-name) (set-keymap-name map 'sql-interactive-mode-map)); XEmacs (define-key map (kbd "C-j") 'sql-accumulate-and-indent) (define-key map (kbd "C-c C-w") 'sql-copy-column) @@ -1901,16 +1902,8 @@ appended to the SQLi buffer without disturbing your SQL buffer." (describe-function 'sql-help)) (defun sql-read-passwd (prompt &optional default) - "Read a password using PROMPT. -Optional DEFAULT is password to start with. This function calls -`read-passwd' if it is available. If not, function -`ange-ftp-read-passwd' is called. This should always be available, -even in old versions of Emacs." - (if (fboundp 'read-passwd) - (read-passwd prompt nil default) - (unless (fboundp 'ange-ftp-read-passwd) - (autoload 'ange-ftp-read-passwd "ange-ftp")) - (ange-ftp-read-passwd prompt default))) + "Read a password using PROMPT. Optional DEFAULT is password to start with." + (read-passwd prompt nil default)) (defun sql-get-login (&rest what) "Get username, password and database from the user. From 4026bd74b2bf3bb422ff1c8525987f195dd63724 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:44:07 +0000 Subject: [PATCH 094/347] Reto Zimmermann seems to have disappeared. --- lisp/progmodes/vhdl-mode.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 26d68aea50f..5d517edaafc 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4,9 +4,8 @@ ;; Authors: Reto Zimmermann ;; Rodney J. Whitby -;; Maintainer: Reto Zimmermann +;; Maintainer: FSF ;; Keywords: languages vhdl -;; WWW: http://opensource.ethz.ch/emacs/vhdl-mode.html (defconst vhdl-version "3.32.12" "VHDL Mode version number.") From 0e15f9b48da2d0b6c2a1ddde8d616ce537b19aa0 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 11:59:22 +0000 Subject: [PATCH 095/347] (Advising Functions): Explain when to use advice and when to use a hook. --- lispref/advice.texi | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lispref/advice.texi b/lispref/advice.texi index 2006474fc61..e741300b91d 100644 --- a/lispref/advice.texi +++ b/lispref/advice.texi @@ -8,7 +8,7 @@ @cindex advising functions The @dfn{advice} feature lets you add to the existing definition of -a function, by @dfn{advising the function}. This is a clean method +a function, by @dfn{advising the function}. This is a cleaner method for a library to customize functions defined within Emacs---cleaner than redefining the whole function. @@ -23,8 +23,20 @@ are not the same thing. @strong{Usage Note:} Advice is useful for altering the behavior of existing calls to an existing function. If you want the new behavior -for new calls, or for key bindings, it is cleaner to define a new -function (or a new command) which uses the existing function. +for new calls, or for key bindings, you should define a new function +(or a new command) which uses the existing function. + + @strong{Usage note:} Advising a function can cause confusion in +debugging, since people who debug calls to the original function may +not notice that it has been modified with advice. Therefore, if you +have the possibility to change the code of that function (or ask +someone to do so) to run a hook, please solve the problem that way. +Advice should be reserved for the cases where you cannot get the +function changed. + + In particular, this means that a file in Emacs should not put advice +on a function in Emacs. There are currently a few exceptions to this +convention, but we aim to correct them. @menu * Simple Advice:: A simple example to explain the basics of advice. From 7d9f1aede8c8ac595bc6351a6e1257321e73c8e7 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:00:09 +0000 Subject: [PATCH 096/347] (Event Input Misc): Update while-no-input. --- lispref/commands.texi | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/lispref/commands.texi b/lispref/commands.texi index 5ded722155c..47025fb0c28 100644 --- a/lispref/commands.texi +++ b/lispref/commands.texi @@ -2435,15 +2435,26 @@ Emacs version 18. @end defvar @defmac while-no-input body... -This construct runs the @var{body} forms and returns the value -of the last one---but only if no input arrives. If any input -arrives during the execution of the @var{body} forms, it aborts -them (working much like a quit), and the @code{while-no-input} -form returns @code{nil}. +This construct runs the @var{body} forms and returns the value of the +last one---but only if no input arrives. If any input arrives during +the execution of the @var{body} forms, it aborts them (working much +like a quit). The @code{while-no-input} form returns @code{nil} if +aborted by a real quit, and returns @code{t} if aborted by arrival of +other input. If a part of @var{body} binds @code{inhibit-quit} to non-@code{nil}, arrival of input during those parts won't cause an abort until the end of that part. + +If you want to be able to distingish all possible values computed +by @var{body} from both kinds of abort conditions, write the code +like this: + +@example +(while-no-input + (list + (progn . @var{body}))) +@end example @end defmac @defun discard-input From 64230f2d7117c81b69fbb65bd8495166409710b3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:00:57 +0000 Subject: [PATCH 097/347] (Echo Area Customization): Don't define max-mini-window-height here; xref instead. --- lispref/display.texi | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lispref/display.texi b/lispref/display.texi index de024a71b32..c934143c06e 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -495,12 +495,6 @@ sequence are echoed immediately.) If the value is zero, then command input is not echoed. @end defvar -@defopt max-mini-window-height -This variable specifies the maximum height for resizing minibuffer -windows. If a float, it specifies a fraction of the height of the -frame. If an integer, it specifies a number of lines. -@end defopt - @defvar message-truncate-lines Normally, displaying a long message resizes the echo area to display the entire message. But if the variable @code{message-truncate-lines} @@ -508,6 +502,11 @@ is non-@code{nil}, the echo area does not resize, and the message is truncated to fit it, as in Emacs 20 and before. @end defvar + The variable @code{max-mini-window-height}, which specifies the +maximum height for resizing minibuffer windows, also applies to the +echo area (which is really a special use of the minibuffer window. +@xref{Minibuffer Misc}. + @node Warnings @section Reporting Warnings @cindex warnings From 848c29348be7a4c04d4e62ac99a2ebaaca3ffe02 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:01:28 +0000 Subject: [PATCH 098/347] (Defining Hash): Delete stray paren in example. --- lispref/hash.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lispref/hash.texi b/lispref/hash.texi index b8ddd0ee6a4..86a36a57a6e 100644 --- a/lispref/hash.texi +++ b/lispref/hash.texi @@ -281,8 +281,8 @@ compared case-insensitively. (defun case-fold-string-hash (a) (sxhash (upcase a))) -(define-hash-table-test 'case-fold 'case-fold-string= - 'case-fold-string-hash)) +(define-hash-table-test 'case-fold + 'case-fold-string= 'case-fold-string-hash) (make-hash-table :test 'case-fold) @end example From 2c45a1bfd5b27c24a7094c0129290cf9918c1b97 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:05:30 +0000 Subject: [PATCH 099/347] (Minibuffer Misc): Node split up. (Minibuffer Commands, Minibuffer Windows, Minibuffer Contents) (Recursive Mini): New nodes split out from Minibuffer Misc. (Minibuffer Misc): Document max-mini-window-height. --- lispref/minibuf.texi | 186 +++++++++++++++++++++++++------------------ 1 file changed, 107 insertions(+), 79 deletions(-) diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi index a6153fdaca2..61dc4fa7631 100644 --- a/lispref/minibuf.texi +++ b/lispref/minibuf.texi @@ -11,12 +11,13 @@ @cindex complex arguments @cindex minibuffer - A @dfn{minibuffer} is a special buffer that Emacs commands use to read -arguments more complicated than the single numeric prefix argument. -These arguments include file names, buffer names, and command names (as -in @kbd{M-x}). The minibuffer is displayed on the bottom line of the -frame, in the same place as the echo area, but only while it is in use -for reading an argument. + A @dfn{minibuffer} is a special buffer that Emacs commands use to +read arguments more complicated than the single numeric prefix +argument. These arguments include file names, buffer names, and +command names (as in @kbd{M-x}). The minibuffer is displayed on the +bottom line of the frame, in the same place as the echo area +(@pxref{The Echo Area}), but only while it is in use for reading an +argument. @menu * Intro to Minibuffers:: Basic information about minibuffers. @@ -29,6 +30,10 @@ for reading an argument. * Yes-or-No Queries:: Asking a question with a simple answer. * Multiple Queries:: Asking a series of similar questions. * Reading a Password:: Reading a password from the terminal. +* Minibuffer Commands:: Commands used as key bindings in minibuffers. +* Minibuffer Contents:: How such commands access the minibuffer text. +* Minibuffer Windows:: Operating on the special minibuffer windows. +* Recursive Mini:: Whether recursive entry to minibuffer is allowed. * Minibuffer Misc:: Various customization hooks and variables. @end menu @@ -1694,11 +1699,11 @@ return if the user enters empty input. If @var{default} is @code{nil}, then @code{read-passwd} returns the null string in that case. @end defun -@node Minibuffer Misc -@section Minibuffer Miscellany +@node Minibuffer Commands +@section Minibuffer Commands - This section describes some basic functions and variables related to -minibuffers. + This section describes some commands meant for use in the +minibuffer. @deffn Command exit-minibuffer This command exits the active minibuffer. It is normally bound to @@ -1733,65 +1738,11 @@ This command replaces the minibuffer contents with the value of the regular expression). @end deffn -@defun minibuffer-prompt -This function returns the prompt string of the currently active -minibuffer. If no minibuffer is active, it returns @code{nil}. -@end defun +@node Minibuffer Windows +@section Minibuffer Windows -@defun minibuffer-prompt-end -@tindex minibuffer-prompt-end -This function returns the current -position of the end of the minibuffer prompt, if a minibuffer is -current. Otherwise, it returns the minimum valid buffer position. -@end defun - -@defun minibuffer-contents -@tindex minibuffer-contents -This function returns the editable -contents of the minibuffer (that is, everything except the prompt) as -a string, if a minibuffer is current. Otherwise, it returns the -entire contents of the current buffer. -@end defun - -@defun minibuffer-contents-no-properties -@tindex minibuffer-contents-no-properties -This is like @code{minibuffer-contents}, except that it does not copy text -properties, just the characters themselves. @xref{Text Properties}. -@end defun - -@defun delete-minibuffer-contents -@tindex delete-minibuffer-contents -This function erases the editable -contents of the minibuffer (that is, everything except the prompt), if -a minibuffer is current. Otherwise, it erases the entire buffer. -@end defun - -@defun minibuffer-prompt-width -This function returns the current display-width of the minibuffer -prompt, if a minibuffer is current. Otherwise, it returns zero. -@end defun - -@defvar minibuffer-setup-hook -This is a normal hook that is run whenever the minibuffer is entered. -@xref{Hooks}. -@end defvar - -@defvar minibuffer-exit-hook -This is a normal hook that is run whenever the minibuffer is exited. -@xref{Hooks}. -@end defvar - -@defvar minibuffer-help-form -@anchor{Definition of minibuffer-help-form} -The current value of this variable is used to rebind @code{help-form} -locally inside the minibuffer (@pxref{Help Functions}). -@end defvar - -@defun minibufferp &optional buffer-or-name -This function returns non-@code{nil} if @var{buffer-or-name} is a -minibuffer. If @var{buffer-or-name} is omitted, it tests the current -buffer. -@end defun + These functions access and select minibuffer windows +and test whether they are active. @defun active-minibuffer-window This function returns the currently active minibuffer window, or @@ -1832,20 +1783,53 @@ This function returns non-@code{nil} if @var{window}, assumed to be a minibuffer window, is currently active. @end defun -@defvar minibuffer-scroll-window -@anchor{Definition of minibuffer-scroll-window} -If the value of this variable is non-@code{nil}, it should be a window -object. When the function @code{scroll-other-window} is called in the -minibuffer, it scrolls this window. -@end defvar +@node Minibuffer Contents +@section Minibuffer Contents -@defun minibuffer-selected-window -This function returns the window which was selected when the -minibuffer was entered. If selected window is not a minibuffer -window, it returns @code{nil}. + These functions access the minibuffer prompt and contents. + +@defun minibuffer-prompt +This function returns the prompt string of the currently active +minibuffer. If no minibuffer is active, it returns @code{nil}. @end defun -Finally, some functions and variables deal with recursive minibuffers +@defun minibuffer-prompt-end +@tindex minibuffer-prompt-end +This function returns the current +position of the end of the minibuffer prompt, if a minibuffer is +current. Otherwise, it returns the minimum valid buffer position. +@end defun + +@defun minibuffer-prompt-width +This function returns the current display-width of the minibuffer +prompt, if a minibuffer is current. Otherwise, it returns zero. +@end defun + +@defun minibuffer-contents +@tindex minibuffer-contents +This function returns the editable +contents of the minibuffer (that is, everything except the prompt) as +a string, if a minibuffer is current. Otherwise, it returns the +entire contents of the current buffer. +@end defun + +@defun minibuffer-contents-no-properties +@tindex minibuffer-contents-no-properties +This is like @code{minibuffer-contents}, except that it does not copy text +properties, just the characters themselves. @xref{Text Properties}. +@end defun + +@defun delete-minibuffer-contents +@tindex delete-minibuffer-contents +This function erases the editable contents of the minibuffer (that is, +everything except the prompt), if a minibuffer is current. Otherwise, +it erases the entire current buffer. +@end defun + +@node Recursive Mini +@section Recursive Minibuffers + + These functions and variables deal with recursive minibuffers (@pxref{Recursive Editing}): @defun minibuffer-depth @@ -1875,6 +1859,50 @@ to @code{t} in the interactive declaration (@pxref{Using Interactive}). The minibuffer command @code{next-matching-history-element} (normally @kbd{M-s} in the minibuffer) does the latter. +@node Minibuffer Misc +@section Minibuffer Miscellany + +@defun minibufferp &optional buffer-or-name +This function returns non-@code{nil} if @var{buffer-or-name} is a +minibuffer. If @var{buffer-or-name} is omitted, it tests the current +buffer. +@end defun + +@defvar minibuffer-setup-hook +This is a normal hook that is run whenever the minibuffer is entered. +@xref{Hooks}. +@end defvar + +@defvar minibuffer-exit-hook +This is a normal hook that is run whenever the minibuffer is exited. +@xref{Hooks}. +@end defvar + +@defvar minibuffer-help-form +@anchor{Definition of minibuffer-help-form} +The current value of this variable is used to rebind @code{help-form} +locally inside the minibuffer (@pxref{Help Functions}). +@end defvar + +@defvar minibuffer-scroll-window +@anchor{Definition of minibuffer-scroll-window} +If the value of this variable is non-@code{nil}, it should be a window +object. When the function @code{scroll-other-window} is called in the +minibuffer, it scrolls this window. +@end defvar + +@defun minibuffer-selected-window +This function returns the window which was selected when the +minibuffer was entered. If selected window is not a minibuffer +window, it returns @code{nil}. +@end defun + +@defopt max-mini-window-height +This variable specifies the maximum height for resizing minibuffer +windows. If a float, it specifies a fraction of the height of the +frame. If an integer, it specifies a number of lines. +@end defopt + @defun minibuffer-message string This function displays @var{string} temporarily at the end of the minibuffer text, for two seconds, or until the next input event From 0fb9f9aed49a6b8ab60d716acbf6014508c4c5df Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:06:59 +0000 Subject: [PATCH 100/347] (Top): Update submenu for Minibuffer. --- lispref/elisp.texi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lispref/elisp.texi b/lispref/elisp.texi index 64b4ee90292..b935b77c0fd 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -543,6 +543,10 @@ Minibuffers * Yes-or-No Queries:: Asking a question with a simple answer. * Multiple Queries:: Asking a series of similar questions. * Reading a Password:: Reading a password from the terminal. +* Minibuffer Commands:: Commands used as key bindings in minibuffers. +* Minibuffer Contents:: How such commands access the minibuffer text. +* Minibuffer Windows:: Operating on the special minibuffer windows. +* Recursive Mini:: Whether recursive entry to minibuffer is allowed. * Minibuffer Misc:: Various customization hooks and variables. Completion From 32808f83562a90037e5ae45e21159cb4b53a7f95 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:09:14 +0000 Subject: [PATCH 101/347] (Defining Minor Modes): Explain when init-value can be non-nil. --- lispref/modes.texi | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lispref/modes.texi b/lispref/modes.texi index 053e7a511e8..098a2d57068 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -1373,7 +1373,8 @@ symbol). It defines a command named @var{mode} to toggle the minor mode, with @var{doc} as its documentation string. It also defines a variable named @var{mode}, which is set to @code{t} or @code{nil} by enabling or disabling the mode. The variable is initialized to -@var{init-value}. +@var{init-value}. Except in unusual circumstances (see below), this +value must be @code{nil}. The string @var{lighter} says what to display in the mode line when the mode is enabled; if it is @code{nil}, the mode is not displayed @@ -1424,6 +1425,14 @@ as setting the variable named @var{mode} and then executes the variable @code{@var{mode}-hook}. @end defmac + The initial value must be @code{nil} except in cases where (1) the +mode is preloaded in Emacs, or (2) it is painless to for loading to +enable the mode even though the user did not request it. For +instance, if the mode has no effect unless something else is enabled, +and will always be loaded by that time, enabling it by default is +harmless. But these are unusual circumstances. Normally, the +initial value must be @code{nil}. + @findex easy-mmode-define-minor-mode The name @code{easy-mmode-define-minor-mode} is an alias for this macro. From fb5a74cd19ffc55245bfe300734929356dfef77c Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:09:36 +0000 Subject: [PATCH 102/347] (Coding Conventions): Minor cleanup. --- lispref/tips.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/tips.texi b/lispref/tips.texi index 6e309155876..3ec885eca66 100644 --- a/lispref/tips.texi +++ b/lispref/tips.texi @@ -294,7 +294,7 @@ accessed in random order (not searched front to back), provided there is no need to insert or delete elements (only lists allow that). @item -The recommended way to print a message in the echo area is with +The recommended way to show a message in the echo area is with the @code{message} function, not @code{princ}. @xref{The Echo Area}. @item From 17365af46c54d8587a4e13c1c560b9869d57ecb5 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:10:29 +0000 Subject: [PATCH 103/347] (QUIT): Throw t to Vthrow_on_input. --- src/lisp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lisp.h b/src/lisp.h index 375e0e9cb9b..70f5ddffa94 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1797,7 +1797,7 @@ extern int interrupt_input_pending; Lisp_Object flag = Vquit_flag; \ Vquit_flag = Qnil; \ if (EQ (Vthrow_on_input, flag)) \ - Fthrow (Vthrow_on_input, Qnil); \ + Fthrow (Vthrow_on_input, Qt); \ Fsignal (Qquit, Qnil); \ } \ else if (interrupt_input_pending) \ From a8f0f551007be7c04b1fe039a8b74f3a605146f3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:10:40 +0000 Subject: [PATCH 104/347] (BYTE_CODE_QUIT): Throw t to Vthrow_on_input. --- src/bytecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bytecode.c b/src/bytecode.c index 918ebdd550b..e5a3e7b2a7c 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -389,7 +389,7 @@ unmark_byte_stack () Vquit_flag = Qnil; \ BEFORE_POTENTIAL_GC (); \ if (EQ (Vthrow_on_input, flag)) \ - Fthrow (Vthrow_on_input, Qnil); \ + Fthrow (Vthrow_on_input, Qt); \ Fsignal (Qquit, Qnil); \ AFTER_POTENTIAL_GC (); \ } \ From 61298e176c1a1e27aa09c6531b54622c5aff3bbd Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 12:11:00 +0000 Subject: [PATCH 105/347] *** empty log message *** --- admin/FOR-RELEASE | 19 +++++++++++++++ etc/NEWS | 4 ++++ lisp/ChangeLog | 46 +++++++++++++++++++++++++++++++++++++ lisp/progmodes/vhdl-mode.el | 2 +- lispref/ChangeLog | 24 +++++++++++++++++++ man/ChangeLog | 6 +++++ src/ChangeLog | 6 +++++ 7 files changed, 106 insertions(+), 1 deletion(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 19656cabdde..31bc4caf0f3 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -49,6 +49,25 @@ invalid pointer from string_free_list. ** Fix those modes that still use compile-internal, to not use it. +** Fix recognition of shell's `dirs' command. + +Is his change right? + +Date: Wed, 29 Jun 2005 18:21:28 -0500 (CDT) +From: kevin.gal@verizon.net + +When I use tcsh (which echoes command input) in a shell buffer, +entering "M-x dirs" fails because it mistakens the echoed "dirs" +string as the directory string to use as input when changing the +buffers default directory. The attached gziped patch file contains a +fix. The patch also binds the "dirs" command to "\e\C-m" in +shell-mode-map (previously unbound) to make it easy to invoke. +Finally, a test has been added to see if "shell-dirstack-query" is +non-nil. If so, it is not overwritten. + +To enable the fix, the user must set comint-process-echoes to t. + + ** Bug in ebrowse Date: Fri, 27 May 2005 17:35:48 +0200 diff --git a/etc/NEWS b/etc/NEWS index 0935d2066da..1952c65fab0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -2798,6 +2798,10 @@ version 5.0.2; see MH-E-NEWS for details. ** Calendar changes: ++++ +*** You can now use < and >, instead of C-x < and C-x >, to scroll +the calendar left or right. (The old key bindings still work too.) + +++ *** There is a new calendar package, icalendar.el, that can be used to convert Emacs diary entries to/from the iCalendar format. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1be3c4b7c5f..bdf55d10e9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,49 @@ +2005-08-09 Richard M. Stallman + + * progmodes/sql.el (sql-interactive-mode-map): Use fboundp. + (sql-read-passwd): Use read-passwd. + + * progmodes/idlw-toolbar.el (idlwave-toolbar) + (idlwave-toolbar-is-possible): Add defvars. + + * progmodes/idlw-shell.el (idlwave-xemacs-hack-mouse-track): + Avoid warnings. + + * progmodes/idlw-rinfo.el (idlwave-system-variables-alist) + (idlwave-system-class-info, idlwave-executive-commands-alist): + Use defvar. + + * progmodes/cc-engine.el (c-guess-basic-syntax): Add autoload. + + * mail/supercite.el (sc-ask, sc-no-blank-line-or-header): + Avoid warnings. + + * mail/rmail.el (rmail-ignored-headers): Don't hide mime-version: + and content-type: headers. + + * eshell/eshell.el (eshell): Avoid warnings about eshell-mode. + + * emacs-lisp/map-ynp.el (map-y-or-n-p): Reorder the options + and rename some of them to be more self-explanatory. + + * calendar/calendar.el (calendar-mode-map): Bind < and > usefully. + + * startup.el (command-line-1): Implement -scriptload. + + * replace.el (occur-engine): Initial *Occur* output not undoable. + + * menu-bar.el (menu-bar-file-menu): Rename some menu items + and improve help strings. + + * isearch.el (isearch-repeat): When changing direction, + mark search successful. + + * ediff-init.el: Use (featurep 'xemacs). + + * comint.el (send-invisible): Identify buffer, if not selected. + + * align.el: Delete autoload for c-guess-basic-syntax. + 2005-08-09 Juanma Barranquero * textmodes/refbib.el (r2b-convert-record, r2b-convert-buffer): diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 5d517edaafc..de5f3ebabd7 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4,7 +4,7 @@ ;; Authors: Reto Zimmermann ;; Rodney J. Whitby -;; Maintainer: FSF +;; Maintainer: FSF (Because Reto Zimmermann seems to have disappeared) ;; Keywords: languages vhdl (defconst vhdl-version "3.32.12" diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 98d38b57ce0..329c8d912a6 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,27 @@ +2005-08-09 Richard M. Stallman + + * tips.texi (Coding Conventions): Minor cleanup. + + * modes.texi (Defining Minor Modes): Explain when init-value + can be non-nil. + + * elisp.texi (Top): Update submenu for Minibuffer. + + * minibuf.texi (Minibuffer Misc): Node split up. + (Minibuffer Commands, Minibuffer Windows, Minibuffer Contents) + (Recursive Mini): New nodes split out from Minibuffer Misc. + (Minibuffer Misc): Document max-mini-window-height. + + * hash.texi (Defining Hash): Delete stray paren in example. + + * display.texi (Echo Area Customization): Don't define + max-mini-window-height here; xref instead. + + * commands.texi (Event Input Misc): Update while-no-input. + + * advice.texi (Advising Functions): Explain when to use advice + and when to use a hook. + 2005-07-30 Eli Zaretskii * makefile.w32-in (info): Don't run install-info. diff --git a/man/ChangeLog b/man/ChangeLog index 0baae8e1187..67cd0d6233e 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,9 @@ +2005-08-09 Richard M. Stallman + + * files.texi (Comparing Files): Clarify compare-windows. + + * calendar.texi (Scroll Calendar): Document < and > in calendar. + 2005-08-09 Juri Linkov * info.texi (Help-P): Replace `Prev' with `Previous'. diff --git a/src/ChangeLog b/src/ChangeLog index 256b720eace..68614d7c8c4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-08-09 Richard M. Stallman + + * bytecode.c (BYTE_CODE_QUIT): Throw t to Vthrow_on_input. + + * lisp.h (QUIT): Throw t to Vthrow_on_input. + 2005-08-09 Thien-Thi Nguyen * floatfns.c (Fexpt): Use floats for negative exponent. From e8f30180f4fad05b793829966e4cb78539f38d33 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 13:35:12 +0000 Subject: [PATCH 106/347] (find-file-noselect): Don't call set-buffer-major-mode. (find-file-noselect-1): Call it here, only if RAWFILE. (normal-mode): Always set some major mode. (save-some-buffers-action-alist): Change some explanation strings. (file-name-non-special): In the `quote' method, use unwind-protect. --- lisp/ChangeLog | 19 +++++++++++++++++++ lisp/files.el | 11 ++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bdf55d10e9f..1fa27e44974 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +2005-08-09 Richard M. Stallman + + * files.el (find-file-noselect): Don't call set-buffer-major-mode. + (find-file-noselect-1): Call it here, only if RAWFILE. + (normal-mode): Always set some major mode. + (save-some-buffers-action-alist): Change some explanation strings. + (file-name-non-special): In the `quote' method, use unwind-protect. + +2005-08-09 Magnus Henoch + + * textmodes/ispell.el (aspell-have-dictionaries): New variable. + (aspell-find-dictionaries): New command. + (aspell-data-dir): New variable. + (aspell-find-data-dir): New function. + (aspell-find-dictionary): New function. + (ispell-valid-dictionary-list): Call aspell-find-dictionaries if + appropriate. Don't look for ispell dictionaries if we use + aspell. + 2005-08-09 Richard M. Stallman * progmodes/sql.el (sql-interactive-mode-map): Use fboundp. diff --git a/lisp/files.el b/lisp/files.el index 8850928d94a..35afa099012 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1464,7 +1464,6 @@ the various files." buf) ;; Create a new buffer. (setq buf (create-file-buffer filename)) - (set-buffer-major-mode buf) ;; find-file-noselect-1 may use a different buffer. (find-file-noselect-1 buf filename nowarn rawfile truename number)))))) @@ -1538,6 +1537,7 @@ the various files." (progn (set-buffer-multibyte nil) (setq buffer-file-coding-system 'no-conversion) + (set-buffer-major-mode buf) (make-local-variable 'find-file-literally) (setq find-file-literally t)) (after-find-file error (not nowarn))) @@ -1727,7 +1727,7 @@ not set local variables (though we do notice a mode specified with -*-.) or from Lisp without specifying the optional argument FIND-FILE; in that case, this function acts as if `enable-local-variables' were t." (interactive) - (or find-file (funcall (or default-major-mode 'fundamental-mode))) + (funcall (or default-major-mode 'fundamental-mode)) (let ((enable-local-variables (or (not find-file) enable-local-variables))) (report-errors "File mode specification error: %s" (set-auto-mode)) @@ -3450,9 +3450,9 @@ This requires the external program `diff' to be in your `exec-path'." (recursive-edit) ;; Return nil to ask about BUF again. nil) - "display the current buffer") + "view this file") (?d diff-buffer-with-file - "show difference to last saved version")) + "view changes in file")) "ACTION-ALIST argument used in call to `map-y-or-n-p'.") (put 'save-some-buffers-action-alist 'risky-local-variable t) @@ -4844,7 +4844,8 @@ With prefix arg, silently save all file-visiting buffers, then kill." ((eq method 'add) (concat "/:" (apply operation arguments))) ((eq method 'quote) - (prog1 (apply operation arguments) + (unwind-protect + (apply operation arguments) (setq buffer-file-name (concat "/:" buffer-file-name)))) ((eq method 'unquote-then-quote) (let (res) From 6f2b20a2fa4824b64c400cfdeec344d880537b1d Mon Sep 17 00:00:00 2001 From: Stephen Eglen Date: Tue, 9 Aug 2005 13:53:35 +0000 Subject: [PATCH 107/347] Update URLs. --- etc/MORE.STUFF | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF index ab1a10e6182..3238caacb16 100644 --- a/etc/MORE.STUFF +++ b/etc/MORE.STUFF @@ -16,7 +16,7 @@ Please submit a bug report if you find that any of the addresses listed here fail. * The `Emacs Lisp List' at - has pointers + has pointers to sources of a large number of packages. * gnu.emacs.sources @@ -73,8 +73,6 @@ You might find bug-fixes or enhancements in these places. * Ispell: - * Iswitchb: - * PC Selection: * PS mode: @@ -159,7 +157,7 @@ Several are for Debian GNU/Linux in particular. * EMacro: EMacro is a portable configuration file that configures itself. - * Emacs statistical system (ESS): statistical programming within Emacs + * Emacs speaks statistics (ESS): statistical programming within Emacs * Emacspeak -- A Speech Output Subsystem For Emacs: From 8ad8316c3eb56952e12b682b6cedce95210a8da1 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 9 Aug 2005 14:05:24 +0000 Subject: [PATCH 108/347] (fill-nonuniform-paragraphs): Improve argument/docstring consistency. (canonically-space-region, fill-context-prefix, fill-french-nobreak-p, fill-delete-newlines, fill-comment-paragraph, justify-current-line): "?\ " -> "?\s". --- lisp/ChangeLog | 14 +++++++++++++- lisp/textmodes/fill.el | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1fa27e44974..817bee01c17 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2005-08-09 Juanma Barranquero + + * textmodes/fill.el (canonically-space-region) + (fill-context-prefix, fill-french-nobreak-p) + (fill-delete-newlines, fill-comment-paragraph) + (justify-current-line): "?\ " -> "?\s". + +2005-08-09 Ben North (tiny change) + + * textmodes/fill.el (fill-nonuniform-paragraphs): + Improve argument/docstring consistency. + 2005-08-09 Richard M. Stallman * files.el (find-file-noselect): Don't call set-buffer-major-mode. @@ -8,7 +20,7 @@ 2005-08-09 Magnus Henoch - * textmodes/ispell.el (aspell-have-dictionaries): New variable. + * textmodes/ispell.el (aspell-have-dictionaries): New variable. (aspell-find-dictionaries): New command. (aspell-data-dir): New variable. (aspell-find-data-dir): New function. diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index d77daaeed39..11ddfc0e967 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -163,7 +163,7 @@ Remove indentation from each line." ;; This is quick, but loses when a tab follows the end of a sentence. ;; Actually, it is difficult to tell that from "Mr.\tSmith". ;; Blame the typist. - (subst-char-in-region beg end ?\t ?\ ) + (subst-char-in-region beg end ?\t ?\s) (while (and (< (point) end) (re-search-forward end-spc-re end t)) (delete-region @@ -282,7 +282,7 @@ act as a paragraph-separator." (string-match comment-start-skip first-line-prefix))) first-line-prefix - (make-string (string-width first-line-prefix) ?\ )))) + (make-string (string-width first-line-prefix) ?\s)))) ;; But either way, reject it if it indicates the start ;; of a paragraph when text follows it. (if (not (eq 0 (string-match paragraph-start @@ -312,7 +312,7 @@ places." (backward-char 1) (or (looking-at "[([{,A+,b+(B]") ;; Don't cut right after a single-letter word. - (and (memq (preceding-char) '(?\t ?\ )) + (and (memq (preceding-char) '(?\t ?\s)) (eq (char-syntax (following-char)) ?w))))))) (defcustom fill-nobreak-predicate nil @@ -439,10 +439,10 @@ Point is moved to just past the fill prefix on the first line." (sentence-end-without-space-list (string-to-list sentence-end-without-space))) (while (re-search-forward eol-double-space-re to t) - (or (>= (point) to) (memq (char-before) '(?\t ?\ )) + (or (>= (point) to) (memq (char-before) '(?\t ?\s)) (memq (char-after (match-beginning 0)) sentence-end-without-space-list) - (insert-and-inherit ?\ )))) + (insert-and-inherit ?\s)))) (goto-char from) (if enable-multibyte-characters @@ -471,7 +471,7 @@ Point is moved to just past the fill prefix on the first line." (goto-char from) (skip-chars-forward " \t") ;; Then change all newlines to spaces. - (subst-char-in-region from to ?\n ?\ ) + (subst-char-in-region from to ?\n ?\s) (if (and nosqueeze (not (eq justify 'full))) nil (canonically-space-region (or squeeze-after (point)) to) @@ -830,10 +830,10 @@ can take care of filling. JUSTIFY is used as in `fill-paragraph'." (if has-code-and-comment (concat (if (not indent-tabs-mode) - (make-string (current-column) ?\ ) + (make-string (current-column) ?\s) (concat (make-string (/ (current-column) tab-width) ?\t) - (make-string (% (current-column) tab-width) ?\ ))) + (make-string (% (current-column) tab-width) ?\s))) (buffer-substring (point) comin)) (buffer-substring (line-beginning-position) comin)))) beg end) @@ -1223,7 +1223,7 @@ otherwise it is made canonical." (while (> count 0) (skip-chars-forward " ") (insert-and-inherit - (make-string (/ curr-fracspace nspaces) ?\ )) + (make-string (/ curr-fracspace nspaces) ?\s)) (search-forward " " nil t) (setq count (1- count) curr-fracspace @@ -1282,8 +1282,8 @@ in the paragraph. When calling from a program, pass range to fill as first two arguments. -Optional third and fourth arguments JUSTIFY and MAIL-FLAG: -JUSTIFY to justify paragraphs (prefix arg), +Optional third and fourth arguments JUSTIFYP and CITATION-REGEXP: +JUSTIFYP to justify paragraphs (prefix arg). When filling a mail message, pass a regexp for CITATION-REGEXP which will match the prefix of a line which is a citation marker plus whitespace, but no other kind of prefix. From e7cdb3e043eeec251bc504b368900b5797c49910 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 14:12:44 +0000 Subject: [PATCH 109/347] (ispell-word): More fboundp checks. (ispell-find-aspell-dictionaries): New command. (ispell-have-aspell-dictionaries): New variable. (ispell-aspell-data-dir, ispell-aspell-dict-dir): New variables. (ispell-get-aspell-config-value): New function. (ispell-aspell-find-dictionary): New function. (ispell-aspell-add-aliases): New function. (ispell-valid-dictionary-list): Call ispell-find-aspell-dictionaries if appropriate. Don't look for ispell dictionaries if we use aspell. (ispell-menu-map): Don't build a submenu of dictionaries. --- lisp/ChangeLog | 21 +++--- lisp/textmodes/ispell.el | 148 ++++++++++++++++++++++++++++++--------- 2 files changed, 128 insertions(+), 41 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 817bee01c17..5ddf15cceda 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -12,6 +12,8 @@ 2005-08-09 Richard M. Stallman + * textmodes/ispell.el (ispell-word): More fboundp checks. + * files.el (find-file-noselect): Don't call set-buffer-major-mode. (find-file-noselect-1): Call it here, only if RAWFILE. (normal-mode): Always set some major mode. @@ -20,15 +22,16 @@ 2005-08-09 Magnus Henoch - * textmodes/ispell.el (aspell-have-dictionaries): New variable. - (aspell-find-dictionaries): New command. - (aspell-data-dir): New variable. - (aspell-find-data-dir): New function. - (aspell-find-dictionary): New function. - (ispell-valid-dictionary-list): Call aspell-find-dictionaries if - appropriate. Don't look for ispell dictionaries if we use - aspell. - + * textmodes/ispell.el (ispell-find-aspell-dictionaries): New command. + (ispell-have-aspell-dictionaries): New variable. + (ispell-aspell-data-dir, ispell-aspell-dict-dir): New variables. + (ispell-get-aspell-config-value): New function. + (ispell-aspell-find-dictionary): New function. + (ispell-aspell-add-aliases): New function. + (ispell-valid-dictionary-list): Call ispell-find-aspell-dictionaries if + appropriate. Don't look for ispell dictionaries if we use aspell. + (ispell-menu-map): Don't build a submenu of dictionaries. + 2005-08-09 Richard M. Stallman * progmodes/sql.el (sql-interactive-mode-map): Use fboundp. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index a0a0ca20218..5afdf63ff2a 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -862,9 +862,113 @@ and added as a submenu of the \"Edit\" menu.") ) "Non-nil means that the OS supports asynchronous processes.") +;; Make ispell.el work better with aspell. + +(defvar ispell-have-aspell-dictionaries nil + "Non-nil if we have queried Aspell for dictionaries at least once.") + +(defun ispell-find-aspell-dictionaries () + "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'." + (interactive) + (unless ispell-really-aspell + (error "This function only works with aspell")) + (let ((dictionaries + (split-string + (with-temp-buffer + (call-process ispell-program-name nil t nil "dicts") + (buffer-string))))) + (setq ispell-dictionary-alist + (mapcar #'ispell-aspell-find-dictionary dictionaries)) + (ispell-aspell-add-aliases) + ;; Add a default entry + (let* ((english-dict (assoc "en" ispell-dictionary-alist)) + (default-dict (cons nil (cdr english-dict)))) + (push default-dict ispell-dictionary-alist)) + (setq ispell-have-aspell-dictionaries t))) + +(defvar ispell-aspell-data-dir nil + "Data directory of Aspell.") + +(defvar ispell-aspell-dict-dir nil + "Dictionary directory of Aspell.") + +(defun ispell-get-aspell-config-value (key) + "Return value of Aspell configuration option KEY. +Assumes that value contains no whitespace." + (with-temp-buffer + (call-process ispell-program-name nil t nil "config" key) + (car (split-string (buffer-string))))) + +(defun ispell-aspell-find-dictionary (dict-name) + (let* ((lang ;; Strip out region, variant, etc. + (and (string-match "^[[:alpha:]]+" dict-name) + (match-string 0 dict-name))) + (data-file + (concat (or ispell-aspell-data-dir + (setq ispell-aspell-data-dir + (ispell-get-aspell-config-value "data-dir"))) + "/" lang ".dat")) + otherchars) + ;; This file really should exist; there is no sensible recovery. + (with-temp-buffer + (insert-file-contents data-file) + ;; There is zero or one line with special characters declarations. + (when (search-forward-regexp "^special" nil t) + (let ((specials (split-string + (buffer-substring (point) + (progn (end-of-line) (point)))))) + ;; The line looks like: special ' -** - -** . -** : -*- + ;; -** means that this character + ;; - doesn't appear at word start + ;; * may appear in the middle of a word + ;; * may appear at word end + ;; `otherchars' is about the middle case. + (while specials + (when (eq (aref (cadr specials) 1) ?*) + (push (car specials) otherchars)) + (setq specials (cddr specials)))))) + (list dict-name + "[[:alpha:]]" + "[^[:alpha:]]" + (regexp-opt otherchars) + t ; We can't tell, so set this to t + (list "-d" dict-name "--encoding=utf-8") + nil ; aspell doesn't support this + ;; Here we specify the encoding to use while communicating with + ;; aspell. This doesn't apply to command line arguments, so + ;; just don't pass words to spellcheck as arguments... + 'utf-8))) + +(defun ispell-aspell-add-aliases () + "Find aspell's dictionary aliases and add them to `ispell-dictionary-alist'." + (let ((aliases (file-expand-wildcards + (concat (or ispell-aspell-dict-dir + (setq ispell-aspell-dict-dir + (ispell-get-aspell-config-value "dict-dir"))) + "/*.alias")))) + (dolist (alias-file aliases) + (with-temp-buffer + (insert-file-contents alias-file) + ;; Look for a line "add FOO.multi", extract FOO + (when (search-forward-regexp "^add \\([^.]+\\)\\.multi" nil t) + (let* ((aliasname (file-name-sans-extension + (file-name-nondirectory alias-file))) + (already-exists-p (assoc aliasname ispell-dictionary-alist)) + (realname (match-string 1)) + (realdict (assoc realname ispell-dictionary-alist))) + (when (and realdict (not already-exists-p)) + (push (cons aliasname (cdr realdict)) ispell-dictionary-alist)))))))) + (defun ispell-valid-dictionary-list () "Returns a list of valid dictionaries. The variable `ispell-library-directory' defines the library location." + ;; If Ispell is really Aspell, query it for the dictionary list. + (when (and (not ispell-have-aspell-dictionaries) + (condition-case () + (progn (ispell-check-version) t) + (error nil)) + ispell-really-aspell) + (ispell-find-aspell-dictionaries)) (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist)) (dict-list (cons "default" nil)) name load-dict) @@ -875,7 +979,9 @@ The variable `ispell-library-directory' defines the library location." (if (and name ;; include all dictionaries if lib directory not known. - (or (not ispell-library-directory) + ;; For Aspell, we already know which dictionaries exist. + (or ispell-really-aspell + (not ispell-library-directory) (file-exists-p (concat ispell-library-directory "/" name ".hash")) (file-exists-p (concat ispell-library-directory "/" name ".has")) @@ -887,36 +993,11 @@ The variable `ispell-library-directory' defines the library location." (setq dict-list (cons name dict-list)))) dict-list)) -;;;###autoload -(if ispell-menu-map-needed - (let ((dicts (if (fboundp 'ispell-valid-dictionary-list) - (ispell-valid-dictionary-list) - ;; This case is used in loaddefs.el - ;; since ispell-valid-dictionary-list isn't defined then. - (mapcar (lambda (x) (or (car x) "default")) - ispell-dictionary-alist))) - (dict-map (make-sparse-keymap "Dictionaries"))) - (setq ispell-menu-map (make-sparse-keymap "Spell")) - ;; add the dictionaries to the bottom of the list. - (if (not dicts) - (define-key ispell-menu-map [default] - '("Select Default Dict" - "Dictionary for which Ispell was configured" - . (lambda () (interactive) - (ispell-change-dictionary "default"))))) - (fset 'ispell-dict-map dict-map) - (define-key ispell-menu-map [dictionaries] - `(menu-item "Select Dict" ispell-dict-map)) - (dolist (name dicts) - (define-key dict-map (vector (intern name)) - (cons (concat "Select " (capitalize name) " Dict") - `(lambda () (interactive) - (ispell-change-dictionary ,name))))))) - ;;; define commands in menu in opposite order you want them to appear. ;;;###autoload (if ispell-menu-map-needed (progn + (setq ispell-menu-map (make-sparse-keymap "Spell")) (define-key ispell-menu-map [ispell-change-dictionary] '(menu-item "Change Dictionary..." ispell-change-dictionary :help "Supply explicit dictionary file name")) @@ -1491,7 +1572,8 @@ quit spell session exited." (funcall ispell-format-word word))) (and (fboundp 'extent-at) (extent-at start) - (delete-extent (extent-at start)))) + (and (fboundp 'delete-extent) + (delete-extent (extent-at start))))) ((stringp poss) (or quietly (message "%s is correct because of root %s" @@ -1499,13 +1581,15 @@ quit spell session exited." (funcall ispell-format-word poss))) (and (fboundp 'extent-at) (extent-at start) - (delete-extent (extent-at start)))) + (and (fboundp 'delete-extent) + (delete-extent (extent-at start))))) ((null poss) (message "Error in ispell process")) (ispell-check-only ; called from ispell minor mode. (if (fboundp 'make-extent) - (let ((ext (make-extent start end))) - (set-extent-property ext 'face ispell-highlight-face) - (set-extent-property ext 'priority 2000)) + (if (fboundp 'set-extent-property) + (let ((ext (make-extent start end))) + (set-extent-property ext 'face ispell-highlight-face) + (set-extent-property ext 'priority 2000))) (beep) (message "%s is incorrect"(funcall ispell-format-word word)))) (t ; prompt for correct word. From 28df3a10ce195838ebe9b56b94700b7fdbb6d61a Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 9 Aug 2005 15:26:52 +0000 Subject: [PATCH 110/347] Add W32-specific issues. --- admin/FOR-RELEASE | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 31bc4caf0f3..e9d2a75ddec 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -45,6 +45,16 @@ To be done by Andre Spiegel . ** Investigate reported crashes related to using an invalid pointer from string_free_list. +** Emacs on Windows crashes reading JPEG images from files. + +The problem is caused by the Emacs executable and the image library +having multiple, incompatible copies of the run-time code, which can +happen when mixing a MSVC build of Emacs with a MinGW build of the +jpeg library (or the other way around). The fix is straightforward +and has already been posted on the developers' list, but it is on the +back burner waiting for a legal comment or an alternate implementation +(around 30 lines of code). + * BUGS ** Fix those modes that still use compile-internal, to not use it. @@ -67,6 +77,13 @@ non-nil. If so, it is not overwritten. To enable the fix, the user must set comint-process-echoes to t. +** Server processes do not work on Windows. + +TCP/IP server processes created with `make-network-process' consume +excesive CPU on some Windows environments. Usages of 50% and 100% +CPU time have been observed on different Window XP configurations. + +When calling `delete-process' on an UDP server process, Emacs hangs. ** Bug in ebrowse From adb5e445daab1746b33bda2c69eaeb46d4217158 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Tue, 9 Aug 2005 18:33:33 +0000 Subject: [PATCH 111/347] *** empty log message *** --- lispref/ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 329c8d912a6..7d2d47471f5 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,11 @@ +2005-08-09 Luc Teirlinck + + * positions.texi (Screen Lines): Update xref for previous change + in minibuf.texi. + + * minibuf.texi (Intro to Minibuffers): Update pxref for previous + change in minibuf.texi. + 2005-08-09 Richard M. Stallman * tips.texi (Coding Conventions): Minor cleanup. From 872e3f6ffcf5b287dab4e88c86dc17b229a369f5 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Tue, 9 Aug 2005 18:36:01 +0000 Subject: [PATCH 112/347] (Intro to Minibuffers): Update pxref for previous change in minibuf.texi. --- lispref/minibuf.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi index 61dc4fa7631..ed2b2167f58 100644 --- a/lispref/minibuf.texi +++ b/lispref/minibuf.texi @@ -84,7 +84,7 @@ recursive minibuffers, the innermost (or most recently entered) is the active minibuffer. We usually call this ``the'' minibuffer. You can permit or forbid recursive minibuffers by setting the variable @code{enable-recursive-minibuffers} or by putting properties of that -name on command symbols (@pxref{Minibuffer Misc}). +name on command symbols (@pxref{Recursive Mini}). Like other buffers, a minibuffer may use any of several local keymaps (@pxref{Keymaps}); these contain various exit commands and in some cases From 0a54f38c4b877cedb62d12db64b2e5151a27d831 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Tue, 9 Aug 2005 18:37:15 +0000 Subject: [PATCH 113/347] (Screen Lines): Update xref for previous change in minibuf.texi. --- lispref/positions.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/positions.texi b/lispref/positions.texi index 3c1e642e6b4..cab8d416e4a 100644 --- a/lispref/positions.texi +++ b/lispref/positions.texi @@ -636,7 +636,7 @@ the end of the accessible portion of the buffer, and pass @var{line} and When you use @code{compute-motion} for the minibuffer, you need to use @code{minibuffer-prompt-width} to get the horizontal position of the -beginning of the first screen line. @xref{Minibuffer Misc}. +beginning of the first screen line. @xref{Minibuffer Contents}. @end defun @node List Motion From e8bf834340819430b8115729842b6380ac223d8d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 20:38:35 +0000 Subject: [PATCH 114/347] Address change. --- lisp/newcomment.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/newcomment.el b/lisp/newcomment.el index 78f3824ed23..6d95d3ee16e 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -4,7 +4,7 @@ ;; 2005 Free Software Foundation, Inc. ;; Author: code extracted from Emacs-20's simple.el -;; Maintainer: Stefan Monnier +;; Maintainer: Stefan Monnier ;; Keywords: comment uncomment ;; This file is part of GNU Emacs. From 8012c83504abeb354f9d3a906975b384593d0499 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 9 Aug 2005 21:00:39 +0000 Subject: [PATCH 115/347] * lisp/net/ange-ftp.el (ange-ftp-send-cmd): Make it work properly with uploading files. (ange-ftp-canonize-filename): Handle file names beginning with ~ correctly. --- lisp/ChangeLog | 11 +++++++++-- lisp/net/ange-ftp.el | 17 +++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5ddf15cceda..278a66be229 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2005-08-09 Katsumi Yamaoka (tiny change) + + * net/ange-ftp.el (ange-ftp-send-cmd): Make it work properly with + uploading files. + (ange-ftp-canonize-filename): Handle file names beginning with ~ + correctly. + 2005-08-09 Juanma Barranquero * textmodes/fill.el (canonically-space-region) @@ -23,7 +30,7 @@ 2005-08-09 Magnus Henoch * textmodes/ispell.el (ispell-find-aspell-dictionaries): New command. - (ispell-have-aspell-dictionaries): New variable. + (ispell-have-aspell-dictionaries): New variable. (ispell-aspell-data-dir, ispell-aspell-dict-dir): New variables. (ispell-get-aspell-config-value): New function. (ispell-aspell-find-dictionary): New function. @@ -31,7 +38,7 @@ (ispell-valid-dictionary-list): Call ispell-find-aspell-dictionaries if appropriate. Don't look for ispell dictionaries if we use aspell. (ispell-menu-map): Don't build a submenu of dictionaries. - + 2005-08-09 Richard M. Stallman * progmodes/sql.el (sql-interactive-mode-map): Use fboundp. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 59d24e4e591..d4b48323e4c 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -2328,8 +2328,13 @@ and NOWAIT." ;; We cd and then use `ls' with no directory argument. ;; This works around a misfeature of some versions of netbsd ftpd. (unless (equal cmd1 ".") - (setq result (ange-ftp-cd host user (nth 1 cmd) 'noerror))) - (setq cmd1 cmd3))) + (setq result (ange-ftp-cd host user + ;; Make sure the target to which + ;; `cd' is performed is a directory. + (file-name-directory (nth 1 cmd)) + 'noerror))) + ;; Concatenate the switches and the target to be used with `ls'. + (setq cmd1 (concat "\"" cmd3 " " cmd1 "\"")))) ;; First argument is the remote name ((progn @@ -3122,8 +3127,12 @@ logged in as user USER and cd'd to directory DIR." (rest (substring name (match-end 0))) (dir (ange-ftp-expand-dir host user tilda))) (if dir - (setq name (if (string-equal dir "/") - rest (concat dir rest))) + (setq name (cond ((string-equal rest "") + dir) + ((string-equal dir "/") + rest) + (t + (concat dir rest)))) (error "User \"%s\" is not known" (substring tilda 1))))) From 38dbf92be67e0e09ed0aaf8a1925b1f889a6897a Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:34:40 +0000 Subject: [PATCH 116/347] (compilation-mode-font-lock-keywords): Remove `-text' from face variable names. (compilation-error-file-name, compilation-warning-file-name) (compilation-info-file-name): Delete faces. (compilation-line-number, compilation-column-number): Remove face underlining. (compilation-message-face): Set to `underline' value by default. (compilation-error-face, compilation-warning-face) (compilation-info-face): Remove `-file-name' from face names. (compilation-error-text-face, compilation-warning-text-face) (compilation-info-text-face): Delete face variables. (compilation-text-face): Delete function. --- lisp/progmodes/compile.el | 57 +++++++-------------------------------- 1 file changed, 10 insertions(+), 47 deletions(-) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index b7b14c238b3..6d5acfcbdf4 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -377,13 +377,13 @@ you may also want to change `compilation-page-delimiter'.") '(;; configure output lines. ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$" (1 font-lock-variable-name-face) - (2 (compilation-text-face '(4 . 3)))) + (2 (compilation-face '(4 . 3)))) ;; Command output lines. Recognize `make[n]:' lines too. ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:" (1 font-lock-function-name-face) (3 compilation-line-face nil t)) (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1) - ("^Compilation finished" . compilation-info-text-face) - ("^Compilation exited abnormally" . compilation-error-text-face)) + ("^Compilation finished" . compilation-info-face) + ("^Compilation exited abnormally" . compilation-error-face)) "Additional things to highlight in Compilation mode. This gets tacked on the end of the generated expressions.") @@ -499,67 +499,35 @@ starting the compilation process.") ;; backward-compatibility alias (put 'compilation-info-face 'face-alias 'compilation-info) -(defface compilation-error-file-name - '((default :inherit compilation-error) - (((supports :underline t)) :underline t)) - "Face for displaying file names in error messages." - :group 'font-lock-highlighting-faces - :version "22.1") - -(defface compilation-warning-file-name - '((default :inherit compilation-warning) - (((supports :underline t)) :underline t)) - "Face for displaying file names in warning messages." - :group 'font-lock-highlighting-faces - :version "22.1") - -(defface compilation-info-file-name - '((default :inherit compilation-info) - (((supports :underline t)) :underline t)) - "Face for displaying file names in informational messages." - :group 'font-lock-highlighting-faces - :version "22.1") - (defface compilation-line-number - '((default :inherit font-lock-variable-name-face) - (((supports :underline t)) :underline t)) + '((t :inherit font-lock-variable-name-face)) "Face for displaying line numbers in compiler messages." :group 'font-lock-highlighting-faces :version "22.1") (defface compilation-column-number - '((default :inherit font-lock-type-face) - (((supports :underline t)) :underline t)) + '((t :inherit font-lock-type-face)) "Face for displaying column numbers in compiler messages." :group 'font-lock-highlighting-faces :version "22.1") -(defvar compilation-message-face nil +(defvar compilation-message-face 'underline "Face name to use for whole messages. Faces `compilation-error-face', `compilation-warning-face', `compilation-info-face', `compilation-line-face' and `compilation-column-face' get prepended to this, when applicable.") -(defvar compilation-error-face 'compilation-error-file-name +(defvar compilation-error-face 'compilation-error "Face name to use for file name in error messages.") -(defvar compilation-error-text-face 'compilation-error - "Face name to use for text of error messages.") - -(defvar compilation-warning-face 'compilation-warning-file-name +(defvar compilation-warning-face 'compilation-warning "Face name to use for file name in warning messages.") -(defvar compilation-warning-text-face 'compilation-warning - "Face name to use for text of warning messages.") - -(defvar compilation-info-face 'compilation-info-file-name +(defvar compilation-info-face 'compilation-info "Face name to use for file name in informational messages.") -(defvar compilation-info-text-face 'compilation-info - "Face name to use for text of informational messages.") - (defvar compilation-line-face 'compilation-line-number - "Face name to use for line numbers in compiler message.") + "Face name to use for line numbers in compiler messages.") (defvar compilation-column-face 'compilation-column-number "Face name to use for column numbers in compiler messages.") @@ -585,11 +553,6 @@ Faces `compilation-error-face', `compilation-warning-face', (and (cdr type) (match-end (cdr type)) compilation-info-face) compilation-error-face)) -(defun compilation-text-face (type) - (or (and (car type) (match-end (car type)) compilation-warning-text-face) - (and (cdr type) (match-end (cdr type)) compilation-info-text-face) - compilation-error-text-face)) - ;; Internal function for calculating the text properties of a directory ;; change message. The directory property is important, because it is ;; the stack of nested enter-messages. Relative filenames on the following From 7462142dc4355d8334d387e149257ddd03b62121 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:37:34 +0000 Subject: [PATCH 117/347] (grep-regexp-alist): Use `.+?' instead of `[^:\n]+'. (grep-mode-font-lock-keywords): Use `.+?' instead of `[^\n-]+'. (grep-error-face): Set to `compilation-error' instead of `compilation-error-face' (which is redefined to `grep-hit-face' in grep buffers). (grep-mode-font-lock-keywords): Remove `-text' from face variable names. Use `grep-error-face' instead of `compilation-error-text-face'. --- lisp/progmodes/grep.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 3af5aebfc6a..303ce2f5a15 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -244,11 +244,11 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies ;;;###autoload (defvar grep-regexp-alist - '(("^\\([^:\n]+\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2" + '(("^\\(.+?\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2" 1 3) ;; Rule to match column numbers is commented out since no known grep ;; produces them - ;; ("^\\([^:\n]+\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\2\\)?" + ;; ("^\\(.+?\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\2\\)?" ;; 1 3 (4 . 5)) ("^\\(\\(.+?\\):\\([0-9]+\\):\\).*?\ \\(\033\\[01;31m\\(?:\033\\[K\\)?\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)" @@ -272,7 +272,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (defvar grep-hit-face compilation-info-face "Face name to use for grep hits.") -(defvar grep-error-face compilation-error-face +(defvar grep-error-face 'compilation-error "Face name to use for grep error messages.") (defvar grep-match-face 'match @@ -289,13 +289,13 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies ;; remove match from grep-regexp-alist before fontifying ("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*" (0 '(face nil message nil help-echo nil mouse-face nil) t) - (1 compilation-info-text-face nil t) - (2 compilation-warning-text-face nil t)) + (1 compilation-info-face nil t) + (2 compilation-warning-face nil t)) ("^Grep \\(exited abnormally\\) with code \\([0-9]+\\).*" (0 '(face nil message nil help-echo nil mouse-face nil) t) - (1 compilation-error-text-face) - (2 compilation-error-text-face)) - ("^[^\n-]+-[0-9]+-.*" (0 grep-context-face)) + (1 grep-error-face) + (2 grep-error-face)) + ("^.+?-[0-9]+-.*\n" (0 grep-context-face)) ;; Highlight grep matches and delete markers ("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)" ;; Refontification does not work after the markers have been From 0751a7049a4a913cda0a3d0b005ff362578a2001 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:38:24 +0000 Subject: [PATCH 118/347] (dired-do-query-replace-regexp): Use `query-replace-read-args'. --- lisp/dired-aux.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 9bcb04ef27b..0d3f6fe125b 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -2208,7 +2208,10 @@ Third arg DELIMITED (prefix arg) means replace only word-delimited matches. If you exit (\\[keyboard-quit], RET or q), you can resume the query replace with the command \\[tags-loop-continue]." (interactive - "sQuery replace in marked files (regexp): \nsQuery replace %s by: \nP") + (let ((common + (query-replace-read-args + "Query replace regexp in marked files" t t))) + (list (nth 0 common) (nth 1 common) (nth 2 common)))) (dolist (file (dired-get-marked-files nil nil 'dired-nondirectory-p)) (let ((buffer (get-file-buffer file))) (if (and buffer (with-current-buffer buffer From 90c9fc2aae05ab5017d6dab6fb11a72284259c2d Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:39:09 +0000 Subject: [PATCH 119/347] (query-replace-read-from, query-replace-read-to) (query-replace-read-args): Rename arg `string' to `prompt'. --- lisp/replace.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/replace.el b/lisp/replace.el index ea1bd53e688..33162b02d3c 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -88,7 +88,7 @@ is highlighted lazily using isearch lazy highlighting (see (defun query-replace-descr (string) (mapconcat 'isearch-text-char-description string "")) -(defun query-replace-read-from (string regexp-flag) +(defun query-replace-read-from (prompt regexp-flag) "Query and return the `from' argument of a query-replace operation. The return value can also be a pair (FROM . TO) indicating that the user wants to replace FROM with TO." @@ -107,10 +107,10 @@ wants to replace FROM with TO." query-replace-from-history-variable)))) (read-from-minibuffer (if (and lastto lastfrom) - (format "%s (default %s -> %s): " string + (format "%s (default %s -> %s): " prompt (query-replace-descr lastfrom) (query-replace-descr lastto)) - (format "%s: " string)) + (format "%s: " prompt)) nil nil nil query-replace-from-history-variable nil t t)))) @@ -173,22 +173,22 @@ the original string if not." to)) -(defun query-replace-read-to (from string regexp-flag) +(defun query-replace-read-to (from prompt regexp-flag) "Query and return the `to' argument of a query-replace operation." (query-replace-compile-replacement (save-excursion (read-from-minibuffer - (format "%s %s with: " string (query-replace-descr from)) + (format "%s %s with: " prompt (query-replace-descr from)) nil nil nil query-replace-to-history-variable from t t)) regexp-flag)) -(defun query-replace-read-args (string regexp-flag &optional noerror) +(defun query-replace-read-args (prompt regexp-flag &optional noerror) (unless noerror (barf-if-buffer-read-only)) - (let* ((from (query-replace-read-from string regexp-flag)) + (let* ((from (query-replace-read-from prompt regexp-flag)) (to (if (consp from) (prog1 (cdr from) (setq from (car from))) - (query-replace-read-to from string regexp-flag)))) + (query-replace-read-to from prompt regexp-flag)))) (list from to current-prefix-arg))) (defun query-replace (from-string to-string &optional delimited start end) From 87737bc2a19eca86a48948a44c28d345bd4bcdc1 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:39:34 +0000 Subject: [PATCH 120/347] (menu-bar-showhide-menu): Add `showhide-battery'. --- lisp/menu-bar.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index cbfc78fb95f..285206aefac 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -700,6 +700,11 @@ by \"Save Options\" in Custom buffers.") (define-key menu-bar-showhide-menu [linecolumn-separator] '("--")) +(define-key menu-bar-showhide-menu [showhide-battery] + (menu-bar-make-mm-toggle display-battery-mode + "Battery status" + "Display battery status information in mode line")) + (define-key menu-bar-showhide-menu [showhide-date-time] (menu-bar-make-mm-toggle display-time-mode "Date, Time and Mail" From 869d986e167c4b1dfca50036db22a1746dfa4006 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:48:12 +0000 Subject: [PATCH 121/347] (Compilation): Use `itemx' instead of `item'. (Grep Searching): Simplify phrase. --- man/building.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/building.texi b/man/building.texi index 69b56f467f5..69ca71b0fdc 100644 --- a/man/building.texi +++ b/man/building.texi @@ -52,7 +52,7 @@ Invoke a compiler with the same command as in the last invocation of Run @code{grep} asynchronously under Emacs, with matching lines listed in the buffer named @samp{*grep*}. @item M-x grep-find -@item M-x find-grep +@itemx M-x find-grep Run @code{grep} via @code{find}, with user-specified arguments, and collect output in the buffer named @samp{*grep*}. @item M-x kill-compilation @@ -325,7 +325,7 @@ Emacs. @xref{MS-DOS}. @findex grep Just as you can run a compiler from Emacs and then visit the lines -where there were compilation errors, you can also run @code{grep} and +with compilation errors, you can also run @code{grep} and then visit the lines on which matches were found. This works by treating the matches reported by @code{grep} as if they were ``errors.'' From 58f1b4d861e9303468d383ca79e6b50b905a99cc Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:51:54 +0000 Subject: [PATCH 122/347] (Standard Faces): Describe vertical-border on window systems. --- man/display.texi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/man/display.texi b/man/display.texi index 06b3a58642f..52764344ac2 100644 --- a/man/display.texi +++ b/man/display.texi @@ -188,9 +188,11 @@ in that face affect mode lines in all windows. Similar to @code{mode-line} for a window's header line. Most modes don't use the header line, but the Info mode does. @item vertical-border -This face is used for the vertical divider between windows on -character terminals. By default this face inherits from the -@code{mode-line-inactive} face. +This face is used for the vertical divider between windows. +By default this face inherits from the @code{mode-line-inactive} face +on character terminals. On window systems the foreground color of +this face is used for the vertical line between windows without +scrollbars. @item minibuffer-prompt This face is used for the prompt strings displayed in the minibuffer. @item fringe From 45cfcb437f163a585a3caa6ee103e5920547ac87 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:54:10 +0000 Subject: [PATCH 123/347] (Split Window): Simplify phrase and mention vertical-border face. --- man/windows.texi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/man/windows.texi b/man/windows.texi index 092a678901b..db5c9988d94 100644 --- a/man/windows.texi +++ b/man/windows.texi @@ -94,7 +94,8 @@ numeric argument specifies how many lines to give to the top window. @kbd{C-x 3} (@code{split-window-horizontally}) breaks the selected window into two side-by-side windows. A numeric argument specifies how many columns to give the one on the left. If you are not using -scrollbars, a line of vertical bars separates the two windows. +scrollbars, a vertical line separates the two windows. +You can customize its color with the face @code{vertical-border}. Windows that are not the full width of the screen have mode lines, but they are truncated. On terminals where Emacs does not support highlighting, truncated mode lines sometimes do not appear in inverse From 5ebbfd9628ed6514ef202f581e6aba433aa9ad1a Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 21:54:36 +0000 Subject: [PATCH 124/347] *** empty log message *** --- lisp/ChangeLog | 33 +++++++++++++++++++++++++++++++++ man/ChangeLog | 11 +++++++++++ 2 files changed, 44 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 278a66be229..2ab5adfb670 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,36 @@ +2005-08-09 Juri Linkov + + * progmodes/compile.el (compilation-mode-font-lock-keywords): + Remove `-text' from face variable names. + (compilation-error-file-name, compilation-warning-file-name) + (compilation-info-file-name): Delete faces. + (compilation-line-number, compilation-column-number): + Remove face underlining. + (compilation-message-face): Set to `underline' value by default. + (compilation-error-face, compilation-warning-face) + (compilation-info-face): Remove `-file-name' from face names. + (compilation-error-text-face, compilation-warning-text-face) + (compilation-info-text-face): Delete face variables. + (compilation-text-face): Delete function. + + * progmodes/grep.el (grep-regexp-alist): Use `.+?' instead of + `[^:\n]+'. + (grep-mode-font-lock-keywords): Use `.+?' instead of `[^\n-]+'. + (grep-error-face): Set to `compilation-error' instead of + `compilation-error-face' (which is redefined to `grep-hit-face' in + grep buffers). + (grep-mode-font-lock-keywords): Remove `-text' from face + variable names. Use `grep-error-face' instead of + `compilation-error-text-face'. + + * dired-aux.el (dired-do-query-replace-regexp): + Use `query-replace-read-args'. + + * replace.el (query-replace-read-from, query-replace-read-to) + (query-replace-read-args): Rename arg `string' to `prompt'. + + * menu-bar.el (menu-bar-showhide-menu): Add `showhide-battery'. + 2005-08-09 Katsumi Yamaoka (tiny change) * net/ange-ftp.el (ange-ftp-send-cmd): Make it work properly with diff --git a/man/ChangeLog b/man/ChangeLog index 67cd0d6233e..5bacd6fd404 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,14 @@ +2005-08-09 Juri Linkov + + * building.texi (Compilation): Use `itemx' instead of `item'. + (Grep Searching): Simplify phrase. + + * display.texi (Standard Faces): Describe vertical-border on + window systems. + + * windows.texi (Split Window): Simplify phrase and mention + vertical-border face. + 2005-08-09 Richard M. Stallman * files.texi (Comparing Files): Clarify compare-windows. From a11c921564a2630ddffd49e16f72f1803df2bae0 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 9 Aug 2005 22:24:18 +0000 Subject: [PATCH 125/347] Fix `+++' and `---' for Info mode. Add `vertical-border' face. --- etc/NEWS | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 1952c65fab0..7d6fec8b360 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -813,6 +813,9 @@ black or white default foreground color. This generic shadow face allows customization of the appearance of shadowed text in one place, so package-specific faces can inherit from it. ++++ +*** `vertical-border' face is used for the vertical divider between windows. + ** Font-Lock changes: +++ @@ -882,8 +885,7 @@ This menu allows you to turn various display features on and off (such as the fringes, the tool bar, the speedbar, and the menu bar itself). You can also move the vertical scroll bar to either side here or turn it off completely. There is also a menu-item to toggle displaying of -current date and time, current line and column number in the -mode-line. +current date and time, current line and column number in the mode-line. --- *** Speedbar has moved from the "Tools" top level menu to "Show/Hide". @@ -1828,7 +1830,7 @@ when Emacs visits them. *** A numeric prefix argument of `info' selects an Info buffer with the number appended to the `*info*' buffer name (e.g. "*info*<2>"). ---- ++++ *** isearch in Info uses Info-search and searches through multiple nodes. Before leaving the initial Info node isearch fails once with the error @@ -1839,31 +1841,38 @@ aroung the whole manual to the top/final node. The user option or the default isearch search function that wraps around the current Info node. +--- *** New search commands: `Info-search-case-sensitively' (bound to S), `Info-search-backward', and `Info-search-next' which repeats the last search without prompting for a new search string. ++++ *** New command `Info-history-forward' (bound to r and new toolbar icon) moves forward in history to the node you returned from after using `Info-history-back' (renamed from `Info-last'). +--- *** New command `Info-history' (bound to L) displays a menu of visited nodes. +--- *** New command `Info-toc' (bound to T) creates a node with table of contents from the tree structure of menus of the current Info file. ++++ *** New command `info-apropos' searches the indices of the known Info files on your system for a string, and builds a menu of the possible matches. +--- *** New command `Info-copy-current-node-name' (bound to w) copies the current Info node name into the kill ring. With a zero prefix arg, puts the node name inside the `info' function call. ---- ++++ *** New face `info-xref-visited' distinguishes visited nodes from unvisited and a new option `Info-fontify-visited-nodes' to control this. +--- *** http and ftp links in Info are now operational: they look like cross references and following them calls `browse-url'. From 1e2e2829f336e3ca68f0001711178f4f9ee586b4 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:29:57 +0000 Subject: [PATCH 126/347] (Window Frame Parameters): Node split up. (Basic Parameters, Position Parameters, Size Parameters) (Layout Parameters, Buffer Parameters, Management Parameters) (Cursor Parameters, Color Parameters): New subnodes. --- lispref/frames.texi | 307 +++++++++++++++++++++++++++----------------- 1 file changed, 191 insertions(+), 116 deletions(-) diff --git a/lispref/frames.texi b/lispref/frames.texi index 827f98d24c2..d7412272666 100644 --- a/lispref/frames.texi +++ b/lispref/frames.texi @@ -310,14 +310,31 @@ Line Arguments for Emacs Invocation, emacs, The GNU Emacs Manual}. @node Window Frame Parameters @subsection Window Frame Parameters - Just what parameters a frame has depends on what display mechanism it -uses. Here is a table of the parameters that have special meanings in a -window frame; of these, @code{name}, @code{title}, @code{height}, -@code{width}, @code{buffer-list} and @code{buffer-predicate} provide -meaningful information in terminal frames, and @code{tty-color-mode} -is meaningful @emph{only} in terminal frames. Frame parameter whose -values measured in pixels, when used on text-only terminals, count -characters or lines instead. + Just what parameters a frame has depends on what display mechanism +it uses. This section describes the parameters that have special +meanings on some or all kinds of terminals. Of these, @code{name}, +@code{title}, @code{height}, @code{width}, @code{buffer-list} and +@code{buffer-predicate} provide meaningful information in terminal +frames, and @code{tty-color-mode} is meaningful @emph{only} in +terminal frames. + +@menu +* Basic Parameters:: Parameters that are fundamental. +* Position Parameters:: The position of the frame on the screen. +* Size Parameters:: Frame's size. +* Layout Parameters:: Size of parts of the frame, and + enabling or disabling some parts. +* Buffer Parameters:: Which buffers have been or should be shown. +* Management Parameters:: Communicating with the window manager. +* Cursor Parameters:: Controlling the cursor appearance. +* Color Parameters:: Colors of various parts of the frame. +@end menu + +@node Basic Parameters +@subsubsection Basic Parameters + + These frame parameters give the most basic information about the +frame. @code{title} and @code{name} are meaningful on all terminals. @table @code @item display @@ -325,6 +342,11 @@ The display on which to open this frame. It should be a string of the form @code{"@var{host}:@var{dpy}.@var{screen}"}, just like the @code{DISPLAY} environment variable. +@item display-type +This parameter describes the range of possible colors that can be used +in this frame. Its value is @code{color}, @code{grayscale} or +@code{mono}. + @item title If a frame has a non-@code{nil} title, it appears in the window system's border for the frame, and also in the mode line of windows in that frame @@ -342,7 +364,15 @@ you don't specify a name, Emacs sets the frame name automatically If you specify the frame name explicitly when you create the frame, the name is also used (instead of the name of the Emacs executable) when looking up X resources for the frame. +@end table +@node Position Parameters +@subsubsection Position Parameters + + Position parameters' values are normally measured in pixels, but on +text-only terminals they count characters or lines instead. + +@table @code @item left The screen position of the left edge, in pixels, with respect to the left edge of the screen. The value may be a positive number @var{pos}, @@ -397,7 +427,15 @@ When you call @code{make-frame}, you should specify a non-@code{nil} value for this parameter if the values of the @code{left} and @code{top} parameters represent the user's stated preference; otherwise, use @code{nil}. +@end table +@node Size Parameters +@subsubsection Size Parameters + + Size parameters' values are normally measured in pixels, but on +text-only terminals they count characters or lines instead. + +@table @code @item height The height of the frame contents, in characters. (To get the height in pixels, call @code{frame-pixel-height}; see @ref{Size and Position}.) @@ -417,14 +455,76 @@ The value @code{fullwidth} specifies that width shall be the size of the screen. The value @code{fullheight} specifies that height shall be the size of the screen. The value @code{fullboth} specifies that both the width and the height shall be set to the size of the screen. +@end table -@item window-id -The number of the window-system window used by the frame -to contain the actual Emacs windows. +@node Layout Parameters +@subsubsection Layout Parameters -@item outer-window-id -The number of the outermost window-system window used for the whole frame. + These frame parameters enable or disable various parts of the +frame, or control their sizes. +@table @code +@item border-width +The width in pixels of the window border. + +@item internal-border-width +The distance in pixels between text and border. + +@item vertical-scroll-bars +Whether the frame has scroll bars for vertical scrolling, and which side +of the frame they should be on. The possible values are @code{left}, +@code{right}, and @code{nil} for no scroll bars. + +@ignore +@item horizontal-scroll-bars +Whether the frame has scroll bars for horizontal scrolling +(non-@code{nil} means yes). Horizontal scroll bars are not currently +implemented. +@end ignore + +@item scroll-bar-width +The width of vertical scroll bars, in pixels, or @code{nil} meaning to +use the default width. + +@item left-fringe +@itemx right-fringe +The default width of the left and right fringes of windows in this +frame (@pxref{Fringes}). If either of these is zero, that effectively +removes the corresponding fringe. A value of @code{nil} stands for +the standard fringe width, which is the width needed to display the +fringe bitmaps. + +The combined fringe widths must add up to an integral number of +columns, so the actual default fringe widths for the frame may be +larger than the specified values. The extra width needed to reach an +acceptable total is distributed evenly between the left and right +fringe. However, you can force one fringe or the other to a precise +width by specifying that width as a negative integer. If both widths are +negative, only the left fringe gets the specified width. + +@item menu-bar-lines +The number of lines to allocate at the top of the frame for a menu +bar. The default is 1. A value of @code{nil} means don't display a +menu bar. @xref{Menu Bar}. (The X toolkit and GTK allow at most one +menu bar line; they treat larger values as 1.) + +@item tool-bar-lines +The number of lines to use for the tool bar. A value of @code{nil} +means don't display a tool bar. (GTK allows at most one tool bar line; +it treats larger values as 1.) + +@item line-spacing +Additional space to leave below each text line, in pixels (a positive +integer) +@end table + +@node Buffer Parameters +@subsubsection Buffer Parameters + + These frame parameters, meaningful on all kinds of terminals, deal +with which buffers have been, or should, be displayed in the frame. + +@table @code @item minibuffer Whether this frame has its own minibuffer. The value @code{t} means yes, @code{nil} means no, @code{only} means this frame is just a @@ -443,26 +543,28 @@ considers that buffer. A list of buffers that have been selected in this frame, ordered most-recently-selected first. +@item unsplittable +If non-@code{nil}, this frame's window is never split automatically. +@end table + +@node Management Parameters +@subsubsection Window Management Parameters + + These frame parameters, meaningful only on window system displays, +interact with the window manager. + +@table @code +@item visibility +The state of visibility of the frame. There are three possibilities: +@code{nil} for invisible, @code{t} for visible, and @code{icon} for +iconified. @xref{Visibility of Frames}. + @item auto-raise Whether selecting the frame raises it (non-@code{nil} means yes). @item auto-lower Whether deselecting the frame lowers it (non-@code{nil} means yes). -@item vertical-scroll-bars -Whether the frame has scroll bars for vertical scrolling, and which side -of the frame they should be on. The possible values are @code{left}, -@code{right}, and @code{nil} for no scroll bars. - -@item horizontal-scroll-bars -Whether the frame has scroll bars for horizontal scrolling -(non-@code{nil} means yes). (Horizontal scroll bars are not currently -implemented.) - -@item scroll-bar-width -The width of the vertical scroll bar, in pixels, -or @code{nil} meaning to use the default width. - @item icon-type The type of icon to use for this frame when it is iconified. If the value is a string, that specifies a file containing a bitmap to use. @@ -473,29 +575,35 @@ picture of a gnu); @code{nil} specifies a text icon. The name to use in the icon for this frame, when and if the icon appears. If this is @code{nil}, the frame's title is used. -@item background-mode -This parameter is either @code{dark} or @code{light}, according -to whether the background color is a light one or a dark one. +@item window-id +The number of the window-system window used by the frame +to contain the actual Emacs windows. -@item tty-color-mode -@cindex standard colors for character terminals -This parameter overrides the terminal's color support as given by the -system's terminal capabilities database in that this parameter's value -specifies the color mode to use in terminal frames. The value can be -either a symbol or a number. A number specifies the number of colors -to use (and, indirectly, what commands to issue to produce each -color). For example, @code{(tty-color-mode . 8)} forces Emacs to use -the ANSI escape sequences for 8 standard text colors; and a value of --1 means Emacs should turn off color support. If the parameter's -value is a symbol, that symbol is looked up in the alist -@code{tty-color-mode-alist}, and if found, the associated number is -used as the color support mode. +@item outer-window-id +The number of the outermost window-system window used for the whole frame. -@item display-type -This parameter describes the range of possible colors that can be used -in this frame. Its value is @code{color}, @code{grayscale} or -@code{mono}. +@item wait-for-wm +If non-@code{nil}, tell Xt to wait for the window manager to confirm +geometry changes. Some window managers, including versions of Fvwm2 +and KDE, fail to confirm, so Xt hangs. Set this to @code{nil} to +prevent hanging with those window managers. +@ignore +@item parent-id +@c ??? Not yet working. +The X window number of the window that should be the parent of this one. +Specifying this lets you create an Emacs window inside some other +application's window. (It is not certain this will be implemented; try +it and see if it works.) +@end ignore +@end table + +@node Cursor Parameters +@subsubsection Cursor Parameters + + This frame parameter controls the way the cursor looks. + +@table @code @item cursor-type How to display the cursor. Legitimate values are: @@ -515,52 +623,51 @@ Display a horizontal bar. @item (hbar . @var{height}) Display a horizontal bar @var{height} pixels high. @end table +@end table @vindex cursor-type The buffer-local variable @code{cursor-type} overrides the value of the @code{cursor-type} frame parameter, but if it is @code{t}, that means to use the cursor specified for the frame. -@item border-width -The width in pixels of the window border. +@defvar blink-cursor-alist +This variable specifies how to blink the cursor. Each element has the +form @code{(@var{on-state} . @var{off-state})}. Whenever the cursor +type equals @var{on-state} (comparing using @code{equal}), the +corresponding @var{off-state} specifies what the cursor looks like +when it blinks ``off''. Both @var{on-state} and @var{off-state} +should be suitable values for the @code{cursor-type} frame parameter. -@item internal-border-width -The distance in pixels between text and border. +There are various defaults for how to blink each type of cursor, if +the type is not mentioned as an @var{on-state} here. Changes in this +variable do not take effect immediately, because the variable is +examined only when you specify the @code{cursor-type} parameter. +@end defvar -@item left-fringe -@itemx right-fringe -The default width of the left and right fringes of windows in this -frame (@pxref{Fringes}). If either of these is zero, that effectively -removes the corresponding fringe. A value of @code{nil} stands for -the standard fringe width, which is the width needed to display the -fringe bitmaps. +@node Color Parameters +@subsubsection Color Parameters -The combined fringe widths must add up to an integral number of -columns, so the actual default fringe widths for the frame may be -larger than the specified values. The extra width needed to reach an -acceptable total is distributed evenly between the left and right -fringe. However, you can force one fringe or the other to a precise -width by specifying that width as a negative integer. If both widths are -negative, only the left fringe gets the specified width. + These frame parameters control the use of colors. -@item unsplittable -If non-@code{nil}, this frame's window is never split automatically. +@table @code +@item background-mode +This parameter is either @code{dark} or @code{light}, according +to whether the background color is a light one or a dark one. -@item visibility -The state of visibility of the frame. There are three possibilities: -@code{nil} for invisible, @code{t} for visible, and @code{icon} for -iconified. @xref{Visibility of Frames}. +@item tty-color-mode +@cindex standard colors for character terminals +This parameter overrides the terminal's color support as given by the +system's terminal capabilities database in that this parameter's value +specifies the color mode to use in terminal frames. The value can be +either a symbol or a number. A number specifies the number of colors +to use (and, indirectly, what commands to issue to produce each +color). For example, @code{(tty-color-mode . 8)} specifies use of the +ANSI escape sequences for 8 standard text colors. A value of -1 turns +off color support. -@item menu-bar-lines -The number of lines to allocate at the top of the frame for a menu -bar. The default is 1. A value of @code{nil} means don't display a -menu bar. @xref{Menu Bar}. (The X toolkit and GTK allow at most one -menu bar line; they treat larger values as 1.) - -@item tool-bar-lines -The number of lines to use for the tool bar. A value of @code{nil} -means don't display a tool bar. (GTK allows at most one tool bar line; -it treats larger values as 1.) +If the parameter's value is a symbol, it specifies a number through +the value of @code{tty-color-mode-alist}, and the associated number is +used instead. @item screen-gamma @cindex gamma correction @@ -580,40 +687,8 @@ If your monitor displays colors too light, you should specify a @code{screen-gamma} value smaller than 2.2. This requests correction that makes colors darker. A screen gamma value of 1.5 may give good results for LCD color displays. - -@item line-spacing -Additional space put below text lines, in pixels (a positive integer) - -@item wait-for-wm -If non-@code{nil}, tell Xt to wait for the window manager to confirm -geometry changes. Some window managers, including versions of Fvwm2 -and KDE, fail to confirm, so Xt hangs. Set this to @code{nil} to -prevent hanging with those window managers. - -@ignore -@item parent-id -@c ??? Not yet working. -The X window number of the window that should be the parent of this one. -Specifying this lets you create an Emacs window inside some other -application's window. (It is not certain this will be implemented; try -it and see if it works.) -@end ignore @end table -@defvar blink-cursor-alist -This variable specifies how to blink the cursor. Each element has the -form @code{(@var{on-state} . @var{off-state})}. Whenever the cursor -type equals @var{on-state} (comparing using @code{equal}), Emacs uses -@var{off-state} to specify what the cursor looks like when it blinks -``off''. Both @var{on-state} and @var{off-state} should be suitable -values for the @code{cursor-type} frame parameter. - -There are various defaults for how to blink each type of cursor, -if the type is not mentioned as an @var{on-state} here. Changes -in this variable do not take effect immediately, because the variable -is examined only when you specify a cursor type for a frame. -@end defvar - These frame parameters are semi-obsolete in that they are automatically equivalent to particular face attributes of particular faces. @@ -1150,7 +1225,7 @@ they are currently being displayed or not, and this function returns @end defun The visibility status of a frame is also available as a frame -parameter. You can read or change it as such. @xref{Window Frame +parameter. You can read or change it as such. @xref{Management Parameters}. The user can iconify and deiconify frames with the window manager. @@ -1195,7 +1270,7 @@ that the minibuffer window is in. You can also enable auto-raise (raising automatically when a frame is selected) or auto-lower (lowering automatically when it is deselected) -for any frame using frame parameters. @xref{Window Frame Parameters}. +for any frame using frame parameters. @xref{Management Parameters}. @node Frame Configurations @section Frame Configurations @@ -1504,7 +1579,7 @@ is over mouse-sensitive text. These variables affect newly created frames. They do not normally affect existing frames; however, if you set the mouse color of a frame, that also updates its pointer shapes based on the current values of -these variables. @xref{Window Frame Parameters}. +these variables. @xref{Color Parameters}. The values you can use, to specify either of these pointer shapes, are defined in the file @file{lisp/term/x-win.el}. Use @kbd{M-x apropos From 8deadbd4032799f9767d4a145c894c2868d8f9f3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:30:43 +0000 Subject: [PATCH 127/347] (%-Constructs): Fix xref. --- lispref/modes.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/modes.texi b/lispref/modes.texi index 098a2d57068..baeb2800931 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -1929,7 +1929,7 @@ function. @xref{Buffer File Name}. @item %F The title (only on a window system) or the name of the selected frame. -@xref{Window Frame Parameters}. +@xref{Basic Parameters}. @item %i The size of the accessible part of the current buffer; basically From 4d240e33df9c64125a51c0391d5e9e5e0cc44733 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:31:11 +0000 Subject: [PATCH 128/347] (Standard Buffer-Local Variables): Fix xref. --- lispref/locals.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/locals.texi b/lispref/locals.texi index 942baa9dd1b..72bbcece4d8 100644 --- a/lispref/locals.texi +++ b/lispref/locals.texi @@ -82,7 +82,7 @@ use, but we don't try to list them all here. @xref{Usual Display}. @item cursor-type -@xref{Window Frame Parameters}. +@xref{Cursor Parameters}. @item comment-column @xref{Comments,,, emacs, The GNU Emacs Manual}. From fdb485086538735822e9c694c2847ce698877559 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:31:36 +0000 Subject: [PATCH 129/347] (Menu Bar): Fix xref. --- lispref/keymaps.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi index 895ca48109b..f65da56002d 100644 --- a/lispref/keymaps.texi +++ b/lispref/keymaps.texi @@ -2199,7 +2199,7 @@ were @code{nil}. @xref{Active Keymaps}. parameter must be greater than zero. Emacs uses just one line for the menu bar itself; if you specify more than one line, the other lines serve to separate the menu bar from the windows in the frame. We -recommend 1 or 2 as the value of @code{menu-bar-lines}. @xref{Window Frame +recommend 1 or 2 as the value of @code{menu-bar-lines}. @xref{Layout Parameters}. Here's an example of setting up a menu bar item: From 2adbd9b6b43f1a2ded0b192f9bc1a5aa3ccc6a26 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:33:54 +0000 Subject: [PATCH 130/347] (Line Height, Scroll Bars): Fix xrefs. --- lispref/display.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lispref/display.texi b/lispref/display.texi index c934143c06e..15c1d0ba724 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -1641,7 +1641,7 @@ parts of Emacs text. @vindex default-line-spacing You can specify the line spacing for all lines in a frame with the -@code{line-spacing} frame parameter, @xref{Window Frame Parameters}. +@code{line-spacing} frame parameter (@pxref{Layout Parameters}). However, if the variable @code{default-line-spacing} is non-@code{nil}, it overrides the frame's @code{line-spacing} parameter. An integer value specifies the number of pixels put below @@ -3077,7 +3077,7 @@ Normally the frame parameter @code{vertical-scroll-bars} controls whether the windows in the frame have vertical scroll bars, and whether they are on the left or right. The frame parameter @code{scroll-bar-width} specifies how wide they are (@code{nil} -meaning the default). @xref{Window Frame Parameters}. +meaning the default). @xref{Layout Parameters}. @defun frame-current-scroll-bars &optional frame This function reports the scroll bar type settings for frame From 94d6dae7d380991ea044717e0311991ed765c7b5 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:34:11 +0000 Subject: [PATCH 131/347] (Layout Parameters): Add xref. --- lispref/frames.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/frames.texi b/lispref/frames.texi index d7412272666..bc6d54c41b0 100644 --- a/lispref/frames.texi +++ b/lispref/frames.texi @@ -515,7 +515,7 @@ it treats larger values as 1.) @item line-spacing Additional space to leave below each text line, in pixels (a positive -integer) +integer). @cref{Line Height}, for more information. @end table @node Buffer Parameters From b8da16c648362892d0d8bf2aec33c43df76b3a5c Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:34:38 +0000 Subject: [PATCH 132/347] (Splitting Windows): Fix xref. --- lispref/windows.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lispref/windows.texi b/lispref/windows.texi index ec372d98aa8..d37a31f86d2 100644 --- a/lispref/windows.texi +++ b/lispref/windows.texi @@ -267,7 +267,7 @@ Now the screen looks like this: @end smallexample Normally, Emacs indicates the border between two side-by-side windows -with a scroll bar (@pxref{Window Frame Parameters,Scroll Bars}) or @samp{|} +with a scroll bar (@pxref{Layout Parameters,Scroll Bars}) or @samp{|} characters. The display table can specify alternative border characters; see @ref{Display Tables}. @end deffn From 67ec7f41d043a895556e581b6d035fa4906dabd1 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:37:15 +0000 Subject: [PATCH 133/347] (The Buffer List): Fix xrefs. --- lispref/ChangeLog | 21 +++++++++++++++++++++ lispref/buffers.texi | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 7d2d47471f5..633fdab3512 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,24 @@ +2005-08-09 Richard M. Stallman + + * buffers.texi (The Buffer List): Fix xrefs. + + * windows.texi (Splitting Windows): Fix xref. + + * frames.texi (Layout Parameters): Add xref. + + * display.texi (Line Height, Scroll Bars): Fix xrefs. + + * keymaps.texi (Menu Bar): Fix xref. + + * locals.texi (Standard Buffer-Local Variables): Fix xref. + + * modes.texi (%-Constructs): Fix xref. + + * frames.texi (Window Frame Parameters): Node split up. + (Basic Parameters, Position Parameters, Size Parameters) + (Layout Parameters, Buffer Parameters, Management Parameters) + (Cursor Parameters, Color Parameters): New subnodes. + 2005-08-09 Luc Teirlinck * positions.texi (Screen Lines): Update xref for previous change diff --git a/lispref/buffers.texi b/lispref/buffers.texi index a0769be23dd..d9e276c13cf 100644 --- a/lispref/buffers.texi +++ b/lispref/buffers.texi @@ -771,7 +771,7 @@ buffer list displayed for the user also follows this order. own version of the buffer list, in which the buffers that have been selected in that frame come first, starting with the buffers most recently selected @emph{in that frame}. (This order is recorded in -@var{frame}'s @code{buffer-list} frame parameter; see @ref{Window Frame +@var{frame}'s @code{buffer-list} frame parameter; see @ref{Buffer Parameters}.) The buffers that were never selected in @var{frame} come afterward, ordered according to the fundamental Emacs buffer list. @@ -838,7 +838,7 @@ buffer list that is not now visible in any window in a visible frame. If @var{frame} has a non-@code{nil} @code{buffer-predicate} parameter, then @code{other-buffer} uses that predicate to decide which buffers to consider. It calls the predicate once for each buffer, and if the value -is @code{nil}, that buffer is ignored. @xref{Window Frame Parameters}. +is @code{nil}, that buffer is ignored. @xref{Buffer Parameters}. @c Emacs 19 feature If @var{visible-ok} is @code{nil}, @code{other-buffer} avoids returning From 76d47f0dda9d9c723fac4767ef9f0534873e6560 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 23:54:01 +0000 Subject: [PATCH 134/347] (Geometry): New node, split from Size and Position. (Frame Parameters): Refer to Geometry. (Layout Parameters): Fix typo. --- lispref/ChangeLog | 3 +++ lispref/frames.texi | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 633fdab3512..2ecdb2d89db 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,5 +1,8 @@ 2005-08-09 Richard M. Stallman + * frames.texi (Geometry): New node, split from Size and Position. + (Frame Parameters): Refer to Geometry. + * buffers.texi (The Buffer List): Fix xrefs. * windows.texi (Splitting Windows): Fix xref. diff --git a/lispref/frames.texi b/lispref/frames.texi index bc6d54c41b0..10d91a094f8 100644 --- a/lispref/frames.texi +++ b/lispref/frames.texi @@ -205,6 +205,7 @@ parameters @code{foreground-color}, @code{background-color}, * Initial Parameters:: Specifying frame parameters when you make a frame. * Window Frame Parameters:: List of frame parameters for window systems. * Size and Position:: Changing the size and position of a frame. +* Geometry:: Parsing geometry specifications. @end menu @node Parameter Access @@ -515,7 +516,7 @@ it treats larger values as 1.) @item line-spacing Additional space to leave below each text line, in pixels (a positive -integer). @cref{Line Height}, for more information. +integer). @xref{Line Height}, for more information. @end table @node Buffer Parameters @@ -825,6 +826,12 @@ The argument @var{pretend} has the same meaning as in screen, in Emacs versions that did not support multiple frames. They are semi-obsolete, but still work; they apply to the selected frame. +@node Geometry +@subsection Geometry + + Here's how to examine the data in an X-style window geometry +specification: + @defun x-parse-geometry geom @cindex geometry specification The function @code{x-parse-geometry} converts a standard X window From 682591cf3cd54f31c07365458f7383be55c51762 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Tue, 9 Aug 2005 23:58:46 +0000 Subject: [PATCH 135/347] *** empty log message *** --- lisp/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2ab5adfb670..43c4af17f94 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-08-09 Luc Teirlinck + + * menu-bar.el (menu-bar-options-save): Move `display-time-mode' to + correct group: it is set with `menu-bar-make-mm-toggle' (pointed + out by Juri Linkov). Add `display-battery-mode'. + 2005-08-09 Juri Linkov * progmodes/compile.el (compilation-mode-font-lock-keywords): From 142b8412ec5940ca94a0eeaf5e065b4275eab209 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Wed, 10 Aug 2005 00:01:06 +0000 Subject: [PATCH 136/347] (menu-bar-options-save): Move `display-time-mode' to correct group: it is set with `menu-bar-make-mm-toggle' (pointed out by Juri Linkov). Add `display-battery-mode'. --- lisp/menu-bar.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 285206aefac..250eca12134 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -641,7 +641,8 @@ by \"Save Options\" in Custom buffers.") ;; put on a customized-value property. (dolist (elt '(line-number-mode column-number-mode size-indication-mode cua-mode show-paren-mode transient-mark-mode - global-font-lock-mode blink-cursor-mode)) + global-font-lock-mode blink-cursor-mode + display-time-mode display-battery-mode)) (and (customize-mark-to-save elt) (setq need-save t))) ;; These are set with `customize-set-variable'. @@ -650,7 +651,7 @@ by \"Save Options\" in Custom buffers.") tooltip-mode menu-bar-mode tool-bar-mode save-place uniquify-buffer-name-style fringe-mode indicate-empty-lines indicate-buffer-boundaries - case-fold-search display-time-mode auto-compression-mode + case-fold-search auto-compression-mode current-language-environment default-input-method ;; Saving `text-mode-hook' is somewhat questionable, ;; as we might get more than we bargain for, if From df76c589564f48d4e858d7642b72f9bc1f75986b Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 10 Aug 2005 00:50:16 +0000 Subject: [PATCH 137/347] Add `obj' and `oo' for in-place installations. --- nt/.gitignore | 4 +++- nt/ChangeLog | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nt/.gitignore b/nt/.gitignore index e371584228b..26f5de661a0 100644 --- a/nt/.gitignore +++ b/nt/.gitignore @@ -1,5 +1,7 @@ *-spd *.pdb .arch-inventory -makefile config.log +makefile +obj +oo diff --git a/nt/ChangeLog b/nt/ChangeLog index d960f224898..f385324b89f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2005-08-10 Juanma Barranquero + + * .cvsignore: Add `obj' and `oo' for in-place installations. + 2005-07-30 Eli Zaretskii * config.nt: (HAVE_GETOPT_H, HAVE_GETOPT_LONG_ONLY): Undefine. From c8bf19a1ac742b3d69c9334616dd45b25da01936 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Wed, 10 Aug 2005 13:15:22 +0000 Subject: [PATCH 138/347] Update "copyright years" section. --- admin/FOR-RELEASE | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index e9d2a75ddec..c5167fd9423 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -131,6 +131,7 @@ you're going to handle. DIRECTORY STATUS IN CHARGE --------- ------ --------- +etc working Thien-Thi Nguyen leim working Kenichi Handa lib-src done Thien-Thi Nguyen lisp done Thien-Thi Nguyen @@ -152,10 +153,16 @@ lisp/term done Thien-Thi Nguyen lisp/textmodes done Thien-Thi Nguyen lisp/toolbar done Thien-Thi Nguyen lisp/url done Thien-Thi Nguyen +lispintro working Thien-Thi Nguyen +lispref working Thien-Thi Nguyen lwlib done Thien-Thi Nguyen -src done Thien-Thi Nguyen -src/m done Thien-Thi Nguyen -src/s done Thien-Thi Nguyen +m4 done Thien-Thi Nguyen +mac/* (+ subdirs) working Thien-Thi Nguyen +man working Thien-Thi Nguyen +msdos working Thien-Thi Nguyen +nt/* (+ subdirs) working Thien-Thi Nguyen +oldXMenu working Thien-Thi Nguyen +src/* (+ subdirs) done Thien-Thi Nguyen vms done Thien-Thi Nguyen ** Check the Emacs manual. From 651f374c99a2bcf5e2ed326a26cf0d89a5c204f5 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Wed, 10 Aug 2005 14:29:01 +0000 Subject: [PATCH 139/347] Update years in copyright notice; nfc. --- lispref/ChangeLog | 3 ++- lispref/Makefile.in | 4 ++-- lispref/abbrevs.texi | 4 ++-- lispref/advice.texi | 3 ++- lispref/anti.texi | 2 +- lispref/backups.texi | 4 ++-- lispref/buffers.texi | 4 ++-- lispref/commands.texi | 4 ++-- lispref/compile.texi | 3 ++- lispref/control.texi | 4 ++-- lispref/customize.texi | 3 ++- lispref/debugging.texi | 4 ++-- lispref/display.texi | 2 +- lispref/edebug.texi | 3 ++- lispref/elisp.texi | 2 +- lispref/errors.texi | 3 ++- lispref/eval.texi | 3 ++- lispref/files.texi | 4 ++-- lispref/frames.texi | 4 ++-- lispref/functions.texi | 4 ++-- lispref/hash.texi | 2 +- lispref/help.texi | 4 ++-- lispref/hooks.texi | 3 ++- lispref/internals.texi | 4 ++-- lispref/intro.texi | 4 ++-- lispref/keymaps.texi | 4 ++-- lispref/lists.texi | 5 ++--- lispref/loading.texi | 5 ++--- lispref/locals.texi | 3 ++- lispref/macros.texi | 3 ++- lispref/makefile.w32-in | 3 +-- lispref/maps.texi | 3 ++- lispref/markers.texi | 4 ++-- lispref/minibuf.texi | 5 ++--- lispref/modes.texi | 2 +- lispref/nonascii.texi | 3 ++- lispref/numbers.texi | 4 ++-- lispref/objects.texi | 4 ++-- lispref/os.texi | 4 ++-- lispref/positions.texi | 4 ++-- lispref/processes.texi | 4 ++-- lispref/searching.texi | 4 ++-- lispref/sequences.texi | 4 ++-- lispref/streams.texi | 4 ++-- lispref/strings.texi | 4 ++-- lispref/symbols.texi | 4 ++-- lispref/syntax.texi | 4 ++-- lispref/text.texi | 5 ++--- lispref/tindex.pl | 2 +- lispref/tips.texi | 4 ++-- lispref/variables.texi | 5 ++--- lispref/vol1.texi | 4 ++-- lispref/vol2.texi | 4 ++-- lispref/windows.texi | 4 ++-- 54 files changed, 101 insertions(+), 95 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 2ecdb2d89db..0e28b7b2168 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -3741,7 +3741,8 @@ Tue Apr 11 12:23:28 1989 Robert J. Chassell (bob@rice-chex.ai.mit.edu) ;; coding: iso-2022-7bit ;; End: - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lispref/Makefile.in b/lispref/Makefile.in index 4fac4c025b0..7d5ce02714d 100644 --- a/lispref/Makefile.in +++ b/lispref/Makefile.in @@ -1,7 +1,7 @@ # Makefile for the GNU Emacs Lisp Reference Manual. -# Copyright (C) 1990,1991,1992,1993,1994,1995,1996,1998,1999,2000,2001,2003,2004 -# Free Software Foundation, Inc. +# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, +# 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lispref/abbrevs.texi b/lispref/abbrevs.texi index a58064ab387..38c5854adc6 100644 --- a/lispref/abbrevs.texi +++ b/lispref/abbrevs.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/abbrevs @node Abbrevs, Processes, Syntax Tables, Top diff --git a/lispref/advice.texi b/lispref/advice.texi index e741300b91d..8299e13ac10 100644 --- a/lispref/advice.texi +++ b/lispref/advice.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1998, 1999 Free Software Foundation, Inc. +@c Copyright (C) 1998, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/advising @node Advising Functions, Debugging, Byte Compilation, Top diff --git a/lispref/anti.texi b/lispref/anti.texi index 2c3d6414c1c..d6ae30f2106 100644 --- a/lispref/anti.texi +++ b/lispref/anti.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1999, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This node must have no pointers. diff --git a/lispref/backups.texi b/lispref/backups.texi index 24c617510bf..3b5363f64a3 100644 --- a/lispref/backups.texi +++ b/lispref/backups.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/backups @node Backups and Auto-Saving, Buffers, Files, Top diff --git a/lispref/buffers.texi b/lispref/buffers.texi index d9e276c13cf..b5118af6610 100644 --- a/lispref/buffers.texi +++ b/lispref/buffers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/buffers @node Buffers, Windows, Backups and Auto-Saving, Top diff --git a/lispref/commands.texi b/lispref/commands.texi index 47025fb0c28..353a7436c28 100644 --- a/lispref/commands.texi +++ b/lispref/commands.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/commands @node Command Loop, Keymaps, Minibuffers, Top diff --git a/lispref/compile.texi b/lispref/compile.texi index 951a090e0da..79ac366c27d 100644 --- a/lispref/compile.texi +++ b/lispref/compile.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/compile @node Byte Compilation, Advising Functions, Loading, Top diff --git a/lispref/control.texi b/lispref/control.texi index 573a32b1cde..8dae3d46484 100644 --- a/lispref/control.texi +++ b/lispref/control.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/control @node Control Structures, Variables, Evaluation, Top diff --git a/lispref/customize.texi b/lispref/customize.texi index 8ee82f088a8..b573ab942a6 100644 --- a/lispref/customize.texi +++ b/lispref/customize.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/customize @node Customization, Loading, Macros, Top diff --git a/lispref/debugging.texi b/lispref/debugging.texi index 66663aad131..9c0fa9bc865 100644 --- a/lispref/debugging.texi +++ b/lispref/debugging.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/debugging @node Debugging, Read and Print, Advising Functions, Top diff --git a/lispref/display.texi b/lispref/display.texi index 15c1d0ba724..9f299e9c6d6 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2005 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/display @node Display, System Interface, Processes, Top diff --git a/lispref/edebug.texi b/lispref/edebug.texi index f074cf3dbd5..a32c5e9189c 100644 --- a/lispref/edebug.texi +++ b/lispref/edebug.texi @@ -1,6 +1,7 @@ @comment -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This file can also be used by an independent Edebug User diff --git a/lispref/elisp.texi b/lispref/elisp.texi index b935b77c0fd..ba813430bfe 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -31,7 +31,7 @@ This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual, corresponding to Emacs version @value{EMACSVER}. Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, - 2000, 2002, 2003, 2004, 2005, Free Software Foundation, Inc. + 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/lispref/errors.texi b/lispref/errors.texi index a246539b8fd..ce48c3cf549 100644 --- a/lispref/errors.texi +++ b/lispref/errors.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1999 Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/errors @node Standard Errors, Standard Buffer-Local Variables, GNU Emacs Internals, Top diff --git a/lispref/eval.texi b/lispref/eval.texi index 6a43466af67..36bc941f26b 100644 --- a/lispref/eval.texi +++ b/lispref/eval.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2003, 2004 Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/eval @node Evaluation, Control Structures, Symbols, Top diff --git a/lispref/files.texi b/lispref/files.texi index 93c104e6ccd..d8d47964cdf 100644 --- a/lispref/files.texi +++ b/lispref/files.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/files @node Files, Backups and Auto-Saving, Documentation, Top diff --git a/lispref/frames.texi b/lispref/frames.texi index 10d91a094f8..3cb5e49dbac 100644 --- a/lispref/frames.texi +++ b/lispref/frames.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/frames @node Frames, Positions, Windows, Top diff --git a/lispref/functions.texi b/lispref/functions.texi index f58cad69bb7..17a96734b10 100644 --- a/lispref/functions.texi +++ b/lispref/functions.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/functions @node Functions, Macros, Variables, Top diff --git a/lispref/hash.texi b/lispref/hash.texi index 86a36a57a6e..7b4c8c67711 100644 --- a/lispref/hash.texi +++ b/lispref/hash.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1999, 2003 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/hash @node Hash Tables, Symbols, Sequences Arrays Vectors, Top diff --git a/lispref/help.texi b/lispref/help.texi index 2dbea2038cc..c7c99fa8987 100644 --- a/lispref/help.texi +++ b/lispref/help.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/help @node Documentation, Files, Modes, Top diff --git a/lispref/hooks.texi b/lispref/hooks.texi index 1278589de53..11b2233dc0e 100644 --- a/lispref/hooks.texi +++ b/lispref/hooks.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2004, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/hooks @node Standard Hooks, Index, Standard Keymaps, Top diff --git a/lispref/internals.texi b/lispref/internals.texi index 5cc0fe6e497..e032f5a7ddf 100644 --- a/lispref/internals.texi +++ b/lispref/internals.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/internals @node GNU Emacs Internals, Standard Errors, Tips, Top diff --git a/lispref/intro.texi b/lispref/intro.texi index bb264c81c46..01ffeb3321c 100644 --- a/lispref/intro.texi +++ b/lispref/intro.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/intro diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi index f65da56002d..5509b35b799 100644 --- a/lispref/keymaps.texi +++ b/lispref/keymaps.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/keymaps @node Keymaps, Modes, Command Loop, Top diff --git a/lispref/lists.texi b/lispref/lists.texi index 22edec42db2..422c977184c 100644 --- a/lispref/lists.texi +++ b/lispref/lists.texi @@ -1,8 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, -@c 2003, 2004, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/lists @node Lists, Sequences Arrays Vectors, Strings and Characters, Top diff --git a/lispref/loading.texi b/lispref/loading.texi index b64a0ce6736..afef0e787a5 100644 --- a/lispref/loading.texi +++ b/lispref/loading.texi @@ -1,8 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, -@c 2003, 2004, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/loading @node Loading, Byte Compilation, Customization, Top diff --git a/lispref/locals.texi b/lispref/locals.texi index 72bbcece4d8..57b17d3d41b 100644 --- a/lispref/locals.texi +++ b/lispref/locals.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1999 Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/locals @node Standard Buffer-Local Variables, Standard Keymaps, Standard Errors, Top diff --git a/lispref/macros.texi b/lispref/macros.texi index 0a1bf942c29..dc822352ab3 100644 --- a/lispref/macros.texi +++ b/lispref/macros.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2004 Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/macros @node Macros, Customization, Functions, Top diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in index 10b1e168805..038c05db7c3 100644 --- a/lispref/makefile.w32-in +++ b/lispref/makefile.w32-in @@ -1,7 +1,6 @@ # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual. -# Copyright (C) 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/lispref/maps.texi b/lispref/maps.texi index 16c1f0bab9b..ef5984cc32f 100644 --- a/lispref/maps.texi +++ b/lispref/maps.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1999 Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/maps @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top diff --git a/lispref/markers.texi b/lispref/markers.texi index 60b2aae6a98..d9f6d19a4b0 100644 --- a/lispref/markers.texi +++ b/lispref/markers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/markers @node Markers, Text, Positions, Top diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi index ed2b2167f58..04443c493f3 100644 --- a/lispref/minibuf.texi +++ b/lispref/minibuf.texi @@ -1,8 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, -@c 2001, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/minibuf @node Minibuffers, Command Loop, Read and Print, Top diff --git a/lispref/modes.texi b/lispref/modes.texi index baeb2800931..5520b9c76bd 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, @c 2003, 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/modes diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi index 9683156541d..2af367a0f85 100644 --- a/lispref/nonascii.texi +++ b/lispref/nonascii.texi @@ -1,6 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1998, 1999 Free Software Foundation, Inc. +@c Copyright (C) 1998, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/characters @node Non-ASCII Characters, Searching and Matching, Text, Top diff --git a/lispref/numbers.texi b/lispref/numbers.texi index f7f88248ff1..db28a2850a6 100644 --- a/lispref/numbers.texi +++ b/lispref/numbers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/numbers @node Numbers, Strings and Characters, Lisp Data Types, Top diff --git a/lispref/objects.texi b/lispref/objects.texi index 4a693f186d6..99ef896c4b4 100644 --- a/lispref/objects.texi +++ b/lispref/objects.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/objects @node Lisp Data Types, Numbers, Introduction, Top diff --git a/lispref/os.texi b/lispref/os.texi index 1e6dacb7d80..52108907e9c 100644 --- a/lispref/os.texi +++ b/lispref/os.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/os @node System Interface, Antinews, Display, Top diff --git a/lispref/positions.texi b/lispref/positions.texi index cab8d416e4a..cb249f526f1 100644 --- a/lispref/positions.texi +++ b/lispref/positions.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/positions @node Positions, Markers, Frames, Top diff --git a/lispref/processes.texi b/lispref/processes.texi index dddb08bc46b..bf92fc387a7 100644 --- a/lispref/processes.texi +++ b/lispref/processes.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/processes @node Processes, Display, Abbrevs, Top diff --git a/lispref/searching.texi b/lispref/searching.texi index cfb5a87d8ec..a8ea8573629 100644 --- a/lispref/searching.texi +++ b/lispref/searching.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/searching @node Searching and Matching, Syntax Tables, Non-ASCII Characters, Top diff --git a/lispref/sequences.texi b/lispref/sequences.texi index 61387fe1e0c..eade483bda3 100644 --- a/lispref/sequences.texi +++ b/lispref/sequences.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/sequences @node Sequences Arrays Vectors, Hash Tables, Lists, Top diff --git a/lispref/streams.texi b/lispref/streams.texi index 09f8695cd25..b5a18e27d01 100644 --- a/lispref/streams.texi +++ b/lispref/streams.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/streams @node Read and Print, Minibuffers, Debugging, Top diff --git a/lispref/strings.texi b/lispref/strings.texi index d0504684f82..18c516041d6 100644 --- a/lispref/strings.texi +++ b/lispref/strings.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/strings @node Strings and Characters, Lists, Numbers, Top diff --git a/lispref/symbols.texi b/lispref/symbols.texi index 9f59ad1f02d..9e4b482cfa0 100644 --- a/lispref/symbols.texi +++ b/lispref/symbols.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/symbols @node Symbols, Evaluation, Hash Tables, Top diff --git a/lispref/syntax.texi b/lispref/syntax.texi index e582b52a2c8..5cde2badabd 100644 --- a/lispref/syntax.texi +++ b/lispref/syntax.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/syntax @node Syntax Tables, Abbrevs, Searching and Matching, Top diff --git a/lispref/text.texi b/lispref/text.texi index 5b9b4259a1c..59259415cc0 100644 --- a/lispref/text.texi +++ b/lispref/text.texi @@ -1,8 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, -@c 2000, 2001, 2004, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/text @node Text, Non-ASCII Characters, Markers, Top diff --git a/lispref/tindex.pl b/lispref/tindex.pl index f3372bf21ee..68931bc9ed6 100755 --- a/lispref/tindex.pl +++ b/lispref/tindex.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/lispref/tips.texi b/lispref/tips.texi index 3ec885eca66..e37c9c3d999 100644 --- a/lispref/tips.texi +++ b/lispref/tips.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/tips @node Tips, GNU Emacs Internals, GPL, Top diff --git a/lispref/variables.texi b/lispref/variables.texi index 38fb929c16d..1f26b56db8f 100644 --- a/lispref/variables.texi +++ b/lispref/variables.texi @@ -1,8 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, -@c 2000, 2003, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/variables @node Variables, Functions, Control Structures, Top diff --git a/lispref/vol1.texi b/lispref/vol1.texi index f772fc58be5..e0a1f02df8d 100644 --- a/lispref/vol1.texi +++ b/lispref/vol1.texi @@ -2,8 +2,8 @@ This file is obsolete, and no longer part of the Emacs Lisp Reference Manual. It is still present in CVS in case we ever want to use some of it again. @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. \input texinfo @c -*-texinfo-*- diff --git a/lispref/vol2.texi b/lispref/vol2.texi index a4c6d4ae795..40ec8c4904f 100644 --- a/lispref/vol2.texi +++ b/lispref/vol2.texi @@ -2,8 +2,8 @@ This file is obsolete, and no longer part of the Emacs Lisp Reference Manual. It is still present in CVS in case we ever want to use some of it again. @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. diff --git a/lispref/windows.texi b/lispref/windows.texi index d37a31f86d2..e204a7ce7d0 100644 --- a/lispref/windows.texi +++ b/lispref/windows.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../info/windows @node Windows, Frames, Buffers, Top From b65d8176e6adcb4ac950d4c49419689eeacd03d7 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Wed, 10 Aug 2005 15:40:54 +0000 Subject: [PATCH 140/347] Update years in copyright notice; nfc. --- mac/ChangeLog | 2 +- mac/INSTALL | 2 +- mac/README | 2 +- mac/cw6-mcp.xml | 2 +- mac/inc/alloca.h | 2 +- mac/inc/config.h | 3 ++- mac/inc/defs-cw6.h | 2 +- mac/inc/dirent.h | 3 ++- mac/inc/epaths.h | 3 ++- mac/inc/grp.h | 2 +- mac/inc/m-mac.h | 3 ++- mac/inc/pwd.h | 3 ++- mac/inc/s-mac.h | 3 ++- mac/inc/sys/file.h | 3 ++- mac/inc/sys/ioctl.h | 3 ++- mac/inc/sys/param.h | 3 ++- mac/inc/sys/stat.h | 3 ++- mac/inc/sys/time.h | 2 +- mac/inc/sys/types.h | 3 ++- mac/inc/termio.h | 3 ++- mac/inc/utime.h | 2 +- mac/inc/utsname.h | 2 +- mac/make-package | 2 +- mac/makefile.MPW | 3 ++- mac/src/Emacs.r | 3 ++- mac/src/EmacsMPW.r | 3 ++- mac/src/chdir.c | 3 ++- man/ChangeLog | 4 ++-- man/Makefile.in | 4 ++-- man/abbrevs.texi | 3 ++- man/ack.texi | 4 ++-- man/ada-mode.texi | 3 ++- man/anti.texi | 2 +- man/autotype.texi | 6 ++++-- man/basic.texi | 3 ++- man/buffers.texi | 4 ++-- man/building.texi | 3 ++- man/calc.texi | 7 ++++--- man/calendar.texi | 2 +- man/cc-mode.texi | 2 +- man/cl.texi | 2 +- man/cmdargs.texi | 4 ++-- man/commands.texi | 3 ++- man/custom.texi | 4 ++-- man/dired-x.texi | 3 ++- man/dired.texi | 4 ++-- man/display.texi | 4 ++-- man/ebrowse.texi | 3 ++- man/ediff.texi | 4 ++-- man/emacs-mime.texi | 4 ++-- man/emacs-xtra.texi | 3 +-- man/emacs.texi | 4 ++-- man/entering.texi | 3 ++- man/eshell.texi | 3 ++- man/eudc.texi | 3 ++- man/faq.texi | 2 +- man/files.texi | 2 +- man/fixit.texi | 3 ++- man/flymake.texi | 2 +- man/forms.texi | 3 ++- man/frames.texi | 4 ++-- man/glossary.texi | 3 ++- man/gnu.texi | 6 ++++-- man/gnus.texi | 5 ++--- man/help.texi | 4 ++-- man/idlwave.texi | 8 ++++---- man/indent.texi | 3 ++- man/info.texi | 2 +- man/killing.texi | 4 ++-- man/kmacro.texi | 2 +- man/m-x.texi | 3 ++- man/macos.texi | 3 ++- man/maintaining.texi | 2 +- man/major.texi | 3 ++- man/makefile.w32-in | 3 +-- man/mark.texi | 3 ++- man/message.texi | 4 ++-- man/mh-e.texi | 3 ++- man/mini.texi | 4 ++-- man/misc.texi | 2 +- man/msdog.texi | 4 ++-- man/mule.texi | 3 ++- man/org.texi | 2 +- man/pcl-cvs.texi | 2 +- man/pgg.texi | 2 +- man/picture.texi | 3 ++- man/programs.texi | 2 +- man/reftex.texi | 3 ++- man/regs.texi | 3 ++- man/rmail.texi | 3 ++- man/sc.texi | 3 ++- man/screen.texi | 3 ++- man/search.texi | 4 ++-- man/sending.texi | 4 ++-- man/ses.texi | 2 +- man/sieve.texi | 2 +- man/smtpmail.texi | 2 +- man/speedbar.texi | 3 ++- man/texinfo.tex | 7 ++++--- man/text.texi | 4 ++-- man/tramp.texi | 4 ++-- man/trouble.texi | 3 ++- man/url.texi | 6 ++++-- man/vip.texi | 3 ++- man/viper.texi | 4 ++-- man/windows.texi | 3 ++- man/woman.texi | 3 ++- man/xresources.texi | 3 ++- msdos/ChangeLog | 4 ++-- msdos/README | 3 +-- msdos/mainmake | 3 ++- msdos/mainmake.v2 | 4 ++-- msdos/sed1.inp | 4 ++-- msdos/sed1v2.inp | 4 ++-- msdos/sed2.inp | 4 ++-- msdos/sed2v2.inp | 4 ++-- msdos/sed2x.inp | 3 +-- msdos/sed3.inp | 4 ++-- msdos/sed3v2.inp | 4 ++-- msdos/sed4.inp | 3 +-- msdos/sed5x.inp | 3 +-- msdos/sed6.inp | 4 ++-- msdos/sedleim.inp | 4 ++-- msdos/sedlisp.inp | 3 +-- nt/ChangeLog | 4 ++-- nt/INSTALL | 2 +- nt/README | 2 +- nt/addpm.c | 2 +- nt/addsection.c | 2 +- nt/cmdproxy.c | 2 +- nt/config.nt | 3 ++- nt/ddeclient.c | 2 +- nt/emacs.rc | 2 +- nt/envadd.bat | 2 +- nt/gmake.defs | 3 ++- nt/inc/grp.h | 2 +- nt/inc/sys/socket.h | 2 +- nt/makefile.w32-in | 3 ++- nt/multi-install-info.bat | 2 +- nt/nmake.defs | 3 ++- nt/paths.h | 4 ++-- nt/preprep.c | 2 +- nt/runemacs.c | 20 ++++++++++++++++++++ 143 files changed, 268 insertions(+), 195 deletions(-) diff --git a/mac/ChangeLog b/mac/ChangeLog index 8715ea3319f..acc89f75bd1 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -764,7 +764,7 @@ ;; coding: iso-2022-7bit-unix ;; End: - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/mac/INSTALL b/mac/INSTALL index 9dcf1324f7d..c8af7e5f484 100644 --- a/mac/INSTALL +++ b/mac/INSTALL @@ -1,6 +1,6 @@ * BUILDING EMACS ON MAC OS 8/9 AND MAC OS X -*- outline -*- -Copyright (c) 2001, 2002, 2004 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that diff --git a/mac/README b/mac/README index 6a352e04af6..18e0942b365 100644 --- a/mac/README +++ b/mac/README @@ -1,6 +1,6 @@ Emacs for Mac OS 8/9 and Mac OS X -Copyright (c) 2001-4 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml index 4d3ae5a8c22..54bfc4be7e9 100644 --- a/mac/cw6-mcp.xml +++ b/mac/cw6-mcp.xml @@ -1,5 +1,5 @@