diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/authors.el | 27 | ||||
| -rw-r--r-- | lisp/emacs-lisp/copyright.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 21 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 20 | ||||
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 6 |
6 files changed, 51 insertions, 30 deletions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 5ab42c06e8e..8eb177dd9ca 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -41,7 +41,6 @@ files.") (defconst authors-aliases '( - ("Andrew Innes" "Andrw Innes") ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc." "Barry A. Warsaw, ITB" "Barry Warsaw") ("Bj,Av(Brn Torkelsson" "Bjorn Torkelsson") @@ -57,7 +56,7 @@ files.") ("Edward M. Reingold" "Ed Reingold" "Edward M Reingold" "Reingold Edward M") ("Eli Zaretskii" "eliz") -; ("Emilio C. Lopes" "Emilio Lopes") + ("Emilio C. Lopes" "Emilio Lopes") ("Era Eriksson" "Era@Iki.Fi") ("Eric M. Ludlam" "Eric Ludlam") ("Eric S. Raymond" "Eric Raymond") @@ -79,8 +78,10 @@ files.") ("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams") ("J,Ai(Br,At(Bme Marant" "J,bi(Br,bt(Bme Marant" "Jerome Marant") ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen") + ("John W. Eaton" "John Eaton") ("Jonathan I. Kamens" "Jonathan Kamens") ("Joseph Arceneaux" "Joe Arceneaux") + ("Juan Le,As(Bn Lahoz Garc,Am(Ba" "Juan-Leon Lahoz Garcia") ("K. Shane Hartman" "Shane Hartman") ("Kai Gro,A_(Bjohann" "Kai Grossjohann" "Kai Gro,b_(Bjohann" "Kai.Grossjohann@Cs.Uni-Dortmund.De" @@ -89,14 +90,17 @@ files.") ("Kazushi Marukawa" "Kazushi") ("Ken Manheimer" "Kenneth Manheimer") ("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA") + ("Kevin Greiner" "Kevin J. Greiner") ("Kim F. Storm" "Kim Storm") ("Kyle Jones" "Kyle E. Jones") ("Marcus G. Daniels" "Marcus Daniels") ("Mark D. Baushke" "Mark D Baushke") ("Martin Lorentzon" "Martin Lorentzson") ("Matt Swift" "Matthew Swift") + ("Michael R. Mauger" "Michael Mauger") ("Michael D. Ernst" "Michael Ernst") ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, P/Bsg") + ("Mikio Nakajima" "Nakajima Mikio") ("Paul Eggert" "eggert") ("Paul Reilly" "(pmr@legacy.pajato.com)") ("Pavel Jan,Bm(Bk" "Pavel Jan,Am(Bk Ml." "Pavel Jan,Am(Bk" "Pavel@Janik.Cz") @@ -114,6 +118,7 @@ files.") ("Stephen A. Wood" "(saw@cebaf.gov)") ("Steven L. Baur" "SL Baur" "Steven L Baur") ("Takaaki Ota" "Tak Ota") + ("Takahashi Naoto" "Naoto Takahashi") ("Teodor Zlatanov" "Ted Zlatanov") ("Torbj,Av(Brn Axelsson" "Torbjvrn Axelsson") ("Torbj,Av(Brn Einarsson" "Torbj.*rn Einarsson") @@ -152,6 +157,13 @@ If REALNAME is nil, ignore that author.") Changes to files matching one of the regexps in this list are not listed.") +(defconst authors-ignored-files + '("external-lisp" + "lock" "share-lib" "local-lisp" + "noleim-Makefile.in" + "NEWS" "PROBLEMS" "FAQ") + "List of files and directories to ignore. +Changes to files in this list are not listed.") (defconst authors-fixed-entries '(("Richard M. Stallman" :wrote "[The original GNU emacs and numerous files]") @@ -184,7 +196,7 @@ listed.") "mem-limits.h" "process.c" "template.h" "sysdep.c" "syssignal.h" "systty.h" "unexec.c" "ymakefile" "linux.h") ("Kyle E. Jones" :wrote "mldrag.el") - ("Kenry Kautz" :wrote "bib-mode.el") + ("Henry Kautz" :wrote "bib-mode.el") ("Joseph M. Kelsey" :changed "fileio.c" "vms-pwd.h" "vmsfns.c" "dir.h" "uaf.h") ("Sam Kendall" :changed "etags.c" "etags.el") @@ -260,7 +272,8 @@ listed.") (defconst authors-valid-file-names '("aclocal.m4" - "makedist.bat") + "makedist.bat" + "make-delta") "File names which are valid, but no longer exists (or cannot be found) in the repository.") @@ -274,6 +287,9 @@ found) in the repository.") ("s/windowsnt.h" . "s/ms-w32.h") ("config.emacs" . "configure") ("GETTING.GNU.SOFTWARE" . "FTP") + ("leim-Makefile" . "leim/Makefile") + ("leim-Makefile.in" . "leim/Makefile.in") + ("INSTALL-CVS" . "INSTALL.CVS") ) "Alist of files which have been renamed during their lifetime. Elements are (OLDNAME . NEWNAME).") @@ -372,7 +388,8 @@ from `authors-obsolete-files-regexps'." ACTION is a keyword symbol describing what he did. Record file, author and what he did in hash table TABLE. See the description of `authors-scan-change-log' for the structure of the hash table." - (unless (or (authors-obsolete-file-p file) + (unless (or (member file authors-ignored-files) + (authors-obsolete-file-p file) (equal author "")) (let* ((value (gethash author table)) (entry (assoc file value)) diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index a37dfac9e9a..d0ceaa96716 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -110,7 +110,7 @@ When this is `function', only ask when called non-interactively." (concat "Add " copyright-current-year " to copyright? ")))) (if replace - (replace-match copyright-current-year t t nil 1) + (replace-match copyright-current-year t t nil 2) (let ((size (save-excursion (skip-chars-backward "0-9")))) (if (and (eq (% (- (string-to-number copyright-current-year) (string-to-number (buffer-substring diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index a96b1741139..01935c9d5e8 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -94,8 +94,11 @@ BODY contains code that will be executed each time the mode is (dis)activated. These following keyword arguments are supported (other keywords will be passed to `defcustom' if the minor mode is global): :group GROUP Custom group name to use in all generated `defcustom' forms. + Defaults to MODE without the possible trailing \"-mode\". + (This default may not be a valid customization group defined + with `defgroup'. Make sure it is.) :global GLOBAL If non-nil specifies that the minor mode is not meant to be - buffer-local, so don't make the variable MODE buffer-local. + buffer-local, so don't make the variable MODE buffer-local. By default, the mode is buffer-local. :init-value VAL Same as the INIT-VALUE argument. :lighter SPEC Same as the LIGHTER argument. @@ -153,10 +156,9 @@ For example, you could write (unless group ;; We might as well provide a best-guess default group. (setq group - `(:group (or (custom-current-group) - ',(intern (replace-regexp-in-string - "-mode\\'" "" mode-name)))))) - + `(:group ',(intern (replace-regexp-in-string + "-mode\\'" "" mode-name))))) + `(progn ;; Define the variable to enable or disable the mode. ,(if (not globalp) @@ -220,8 +222,8 @@ With zero or negative ARG turn mode off. ;; Return the new setting. ,mode) - ;; Autoloading an easy-mmode-define-minor-mode autoloads - ;; everything up-to-here. + ;; Autoloading a define-minor-mode autoloads everything + ;; up-to-here. :autoload-end ;; The toggle's hook. @@ -280,9 +282,8 @@ KEYS is a list of CL-style keyword arguments: (unless group ;; We might as well provide a best-guess default group. (setq group - `(:group (or (custom-current-group) - ',(intern (replace-regexp-in-string - "-mode\\'" "" (symbol-name mode))))))) + `(:group ',(intern (replace-regexp-in-string + "-mode\\'" "" (symbol-name mode)))))) `(progn ;; The actual global minor-mode diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index bc868759d92..f31dafb7b11 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -1,6 +1,7 @@ ;;; eldoc.el --- show function arglist or variable docstring in echo area -;; Copyright (C) 1996, 97, 98, 99, 2000, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2005 +;; Free Software Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com> ;; Maintainer: friedman@splode.com @@ -150,7 +151,7 @@ If point is over a documented variable, print that variable's docstring instead. With prefix ARG, turn ElDoc mode on if and only if ARG is positive." - nil eldoc-minor-mode-string nil + :group 'eldoc :lighter eldoc-minor-mode-string (setq eldoc-last-message nil) (if eldoc-mode (progn diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index d0a2fdc01da..f9442bc0084 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -31,18 +31,16 @@ ;; Note that this variable is used by non-lisp modes too. (defcustom defun-prompt-regexp nil - "*If non-nil, a regexp to ignore before the character that starts a defun. + "*If non-nil, a regexp to ignore before a defun. This is only necessary if the opening paren or brace is not in column 0. -See function `beginning-of-defun'. - -Setting this variable automatically makes it local to the current buffer." +See function `beginning-of-defun'." :type '(choice (const nil) regexp) :group 'lisp) (make-variable-buffer-local 'defun-prompt-regexp) (defcustom parens-require-spaces t - "Non-nil means `insert-parentheses' should insert whitespace as needed." + "If non-nil, `insert-parentheses' inserts whitespace as needed." :type 'boolean :group 'lisp) @@ -74,7 +72,7 @@ move forward across N balanced expressions." The place mark goes is the same place \\[forward-sexp] would move to with the same argument. Interactively, if this command is repeated -or (in Transient Mark mode) if the mark is active, +or (in Transient Mark mode) if the mark is active, it marks the next ARG sexps after the ones already marked." (interactive "P\np") (cond ((and allow-extend @@ -233,13 +231,14 @@ recipe (see `end-of-defun'). Major modes can define this if the normal method is not appropriate.") (defun buffer-end (arg) - "Return the \"far end\" position of the buffer, moving in direction ARG. + "Return the \"far end\" position of the buffer, in direction ARG. If ARG is positive, that's the end of the buffer. Otherwise, that's the beginning of the buffer." (if (> arg 0) (point-max) (point-min))) (defun end-of-defun (&optional arg) - "Move forward to next end of defun. With argument, do it that many times. + "Move forward to next end of defun. +With argument, do it that many times. Negative argument -N means move back to Nth preceding end of defun. An end of a defun occurs right after the close-parenthesis that @@ -299,7 +298,7 @@ is called as a function to find the defun's end." The defun marked is the one that contains point or follows point. Interactively, if this command is repeated -or (in Transient Mark mode) if the mark is active, +or (in Transient Mark mode) if the mark is active, it marks the next defun after the ones already marked." (interactive "p") (cond ((and allow-extend @@ -424,7 +423,8 @@ character is inserted ARG times." (prefix-numeric-value arg)))) (defun insert-parentheses (&optional arg) - "Enclose following ARG sexps in parentheses. Leave point after open-paren. + "Enclose following ARG sexps in parentheses. +Leave point after open-paren. A negative ARG encloses the preceding ARG sexps instead. No argument is equivalent to zero: just insert `()' and leave point between. If `parens-require-spaces' is non-nil, this command also inserts a space diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index d26a0ae5f38..1c8d12fef0e 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -1,6 +1,6 @@ ;;; re-builder.el --- building Regexps with visual feedback -;; Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. ;; Author: Detlev Zundel <dzu@gnu.org> ;; Keywords: matching, lisp, tools @@ -177,7 +177,9 @@ Set it to nil if you don't want limits here." :group 're-builder) (defface reb-match-3 - '((((class color) (background light)) + '((((min-colors 88) (class color) (background light)) + :background "yellow1") + (((class color) (background light)) :background "yellow") (((class color) (background dark)) :background "sienna4") |