diff options
| author | Miles Bader <[email protected]> | 2005-08-05 10:57:36 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2005-08-05 10:57:36 +0000 |
| commit | 5e10f34207ff594cd6570928bc0292a7b53297b8 (patch) | |
| tree | d03b31da4d83d4a49fac3162e5481b77849754d5 /lisp | |
| parent | 07bd7822113da5ae28d0db471453622a2ed5d6cd (diff) | |
| parent | 11e22c4a01e2535ad784e0d122a65837a13ec71c (diff) | |
Revision: [email protected]/emacs--unicode--0--patch-77
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 504-513)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: .cvsignore: Add `lock'.
* gnus--rel--5.10 (patch 99-103)
- Update from CVS
Diffstat (limited to 'lisp')
213 files changed, 1021 insertions, 551 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5ae09a0e9e..5161c5e3fb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,123 @@ +2005-08-05 Kenichi Handa <[email protected]> + + * international/code-pages.el: Add autoload cookies for all coding + systems. + +2005-08-04 Luc Teirlinck <[email protected]> + + * cus-start.el (all): Put undo.c where it alphabetically belongs. + +2005-08-04 Juri Linkov <[email protected]> + + * progmodes/compile.el (compilation-mode-map): + * progmodes/grep.el (grep-mode-map): + Bind TAB to `compilation-next-error' and [backtab] to + `compilation-previous-error'. + + * progmodes/grep.el (grep-regexp-alist): Replace complex regexp + matching line numbers, column numbers and their ranges with regexp + matching only line numbers. + (grep-context-face): New face variable. + (grep-mode-font-lock-keywords): Use it. + + * faces.el (read-face-name): Delete duplicate faces. + +2005-08-02 Juanma Barranquero <[email protected]> + + * thumbs.el (thumbs-find-image): Don't make variables + automatically buffer local. + (thumbs-current-tmp-filename, thumbs-current-image-filename) + (thumbs-image-num): Make automatically buffer local. + (thumbs-show-thumbs-list): Use `make-local-variable', not + `make-variable-buffer-local'. + (thumbs-insert-image): Make `thumbs-current-image-size' + buffer-local. + + * play/doctor.el (doctor-type-symbol): "?\ " -> "?\s". + (**mad**, *debug*, *print-space*, *print-upcase*, abuselst) + (abusewords, account, afraidof, arerelated, areyou, bak, beclst) + (bother, bye, canyou, chatlst, continue, deathlst, describe) + (drnk, drugs, eliza-flag, elizalst, famlst, feared, fears) + (feelings-about, foullst, found, hello, history, howareyoulst) + (howdyflag, huhlst, ibelieve, improve, inter, isee, isrelated) + (lincount, longhuhlst, lover, machlst, mathlst, maybe, moods) + (neglst, obj, object, owner, please, problems, qlist) + (random-adjective, relation, remlst, repetitive-shortness) + (replist, rms-flag, schoollst, sent, sexlst, shortbeclst) + (shortlst, something, sportslst, stallmanlst, states, subj) + (suicide-flag, sure, things, thlst, toklst, typos, verb, want) + (whatwhen, whereoutp, whysay, whywant, zippy-flag, zippylst): + Defvar at compile time. + + * progmodes/ada-mode.el (ada-mode): Use `make-local-variable', + not `make-variable-buffer-local'. + +2005-08-02 Kim F. Storm <[email protected]> + + * emulation/cua-rect.el (cua--highlight-rectangle): Only show + rectangle overlay in selected window. + +2005-08-01 Luc Teirlinck <[email protected]> + + * cus-start.el (all): Put `indicate-empty-lines' in fringe group + instead of display group. Make `indicate-buffer-boundaries' + customizable through Custom. + +2005-08-01 Juanma Barranquero <[email protected]> + + * progmodes/gdb-ui.el (gdb-frame-address, gdb-var-changed) + (gdb-output-sink, gdba, gdb-cpp-define-alist-program) + (gdb-set-gud-minor-mode, gdb-exited, gdb-setup-windows) + (gdb-put-string): Fix typos in docstrings. + +2005-08-01 Nick Roberts <[email protected]> + + Update copyright notices of files in progmodes directory for + release of Emacs 22.1. + + * progmodes/gdb-ui.el (gdb-enable-debug-log): Add autoload cookie. + + * progmodes/gud.el (gud-tooltip-mode): Add autoload cookie. Don't + barf if the GUD buffer has been killed. + +2005-08-01 Kim F. Storm <[email protected]> + + * textmodes/table.el (table-yank-handler): Change defcustom to defvar. + +2005-07-29 Stefan Monnier <[email protected]> + + * emacs-lisp/bytecomp.el (byte-compile-make-variable-buffer-local) + (byte-compile-form-make-variable-buffer-local): New functions to warn + about misuses of make-variable-buffer-local where make-local-variable + was meant. + +2005-07-29 Juanma Barranquero <[email protected]> + + * bs.el (bs-attributes-list): Doc fix. + (bs): Update url-link. + + * desktop.el (desktop-save-buffer): Fix typos in docstring. + (desktop-load-default): Simplify. + + * ibuffer.el (ibuffer-columnize-and-insert-list) + (ibuffer-mouse-toggle-mark, ibuffer-count-marked-lines) + (ibuffer-unmark-all, ibuffer-toggle-marks) + (ibuffer-unmark-forward, ibuffer-unmark-backward) + (ibuffer-compile-make-format-form, ibuffer-format-column) + (ibuffer-current-buffers-with-marks) + (ibuffer-update-title-and-summary): "?\ " -> "?\s". + (ibuffer): Doc fix. + (ibuffer-mode): Fix typo in docstring. + (ibuffer-hooks, ibuffer-mode-hooks): Make obsolete and declare + with `define-obsolete-variable-alias'. + (ibuffer-elide-long-columns): Mark as obsolete. Doc fix. + +2005-07-29 Kenichi Handa <[email protected]> + + * international/mule-cmds.el (select-message-coding-system): + Be sure to use LF for end-of-line. If no coding system is decided, + return iso-8859-1-unix. + 2005-07-28 Stefan Monnier <[email protected]> * net/ange-ftp.el (ange-ftp-gateway-fatal-msgs) @@ -62,17 +182,15 @@ * term/README: Describe the terminal-init-* functionality. - * startup.el (command-line): After loading the terminal - initialization file call the corresponding terminal initialization - function. + * startup.el (command-line): After loading the terminal initialization + file call the corresponding terminal initialization function. 2005-07-27 Kenichi Handa <[email protected]> * ps-bdf.el (bdf-read-font-info): Ignore glyphs whose ENCODING is negative. - * ps-mule.el (ps-mule-bitmap-prologue): Fix arguments to - setcharwidth. + * ps-mule.el (ps-mule-bitmap-prologue): Fix arguments to setcharwidth. (ps-mule-composition-prologue): Fix for the case that RelativeCompose is false. @@ -140,8 +258,6 @@ 2005-07-22 Juri Linkov <[email protected]> - * simple.el (line-move-1): Fix comments. - * startup.el (normal-splash-screen): Update menu name. * tempo.el (tempo-insert-template): Fix 2005-07-16 change. diff --git a/lisp/bs.el b/lisp/bs.el index 67db564889..f8a07337dc 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -25,7 +25,7 @@ ;;; Commentary: ;; Version: 1.17 -;; X-URL: http://home.netsurf.de/olaf.sylvester/emacs +;; X-URL: http://www.geekware.de/software/emacs ;; ;; The bs-package contains a main function bs-show for poping up a ;; buffer in a way similar to `list-buffers' and `electric-buffer-list': @@ -138,7 +138,7 @@ "Buffer Selection: Maintaining buffers by buffer menu." :version "21.1" :link '(emacs-commentary-link "bs") - :link '(url-link "http://home.netsurf.de/olaf.sylvester/emacs") + :link '(url-link "http://www.geekware.de/software/emacs") :group 'convenience) (defgroup bs-appearance nil @@ -160,15 +160,17 @@ "*List specifying the layout of a Buffer Selection Menu buffer. Each entry specifies a column and is a list of the form of: \(HEADER MINIMUM-LENGTH MAXIMUM-LENGTH ALIGNMENT FUN-OR-STRING) -HEADER : string for header for first line or a function - which calculates column title. -MINIMUM-LENGTH : minimum width of column (number or name of function). - The function must return a positive integer. -MAXIMUM-LENGTH : maximum width of column (number or name of function) - (currently ignored) -ALIGNMENT : alignment of column: (`left' `right' `middle') -FUN-OR-STRING : Name of a function for calculating the value or -a string for a constant value. + +HEADER : String for header for first line or a function + which calculates column title. +MINIMUM-LENGTH : Minimum width of column (number or name of function). + The function must return a positive integer. +MAXIMUM-LENGTH : Maximum width of column (number or name of function) + (currently ignored). +ALIGNMENT : Alignment of column (`left', `right', `middle'). +FUN-OR-STRING : Name of a function for calculating the value or a + string for a constant value. + The function gets as parameter the buffer where we have started buffer selection and the list of all buffers to show. The function must return a string representing the column's value." diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 68f3ed5a67..929af33472 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -40,20 +40,6 @@ ;; alloc.c (gc-cons-threshold alloc integer) (garbage-collection-messages alloc boolean) - ;; undo.c - (undo-limit undo integer) - (undo-strong-limit undo integer) - (undo-outer-limit undo - (choice integer - (const :tag "No limit" - :format "%t\n%d" - :doc - "With this choice, \ -the undo info for the current command never gets discarded. -This should only be chosen under exceptional circumstances, -since it could result in memory overflow and make Emacs crash." - nil)) - "22.1") ;; buffer.c (mode-line-format modeline sexp) ;Hard to do right. (default-major-mode internal function) @@ -65,7 +51,47 @@ since it could result in memory overflow and make Emacs crash." (ctl-arrow display boolean) (truncate-lines display boolean) (selective-display-ellipses display boolean) - (indicate-empty-lines display boolean "21.1") + (indicate-empty-lines fringe boolean "21.1") + (indicate-buffer-boundaries + fringe + (choice + (const :tag "No indicators" nil) + (const :tag "On left, with arrows" left) + (const :tag "On right, with arrows" right) + (set :tag "Pick your own design" + :value ((t . nil)) + :format "%{%t%}:\n%v\n%d" + :doc "You can specify a default and then override it \ +for individual indicators. +Leaving \"Default\" unchecked is equivalent with specifying a default of +\"Do not show\"." + (choice :tag "Default" + :value (t . nil) + (const :tag "Do not show" (t . nil)) + (const :tag "On the left" (t . left)) + (const :tag "On the right" (t . right))) + (choice :tag "Top" + :value (top . left) + (const :tag "Do not show" (top . nil)) + (const :tag "On the left" (top . left)) + (const :tag "On the right" (top . right))) + (choice :tag "Bottom" + :value (bottom . left) + (const :tag "Do not show" (bottom . nil)) + (const :tag "On the left" (bottom . left)) + (const :tag "On the right" (bottom . right))) + (choice :tag "Up arrow" + :value (up . left) + (const :tag "Do not show" (up . nil)) + (const :tag "On the left" (up . left)) + (const :tag "On the right" (up . right))) + (choice :tag "Down arrow" + :value (down . left) + (const :tag "Do not show" (down . nil)) + (const :tag "On the left" (down . left)) + (const :tag "On the right" (down . right)))) + (other :tag "On left, no arrows" t)) + "22.1") (scroll-up-aggressively windows (choice (const :tag "off" nil) number) "21.1") @@ -220,6 +246,20 @@ since it could result in memory overflow and make Emacs crash." (words-include-escapes editing-basics boolean) (open-paren-in-column-0-is-defun-start editing-basics boolean "21.1") + ;; undo.c + (undo-limit undo integer) + (undo-strong-limit undo integer) + (undo-outer-limit undo + (choice integer + (const :tag "No limit" + :format "%t\n%d" + :doc + "With this choice, \ +the undo info for the current command never gets discarded. +This should only be chosen under exceptional circumstances, +since it could result in memory overflow and make Emacs crash." + nil)) + "22.1") ;; window.c (temp-buffer-show-function windows (choice (const nil) function)) (display-buffer-function windows (choice (const nil) function)) diff --git a/lisp/desktop.el b/lisp/desktop.el index b80aa600a8..2d0a71bf6c 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -106,7 +106,8 @@ desktop is saved." :group 'desktop) ;; Maintained for backward compatibility -(define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1") +(define-obsolete-variable-alias 'desktop-enable + 'desktop-save-mode "22.1") (defcustom desktop-save 'ask-if-new "*Specifies whether the desktop should be saved when it is killed. @@ -136,7 +137,8 @@ determine where the desktop is saved." "Name of file for Emacs desktop, excluding the directory part." :type 'file :group 'desktop) -(define-obsolete-variable-alias 'desktop-basefilename 'desktop-base-file-name "22.1") +(define-obsolete-variable-alias 'desktop-basefilename + 'desktop-base-file-name "22.1") (defcustom desktop-path '("." "~") "List of directories to search for the desktop file. @@ -292,8 +294,8 @@ See `desktop-restore-eager'." "When non-nil, save buffer status in desktop file. This variable becomes buffer local when set. -If the value is a function, it called by `desktop-save' with argument -DESKTOP-DIRNAME to obtain auxiliary information to saved in the desktop +If the value is a function, it is called by `desktop-save' with argument +DESKTOP-DIRNAME to obtain auxiliary information to save in the desktop file along with the state of the buffer for which it was called. When file names are returned, they should be formatted using the call @@ -776,11 +778,11 @@ It returns t if a desktop file was loaded, nil otherwise." (defun desktop-load-default () "Load the `default' start-up library manually. Also inhibit further loading of it." - (if (not inhibit-default-init) ; safety check - (progn - (load "default" t t) - (setq inhibit-default-init t)))) -(make-obsolete 'desktop-load-default 'desktop-save-mode "22.1") + (unless inhibit-default-init ; safety check + (load "default" t t) + (setq inhibit-default-init t))) +(make-obsolete 'desktop-load-default + 'desktop-save-mode "22.1") ;; ---------------------------------------------------------------------------- ;;;###autoload @@ -801,7 +803,7 @@ directory DIRNAME." "Save the desktop in directory `desktop-dirname'." (interactive) (if desktop-dirname - (desktop-save desktop-dirname) + (desktop-save desktop-dirname) (call-interactively 'desktop-save)) (message "Desktop saved in %s" desktop-dirname)) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 1094b1b8cb..0dd0ead9d6 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3792,6 +3792,19 @@ that suppresses all warnings during execution of BODY." (defun byte-compile-no-warnings (form) (let (byte-compile-warnings) (byte-compile-form (cons 'progn (cdr form))))) + +;; Warn about misuses of make-variable-buffer-local. +(byte-defop-compiler-1 make-variable-buffer-local byte-compile-make-variable-buffer-local) +(defun byte-compile-make-variable-buffer-local (form) + (if (eq (car-safe (car-safe (cdr-safe form))) 'quote) + (byte-compile-warn + "`make-variable-buffer-local' should be called at toplevel")) + (byte-compile-normal-call form)) +(put 'make-variable-buffer-local + 'byte-hunk-handler 'byte-compile-form-make-variable-buffer-local) +(defun byte-compile-form-make-variable-buffer-local (form) + (byte-compile-keep-pending form 'byte-compile-normal-call)) + ;;; tags diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 107f8b1b22..16e777ed2b 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -1,6 +1,6 @@ ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993,2000,2003 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2000, 2003, 2005 Free Software Foundation, Inc. ;; Author: Dave Gillespie <[email protected]> ;; Keywords: extensions @@ -38,9 +38,7 @@ ;;; Code: -(or (memq 'cl-19 features) - (error "Tried to load `cl-extra' before `cl'!")) - +(require 'cl) ;;; Type coercion. @@ -763,5 +761,5 @@ This also does some trivial optimizations to make the form prettier." (run-hooks 'cl-extra-load-hook) -;;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed +;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed ;;; cl-extra.el ends here diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 4091fd5f01..66ff29ecab 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el @@ -1,6 +1,7 @@ ;;; crisp.el --- CRiSP/Brief Emacs emulator -;; Copyright (C) 1997, 1998, 1999, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Gary D. Foster <[email protected]> ;; Keywords: emulations brief crisp diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 49979ce3b7..beb30d500d 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1,7 +1,7 @@ ;;; cua-base.el --- emulate CUA key bindings -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kim F. Storm <[email protected]> ;; Keywords: keyboard emulation convenience cua diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index 6ebbb6fc00..c7c5dd3db6 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -1,6 +1,7 @@ ;;; cua-gmrk.el --- CUA unified global mark support -;; Copyright (C) 1997-2002 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kim F. Storm <[email protected]> ;; Keywords: keyboard emulations convenience cua mark diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 011a0fb8a3..d83ebd543c 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -1,6 +1,7 @@ ;;; cua-rect.el --- CUA unified rectangle support -;; Copyright (C) 1997-2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kim F. Storm <[email protected]> ;; Keywords: keyboard emulations convenience CUA @@ -832,6 +833,7 @@ If command is repeated at same position, delete the rectangle." (overlay-put overlay 'after-string as) (overlay-put overlay 'face rface) (overlay-put overlay 'keymap cua--overlay-keymap) + (overlay-put overlay 'window (selected-window)) (setq new (cons overlay new)))))) ;; Trim old trailing overlays. (mapcar (function delete-overlay) old) diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el index a56c4656c0..4db235c60f 100644 --- a/lisp/emulation/edt-lk201.el +++ b/lisp/emulation/edt-lk201.el @@ -1,6 +1,7 @@ ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards -;; Copyright (C) 1986, 1992, 1993, 1995 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <[email protected]> ;; Maintainer: Kevin Gallagher <[email protected]> diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index eeb34b9c7b..9334c74392 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -1,6 +1,7 @@ ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs -;; Copyright (C) 1994, 1995, 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <[email protected]> ;; Maintainer: Kevin Gallagher <[email protected]> diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el index 41d0b77296..419f6549ba 100644 --- a/lisp/emulation/edt-pc.el +++ b/lisp/emulation/edt-pc.el @@ -1,6 +1,7 @@ ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards -;; Copyright (C) 1986, 1994, 1995 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1994, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <[email protected]> ;; Maintainer: Kevin Gallagher <[email protected]> diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el index 7104c53a77..cd9a065acf 100644 --- a/lisp/emulation/edt-vt100.el +++ b/lisp/emulation/edt-vt100.el @@ -1,6 +1,7 @@ ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals -;; Copyright (C) 1986, 1992, 1993, 1995 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <[email protected]> ;; Maintainer: Kevin Gallagher <[email protected]> diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 8eecf5fca5..8d5071be31 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -1,7 +1,7 @@ ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19 -;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001 -;; Free Software Foundation, Inc. +;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <[email protected]> ;; Maintainer: Kevin Gallagher <[email protected]> diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el index 7479b5ade0..6fc5103c72 100644 --- a/lisp/emulation/keypad.el +++ b/lisp/emulation/keypad.el @@ -1,6 +1,6 @@ ;;; keypad.el --- simplified keypad bindings -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Kim F. Storm <[email protected]> ;; Keywords: keyboard convenience diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el index 3bcb60ec0b..1ec66664b6 100644 --- a/lisp/emulation/pc-mode.el +++ b/lisp/emulation/pc-mode.el @@ -1,6 +1,6 @@ ;;; pc-mode.el --- emulate certain key bindings used on PCs -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el index 3a85a43015..9b9f4d51b4 100644 --- a/lisp/emulation/pc-select.el +++ b/lisp/emulation/pc-select.el @@ -2,7 +2,8 @@ ;;; (or MAC GUI or MS-windoze (bah)) look-and-feel ;;; including key bindings. -;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael Staats <[email protected]> ;; Keywords: convenience emulation diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el index 3c18e2f608..eca6e5c74c 100644 --- a/lisp/emulation/tpu-edt.el +++ b/lisp/emulation/tpu-edt.el @@ -1,6 +1,7 @@ ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT -;; Copyright (C) 1993, 1994, 1995, 2000, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Rob Riepel <[email protected]> ;; Maintainer: Rob Riepel <[email protected]> diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el index 51ed44346a..c48aa97476 100644 --- a/lisp/emulation/tpu-extras.el +++ b/lisp/emulation/tpu-extras.el @@ -1,6 +1,7 @@ ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt -;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Rob Riepel <[email protected]> ;; Maintainer: Rob Riepel <[email protected]> diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el index 66d6541ac0..e21a85db2a 100644 --- a/lisp/emulation/tpu-mapper.el +++ b/lisp/emulation/tpu-mapper.el @@ -1,6 +1,7 @@ ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file -;; Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Rob Riepel <[email protected]> ;; Maintainer: Rob Riepel <[email protected]> diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index aa6e75357e..51fbdb6b8c 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el @@ -1,7 +1,7 @@ ;;; vip.el --- a VI Package for GNU Emacs -;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Masahiko Sato <[email protected]> ;; Keywords: emulations diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 47b677b2e1..ce8b61fd02 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1,6 +1,7 @@ ;;; viper-cmd.el --- Vi command support for Viper -;; Copyright (C) 1997, 98, 99, 2000, 01, 02, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 008b430d16..87d2d7f5d5 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -1,6 +1,7 @@ ;;; viper-ex.el --- functions implementing the Ex commands for Viper -;; Copyright (C) 1994, 95, 96, 97, 98, 2000, 01, 02, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index f898c15c15..3c984a3596 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -1,6 +1,7 @@ ;;; viper-init.el --- some common definitions for Viper -;; Copyright (C) 1997, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 1bbf3dce2c..2af0a9bbfa 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -1,6 +1,7 @@ ;;; viper-keym.el --- Viper keymaps -;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index 6d79ddec04..edc5cba1bb 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -1,6 +1,7 @@ ;;; viper-macs.el --- functions implementing keyboard macros for Viper -;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el index 77c5f84456..084d70050a 100644 --- a/lisp/emulation/viper-mous.el +++ b/lisp/emulation/viper-mous.el @@ -1,6 +1,7 @@ ;;; viper-mous.el --- mouse support for Viper -;; Copyright (C) 1994, 95, 96, 97, 2001, 02 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index d6fe9b43a6..5bd67e1735 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -1,6 +1,7 @@ ;;; viper-util.el --- Utilities used by viper.el -;; Copyright (C) 1994, 95, 96, 97, 99, 2000, 01, 02, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 3a95fa2683..edc1fb1e9d 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -3,7 +3,8 @@ ;; and a venomous VI PERil. ;; Viper Is also a Package for Emacs Rebels. -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 2005 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 <[email protected]> ;; Keywords: emulations diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el index b177319748..41e8f5323a 100644 --- a/lisp/emulation/ws-mode.el +++ b/lisp/emulation/ws-mode.el @@ -1,6 +1,6 @@ ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs -;; Copyright (C) 1991 Free Software Foundation, Inc. +;; Copyright (C) 1991, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Juergen Nickelsen <[email protected]> ;; Version: 0.7 diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el index ba84384e1d..67e007a7f0 100644 --- a/lisp/eshell/em-alias.el +++ b/lisp/eshell/em-alias.el @@ -1,6 +1,7 @@ ;;; em-alias.el --- creation and management of command aliases -;; Copyright (C) 1999, 2000, 2004 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el index 0611ea3e5e..017474ca6f 100644 --- a/lisp/eshell/em-banner.el +++ b/lisp/eshell/em-banner.el @@ -1,6 +1,7 @@ ;;; em-banner.el --- sample module that displays a login banner -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el index d0712ade94..c42b843add 100644 --- a/lisp/eshell/em-basic.el +++ b/lisp/eshell/em-basic.el @@ -1,6 +1,7 @@ ;;; em-basic.el --- basic shell builtin commands -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index 734d0a87eb..423a93d46e 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -1,6 +1,7 @@ ;;; em-cmpl.el --- completion using the TAB key -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index a699ea8363..3a18b1e042 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -1,6 +1,7 @@ ;;; em-dirs.el --- directory navigation commands -;; Copyright (C) 1999, 2000, 2004 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index 3a53ded645..869144dad7 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -1,6 +1,7 @@ ;;; em-glob.el --- extended file name globbing -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 6877078834..fd887e5fa8 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -1,6 +1,7 @@ ;;; em-hist.el --- history list management -;; Copyright (C) 1999, 2000, 2004 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index 8ed49ccbd4..a42544bf98 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -1,6 +1,7 @@ ;;; em-ls.el --- implementation of ls in Lisp -;; Copyright (C) 1999, 2000, 2005 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index af72446bd1..9e2e8a32af 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -1,6 +1,7 @@ ;;; em-pred.el --- argument predicates and modifiers (ala zsh) -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el index fcb029fc9c..a4ba51609b 100644 --- a/lisp/eshell/em-prompt.el +++ b/lisp/eshell/em-prompt.el @@ -1,6 +1,7 @@ ;;; em-prompt.el --- command prompts -;; Copyright (C) 1999, 2000, 2005 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el index 203801224b..da36551a4d 100644 --- a/lisp/eshell/em-rebind.el +++ b/lisp/eshell/em-rebind.el @@ -1,6 +1,7 @@ ;;; em-rebind.el --- rebind keys when point is at current input -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index df1df5afe8..d67c5e063c 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el @@ -1,6 +1,7 @@ ;;; em-script.el --- Eshell script files -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el index aa80c6271d..1d8133effe 100644 --- a/lisp/eshell/em-smart.el +++ b/lisp/eshell/em-smart.el @@ -1,6 +1,7 @@ ;;; em-smart.el --- smart display of output -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index c539f2edac..8e0786349a 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el @@ -1,6 +1,7 @@ ;;; em-term.el --- running visual commands -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 94f729c287..340b95f4d5 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -1,6 +1,7 @@ ;;; em-unix.el --- UNIX command aliases -;; Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el index 2f9eee3dd8..3db159ad84 100644 --- a/lisp/eshell/em-xtra.el +++ b/lisp/eshell/em-xtra.el @@ -1,6 +1,7 @@ ;;; em-xtra.el --- extra alias functions -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index afd52c36b4..7e0be3138e 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -1,6 +1,7 @@ ;;; esh-arg.el --- argument processing -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 4e2466c4d6..d396908d8a 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -1,6 +1,7 @@ ;;; esh-cmd.el --- command invocation -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 4b984af894..e7192399a9 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -1,6 +1,7 @@ ;;; esh-ext.el --- commands external to Eshell -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index a5c939e0a3..1c3fd21945 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el @@ -1,6 +1,7 @@ ;;; esh-io.el --- I/O management -;; Copyright (C) 1999, 2000, 2005 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el index d99eba388d..56d92b0c6a 100644 --- a/lisp/eshell/esh-maint.el +++ b/lisp/eshell/esh-maint.el @@ -1,6 +1,7 @@ ;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*- -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index c37cdc92cd..df5d7732ef 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -1,6 +1,7 @@ ;;; esh-mode.el --- user interface -;; Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el index fc0801f3a9..ea87c662c1 100644 --- a/lisp/eshell/esh-module.el +++ b/lisp/eshell/esh-module.el @@ -1,6 +1,7 @@ ;;; esh-module.el --- Eshell modules -;; Copyright (C) 1999, 2000, 2004 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> ;; Keywords: processes diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index 0eabcedff7..a3adac8db0 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -1,6 +1,7 @@ ;;; esh-opt.el --- command options processing -;; Copyright (C) 1999, 2000, 2003 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index a91cfa01bb..82a0968ae3 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -1,6 +1,7 @@ ;;; esh-proc.el --- process management -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el index e2972030b6..b7dcfab027 100644 --- a/lisp/eshell/esh-test.el +++ b/lisp/eshell/esh-test.el @@ -1,6 +1,7 @@ ;;; esh-test.el --- Eshell test suite -;; Copyright (C) 1999, 2000, 2005 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index f5e2072552..c05f6abb23 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -1,6 +1,7 @@ ;;; esh-util.el --- general utilities -;; Copyright (C) 1999, 2000, 2001 Free Software Foundation +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index 2d444a3ae0..10cc7c703d 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el @@ -1,6 +1,7 @@ ;;; esh-var.el --- handling of variables -;; Copyright (C) 1999, 2000, 2005 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 89b5a338ec..8c13b485cc 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -1,6 +1,7 @@ ;;; eshell.el --- the Emacs command shell -;; Copyright (C) 1999, 2000 Free Software Foundation +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: John Wiegley <[email protected]> ;; Version: 2.4.2 diff --git a/lisp/faces.el b/lisp/faces.el index 733d7cae1b..d747149eed 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -882,6 +882,7 @@ Otherwise, return a single face." (push f faces))) (if (symbolp faceprop) (push faceprop faces))) + (delete-dups faces) ;; Build up the completion tables. (mapatoms (lambda (s) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7bc733ad90..9f5ee5e1e3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,8 +1,74 @@ +2005-08-05 Katsumi Yamaoka <[email protected]> + + * mm-bodies.el (mm-encode-body): Use coding system rather than + charset to encode text. + + * mm-util.el (mm-find-mime-charset-region): Attempt to reduce the + number of charsets if utf-8 is available (XEmacs). + +2005-08-04 Lars Magne Ingebrigtsen <[email protected]> + + * gnus-art.el (article-unsplit-urls): Don't anchor urls to the + start of the lines. + (gnus-picon-databases): Add /usr/share/picons. + +2005-08-04 Reiner Steib <[email protected]> + + * gnus-art.el (gnus-button-valid-localpart-regexp): New variable + taken from `gnus-button-mid-or-mail-regexp'. + (gnus-button-mid-or-mail-regexp, gnus-button-alist): Use it. + (gnus-button-alist): Improve regexp for domain part of the MIDs + for news:localpart@domain buttons. + (gnus-button-ctan-directory-regexp): Update. + + * message.el (message-kill-buffer): Raise the current frame. + (message-bury): Use `window-dedicated-p'. + +2005-08-02 Katsumi Yamaoka <[email protected]> + + * sieve-manage.el (sieve-manage-interactive-login): Use + make-local-variable rather than make-variable-buffer-local. + (sieve-manage-open): Ditto. + (sieve-manage-authenticate): Ditto. + + * mml.el (mml-generate-mime-1): Make the content type default to + text/plain if the filename is not specified. + +2005-08-01 Katsumi Yamaoka <[email protected]> + + * gnus-uu.el (gnus-uu-save-article): Use insert-buffer-substring + instead of insert-buffer. + + * message.el (message-yank-original): Ditto; set the mark at the + end of the yanked message. + +2005-07-29 Katsumi Yamaoka <[email protected]> + + * gnus-art.el (gnus-article-next-page-1): Reduce the number of + lines to scroll rather than to stop it. + + * mml.el (mml-generate-default-type): Add doc string. + (mml-generate-mime-1): Use mm-default-file-encoding or make it + default to application/octet-stream when determining the content + type if it is not specified for the part or the mml contents; add + a comment about mml-generate-default-type. + +2005-07-29 Reiner Steib <[email protected]> + + * mml.el (mml-generate-mime-1): Use mm-default-file-encoding or + make it default to application/octet-stream when determining the + content type if it is not specified for the external contents. + 2005-07-28 Katsumi Yamaoka <[email protected]> * rfc2231.el (rfc2231-parse-string): Take care that not only a segmented parameter but also other parameters might be there. +2005-07-27 Katsumi Yamaoka <[email protected]> + + * mm-decode.el (mm-display-external): Delete temp file, directory + and buffer immediately if the external process is exited. + 2005-07-26 Katsumi Yamaoka <[email protected]> * gnus-art.el (gnus-article-next-page-1): Don't scroll if there're diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index f7e3420e92..0d8116b00b 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -842,7 +842,8 @@ be controlled by `gnus-treat-body-boundary'." :type '(choice (item :tag "None" :value nil) string)) -(defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces") +(defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces" + "/usr/share/picons") "Defines the location of the faces database. For information on obtaining this database of pretty pictures, please see http://www.cs.indiana.edu/picons/ftp/index.html" @@ -2428,7 +2429,7 @@ If READ-CHARSET, ask for a coding system." (let ((inhibit-read-only t)) (goto-char (point-min)) (while (re-search-forward - "^\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t) + "\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t) (replace-match "\\1\\3" t))) (when (interactive-p) (gnus-treat-article nil)))) @@ -5197,17 +5198,23 @@ specifies." 1 0))))))) (defun gnus-article-next-page-1 (lines) - (unless (and (not (featurep 'xemacs)) - (> (symbol-value 'scroll-margin) 0) - (<= (count-lines (window-start) (point-max)) - (symbol-value 'scroll-margin))) - (condition-case () - (let ((scroll-in-place nil)) - (scroll-up lines)) - (end-of-buffer - ;; Long lines may cause an end-of-buffer error. - (goto-char (point-max)))) - (gnus-article-beginning-of-window))) + (when (and (not (featurep 'xemacs)) + (numberp lines) + (> lines 0) + (numberp (symbol-value 'scroll-margin)) + (> (symbol-value 'scroll-margin) 0)) + ;; Protect against the bug that Emacs 21.x hangs up when scrolling up for + ;; too many number of lines if `scroll-margin' is set as two or greater. + (setq lines (min lines + (max 0 (- (count-lines (window-start) (point-max)) + (symbol-value 'scroll-margin)))))) + (condition-case () + (let ((scroll-in-place nil)) + (scroll-up lines)) + (end-of-buffer + ;; Long lines may cause an end-of-buffer error. + (goto-char (point-max)))) + (gnus-article-beginning-of-window)) (defun gnus-article-prev-page (&optional lines) "Show previous page of current article. @@ -5880,6 +5887,14 @@ groups." :group 'gnus-article-buttons :type 'regexp) +;; Regexp suggested by Felix Wiemann in <[email protected]> +(defcustom gnus-button-valid-localpart-regexp + "[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t ]*" + "Regular expression that matches a localpart of mail addresses or MIDs." + :version "22.1" + :group 'gnus-article-buttons + :type 'regexp) + (defcustom gnus-button-man-handler 'manual-entry "Function to use for displaying man pages. The function must take at least one argument with a string naming the @@ -5919,12 +5934,11 @@ The function must take one argument, the string naming the URL." (regexp :tag "Other"))) (defcustom gnus-button-ctan-directory-regexp - (concat - "\\("; Cannot use `\(?: ... \)' (compatibility with Emacs 20). - "biblio\\|digests\\|dviware\\|fonts\\|graphics\\|help\\|" - "indexing\\|info\\|language\\|macros\\|support\\|systems\\|" - "tds\\|tools\\|usergrps\\|web\\|nonfree\\|obsolete" - "\\)") + (regexp-opt + (list "archive-tools" "biblio" "bibliography" "digests" "documentation" + "dviware" "fonts" "graphics" "help" "indexing" "info" "language" + "languages" "macros" "nonfree" "obsolete" "support" "systems" + "tds" "tools" "usergrps" "web") t) "Regular expression for ctan directories. It should match all directories in the top level of `gnus-ctan-url'." :version "22.1" @@ -5932,8 +5946,7 @@ It should match all directories in the top level of `gnus-ctan-url'." :type 'regexp) (defcustom gnus-button-mid-or-mail-regexp - (concat "\\b\\(<?[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t ]*@" - ;; Felix Wiemann in <[email protected]> + (concat "\\b\\(<?" gnus-button-valid-localpart-regexp "@" gnus-button-valid-fqdn-regexp ">?\\)\\b") "Regular expression that matches a message ID or a mail address." @@ -6248,8 +6261,9 @@ positives are possible." (defcustom gnus-button-alist '(("<\\(url:[>\n\t ]*?\\)?\\(nntp\\|news\\):[>\n\t ]*\\([^>\n\t ]*@[^>\n\t ]*\\)>" 0 (>= gnus-button-message-level 0) gnus-button-handle-news 3) - ("\\b\\(nntp\\|news\\):\\([^>\n\t ]*@[^>)!;:,\n\t ]*\\)" 0 t - gnus-button-handle-news 2) + ((concat "\\b\\(nntp\\|news\\):\\(" + gnus-button-valid-localpart-regexp "@[a-z0-9.-]+[a-z]\\)") + 0 t gnus-button-handle-news 2) ("\\(\\b<\\(url:[>\n\t ]*\\)?\\(nntp\\|news\\):[>\n\t ]*\\(//\\)?\\([^>\n\t ]*\\)>\\)" 1 (>= gnus-button-message-level 0) gnus-button-fetch-group 5) ("\\b\\(nntp\\|news\\):\\(//\\)?\\([^'\">\n\t ]+\\)" diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 5bdd17f84c..4a7d5fec42 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -917,16 +917,16 @@ When called interactively, prompt for REGEXP." (if (and message-forward-as-mime gnus-uu-digest-buffer) (with-current-buffer gnus-uu-digest-buffer (erase-buffer) - (insert-buffer "*gnus-uu-pre*") + (insert-buffer-substring "*gnus-uu-pre*") (goto-char (point-max)) - (insert-buffer "*gnus-uu-body*")) + (insert-buffer-substring "*gnus-uu-body*")) (save-excursion (set-buffer "*gnus-uu-pre*") (insert (format "\n\n%s\n\n" (make-string 70 ?-))) (if gnus-uu-digest-buffer (with-current-buffer gnus-uu-digest-buffer (erase-buffer) - (insert-buffer "*gnus-uu-pre*")) + (insert-buffer-substring "*gnus-uu-pre*")) (let ((coding-system-for-write mm-text-coding-system)) (gnus-write-buffer gnus-uu-saved-article-name)))) (save-excursion @@ -939,7 +939,7 @@ When called interactively, prompt for REGEXP." (if gnus-uu-digest-buffer (with-current-buffer gnus-uu-digest-buffer (goto-char (point-max)) - (insert-buffer "*gnus-uu-body*")) + (insert-buffer-substring "*gnus-uu-body*")) (let ((coding-system-for-write mm-text-coding-system) (file-name-coding-system nnmail-pathname-coding-system)) (write-region diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 931ac30e8a..62266580a2 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -3206,7 +3206,9 @@ prefix, and don't delete any headers." (when (and message-reply-buffer message-cite-function) (delete-windows-on message-reply-buffer t) - (insert-buffer message-reply-buffer) + (push-mark (save-excursion + (insert-buffer-substring message-reply-buffer) + (point))) (unless arg (funcall message-cite-function)) (message-exchange-point-and-mark) @@ -3416,8 +3418,15 @@ Instead, just auto-save the buffer and then bury it." (file-exists-p auto-save-file-name)) (and file-name (file-exists-p file-name))) - (yes-or-no-p (format "Remove the backup file%s? " - (if modified " too" "")))) + (progn + ;; If the message buffer has lived in a dedicated window, + ;; `kill-buffer' has killed the frame. Thus the + ;; `yes-or-no-p' may show up in a lowered frame. Make sure + ;; that the user can see the question by raising the + ;; current frame: + (raise-frame) + (yes-or-no-p (format "Remove the backup file%s? " + (if modified " too" ""))))) (ignore-errors (delete-file auto-save-file-name)) (let ((message-draft-article draft-article)) @@ -3428,8 +3437,7 @@ Instead, just auto-save the buffer and then bury it." "Bury this mail BUFFER." (let ((newbuf (other-buffer buffer))) (bury-buffer buffer) - (if (and (fboundp 'frame-parameters) - (cdr (assq 'dedicated (frame-parameters))) + (if (and (window-dedicated-p (selected-window)) (not (null (delq (selected-frame) (visible-frame-list))))) (delete-frame (selected-frame)) (switch-to-buffer newbuf)))) diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el index 3e9766c3d4..b4debfe718 100644 --- a/lisp/gnus/mm-bodies.el +++ b/lisp/gnus/mm-bodies.el @@ -1,6 +1,6 @@ ;;; mm-bodies.el --- Functions for decoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 +;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <[email protected]> @@ -95,7 +95,8 @@ If no encoding was done, nil is returned." (save-excursion (if charset (progn - (mm-encode-coding-region (point-min) (point-max) charset) + (mm-encode-coding-region (point-min) (point-max) + (mm-charset-to-coding-system charset)) charset) (goto-char (point-min)) (let ((charsets (mm-find-mime-charset-region (point-min) (point-max)))) diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 601843dcf5..c65d5f80ba 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -817,11 +817,32 @@ external if displayed external." (let ((command (mm-mailcap-command method file (mm-handle-type handle)))) (unwind-protect - (start-process "*display*" - (setq buffer - (generate-new-buffer " *mm*")) - shell-file-name - shell-command-switch command) + (progn + (start-process "*display*" + (setq buffer + (generate-new-buffer " *mm*")) + shell-file-name + shell-command-switch command) + (set-process-sentinel + (get-buffer-process buffer) + `(lambda (process state) + (when (eq 'exit (process-status process)) + ;; Don't use `ignore-errors'. + (condition-case nil + (delete-file ,file) + (error)) + (condition-case nil + (delete-directory ,(file-name-directory file)) + (error)) + (condition-case nil + (kill-buffer ,buffer) + (error)) + (condition-case nil + ,(macroexpand (list 'mm-handle-set-undisplayer + (list 'quote handle) + nil)) + (error)) + (message "Displaying %s...done" ,command))))) (mm-handle-set-external-undisplayer handle (cons file buffer))) (message "Displaying %s..." command)) diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index a44a4560cf..6fd4aeb40b 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -123,7 +123,13 @@ unknown encoding; `use-ascii': always use ASCII for those characters with unknown encoding; `multipart': always send messages with more than one charsets.") -(defvar mml-generate-default-type "text/plain") +(defvar mml-generate-default-type "text/plain" + "Content type by which the Content-Type header can be omitted. +The Content-Type header will not be put in the MIME part if the type +equals the value and there's no parameter (e.g. charset, format, etc.) +and `mml-insert-mime-headers-always' is nil. The value will be bound +to \"message/rfc822\" when encoding an article to be forwarded as a MIME +part. This is for the internal use, you should never modify the value.") (defvar mml-buffer-list nil) @@ -399,9 +405,14 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (mml-tweak-part cont) (cond ((or (eq (car cont) 'part) (eq (car cont) 'mml)) - (let ((raw (cdr (assq 'raw cont))) - coded encoding charset filename type flowed) - (setq type (or (cdr (assq 'type cont)) "text/plain")) + (let* ((raw (cdr (assq 'raw cont))) + (filename (cdr (assq 'filename cont))) + (type (or (cdr (assq 'type cont)) + (if filename + (or (mm-default-file-encoding filename) + "application/octet-stream") + "text/plain"))) + coded encoding charset flowed) (if (and (not raw) (member (car (split-string type "/")) '("text" "message"))) (progn @@ -413,7 +424,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (cond ((cdr (assq 'buffer cont)) (insert-buffer-substring (cdr (assq 'buffer cont)))) - ((and (setq filename (cdr (assq 'filename cont))) + ((and filename (not (equal (cdr (assq 'nofile cont)) "yes"))) (let ((coding-system-for-read charset)) (mm-insert-file-contents filename))) @@ -433,6 +444,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (cond ((eq (car cont) 'mml) (let ((mml-boundary (mml-compute-boundary cont)) + ;; It is necessary for the case where this + ;; function is called recursively since + ;; `m-g-d-t' will be bound to "message/rfc822" + ;; when encoding an article to be forwarded. (mml-generate-default-type "text/plain")) (mml-to-mime)) (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b"))) @@ -474,7 +489,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (insert (with-current-buffer (cdr (assq 'buffer cont)) (mm-with-unibyte-current-buffer (buffer-string))))) - ((and (setq filename (cdr (assq 'filename cont))) + ((and filename (not (equal (cdr (assq 'nofile cont)) "yes"))) (let ((coding-system-for-read mm-binary-coding-system)) (mm-insert-file-contents filename nil nil nil nil t))) @@ -515,15 +530,21 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." "access-type=url")) (when parameters (mml-insert-parameter-string - cont '(expiration size permission)))) - (insert "\n\n") - (insert "Content-Type: " (cdr (assq 'type cont)) "\n") - (insert "Content-ID: " (message-make-message-id) "\n") - (insert "Content-Transfer-Encoding: " - (or (cdr (assq 'encoding cont)) "binary")) - (insert "\n\n") - (insert (or (cdr (assq 'contents cont)))) - (insert "\n")) + cont '(expiration size permission))) + (insert "\n\n") + (insert "Content-Type: " + (or (cdr (assq 'type cont)) + (if name + (or (mm-default-file-encoding name) + "application/octet-stream") + "text/plain")) + "\n") + (insert "Content-ID: " (message-make-message-id) "\n") + (insert "Content-Transfer-Encoding: " + (or (cdr (assq 'encoding cont)) "binary")) + (insert "\n\n") + (insert (or (cdr (assq 'contents cont)))) + (insert "\n"))) ((eq (car cont) 'multipart) (let* ((type (or (cdr (assq 'type cont)) "mixed")) (mml-generate-default-type (if (equal type "digest") @@ -559,7 +580,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (message-options-set 'message-sender sender)) (if (setq recipients (cdr (assq 'recipients cont))) (message-options-set 'message-recipients recipients)) - (let ((style (mml-signencrypt-style (first (or sign-item encrypt-item))))) + (let ((style (mml-signencrypt-style + (first (or sign-item encrypt-item))))) ;; check if: we're both signing & encrypting, both methods ;; are the same (why would they be different?!), and that ;; the signencrypt style allows for combined operation. diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el index 2afa49c79a..5c0712420a 100644 --- a/lisp/gnus/sieve-manage.el +++ b/lisp/gnus/sieve-manage.el @@ -1,5 +1,5 @@ ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson <[email protected]> @@ -184,8 +184,8 @@ LOGINFUNC is passed a username and a password, it should return t if it where sucessful authenticating itself to the server, nil otherwise. Returns t if login was successful, nil otherwise." (with-current-buffer buffer - (make-variable-buffer-local 'sieve-manage-username) - (make-variable-buffer-local 'sieve-manage-password) + (make-local-variable 'sieve-manage-username) + (make-local-variable 'sieve-manage-password) (let (user passwd ret reason) ;; (condition-case () (while (or (not user) (not passwd)) @@ -370,7 +370,7 @@ Optional variable BUFFER is buffer (buffer, or string naming buffer) to work in." (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 2000)))) (with-current-buffer (get-buffer-create buffer) - (mapcar 'make-variable-buffer-local sieve-manage-local-variables) + (mapcar 'make-local-variable sieve-manage-local-variables) (sieve-manage-disable-multibyte) (buffer-disable-undo) (setq sieve-manage-server (or server sieve-manage-server)) @@ -458,8 +458,8 @@ password is remembered in the buffer." (with-current-buffer (or buffer (current-buffer)) (if (not (eq sieve-manage-state 'nonauth)) (eq sieve-manage-state 'auth) - (make-variable-buffer-local 'sieve-manage-username) - (make-variable-buffer-local 'sieve-manage-password) + (make-local-variable 'sieve-manage-username) + (make-local-variable 'sieve-manage-password) (if user (setq sieve-manage-username user)) (if passwd (setq sieve-manage-password passwd)) (if (funcall (nth 2 (assq sieve-manage-auth diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index dd0fba2091..b8555c4d71 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -1,6 +1,7 @@ ;;; ibuffer.el --- operate on buffers like dired -;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Colin Walters <[email protected]> ;; Maintainer: John Paul Wallington <[email protected]> @@ -193,11 +194,12 @@ view of the buffers." (defvar ibuffer-sorting-reversep nil) (defcustom ibuffer-elide-long-columns nil - "If non-nil, then elide column entries which exceed their max length. -This variable is deprecated; use the :elide argument of -`ibuffer-formats' to elide just certain columns." + "If non-nil, then elide column entries which exceed their max length." :type 'boolean :group 'ibuffer) +(make-obsolete-variable 'ibuffer-elide-long-columns + "use the :elide argument of `ibuffer-formats'." + "22.1") (defcustom ibuffer-eliding-string "..." "The string to use for eliding long columns." @@ -307,13 +309,15 @@ directory, like `default-directory'." "Hook run when `ibuffer' is called." :type 'hook :group 'ibuffer) -(defvaralias 'ibuffer-hooks 'ibuffer-hook) +(define-obsolete-variable-alias 'ibuffer-hooks + 'ibuffer-hook "22.1") (defcustom ibuffer-mode-hook nil "Hook run upon entry into `ibuffer-mode'." :type 'hook :group 'ibuffer) -(defvaralias 'ibuffer-mode-hooks 'ibuffer-mode-hook) +(define-obsolete-variable-alias 'ibuffer-mode-hooks + 'ibuffer-mode-hook "22.1") (defcustom ibuffer-load-hook nil "Hook run when Ibuffer is loaded." @@ -838,7 +842,7 @@ width and the longest string in LIST." (while list (dotimes (i (1- columns)) (insert (concat (car list) (make-string (- max (length (car list))) - ? ))) + ?\s))) (setq list (cdr list))) (when (not (null list)) (insert (pop list))) @@ -861,7 +865,7 @@ width and the longest string in LIST." (let ((mark (ibuffer-current-mark))) (setq buffer-read-only nil) (if (eq mark ibuffer-marked-char) - (ibuffer-set-mark ? ) + (ibuffer-set-mark ?\s) (ibuffer-set-mark ibuffer-marked-char))))) (setq buffer-read-only t))) @@ -1153,7 +1157,7 @@ a new window in the current frame, splitting vertically." (if all (ibuffer-map-lines-nomodify #'(lambda (buf mark) - (not (char-equal mark ? )))) + (not (char-equal mark ?\s)))) (ibuffer-map-lines-nomodify #'(lambda (buf mark) (char-equal mark ibuffer-marked-char))))) @@ -1227,18 +1231,18 @@ a new window in the current frame, splitting vertically." ((char-equal mark ibuffer-marked-char) (ibuffer-map-marked-lines #'(lambda (buf mark) - (ibuffer-set-mark-1 ? ) + (ibuffer-set-mark-1 ?\s) t))) ((char-equal mark ibuffer-deletion-char) (ibuffer-map-deletion-lines #'(lambda (buf mark) - (ibuffer-set-mark-1 ? ) + (ibuffer-set-mark-1 ?\s) t))) (t (ibuffer-map-lines #'(lambda (buf mark) - (when (not (char-equal mark ? )) - (ibuffer-set-mark-1 ? )) + (when (not (char-equal mark ?\s)) + (ibuffer-set-mark-1 ?\s)) t))))) (ibuffer-redisplay t)) @@ -1255,9 +1259,9 @@ group." (ibuffer-map-lines #'(lambda (buf mark) (cond ((eq mark ibuffer-marked-char) - (ibuffer-set-mark-1 ? ) + (ibuffer-set-mark-1 ?\s) nil) - ((eq mark ? ) + ((eq mark ?\s) (ibuffer-set-mark-1 ibuffer-marked-char) t) (t @@ -1276,13 +1280,13 @@ If point is on a group name, this function operates on that group." "Unmark the buffer on this line, and move forward ARG lines. If point is on a group name, this function operates on that group." (interactive "P") - (ibuffer-mark-interactive arg ? 1)) + (ibuffer-mark-interactive arg ?\s 1)) (defun ibuffer-unmark-backward (arg) "Unmark the buffer on this line, and move backward ARG lines. If point is on a group name, this function operates on that group." (interactive "P") - (ibuffer-mark-interactive arg ? -1)) + (ibuffer-mark-interactive arg ?\s -1)) (defun ibuffer-mark-interactive (arg mark movement) (assert (eq major-mode 'ibuffer-mode)) @@ -1409,8 +1413,8 @@ If point is on a group name, this function operates on that group." `(substring ,strvar 0 ,maxvar))) (defun ibuffer-compile-make-format-form (strvar widthform alignment) - (let* ((left `(make-string tmp2 ? )) - (right `(make-string (- tmp1 tmp2) ? ))) + (let* ((left `(make-string tmp2 ?\s)) + (right `(make-string (- tmp1 tmp2) ?\s))) `(progn (setq tmp1 ,widthform tmp2 (/ tmp1 2)) @@ -1690,7 +1694,7 @@ If point is on a group name, this function operates on that group." (and (boundp 'dired-directory) (if (stringp dired-directory) dired-directory - (car dired-directory))) + (car dired-directory))) "")))) (define-ibuffer-column filename-and-process @@ -1724,8 +1728,8 @@ If point is on a group name, this function operates on that group." filename))) (defun ibuffer-format-column (str width alignment) - (let ((left (make-string (/ width 2) ? )) - (right (make-string (- width (/ width 2)) ? ))) + (let ((left (make-string (/ width 2) ?\s)) + (right (make-string (- width (/ width 2)) ?\s))) (case alignment (:right (concat left right str)) (:center (concat left str right)) @@ -1881,7 +1885,7 @@ the value of point at the beginning of the line for that buffer." (mapcar #'(lambda (buf) (let ((e (assq buf bufs))) (if e e - (cons buf ? )))) + (cons buf ?\s)))) curbufs))) (defun ibuffer-buf-matches-predicates (buf predicates) @@ -1989,10 +1993,10 @@ the value of point at the beginning of the line for that buffer." (buffer-substring (point) (line-end-position))))) (apply #'insert (mapcar #'(lambda (c) - (if (not (or (char-equal c ? ) + (if (not (or (char-equal c ?\s) (char-equal c ?\n))) ?- - ? )) + ?\s)) str))) (insert "\n")) (point)) @@ -2011,7 +2015,7 @@ the value of point at the beginning of the line for that buffer." (dolist (element format) (insert (if (stringp element) - (make-string (length element) ? ) + (make-string (length element) ?\s) (let ((sym (car element))) (let ((min (cadr element)) ;; (max (caddr element)) @@ -2023,7 +2027,7 @@ the value of point at the beginning of the line for that buffer." (funcall (get sym 'ibuffer-column-summarizer) (get sym 'ibuffer-column-summary)) (make-string (length (get sym 'ibuffer-column-name)) - ? ))) + ?\s))) (len (length summary))) (if (< len min) (ibuffer-format-column summary @@ -2241,22 +2245,22 @@ buffers which are visiting a file." ;;;###autoload (defun ibuffer (&optional other-window-p name qualifiers noselect shrink filter-groups formats) - "Begin using `ibuffer' to edit a list of buffers. + "Begin using Ibuffer to edit a list of buffers. Type 'h' after entering ibuffer for more information. -Optional argument OTHER-WINDOW-P says to use another window. -Optional argument NAME specifies the name of the buffer; it defaults -to \"*Ibuffer*\". -Optional argument QUALIFIERS is an initial set of filtering qualifiers -to use; see `ibuffer-filtering-qualifiers'. -Optional argument NOSELECT means don't select the Ibuffer buffer. -Optional argument SHRINK means shrink the buffer to minimal size. The -special value `onewindow' means always use another window. -Optional argument FILTER-GROUPS is an initial set of filtering -groups to use; see `ibuffer-filter-groups'. -Optional argument FORMATS is the value to use for `ibuffer-formats'. -If specified, then the variable `ibuffer-formats' will have that value -locally in this buffer." +All arguments are optional. +OTHER-WINDOW-P says to use another window. +NAME specifies the name of the buffer (defaults to \"*Ibuffer*\"). +QUALIFIERS is an initial set of filtering qualifiers to use; + see `ibuffer-filtering-qualifiers'. +NOSELECT means don't select the Ibuffer buffer. +SHRINK means shrink the buffer to minimal size. The special + value `onewindow' means always use another window. +FILTER-GROUPS is an initial set of filtering groups to use; + see `ibuffer-filter-groups'. +FORMATS is the value to use for `ibuffer-formats'. + If specified, then the variable `ibuffer-formats' will have + that value locally in this buffer." (interactive "P") (when ibuffer-use-other-window (setq other-window-p t)) @@ -2297,7 +2301,7 @@ locally in this buffer." (put 'ibuffer-mode 'mode-class 'special) (defun ibuffer-mode () "A major mode for viewing a list of buffers. -In ibuffer, you can conveniently perform many operations on the +In Ibuffer, you can conveniently perform many operations on the currently open buffers, in addition to filtering your view to a particular subset of them, and sorting by various criteria. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 330fead239..59d24e4e59 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1,7 +1,7 @@ ;;; ange-ftp.el --- transparent FTP support for GNU Emacs -;; Copyright (C) 1989,90,91,92,93,94,95,96,98, 2000, 2001, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Andy Norman ([email protected]) ;; Maintainer: FSF @@ -745,7 +745,7 @@ These mean that the FTP process should (or already has) been killed." (defcustom ange-ftp-potential-error-msgs ;; On Mac OS X we sometimes get things like: - ;; + ;; ;; ftp> open ftp.nluug.nl ;; Trying 2001:610:1:80aa:192:87:102:36... ;; ftp: connect to address 2001:610:1:80aa:192:87:102:36: No route to host diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 3b6cc279a1..74bace5895 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -1,7 +1,7 @@ ;;; browse-url.el --- pass a URL to a WWW browser -;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Denis Howe <[email protected]> ;; Maintainer: FSF diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el index 6ee8840d3b..668b9edfcd 100644 --- a/lisp/net/eudc-bob.el +++ b/lisp/net/eudc-bob.el @@ -1,6 +1,7 @@ ;;; eudc-bob.el --- Binary Objects Support for EUDC -;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: Pavel Jan�k <[email protected]> diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index 52e09433a2..214481ce7f 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -1,6 +1,7 @@ ;;; eudc-export.el --- functions to export EUDC query results -;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: Pavel Jan�k <[email protected]> diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index a13606e8f4..a8e7f6e328 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el @@ -1,6 +1,7 @@ ;;; eudc-hotlist.el --- hotlist management for EUDC -;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: Pavel Jan�k <[email protected]> diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el index 281daa3ac9..ecff056419 100644 --- a/lisp/net/eudc-vars.el +++ b/lisp/net/eudc-vars.el @@ -1,6 +1,7 @@ ;;; eudc-vars.el --- Emacs Unified Directory Client -;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: Pavel Jan�k <[email protected]> diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index 96289922cc..a2d5baf120 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -1,6 +1,7 @@ ;;; eudc.el --- Emacs Unified Directory Client -;; Copyright (C) 1998, 1999, 2000, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: Pavel Jan�k <[email protected]> diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index 2d3db7f74c..8081cb1aac 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el @@ -1,6 +1,7 @@ ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend -;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: Pavel Jan�k <[email protected]> diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index 1890f34597..e28a044ba5 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el @@ -1,6 +1,7 @@ ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: Pavel Jan�k <[email protected]> diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el index ab9965efc1..3aea603025 100644 --- a/lisp/net/eudcb-ph.el +++ b/lisp/net/eudcb-ph.el @@ -1,6 +1,7 @@ ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend -;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: Pavel Jan�k <[email protected]> diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el index 9ce73dba47..98a8b0a29e 100644 --- a/lisp/net/goto-addr.el +++ b/lisp/net/goto-addr.el @@ -1,6 +1,7 @@ ;;; goto-addr.el --- click to browse URL or to send to e-mail address -;; Copyright (C) 1995, 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Eric Ding <[email protected]> ;; Maintainer: FSF diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index fc86688f56..f8e99abd18 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -1,6 +1,7 @@ ;;; ldap.el --- client interface to LDAP for Emacs -;; Copyright (C) 1998, 1999, 2000, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <[email protected]> ;; Maintainer: FSF diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index 16bc93b612..042dce66aa 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -1,6 +1,7 @@ ;;; net-utils.el --- network functions -;; Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Peter Breton <[email protected]> ;; Created: Sun Mar 16 1997 diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index 963fea444f..228e02bf3a 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -1,6 +1,6 @@ ;;; netrc.el --- .netrc parsing functionality -;; 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 <[email protected]> ;; Keywords: news diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index a030275f73..81a2e8a09a 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -1,6 +1,7 @@ ;;; quickurl.el --- insert an URL based on text at point in buffer -;; Copyright (C) 1999,2000,2001,2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Pearson <[email protected]> ;; Maintainer: Dave Pearson <[email protected]> diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el index 6693f90257..47ee84d42b 100644 --- a/lisp/net/rcompile.el +++ b/lisp/net/rcompile.el @@ -1,6 +1,7 @@ ;;; rcompile.el --- run a compilation on a remote machine -;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Albert <[email protected]> ;; Maintainer: FSF diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el index 46a1847a7c..693113203b 100644 --- a/lisp/net/rlogin.el +++ b/lisp/net/rlogin.el @@ -1,6 +1,7 @@ ;;; rlogin.el --- remote login interface -;; Copyright (C) 1992, 93, 94, 95, 97, 1998, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: Noah Friedman <[email protected]> diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el index 723b73cd77..31c600a280 100644 --- a/lisp/net/snmp-mode.el +++ b/lisp/net/snmp-mode.el @@ -1,6 +1,7 @@ ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode -;; Copyright (C) 1995, 1998, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Paul D. Smith <[email protected]> ;; Keywords: data diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el index a28a74cc2b..e4f91351c2 100644 --- a/lisp/net/telnet.el +++ b/lisp/net/telnet.el @@ -1,6 +1,7 @@ ;;; telnet.el --- run a telnet session from within an Emacs buffer -;; Copyright (C) 1985, 88, 1992, 94, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1988, 1992, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: William F. Schelter ;; Maintainer: FSF diff --git a/lisp/net/tls.el b/lisp/net/tls.el index f0b21383d6..ceebe4b33d 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -1,6 +1,7 @@ ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS -;; Copyright (C) 1996-1999, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson <[email protected]> ;; Keywords: comm, tls, gnutls, ssl diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el index 0b8e83080f..bbfd44c999 100644 --- a/lisp/net/tramp-uu.el +++ b/lisp/net/tramp-uu.el @@ -1,7 +1,7 @@ ;;; -*- coding: iso-2022-7bit; -*- ;;; tramp-uu.el --- uuencode in Lisp -;; Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Kai Gro,A_(Bjohann <[email protected]> ;; Keywords: comm, terminals diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el index 76563c3316..c1806a4be2 100644 --- a/lisp/net/tramp-vc.el +++ b/lisp/net/tramp-vc.el @@ -1,6 +1,7 @@ ;;; tramp-vc.el --- Version control integration for TRAMP.el -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daniel Pittman <[email protected]> ;; Keywords: comm, processes diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 9b029a1707..19794976f7 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1,7 +1,8 @@ ;;; -*- mode: Emacs-Lisp; coding: iso-2022-7bit; -*- ;;; tramp.el --- Transparent Remote Access, Multiple Protocol -;; 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: [email protected] ;; Keywords: comm, processes diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index d928380b86..0feb93af98 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -2,7 +2,7 @@ ;;; trampver.el --- Transparent Remote Access, Multiple Protocol ;;; lisp/trampver.el. Generated from trampver.el.in by configure. -;; Copyright (C) 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: [email protected] ;; Keywords: comm, processes diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index 36625b4b0e..fc7b23ae1b 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el @@ -1,6 +1,7 @@ ;;; webjump.el --- programmable Web hotlist -;; Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Neil W. Van Dyke <[email protected]> ;; Created: 09-Aug-1996 diff --git a/lisp/net/zone-mode.el b/lisp/net/zone-mode.el index ab00c0ce5a..9f6c9d1c77 100644 --- a/lisp/net/zone-mode.el +++ b/lisp/net/zone-mode.el @@ -1,6 +1,6 @@ ;;; zone-mode.el --- major mode for editing DNS zone files -;; Copyright (C) 1998, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: John Heidemann <[email protected]> ;; Keywords: DNS, languages diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index f76ad703fe..855de92ffc 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -1,6 +1,7 @@ ;;; 5x5.el --- simple little puzzle game -;; Copyright (C) 1999,2000,2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Dave Pearson <[email protected]> ;; Maintainer: Dave Pearson <[email protected]> diff --git a/lisp/play/animate.el b/lisp/play/animate.el index 8e45bafc51..662adf119b 100644 --- a/lisp/play/animate.el +++ b/lisp/play/animate.el @@ -1,6 +1,6 @@ ;;; animate.el --- make text dance -;; Copyright (C) 2001,2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: Richard Stallman <[email protected]> ;; Keywords: games diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el index ccb90f3b66..ffde5c4602 100644 --- a/lisp/play/blackbox.el +++ b/lisp/play/blackbox.el @@ -1,6 +1,7 @@ ;;; blackbox.el --- blackbox game in Emacs Lisp -;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: F. Thomas May <[email protected]> ;; Adapted-By: ESR diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el index f91484d4c2..7774e29f2a 100644 --- a/lisp/play/bruce.el +++ b/lisp/play/bruce.el @@ -1,7 +1,8 @@ ;;; bruce.el --- bruce phrase utility for overloading the Communications -*- no-byte-compile: t -*- ;;; Decency Act snoops, if any. -;; Copyright (C) 1988, 1993, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1993, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: games diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el index 3ff307562e..7f17274a68 100644 --- a/lisp/play/cookie1.el +++ b/lisp/play/cookie1.el @@ -1,6 +1,6 @@ ;;; cookie1.el --- retrieve random phrases from fortune cookie files -;; Copyright (C) 1993 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <[email protected]> ;; Maintainer: FSF diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index 263ee14652..6471e23b5f 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el @@ -1,6 +1,7 @@ ;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers ;; -;; Copyright (C) 1995, 1996, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Christopher J. Madsen <[email protected]> ;; Keywords: games diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el index e2ed98ec73..cd19a71686 100644 --- a/lisp/play/dissociate.el +++ b/lisp/play/dissociate.el @@ -1,6 +1,6 @@ ;;; dissociate.el --- scramble text amusingly for Emacs -;; Copyright (C) 1985 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: games diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el index d2b8156b15..ea502646e6 100644 --- a/lisp/play/doctor.el +++ b/lisp/play/doctor.el @@ -1,6 +1,7 @@ ;;; doctor.el --- psychological help for frustrated users -;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: games @@ -45,6 +46,36 @@ ;;; Code: +(eval-when-compile + (defvar **mad**) (defvar *debug*) (defvar *print-space*) + (defvar *print-upcase*) (defvar abuselst) (defvar abusewords) + (defvar account) (defvar afraidof) (defvar arerelated) + (defvar areyou) (defvar bak) (defvar beclst) + (defvar bother) (defvar bye) (defvar canyou) + (defvar chatlst) (defvar continue) (defvar deathlst) + (defvar describe) (defvar drnk) (defvar drugs) + (defvar eliza-flag) (defvar elizalst) (defvar famlst) + (defvar feared) (defvar fears) (defvar feelings-about) + (defvar foullst) (defvar found) (defvar hello) + (defvar history) (defvar howareyoulst) (defvar howdyflag) + (defvar huhlst) (defvar ibelieve) (defvar improve) + (defvar inter) (defvar isee) (defvar isrelated) + (defvar lincount) (defvar longhuhlst) (defvar lover) + (defvar machlst) (defvar mathlst) (defvar maybe) + (defvar moods) (defvar neglst) (defvar obj) + (defvar object) (defvar owner) (defvar please) + (defvar problems) (defvar qlist) (defvar random-adjective) + (defvar relation) (defvar remlst) (defvar repetitive-shortness) + (defvar replist) (defvar rms-flag) (defvar schoollst) + (defvar sent) (defvar sexlst) (defvar shortbeclst) + (defvar shortlst) (defvar something) (defvar sportslst) + (defvar stallmanlst) (defvar states) (defvar subj) + (defvar suicide-flag) (defvar sure) (defvar things) + (defvar thlst) (defvar toklst) (defvar typos) + (defvar verb) (defvar want) (defvar whatwhen) + (defvar whereoutp) (defvar whysay) (defvar whywant) + (defvar zippy-flag) (defvar zippylst)) + (defun doc// (x) x) (defmacro doc$ (what) @@ -1369,7 +1400,7 @@ Hack on previous word, setting global variable OWNER to correct result." (cond ((or (string-match "^[.,;:?! ]" word) (not *print-space*)) (insert word)) - (t (insert ?\ word))) + (t (insert ?\s word))) (and auto-fill-function (> (current-column) fill-column) (apply auto-fill-function nil)) diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index 1d1adb81bf..62a30d3419 100644 --- a/lisp/play/dunnet.el +++ b/lisp/play/dunnet.el @@ -1,6 +1,7 @@ ;;; dunnet.el --- text adventure for Emacs -;; Copyright (C) 1992, 1993, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Ron Schnell <[email protected]> ;; Created: 25 Jul 1992 diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index f6c5ec3571..3524eeb529 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el @@ -1,6 +1,7 @@ ;;; fortune.el --- use fortune to create signatures -;; Copyright (C) 1999, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Holger Schauer <[email protected]> ;; Keywords: games utils mail diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el index 00193973b0..ee64c17841 100644 --- a/lisp/play/gamegrid.el +++ b/lisp/play/gamegrid.el @@ -1,6 +1,7 @@ ;;; gamegrid.el --- library for implementing grid-based games on Emacs -;; Copyright (C) 1997, 1998, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Glynn Clements <[email protected]> ;; Version: 1.02 diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el index 78add5932f..b2e9fb9f97 100644 --- a/lisp/play/gametree.el +++ b/lisp/play/gametree.el @@ -1,6 +1,7 @@ ;;; gametree.el --- manage game analysis trees in Emacs -;; Copyright (C) 1997, 1999 Free Software Foundation, Inc +;; Copyright (C) 1997, 1999, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Ian T Zimmerman <[email protected]> ;; Created: Wed Dec 10 07:41:46 PST 1997 diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el index 74ddfd3539..5a53b4b888 100644 --- a/lisp/play/gomoku.el +++ b/lisp/play/gomoku.el @@ -1,6 +1,7 @@ ;;; gomoku.el --- Gomoku game between you and Emacs -;; Copyright (C) 1988, 1994, 1996, 2001, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Philippe Schnoebelen <[email protected]> ;; Maintainer: FSF diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el index 2d668f8448..61f8f54d9d 100644 --- a/lisp/play/handwrite.el +++ b/lisp/play/handwrite.el @@ -1,6 +1,6 @@ ;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*- -;; (C) Copyright 1996, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Danny Roozendaal (was: <[email protected]>) ;; Created: October 21 1996 diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index feab5de1bc..4da291d450 100644 --- a/lisp/play/landmark.el +++ b/lisp/play/landmark.el @@ -1,6 +1,7 @@ ;;; landmark.el --- neural-network robot that learns landmarks -;; Copyright (c) 1996, 1997, 2000, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Terrence Brannon (was: <[email protected]>) ;; Created: December 16, 1996 - first release to usenet diff --git a/lisp/play/life.el b/lisp/play/life.el index df678d9ecd..56f10ff258 100644 --- a/lisp/play/life.el +++ b/lisp/play/life.el @@ -1,6 +1,7 @@ ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs -;; Copyright (C) 1988, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kyle Jones <kyleuunet.uu.net> ;; Maintainer: FSF diff --git a/lisp/play/morse.el b/lisp/play/morse.el index 1e3c43cbf8..ae3533227e 100644 --- a/lisp/play/morse.el +++ b/lisp/play/morse.el @@ -1,6 +1,6 @@ ;;; morse.el --- convert text to morse code and back -*- coding: utf-8 -*- -;; Copyright (C) 1995, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Rick Farnbach <[email protected]> ;; Keywords: games diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el index 22d4216ab0..cc252a0871 100644 --- a/lisp/play/mpuz.el +++ b/lisp/play/mpuz.el @@ -1,6 +1,6 @@ ;;; mpuz.el --- multiplication puzzle for GNU Emacs -;; Copyright (C) 1990, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Philippe Schnoebelen <[email protected]> ;; Overhauled: Daniel Pfeiffer <[email protected]> diff --git a/lisp/play/pong.el b/lisp/play/pong.el index 00f740a5f0..e4931c6308 100644 --- a/lisp/play/pong.el +++ b/lisp/play/pong.el @@ -1,6 +1,7 @@ ;;; pong.el --- classical implementation of pong -;; Copyright 1999, 2000, 2001, 2005 by Free Software Foundation, Inc. +;; Copyright 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Benjamin Drieu <[email protected]> ;; Keywords: games diff --git a/lisp/play/snake.el b/lisp/play/snake.el index a36b29eee5..9f2f9c6209 100644 --- a/lisp/play/snake.el +++ b/lisp/play/snake.el @@ -1,6 +1,6 @@ ;;; snake.el --- implementation of Snake for Emacs -;; Copyright (C) 1997, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Glynn Clements <[email protected]> ;; Created: 1997-09-10 diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el index 3c36b0e046..2e20a737e0 100644 --- a/lisp/play/solitaire.el +++ b/lisp/play/solitaire.el @@ -1,6 +1,6 @@ ;;; solitaire.el --- game of solitaire in Emacs Lisp -;; Copyright (C) 1994, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Jan Schormann <[email protected]> ;; Created: Fri afternoon, Jun 3, 1994 diff --git a/lisp/play/spook.el b/lisp/play/spook.el index a19140e965..0979f6a004 100644 --- a/lisp/play/spook.el +++ b/lisp/play/spook.el @@ -1,6 +1,7 @@ ;;; spook.el --- spook phrase utility for overloading the NSA line eater -;; Copyright (C) 1988, 1993 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1993, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: games diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el index 9ecb926124..839046a961 100644 --- a/lisp/play/tetris.el +++ b/lisp/play/tetris.el @@ -1,6 +1,6 @@ ;;; tetris.el --- implementation of Tetris for Emacs -;; Copyright (C) 1997, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Glynn Clements <[email protected]> ;; Version: 2.01 diff --git a/lisp/play/yow.el b/lisp/play/yow.el index 794271fd95..2809e3ec62 100644 --- a/lisp/play/yow.el +++ b/lisp/play/yow.el @@ -1,6 +1,7 @@ ;;; yow.el --- quote random zippyisms -;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Author: Richard Mlynarik diff --git a/lisp/play/zone.el b/lisp/play/zone.el index 7379a6f035..876490b1f9 100644 --- a/lisp/play/zone.el +++ b/lisp/play/zone.el @@ -1,6 +1,7 @@ ;;; zone.el --- idle display hacks -;; Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Victor Zandy <[email protected]> ;; Maintainer: Thien-Thi Nguyen <[email protected]> diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index d062d6d1e9..ea99369d16 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -1,7 +1,7 @@ ;;; ada-mode.el --- major-mode for editing Ada sources -;; Copyright (C) 1994, 95, 97, 98, 99, 2000, 2001, 2002, 03, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Rolf Ebert <[email protected]> ;; Markus Heritsch <[email protected]> @@ -1280,7 +1280,7 @@ If you use ada-xref.el: (progn (add-to-list 'align-dq-string-modes 'ada-mode) (add-to-list 'align-open-comment-modes 'ada-mode) - (set (make-variable-buffer-local 'align-region-separate) + (set (make-local-variable 'align-region-separate) ada-align-region-separate) ;; Exclude comments alone on line from alignment. diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el index 05d965be88..d9bfb891ee 100644 --- a/lisp/progmodes/ada-prj.el +++ b/lisp/progmodes/ada-prj.el @@ -1,6 +1,7 @@ ;;; ada-prj.el --- easy editing of project files for the ada-mode -;; Copyright (C) 1998, 99, 2000-2003 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Emmanuel Briot <[email protected]> ;; Keywords: languages, ada, project file diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el index 362ec87ba0..87825b1d62 100644 --- a/lisp/progmodes/ada-stmt.el +++ b/lisp/progmodes/ada-stmt.el @@ -1,7 +1,7 @@ ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates -;; Copyright(C) 1987, 93, 94, 96, 97, 98, 99, 2000 -;; Free Software Foundation, Inc. +;; Copyright(C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 4210bfd68f..74b5694e8c 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -1,7 +1,7 @@ ;;; ada-xref.el --- for lookup and completion in Ada mode -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 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: Markus Heritsch <[email protected]> ;; Rolf Ebert <[email protected]> diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index c2a8d7a4c5..0415aa910d 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -1,6 +1,7 @@ ;;; antlr-mode.el --- major mode for ANTLR grammar 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: [email protected] ;; Keywords: languages, ANTLR, code generator diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el index c98dbdac89..dc3984e089 100644 --- a/lisp/progmodes/asm-mode.el +++ b/lisp/progmodes/asm-mode.el @@ -1,6 +1,7 @@ ;;; asm-mode.el --- mode for editing assembler code -;; Copyright (C) 1991, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Eric S. Raymond <[email protected]> ;; Maintainer: FSF diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index 75b969d935..98ba14d8f2 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -1,6 +1,7 @@ ;;; autoconf.el --- mode for editing Autoconf configure.in files -;; Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Dave Love <[email protected]> ;; Keywords: languages diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el index 849e98053a..36b4fd2545 100644 --- a/lisp/progmodes/cc-align.el +++ b/lisp/progmodes/cc-align.el @@ -1,6 +1,6 @@ ;;; cc-align.el --- custom indentation functions for CC Mode -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 5a770a9bcb..995dc48c1a 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -1,6 +1,7 @@ ;;; cc-awk.el --- AWK specific code within cc-mode. -;; Copyright (C) 1988,94,96,2000,01,02,03 Free Software Foundation, Inc. +;; Copyright (C) 1988, 94, 96, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Alan Mackenzie <[email protected]> (originally based on awk-mode.el) ;; Maintainer: FSF diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el index 78393e93fc..ae7adb92ed 100644 --- a/lisp/progmodes/cc-bytecomp.el +++ b/lisp/progmodes/cc-bytecomp.el @@ -1,6 +1,7 @@ ;;; cc-bytecomp.el --- compile time setup for proper compilation -;; Copyright (C) 2000, 01, 02, 03 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Martin Stjernholm ;; Maintainer: [email protected] diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index d46281b726..039ef3cceb 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1,6 +1,6 @@ ;;; cc-cmds.el --- user level commands for CC Mode -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el index 8458ab9d60..60dcbd135d 100644 --- a/lisp/progmodes/cc-compat.el +++ b/lisp/progmodes/cc-compat.el @@ -1,6 +1,6 @@ ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1994-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 96e7a093f5..a78fd8f7f7 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -1,6 +1,6 @@ ;;; cc-defs.el --- compile time definitions for CC Mode -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index e9ed474e79..d9f0d08831 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -1,6 +1,6 @@ ;;; cc-engine.el --- core syntax guessing engine for CC mode -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 410637237c..95e4e5226f 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1,6 +1,6 @@ ;;; cc-fonts.el --- font lock support for CC Mode -;; Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 2002- Martin Stjernholm diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index b080b3eac7..27753aa69c 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1,6 +1,6 @@ ;;; cc-langs.el --- language specific settings for CC Mode -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el index 27ce9d6deb..6de4aa8c79 100644 --- a/lisp/progmodes/cc-menus.el +++ b/lisp/progmodes/cc-menus.el @@ -1,6 +1,6 @@ ;;; cc-menus.el --- imenu support for CC Mode -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 0f17a003ef..8f5670ed57 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1,6 +1,6 @@ ;;; cc-mode.el --- major mode for editing C and similar languages -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 2003- Alan Mackenzie ;; 1998- Martin Stjernholm diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index c48956295b..f0a7a2c4b7 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -1,6 +1,6 @@ ;;; cc-styles.el --- support for styles in CC Mode -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index f8d4d6e125..b6a3c40495 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1,6 +1,6 @@ ;;; cc-vars.el --- user customization variables for CC Mode -;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1992-1999 Barry A. Warsaw diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index fd64a59c99..a4b0389ab8 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el @@ -1,6 +1,6 @@ ;;; cfengine.el --- mode for editing Cfengine files -;; Copyright (C) 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dave Love <[email protected]> ;; Keywords: languages diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el index a49b9c3ac7..8db5d0c03f 100644 --- a/lisp/progmodes/cmacexp.el +++ b/lisp/progmodes/cmacexp.el @@ -1,6 +1,7 @@ ;;; cmacexp.el --- expand C macros in a region -;; Copyright (C) 1992, 1994, 1996, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004 +;; Free Software Foundation, Inc. ;; Author: Francesco Potorti` <[email protected]> ;; Adapted-By: ESR @@ -146,8 +147,9 @@ Normally display output in temp buffer, but prefix arg means replace the region with it. `c-macro-preprocessor' specifies the preprocessor to use. -Prompt for arguments to the preprocessor \(e.g. `-DDEBUG -I ./include') -if the user option `c-macro-prompt-flag' is non-nil. +Tf the user option `c-macro-prompt-flag' is non-nil +prompt for arguments to the preprocessor \(e.g. `-DDEBUG -I ./include'), +otherwise use `c-macro-cppflags'. Noninteractive args are START, END, SUBST. For use inside Lisp programs, see also `c-macro-expansion'." diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index ff41a964ec..fa9eac2e02 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1,7 +1,7 @@ ;;; compile.el --- run compiler as inferior of Emacs, parse error messages ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: Roland McGrath <[email protected]>, ;; Daniel Pfeiffer <[email protected]> @@ -1158,6 +1158,8 @@ exited abnormally with code %d\n" (define-key map "\M-p" 'compilation-previous-error) (define-key map "\M-{" 'compilation-previous-file) (define-key map "\M-}" 'compilation-next-file) + (define-key map "\t" 'compilation-next-error) + (define-key map [backtab] 'compilation-previous-error) (define-key map " " 'scroll-up) (define-key map "\^?" 'scroll-down) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 480c0a4160..6d4766bd6a 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1,6 +1,7 @@ ;;; cperl-mode.el --- Perl code editing commands for Emacs -;; Copyright (C) 1985,86,87,91,92,93,94,95,96,97,98,99,2000,03,2004,2005 +;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997, +;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Ilya Zakharevich and Bob Olson diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 41ccc64122..c615082814 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -1,6 +1,7 @@ ;;; cpp.el --- highlight or hide text according to cpp conditionals -;; Copyright (C) 1994, 1995, 2003 Free Software Foundation +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation ;; Author: Per Abrahamsen <[email protected]> ;; Keywords: c, faces, tools diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el index 2cc4d1bda7..9ffc149727 100644 --- a/lisp/progmodes/cwarn.el +++ b/lisp/progmodes/cwarn.el @@ -1,6 +1,7 @@ ;;; cwarn.el --- highlight suspicious C and C++ constructions -;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Anders Lindgren <[email protected]> ;; Keywords: c, languages, faces diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index 90a4e0a959..c7115eed2a 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -1,6 +1,7 @@ ;;; dcl-mode.el --- major mode for editing DCL command files -;; Copyright (c) 1997 Free Software Foundation, Inc. +;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Odd Gripenstam <[email protected]> ;; Maintainer: Odd Gripenstam <[email protected]> diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el index 3a558fdb0c..0c94120a0f 100644 --- a/lisp/progmodes/delphi.el +++ b/lisp/progmodes/delphi.el @@ -1,6 +1,7 @@ ;;; delphi.el --- major mode for editing Delphi source (Object Pascal) in Emacs -;; Copyright (C) 1998, 1999 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Ray Blaak <[email protected]> ;; Keywords: languages diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el index c95959c709..a1b3658c0b 100644 --- a/lisp/progmodes/ebnf-abn.el +++ b/lisp/progmodes/ebnf-abn.el @@ -1,6 +1,6 @@ ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF) -;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <[email protected]> ;; Maintainer: Vinicius Jose Latorre <[email protected]> diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el index 43c0ca20ef..4a596154c4 100644 --- a/lisp/progmodes/ebnf-dtd.el +++ b/lisp/progmodes/ebnf-dtd.el @@ -1,6 +1,6 @@ ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML) -;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <[email protected]> ;; Maintainer: Vinicius Jose Latorre <[email protected]> diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el index c42ab70f74..ada523c6c3 100644 --- a/lisp/progmodes/ebnf-ebx.el +++ b/lisp/progmodes/ebnf-ebx.el @@ -1,6 +1,6 @@ ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX) -;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <[email protected]> ;; Maintainer: Vinicius Jose Latorre <[email protected]> diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el index d450addca5..4beeaa8ad8 100644 --- a/lisp/progmodes/ebnf-otz.el +++ b/lisp/progmodes/ebnf-otz.el @@ -1,6 +1,6 @@ ;;; ebnf-otz.el --- syntactic chart OpTimiZer -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Sofware Foundation, Inc. ;; Author: Vinicius Jose Latorre <[email protected]> diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el index 075e7fa9f1..49d0207882 100644 --- a/lisp/progmodes/ebrowse.el +++ b/lisp/progmodes/ebrowse.el @@ -1,7 +1,8 @@ ;;; ebrowse.el --- Emacs C++ class browser & tags facility -;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, 2005 -;; 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: Gerd Moellmann <[email protected]> ;; Maintainer: FSF diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 02fa54d0a3..54b4cda9d1 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1,6 +1,7 @@ ;;; etags.el --- etags facility for Emacs -;; Copyright (C) 1985, 86, 88, 89, 92, 93, 94, 95, 96, 98, 2000, 2001 +;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998, +;; 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Roland McGrath <[email protected]> diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el index fd291ef437..615e9d0ae9 100644 --- a/lisp/progmodes/executable.el +++ b/lisp/progmodes/executable.el @@ -1,6 +1,7 @@ ;;; executable.el --- base functionality for executable interpreter scripts -*- byte-compile-dynamic: t -*- -;; Copyright (C) 1994, 1995, 1996, 2000, 2003, 2004 by Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <[email protected]> ;; Keywords: languages, unix diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 02fe9c5f11..5e2a3705ef 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1,6 +1,7 @@ ;;; f90.el --- Fortran-90 mode (free format) -;; Copyright (C) 1995, 1996, 1997, 2000, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Torbj\"orn Einarsson <[email protected]> ;; Maintainer: Glenn Morris <[email protected]> diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 4c5f3ad12b..a698ee6322 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -1,6 +1,6 @@ ;;; flymake.el -- a universal on-the-fly syntax checker -;; Copyright (C) 2003, 2005 Free Software Foundation +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation ;; Author: Pavel Kobiakov <[email protected]> ;; Maintainer: Pavel Kobiakov <[email protected]> diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 371cc61091..5ea2e4b783 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -1,7 +1,7 @@ ;;; fortran.el --- Fortran mode for GNU Emacs ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael D. Prange <[email protected]> ;; Maintainer: Glenn Morris <[email protected]> diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 8e574e912c..42e415c579 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -56,7 +56,7 @@ ;; explicitly in your program if you want timely display of I/O in Emacs. ;; Alternatively you can make the output stream unbuffered, for example, by ;; using a macro: -;; +;; ;; #ifdef UNBUFFERED ;; setvbuf(stdout,(char *)NULL, _IONBF,0); ;; #endif @@ -79,7 +79,7 @@ (require 'gud) -(defvar gdb-frame-address "main" "Initialisation for Assembler buffer.") +(defvar gdb-frame-address "main" "Initialization for Assembler buffer.") (defvar gdb-previous-frame-address nil) (defvar gdb-memory-address "main") (defvar gdb-previous-frame nil) @@ -87,7 +87,7 @@ (defvar gdb-frame-number nil) (defvar gdb-current-language nil) (defvar gdb-var-list nil "List of variables in watch window.") -(defvar gdb-var-changed nil "Non-nil means that gdb-var-list has changed.") +(defvar gdb-var-changed nil "Non-nil means that `gdb-var-list' has changed.") (defvar gdb-main-file nil "Source file from which program execution begins.") (defvar gdb-buffer-type nil) (defvar gdb-overlay-arrow-position nil) @@ -118,7 +118,7 @@ Possible values are these symbols: `user' -- gdb output should be copied to the GUD buffer for the user to see. - `inferior' -- gdb output should be copied to the inferior-io buffer + `inferior' -- gdb output should be copied to the inferior-io buffer. `pre-emacs' -- output should be ignored util the post-prompt annotation is received. Then the output-sink @@ -130,7 +130,7 @@ Possible values are these symbols: `post-emacs' -- ignore output until the prompt annotation is received, then go to USER disposition. -gdba (gdb-ui.el) uses all five values, gdbmi (gdb-mi.el) only two +gdba (gdb-ui.el) uses all five values, gdbmi (gdb-mi.el) only two \(`user' and `emacs').") (defvar gdb-current-item nil @@ -149,7 +149,7 @@ The directory containing FILE becomes the initial working directory and source-file directory for your debugger. If `gdb-many-windows' is nil (the default value) then gdb just -pops up the GUD buffer unless `gdb-show-main' is t. In this case +pops up the GUD buffer unless `gdb-show-main' is t. In this case it starts with two windows: one displaying the GUD buffer and the other with the source file with the main routine of the inferior. @@ -201,6 +201,7 @@ detailed description of this mode. (defvar gdb-debug-log nil) +;;;###autoload (defcustom gdb-enable-debug-log nil "Non-nil means record the process input and output in `gdb-debug-log'." :type 'boolean @@ -216,7 +217,7 @@ detailed description of this mode. (defcustom gdb-cpp-define-alist-program "gcc -E -dM -" "Shell command for generating a list of defined macros in a source file. This list is used to display the #define directive associated -with an identifier as a tooltip. It works in a debug session with +with an identifier as a tooltip. It works in a debug session with GDB, when gud-tooltip-mode is t. Set `gdb-cpp-define-alist-flags' for any include paths or @@ -279,7 +280,7 @@ Also display the main routine in the disassembly buffer if present." 'gdb-tooltip-print)))))) (defun gdb-set-gud-minor-mode (buffer) - "Set gud-minor-mode from find-file if appropriate." + "Set `gud-minor-mode' from find-file if appropriate." (goto-char (point-min)) (unless (search-forward "No source file named " nil t) (condition-case nil @@ -972,7 +973,7 @@ being debugged." (defun gdb-exited (ignored) "An annotation handler for `exited' and `signalled'. They say that I/O for the subprocess is now GDB, not the program -being debugged and that the program is no longer running. This +being debugged and that the program is no longer running. This function is used to change the focus of GUD tooltips to #define directives." (setq gdb-active-process nil) @@ -2225,7 +2226,7 @@ corresponding to the mode line clicked." (set-window-dedicated-p (selected-window) t)) (defun gdb-setup-windows () - "Layout the window pattern for gdb-many-windows." + "Layout the window pattern for `gdb-many-windows'." (gdb-display-locals-buffer) (gdb-display-stack-buffer) (delete-other-windows) @@ -2379,7 +2380,7 @@ of the current session." (defun gdb-put-string (putstring pos &optional dprop) "Put string PUTSTRING in front of POS in the current buffer. PUTSTRING is displayed by putting an overlay into the current buffer with a -`before-string' STRING that has a `display' property whose value is +`before-string' string that has a `display' property whose value is PUTSTRING." (let ((string (make-string 1 ?x)) (buffer (current-buffer))) @@ -2484,7 +2485,7 @@ BUFFER nil or omitted means use the current buffer." (def-gdb-auto-updated-buffer gdb-assembler-buffer gdb-invalidate-assembler - (concat gdb-server-prefix "disassemble " + (concat gdb-server-prefix "disassemble " (if (member gdb-frame-address '(nil "main")) nil "0x") gdb-frame-address "\n") gdb-assembler-handler diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index dce17ed130..4378a7c253 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -1,7 +1,7 @@ ;;; grep.el --- run Grep as inferior of Emacs, parse match messages ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Roland McGrath <[email protected]> ;; Maintainer: FSF @@ -187,17 +187,13 @@ See `compilation-error-screen-columns'" (define-key map "\^?" 'scroll-down) (define-key map "\C-c\C-f" 'next-error-follow-minor-mode) - ;; This is intolerable -- rms -;;; (define-key map [remap next-line] 'compilation-next-error) -;;; (define-key map [remap previous-line] 'compilation-previous-error) - (define-key map "\r" 'compile-goto-error) ;; ? (define-key map "n" 'next-error-no-select) (define-key map "p" 'previous-error-no-select) (define-key map "{" 'compilation-previous-file) (define-key map "}" 'compilation-next-file) - (define-key map [backtab] 'compilation-previous-file) - (define-key map "\t" 'compilation-next-file) + (define-key map "\t" 'compilation-next-error) + (define-key map [backtab] 'compilation-previous-error) ;; Set up the menu-bar (define-key map [menu-bar grep] @@ -248,13 +244,12 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies ;;;###autoload (defvar grep-regexp-alist - ;; rms: I removed the code to match parens around the line number - ;; because it causes confusion and so we will find out if anyone needs it. - ;; It causes confusion with a file name that contains a number in parens. - '(("^\\(.+?\\)\\([: \t]\\)+\ -\\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\ -\\(?:-\\(?:\\([0-9]+\\)\\4\\)?\\.?\\([0-9]+\\)?\\)?\\2" - 1 (3 . 6) (5 . 7)) + '(("^\\([^:\n]+\\)\\(:[ \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\\)?" + ;; 1 3 (4 . 5)) ("^\\(\\(.+?\\):\\([0-9]+\\):\\).*?\ \\(\033\\[01;31m\\(?:\033\\[K\\)?\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)" 2 3 @@ -284,6 +279,9 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (defvar grep-match-face 'match "Face name to use for grep matches.") +(defvar grep-context-face 'shadow + "Face name to use for grep context lines.") + (defvar grep-mode-font-lock-keywords '(;; Command output lines. ("^\\([A-Za-z_0-9/\.+-]+\\)[ \t]*:" 1 font-lock-function-name-face) @@ -298,6 +296,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (0 '(face nil message nil help-echo nil mouse-face nil) t) (1 grep-error-face) (2 grep-error-face)) + ("^[^\n-]+-[0-9]+-.*" (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 diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index f93ff3d7e0..22b0b7b36d 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -4,7 +4,8 @@ ;; Maintainer: FSF ;; Keywords: unix, tools -;; Copyright (C) 1992,93,94,95,96,1998,2000,02,03,04,05 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -3209,6 +3210,7 @@ This event can be examined by forms in GUD-TOOLTIP-DISPLAY.") (define-obsolete-function-alias 'tooltip-gud-toggle-dereference 'toggle-gud-tooltip-dereference "22.1") +;;;###autoload (define-minor-mode gud-tooltip-mode "Toggle the display of GUD tooltips." :global t @@ -3225,7 +3227,11 @@ This event can be examined by forms in GUD-TOOLTIP-DISPLAY.") (remove-hook 'tooltip-hook 'gud-tooltip-tips) (define-key global-map [mouse-movement] 'ignore))) (gud-tooltip-activate-mouse-motions-if-enabled) - (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba)) + (if (and + gud-comint-buffer + (buffer-name gud-comint-buffer); gud-comint-buffer might be kille + (with-current-buffer gud-comint-buffer + (memq gud-minor-mode '(gdbmi gdba)))) (if gud-tooltip-mode (progn (dolist (buffer (buffer-list)) diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 35524b4a36..1f843dea03 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -1,6 +1,7 @@ ;;; hideif.el --- hides selected code within ifdef -;; Copyright (C) 1988, 1994, 2001, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004 2005 +;; Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <[email protected]> ;; Maintainer: FSF diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index 0acb995d2f..8f08311cea 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -1,6 +1,7 @@ ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01 Free Software Foundation +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +;; 2004, 2005 Free Software Foundation ;; Author: Thien-Thi Nguyen <[email protected]> ;; Dan Nicolaescu <[email protected]> diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el index 66869d8e6d..aad5686c69 100644 --- a/lisp/progmodes/icon.el +++ b/lisp/progmodes/icon.el @@ -1,6 +1,7 @@ ;;; icon.el --- mode for editing Icon code -;; Copyright (C) 1989 Free Software Foundation, Inc. +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Chris Smith <[email protected]> ;; Created: 15 Feb 89 diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el index e802093748..8808b3ff8a 100644 --- a/lisp/progmodes/idlw-complete-structtag.el +++ b/lisp/progmodes/idlw-complete-structtag.el @@ -1,5 +1,5 @@ ;;; idlw-complete-structtag.el --- Completion of structure tags. -;; Copyright (c) 2001,2002 Free Software Foundation +;; Copyright (c) 2001, 2002, 2003, 2004, 2005 Free Software Foundation ;; Author: Carsten Dominik <[email protected]> ;; Maintainer: J.D. Smith <[email protected]> diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index f038149aaa..6dbbca4c5b 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -1,7 +1,7 @@ ;;; idlw-help.el --- HTML Help code for IDLWAVE ;; Copyright (c) 2000 Carsten Dominik ;; Copyright (c) 2001, 2002 J.D. Smith -;; Copyright (c) 2003,2004,2005 Free Software Foundation +;; Copyright (c) 2003, 2004, 2005, Free Software Foundation ;; ;; Authors: J.D. Smith <[email protected]> ;; Carsten Dominik <[email protected]> diff --git a/lisp/progmodes/idlw-rinfo.el b/lisp/progmodes/idlw-rinfo.el index cfd5db3392..962292b740 100644 --- a/lisp/progmodes/idlw-rinfo.el +++ b/lisp/progmodes/idlw-rinfo.el @@ -1,6 +1,7 @@ ;;; idlw-rinfo.el --- Routine Information for IDLWAVE ;; Copyright (c) 1999 Carsten Dominik -;; Copyright (c) 1999, 2000, 2001,2002,2003,2004,2005 Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation ;; Author: J.D. Smith <[email protected]> ;; Version: 5.7_22 diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 08c95e5bdd..7c1324c94a 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -1,5 +1,6 @@ ;; idlw-shell.el --- run IDL as an inferior process of Emacs. -;; Copyright (c) 1999,2000,2001,2002,2003,2004,2005 Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation ;; Authors: J.D. Smith <[email protected]> ;; Carsten Dominik <[email protected]> diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el index 8d4a8e1f02..9592acb607 100644 --- a/lisp/progmodes/idlw-toolbar.el +++ b/lisp/progmodes/idlw-toolbar.el @@ -1,5 +1,6 @@ ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE -;; Copyright (c) 1999, 2000, 2001,2002,2004 Free Software Foundation +;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation ;; Author: Carsten Dominik <[email protected]> ;; Maintainer: J.D. Smith <[email protected]> diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 5bf7d1b70a..64845e38ae 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -1,6 +1,7 @@ ;;; inf-lisp.el --- an inferior-lisp mode -;; Copyright (C) 1988, 1993, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Olin Shivers <[email protected]> ;; Keywords: processes, lisp diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el index e326d11c65..8b378b7f0a 100644 --- a/lisp/progmodes/ld-script.el +++ b/lisp/progmodes/ld-script.el @@ -1,6 +1,6 @@ ;;; ld-script.el --- GNU linker script editing mode for Emacs -;; Copyright (C) 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Masatake YAMATO<[email protected]> ;; Keywords: languages, faces diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el index 3ad3c1de42..f131576d24 100644 --- a/lisp/progmodes/m4-mode.el +++ b/lisp/progmodes/m4-mode.el @@ -1,6 +1,7 @@ ;;; m4-mode.el --- m4 code editing commands for Emacs -;;; Copyright (C) 1996, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Andrew Csillag <[email protected]> ;; Maintainer: Andrew Csillag <[email protected]> diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 04f83a4d53..b833669130 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1,6 +1,7 @@ ;;; make-mode.el --- makefile editing commands for Emacs -;; Copyright (C) 1992,94,99,2000,2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Thomas Neumann <[email protected]> ;; Eric S. Raymond <[email protected]> diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el index 83caccbe0f..71791ef965 100644 --- a/lisp/progmodes/mantemp.el +++ b/lisp/progmodes/mantemp.el @@ -1,6 +1,7 @@ ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output -;; Copyright (C) 1996 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Tom Houlder <[email protected]> ;; Created: 10 Dec 1996 diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index f89fd8c7fa..9ae3e5a593 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -1,6 +1,7 @@ ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Ulrik Vieth <[email protected]> ;; Version: 1.0 diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index 73b87bbfa4..8f9806c15b 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el @@ -1,6 +1,6 @@ ;;; mixal-mode.el --- Major mode for the mix asm language. -;; Copyright (C) 2003 Free Software Foundation +;; Copyright (C) 2003, 2004, 2005 Free Software Foundation ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as diff --git a/lisp/progmodes/octave-hlp.el b/lisp/progmodes/octave-hlp.el index 38e1bcfd61..a6e66ed407 100644 --- a/lisp/progmodes/octave-hlp.el +++ b/lisp/progmodes/octave-hlp.el @@ -1,6 +1,7 @@ ;;; octave-hlp.el --- getting help on Octave symbols using info -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Kurt Hornik <[email protected]> ;; Author: John Eaton <[email protected]> diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el index 4cd8bc764f..40820c8c22 100644 --- a/lisp/progmodes/octave-inf.el +++ b/lisp/progmodes/octave-inf.el @@ -1,6 +1,7 @@ ;;; octave-inf.el --- running Octave as an inferior Emacs process -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Kurt Hornik <[email protected]> ;; Author: John Eaton <[email protected]> diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 2053dd8f9c..febd3cc4fa 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -1,6 +1,7 @@ ;;; octave-mod.el --- editing Octave source files under Emacs -;; Copyright (C) 1997, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Kurt Hornik <[email protected]> ;; Author: John Eaton <[email protected]> diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 3212107b20..47b36db653 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -1,6 +1,7 @@ ;;; pascal.el --- major mode for editing pascal source in Emacs -;; Copyright (C) 1993, 94, 95, 96, 97, 98, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Espen Skoglund <[email protected]> ;; Keywords: languages diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index 57fdb423cc..9c9db9aab3 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -1,6 +1,7 @@ ;;; perl-mode.el --- Perl code editing commands for GNU Emacs -;; Copyright (C) 1990, 1994, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: William F. Mann ;; Maintainer: FSF diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 8d34dd54b3..0e2d8d9472 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -1,6 +1,7 @@ ;;; prolog.el --- major mode for editing and running Prolog under Emacs -;; Copyright (C) 1986, 1987, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <[email protected]> ;; Keywords: languages diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index 1a5d393df3..fecf1f07eb 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -1,6 +1,7 @@ ;;; ps-mode.el --- PostScript mode for GNU Emacs -;; Copyright (C) 1999, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Peter Kleiweg <[email protected]> ;; Maintainer: Peter Kleiweg <[email protected]> diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index 3f31f4e266..712f967fcb 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el @@ -1,6 +1,6 @@ ;;; scheme.el --- Scheme (and DSSSL) editing mode -;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2005 +;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Bill Rozas <[email protected]> diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el index 46bdb49334..395bee1b22 100644 --- a/lisp/progmodes/simula.el +++ b/lisp/progmodes/simula.el @@ -1,6 +1,7 @@ ;;; simula.el --- SIMULA 87 code editing commands for Emacs -;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Hans Henrik Eriksen <[email protected]> ;; Maintainer: [email protected] diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index cbb33739c3..129137c32f 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -1,6 +1,7 @@ ;;; sql.el --- specialized comint.el for SQL interpreters -;; Copyright (C) 1998,99,2000,01,02,03,04 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Alex Schroeder <[email protected]> ;; Maintainer: Michael Mauger <[email protected]> diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 0e4b13647d..26d68aea50 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -1,6 +1,6 @@ ;;; vhdl-mode.el --- major mode for editing VHDL code -;; Copyright (C) 1992-2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1992-2003, 2004, 2005 Free Software Foundation, Inc. ;; Authors: Reto Zimmermann <[email protected]> ;; Rodney J. Whitby <[email protected]> diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index 059218942a..c1bfc140d8 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -1,6 +1,6 @@ ;;; which-func.el --- print current function in mode line -;; Copyright (C) 1994, 1997, 1998, 2001, 2003, 2005 +;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: Alex Rezinsky <[email protected]> diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el index 0075dac1d0..f53653a306 100644 --- a/lisp/progmodes/xscheme.el +++ b/lisp/progmodes/xscheme.el @@ -1,6 +1,6 @@ ;;; xscheme.el --- run MIT Scheme under Emacs -;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2004, 2005 +;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Maintainer: FSF diff --git a/lisp/simple.el b/lisp/simple.el index 7d6a9febb3..c967559553 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -313,7 +313,7 @@ location." (if (not next-error-follow-minor-mode) (remove-hook 'post-command-hook 'next-error-follow-mode-post-command-hook t) (add-hook 'post-command-hook 'next-error-follow-mode-post-command-hook nil t) - (make-variable-buffer-local 'next-error-follow-last-line))) + (make-local-variable 'next-error-follow-last-line))) ;;; Used as a `post-command-hook' by `next-error-follow-mode' ;;; for the *Compilation* *grep* and *Occur* buffers. diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el index 8b239a706e..22768730e7 100644 --- a/lisp/term/AT386.el +++ b/lisp/term/AT386.el @@ -3,7 +3,7 @@ ;; Author: Eric S. Raymond <[email protected]> ;; Keywords: terminals -;; 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/lisp/term/bg-mouse.el b/lisp/term/bg-mouse.el index 017a92d577..00484c1153 100644 --- a/lisp/term/bg-mouse.el +++ b/lisp/term/bg-mouse.el @@ -1,6 +1,6 @@ ;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse -;; Copyright (C) 2001 Free Software Foundation, Inc. Oct 1985. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: John Robinson <[email protected]> ;; Stephen Gildea <[email protected]> diff --git a/lisp/term/internal.el b/lisp/term/internal.el index 17c3fc9199..1a266b0706 100644 --- a/lisp/term/internal.el +++ b/lisp/term/internal.el @@ -1,6 +1,7 @@ ;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*- -;; Copyright (C) 1993, 1994, 1998, 1999, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Morten Welinder <[email protected]> diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index ef59860b60..e62434d286 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el @@ -1,6 +1,6 @@ ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*- -;; Copyright (C) 1997, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dan Nicolaescu <[email protected]> @@ -58,28 +58,28 @@ (define-key function-key-map "\e[006q" [f6]) (define-key function-key-map "\e[018q" [S-f6]) (define-key function-key-map "\e[030q" [C-f6]) - + (define-key function-key-map "\e[007q" [f7]) (define-key function-key-map "\e[019q" [S-f7]) (define-key function-key-map "\e[031q" [C-f7]) - - + + (define-key function-key-map "\e[008q" [f8]) (define-key function-key-map "\e[020q" [S-f8]) (define-key function-key-map "\e[032q" [C-f8]) - + (define-key function-key-map "\e[009q" [f9]) (define-key function-key-map "\e[021q" [S-f9]) (define-key function-key-map "\e[033q" [C-f9]) - - + + (define-key function-key-map "\e[010q" [f10]) (define-key function-key-map "\e[022q" [S-f10]) (define-key function-key-map "\e[034q" [C-f10]) - - + + (define-key function-key-map "\e[011q" [f11]) (define-key function-key-map "\e[023q" [S-f11]) (define-key function-key-map "\e[035q" [C-f11]) @@ -89,102 +89,102 @@ (define-key function-key-map "\e[024q" [S-f12]) (define-key function-key-map "\e[036q" [C-f12]) (define-key function-key-map "\e[048q" [M-f12]) - - + + (define-key function-key-map "\e[057q" [?\C-`]) (define-key function-key-map "\e[115q" [?\M-`]) - + (define-key function-key-map "\e[049q" [?\C-1]) (define-key function-key-map "\e[058q" [?\M-1]) - - + + (define-key function-key-map "\e[059q" [?\M-2]) - + (define-key function-key-map "\e[050q" [?\C-3]) (define-key function-key-map "\e[060q" [?\M-3]) - + (define-key function-key-map "\e[051q" [?\C-4]) (define-key function-key-map "\e[061q" [?\M-4]) - + (define-key function-key-map "\e[052q" [?\C-5]) (define-key function-key-map "\e[062q" [?\M-5]) - + (define-key function-key-map "\e[063q" [?\M-6]) - + (define-key function-key-map "\e[053q" [?\C-7]) (define-key function-key-map "\e[064q" [?\M-7]) - + (define-key function-key-map "\e[054q" [?\C-8]) (define-key function-key-map "\e[065q" [?\M-8]) - + (define-key function-key-map "\e[055q" [?\C-9]) (define-key function-key-map "\e[066q" [?\M-9]) - + (define-key function-key-map "\e[056q" [?\C-0]) (define-key function-key-map "\e[067q" [?\M-0]) - + (define-key function-key-map "\e[068q" [?\M--]) - + (define-key function-key-map "\e[069q" [?\C-=]) (define-key function-key-map "\e[070q" [?\M-=]) - + ;; I don't know what to do with those. ;;(define-key function-key-map "^H" [<del>]) ;;(define-key function-key-map "^H" [S-<del>]) ;;(define-key function-key-map "\177" [C-<del>]) ;;(define-key function-key-map "\e[071q" [M-<del>]) - + (define-key function-key-map "\e[Z" [?\S-\t]) (define-key function-key-map "\e[072q" [?\C-\t]) ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager. (define-key function-key-map "\e[073q" [?\M-\t]) - + (define-key function-key-map "\e[074q" [?\M-q]) (define-key function-key-map "\e[075q" [?\M-w]) - + (define-key function-key-map "\e[076q" [?\M-e]) (define-key function-key-map "\e[077q" [?\M-r]) - + (define-key function-key-map "\e[078q" [?\M-t]) - + (define-key function-key-map "\e[079q" [?\M-y]) - + (define-key function-key-map "\e[080q" [?\M-u]) - + (define-key function-key-map "\e[081q" [?\M-i]) (define-key function-key-map "\e[082q" [?\M-o]) - + (define-key function-key-map "\e[083q" [?\M-p]) - + (define-key function-key-map "\e[084q" [?\M-\[]) - + (define-key function-key-map "\e[085q" [?\M-\]]) - + (define-key function-key-map "\e[086q" [?\M-\\]) - + (define-key function-key-map "\e[087q" [?\M-a]) - + (define-key function-key-map "\e[088q" [?\M-s]) - + (define-key function-key-map "\e[089q" [?\M-d]) - + (define-key function-key-map "\e[090q" [?\M-f]) - + (define-key function-key-map "\e[091q" [?\M-g]) - + (define-key function-key-map "\e[092q" [?\M-h]) - + (define-key function-key-map "\e[093q" [?\M-j]) - + (define-key function-key-map "\e[094q" [?\M-k]) - + (define-key function-key-map "\e[095q" [?\M-l]) - + (define-key function-key-map "\e[096q" [?\C-\;]) (define-key function-key-map "\e[097q" [?\M-:]) ;; we are cheating ;; here, this is @@ -195,41 +195,41 @@ (define-key function-key-map "\e[098q" [?\C-']) (define-key function-key-map "\e[099q" [?\M-']) - + (define-key function-key-map "\e[100q" [?\M-\n]) - + (define-key function-key-map "\e[101q" [?\M-z]) - + (define-key function-key-map "\e[102q" [?\M-x]) - + (define-key function-key-map "\e[103q" [?\M-c]) - + (define-key function-key-map "\e[104q" [?\M-v]) - + (define-key function-key-map "\e[105q" [?\M-b]) - + (define-key function-key-map "\e[106q" [M-n]) - + (define-key function-key-map "\e[107q" [M-m]) - + (define-key function-key-map "\e[108q" [?\C-,]) (define-key function-key-map "\e[109q" [?\M-,]) - + (define-key function-key-map "\e[110q" [?\C-.]) (define-key function-key-map "\e[111q" [?\M-.]) - + (define-key function-key-map "\e[112q" [?\C-/]) (define-key function-key-map "\e[113q" [?\M-/]) - + (define-key function-key-map "\e[139q" [insert]) (define-key function-key-map "\e[139q" [S-insert]) (define-key function-key-map "\e[140q" [C-insert]) (define-key function-key-map "\e[141q" [M-insert]) - + (define-key function-key-map "\e[H" [home]) (define-key function-key-map "\e[143q" [S-home]) (define-key function-key-map "\e[144q" [C-home]) - + (define-key function-key-map "\e[150q" [prior]) (define-key function-key-map "\e[151q" [S-prior]) ;; those don't @@ -238,90 +238,90 @@ ;; anything (define-key function-key-map "\e[152q" [C-prior]) - - ;; (define-key function-key-map "^?" [delete]) + + ;; (define-key function-key-map "^?" [delete]) (define-key function-key-map "\e[P" [S-delete]) (define-key function-key-map "\e[142q" [C-delete]) (define-key function-key-map "\e[M" [M-delete]) - + (define-key function-key-map "\e[146q" [end]) (define-key function-key-map "\e[147q" [S-end]) ;; those don't seem ;; to generate ;; anything (define-key function-key-map "\e[148q" [C-end]) - + (define-key function-key-map "\e[154q" [next]) (define-key function-key-map "\e[155q" [S-next]) (define-key function-key-map "\e[156q" [C-next]) - + (define-key function-key-map "\e[161q" [S-up]) (define-key function-key-map "\e[162q" [C-up]) (define-key function-key-map "\e[163q" [M-up]) - + (define-key function-key-map "\e[158q" [S-left]) (define-key function-key-map "\e[159q" [C-left]) (define-key function-key-map "\e[160q" [M-left]) - + (define-key function-key-map "\e[164q" [S-down]) (define-key function-key-map "\e[165q" [C-down]) (define-key function-key-map "\e[166q" [M-down]) - + (define-key function-key-map "\e[167q" [S-right]) (define-key function-key-map "\e[168q" [C-right]) (define-key function-key-map "\e[169q" [M-right]) - + ;; Keypad functions, most of those are untested. (define-key function-key-map "\e[179q" [?\C-/]) (define-key function-key-map "\e[180q" [?\M-/]) - + (define-key function-key-map "\e[187q" [?\C-*]) (define-key function-key-map "\e[188q" [?\M-*]) - + (define-key function-key-map "\e[198q" [?\C--]) (define-key function-key-map "\e[199q" [?\M--]) - + ;; Something else takes care of home, up, prior, down, left, right, next ;;(define-key function-key-map "\e[H" [home]) (define-key function-key-map "\e[172q" [C-home]) - + ;;(define-key function-key-map "\e[A" [up]) (define-key function-key-map "\e[182q" [C-up]) - - + + ;;(define-key function-key-map "\e[150q" [prior]) (define-key function-key-map "\e[190q" [C-prior]) - - + + (define-key function-key-map "\e[200q" [?\C-+]) (define-key function-key-map "\e[201q" [?\M-+]) - + ;;(define-key function-key-map "\e[D" [left]) (define-key function-key-map "\e[174q" [C-left]) - + (define-key function-key-map "\e[000q" [begin]) (define-key function-key-map "\e[184q" [C-begin]) - + ;;(define-key function-key-map "\e[C" [right]) (define-key function-key-map "\e[192q" [C-right]) - + ;;(define-key function-key-map "\e[146q" [end]) (define-key function-key-map "\e[176q" [C-end]) - + ;;(define-key function-key-map "\e[B" [down]) (define-key function-key-map "\e[186q" [C-down]) - + ;;(define-key function-key-map "\e[154q" [next]) (define-key function-key-map "\e[194q" [C-next]) - - + + (define-key function-key-map "\e[100q" [M-enter]) - + (define-key function-key-map "\e[139q" [insert]) (define-key function-key-map "\e[178q" [C-inset]) - + (define-key function-key-map "\e[P" [delete]) (define-key function-key-map "\e[196q" [C-delete]) (define-key function-key-map "\e[197q" [M-delete])) diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 5c3f671e6e..a95cccaeaa 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1,7 +1,7 @@ ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8 -;; Copyright (C) 1999, 2000, 2002, 2003, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Andrew Choi <[email protected]> ;; Keywords: terminals diff --git a/lisp/term/news.el b/lisp/term/news.el index f8a4934f8b..014ecb1cc1 100644 --- a/lisp/term/news.el +++ b/lisp/term/news.el @@ -1,6 +1,7 @@ ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*- -;; Copyright (C) 1989, 1993, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals @@ -29,7 +30,7 @@ ;;; Code: (defun terminal-init-news () - "Terminal initialization function for news." + "Terminal initialization function for news." (if (boundp 'news-fkey-prefix) nil ;; The terminal initialization should already have set up some keys diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 529903d06b..bdaef8813e 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -1,6 +1,7 @@ ;;; pc-win.el --- setup support for `PC windows' (whatever that is) -;; Copyright (C) 1994, 1996, 1997, 1999, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Morten Welinder <[email protected]> ;; Maintainer: FSF diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index f0e9dd7b5b..1b4e5a6f61 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -1,6 +1,6 @@ ;;; rxvt.el --- define function key sequences and standard colors for rxvt -;; Copyright (C) 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Eli Zaretskii ;; Keywords: terminals @@ -36,7 +36,7 @@ ;; function-key-map. This substitution is needed because if a key ;; definition if found in function-key-map, there are no further ;; lookups in other keymaps. - (substitute-key-definition [f11] [S-f1] function-key-map) + (substitute-key-definition [f11] [S-f1] function-key-map) (substitute-key-definition [f12] [S-f2] function-key-map) (substitute-key-definition [f13] [S-f3] function-key-map) (substitute-key-definition [f14] [S-f4] function-key-map) @@ -47,7 +47,7 @@ (substitute-key-definition [f19] [S-f9] function-key-map) (substitute-key-definition [f20] [S-f10] function-key-map) - (substitute-key-definition [f23] [C-f1] function-key-map) + (substitute-key-definition [f23] [C-f1] function-key-map) (substitute-key-definition [f24] [C-f2] function-key-map) (substitute-key-definition [f25] [C-f3] function-key-map) (substitute-key-definition [f26] [C-f4] function-key-map) @@ -58,7 +58,7 @@ (substitute-key-definition [f31] [C-f9] function-key-map) (substitute-key-definition [f32] [C-f10] function-key-map) - (substitute-key-definition [f33] [C-S-f1] function-key-map) + (substitute-key-definition [f33] [C-S-f1] function-key-map) (substitute-key-definition [f34] [C-S-f2] function-key-map) (substitute-key-definition [f35] [C-S-f3] function-key-map) (substitute-key-definition [f36] [C-S-f4] function-key-map) diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el index d0126404a2..06fe5fd440 100644 --- a/lisp/term/sun-mouse.el +++ b/lisp/term/sun-mouse.el @@ -1,6 +1,6 @@ ;;; sun-mouse.el --- 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: FSF diff --git a/lisp/term/sun.el b/lisp/term/sun.el index 7d857ca126..3963a18efd 100644 --- a/lisp/term/sun.el +++ b/lisp/term/sun.el @@ -1,6 +1,7 @@ ;;; sun.el --- keybinding for standard default sunterm keys -;; Copyright (C) 1987, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Jeff Peck <[email protected]> ;; Keywords: terminals @@ -253,7 +254,7 @@ (while hooks (eval (car hooks)) (setq hooks (cdr hooks))))) - + (define-key ctl-x-map "\C-@" 'sun-mouse-once)) (defun emacstool-init () diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el index cf4de57587..54da5b3450 100644 --- a/lisp/term/sup-mouse.el +++ b/lisp/term/sup-mouse.el @@ -1,6 +1,7 @@ ;;; sup-mouse.el --- supdup mouse support for lisp machines -;; Copyright (C) Free Software Foundation 1985, 1986 +;; Copyright (C) 1985, 1986, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Wolfgang Rupprecht ;; Maintainer: FSF diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el index 9a5eb5aa83..d3aee8e64f 100644 --- a/lisp/term/tty-colors.el +++ b/lisp/term/tty-colors.el @@ -1,6 +1,7 @@ ;;; tty-colors.el --- color support for character terminals -;; Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Eli Zaretskii ;; Maintainer: FSF diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el index f7bc8c852a..23eea911b7 100644 --- a/lisp/term/tvi970.el +++ b/lisp/term/tvi970.el @@ -3,7 +3,7 @@ ;; Author: Jim Blandy <[email protected]>, January 1992 ;; Keywords: terminals -;; Copyright (C) 1992, 2005 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/lisp/term/vt100.el b/lisp/term/vt100.el index 6b44e94181..3f744a5212 100644 --- a/lisp/term/vt100.el +++ b/lisp/term/vt100.el @@ -1,6 +1,7 @@ ;;; vt100.el --- define VT100 function key sequences in function-key-map -;; Copyright (C) 1989, 1993 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals @@ -41,7 +42,7 @@ (defun terminal-init-vt100 () "Terminal initialization function for vt100." (load "term/lk201" nil t)) - + ;;; Controlling the screen width. (defvar vt100-wide-mode (= (frame-width) 132) "t if vt100 is in 132-column mode.") diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index e541ac43c7..33bb1e9a79 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -1,6 +1,7 @@ ;;; w32-win.el --- parse switches controlling interface with W32 window system -;; Copyright (C) 1993, 1994, 2003, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Kevin Gallo ;; Keywords: terminals @@ -108,8 +109,8 @@ Switch to a buffer editing the last file dropped." (y (cdr coords))) (if (and (> x 0) (> y 0)) (set-frame-selected-window nil window)) - (mapcar (lambda (file-name) - (dnd-handle-one-url window 'private + (mapcar (lambda (file-name) + (dnd-handle-one-url window 'private (concat "file:" file-name))) (car (cdr (cdr event))))) (raise-frame))) diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el index 64c489d720..75f4342001 100644 --- a/lisp/term/wyse50.el +++ b/lisp/term/wyse50.el @@ -1,6 +1,7 @@ ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*- -;; Copyright (C) 1989, 1993, 1994, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <[email protected]>, ;; Jim Blandy <[email protected]> diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 3107b35735..fc07f94bca 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1,6 +1,7 @@ ;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1993, 1994, 2001, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals, i18n @@ -2243,7 +2244,7 @@ order until succeed.") (if text (remove-text-properties 0 (length text) '(foreign-selection nil) text)) text)) - + ;;; Return the value of the current X selection. ;;; Consult the selection, and the cut buffer. Treat empty strings ;;; as if they were unset. diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index d0c26aa4b9..3be1a50823 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -1,6 +1,6 @@ ;;; xterm.el --- define function key sequences and standard colors for xterm -;; Copyright (C) 1995, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals @@ -33,7 +33,7 @@ ;; better in that case to use rxvt's initializion function. (if (and (getenv "COLORTERM") (string-match "\\`rxvt" (getenv "COLORTERM"))) - (progn + (progn (load "term/rxvt") (terminal-init-rxvt)) @@ -45,7 +45,7 @@ ;; function-key-map. This substitution is needed because if a key ;; definition if found in function-key-map, there are no further ;; lookups in other keymaps. - (substitute-key-definition [f13] [S-f1] function-key-map) + (substitute-key-definition [f13] [S-f1] function-key-map) (substitute-key-definition [f14] [S-f2] function-key-map) (substitute-key-definition [f15] [S-f3] function-key-map) (substitute-key-definition [f16] [S-f4] function-key-map) @@ -58,7 +58,7 @@ (substitute-key-definition [f23] [S-f11] function-key-map) (substitute-key-definition [f24] [S-f12] function-key-map) - (substitute-key-definition [f25] [C-f1] function-key-map) + (substitute-key-definition [f25] [C-f1] function-key-map) (substitute-key-definition [f26] [C-f2] function-key-map) (substitute-key-definition [f27] [C-f3] function-key-map) (substitute-key-definition [f28] [C-f4] function-key-map) @@ -71,7 +71,7 @@ (substitute-key-definition [f35] [C-f11] function-key-map) (substitute-key-definition [f36] [C-f12] function-key-map) - (substitute-key-definition [f37] [C-S-f1] function-key-map) + (substitute-key-definition [f37] [C-S-f1] function-key-map) (substitute-key-definition [f38] [C-S-f2] function-key-map) (substitute-key-definition [f39] [C-S-f3] function-key-map) (substitute-key-definition [f40] [C-S-f4] function-key-map) @@ -84,7 +84,7 @@ (substitute-key-definition [f47] [C-S-f11] function-key-map) (substitute-key-definition [f48] [C-S-f12] function-key-map) - (substitute-key-definition [f49] [A-f1] function-key-map) + (substitute-key-definition [f49] [A-f1] function-key-map) (substitute-key-definition [f50] [A-f2] function-key-map) (substitute-key-definition [f51] [A-f3] function-key-map) (substitute-key-definition [f52] [A-f4] function-key-map) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 293df6d9c5..4b6e305922 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -843,9 +843,8 @@ simply by any key input." :type 'hook :group 'table-hooks) -(defcustom table-yank-handler '(nil nil t nil) - "*yank-handler for table." - :group 'table) +(defvar table-yank-handler '(nil nil t nil) + "Yank handler for tables.") (setplist 'table-disable-incompatibility-warning nil) diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 478fb0b652..0d6e9a5ac4 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -138,23 +138,25 @@ this value can let another user see some of your images." :group 'thumbs) ;; Initialize some variable, for later use. -(defvar thumbs-current-tmp-filename - nil +(defvar thumbs-current-tmp-filename nil "Temporary filename of current image.") -(defvar thumbs-current-image-filename - nil +(make-variable-buffer-local 'thumbs-current-tmp-filename) + +(defvar thumbs-current-image-filename nil "Filename of current image.") -(defvar thumbs-current-image-size - nil +(make-variable-buffer-local 'thumbs-current-image-filename) + +(defvar thumbs-current-image-size nil "Size of current image.") -(defvar thumbs-image-num - nil + +(defvar thumbs-image-num nil "Number of current image.") -(defvar thumbs-current-dir - nil +(make-variable-buffer-local 'thumbs-image-num) + +(defvar thumbs-current-dir nil "Current directory.") -(defvar thumbs-markedL - nil + +(defvar thumbs-markedL nil "List of marked files.") (defalias 'thumbs-gensym @@ -365,8 +367,8 @@ If MARKED is non-nil, the image is marked." :conversion ,(if marked 'disabled) :margin ,thumbs-margin))) (insert-image i) - (setq thumbs-current-image-size - (image-size i t)))) + (set (make-local-variable 'thumbs-current-image-size) + (image-size i t)))) (defun thumbs-insert-thumb (img &optional marked) "Insert the thumbnail for IMG at point. @@ -397,8 +399,7 @@ If MARKED is non-nil, the image is marked." (thumbs-mode) (thumbs-do-thumbs-insertion L) (goto-char (point-min)) - (setq thumbs-current-dir default-directory) - (make-variable-buffer-local 'thumbs-current-dir))) + (set (make-local-variable 'thumbs-current-dir) default-directory))) ;;;###autoload (defun thumbs-show-all-from-dir (dir &optional reg same-window) @@ -436,10 +437,6 @@ and SAME-WINDOW to show thumbs in the same window." (setq thumbs-current-image-filename img thumbs-current-tmp-filename nil thumbs-image-num (or num 0)) - (make-variable-buffer-local 'thumbs-current-image-filename) - (make-variable-buffer-local 'thumbs-current-tmp-filename) - (make-variable-buffer-local 'thumbs-current-image-size) - (make-variable-buffer-local 'thumbs-image-num) (delete-region (point-min)(point-max)) (thumbs-insert-image img (thumbs-image-type img) 0))) diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el index 45c51532c9..487255a027 100644 --- a/lisp/toolbar/tool-bar.el +++ b/lisp/toolbar/tool-bar.el @@ -1,6 +1,7 @@ ;;; tool-bar.el --- setting up the tool bar ;; -;; Copyright (C) 2000, 2001, 2002, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Dave Love <[email protected]> ;; Keywords: mouse frames diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el index 9871daa7a5..3c4df12c8b 100644 --- a/lisp/vmsproc.el +++ b/lisp/vmsproc.el @@ -1,6 +1,6 @@ ;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs -;; Copyright (C) 1986 Free Software Foundation, Inc. +;; Copyright (C) 1986, 2005 Free Software Foundation, Inc. ;; Author: Mukesh Prasad ;; Maintainer: FSF @@ -34,24 +34,21 @@ "String to insert to distinguish commands entered by user.") (defvar subprocess-running nil) -(defvar command-mode-map nil) +(defvar subprocess-buf nil) -(if command-mode-map - nil - (setq command-mode-map (make-sparse-keymap)) - (define-key command-mode-map "\C-m" 'command-send-input) - (define-key command-mode-map "\C-u" 'command-kill-line)) +(defvar command-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "\C-m" 'command-send-input) + (define-key map "\C-u" 'command-kill-line) + map)) (defun subprocess-input (name str) "Handles input from a subprocess. Called by Emacs." (if display-subprocess-window (display-buffer subprocess-buf)) - (let ((old-buffer (current-buffer))) - (set-buffer subprocess-buf) + (with-current-buffer subprocess-buf (goto-char (point-max)) - (insert str) - (insert ?\n) - (set-buffer old-buffer))) + (insert str ?\n))) (defun subprocess-exit (name) "Called by Emacs upon subprocess exit." @@ -65,8 +62,7 @@ the end." (if subprocess-running (return t)) (setq subprocess-buf (get-buffer-create "*COMMAND*")) - (save-excursion - (set-buffer subprocess-buf) + (with-current-buffer subprocess-buf (use-local-map command-mode-map)) (setq subprocess-running (spawn-subprocess 1 'subprocess-input 'subprocess-exit)) @@ -81,25 +77,24 @@ the end." (setq cmd (substring command 0 (string-match " " command))) (setq args (substring command (string-match " " command))) (call-process cmd nil buffer nil "*dcl*" args))) -;BUGS: only the output up to the end of the first image activation is trapped. -; (if (not subprocess-running) -; (start-subprocess)) -; (save-excursion -; (set-buffer buffer) -; (let ((output-filename (concat "SYS$SCRATCH:OUTPUT-FOR-" -; (getenv "USER") ".LISTING"))) -; (while (file-exists-p output-filename) -; (delete-file output-filename)) -; (define-logical-name "SYS$OUTPUT" (concat output-filename "-NEW")) -; (send-command-to-subprocess 1 command) -; (send-command-to-subprocess 1 (concat -; "RENAME " output-filename -; "-NEW " output-filename)) -; (while (not (file-exists-p output-filename)) -; (sleep-for 1)) -; (define-logical-name "SYS$OUTPUT" nil) -; (insert-file output-filename) -; (delete-file output-filename)))) + ;; BUGS: only the output up to the end of the first image activation is trapped. + ;; (if (not subprocess-running) + ;; (start-subprocess)) + ;; (with-current-buffer buffer + ;; (let ((output-filename (concat "SYS$SCRATCH:OUTPUT-FOR-" + ;; (getenv "USER") ".LISTING"))) + ;; (while (file-exists-p output-filename) + ;; (delete-file output-filename)) + ;; (define-logical-name "SYS$OUTPUT" (concat output-filename "-NEW")) + ;; (send-command-to-subprocess 1 command) + ;; (send-command-to-subprocess 1 (concat + ;; "RENAME " output-filename + ;; "-NEW " output-filename)) + ;; (while (not (file-exists-p output-filename)) + ;; (sleep-for 1)) + ;; (define-logical-name "SYS$OUTPUT" nil) + ;; (insert-file output-filename) + ;; (delete-file output-filename)))) (defun subprocess-command () "Starts asynchronous subprocess if not running and switches to its window." @@ -115,8 +110,7 @@ the spawned subprocess. Otherwise brings back current line to the last line for resubmission." (interactive) (beginning-of-line) - (let ((current-line (buffer-substring (point) - (progn (end-of-line) (point))))) + (let ((current-line (buffer-substring (point) (line-end-position)))) (if (eobp) (progn (if (not subprocess-running) @@ -129,15 +123,16 @@ line to the last line for resubmission." (progn (beginning-of-line) (insert command-prefix-string))) (next-line 1)))) ;; else -- if not at last line in buffer - (end-of-buffer) + (goto-char (point-max)) (backward-char) (next-line 1) - (if (string-equal command-prefix-string - (substring current-line 0 (length command-prefix-string))) - (insert (substring current-line (length command-prefix-string))) - (insert current-line))))) + (insert + (if (compare-strings command-prefix-string nil nil + current-line 0 (length command-prefix-string)) + (substring current-line (length command-prefix-string)) + current-line))))) -(defun command-kill-line() +(defun command-kill-line () "Kills the current line. Used in command mode." (interactive) (beginning-of-line) @@ -145,5 +140,5 @@ line to the last line for resubmission." (define-key esc-map "$" 'subprocess-command) -;;; arch-tag: 600b2512-f903-4887-bcd2-e76b306f5b66 +;; arch-tag: 600b2512-f903-4887-bcd2-e76b306f5b66 ;;; vmsproc.el ends here |