HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2011 to FSF/AIST copyright years.
[bpt/emacs.git]
/
lisp
/
emacs-lisp
/
lisp-mnt.el
diff --git
a/lisp/emacs-lisp/lisp-mnt.el
b/lisp/emacs-lisp/lisp-mnt.el
index
ce0bc2c
..
9e1e267
100644
(file)
--- a/
lisp/emacs-lisp/lisp-mnt.el
+++ b/
lisp/emacs-lisp/lisp-mnt.el
@@
-1,7
+1,7
@@
;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers
;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2002, 2003, 2004,
;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers
;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008
, 2009, 2010, 2011
Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: FSF
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: FSF
@@
-11,10
+11,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-22,9
+22,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-37,7
+35,8
@@
;; Another entry point automatically addresses bug mail to a package's
;; maintainer or author.
;; Another entry point automatically addresses bug mail to a package's
;; maintainer or author.
-;; This file can be loaded by your lisp-mode-hook. Have it (require 'lisp-mnt)
+;; This file can be loaded by your emacs-lisp-mode-hook. Have it
+;; (require 'lisp-mnt)
;; This file is an example of the header conventions. Note the following
;; features:
;; This file is an example of the header conventions. Note the following
;; features:
@@
-76,8
+75,7
@@
;;
;; * Maintainer line --- should be a single name/address as in the Author
;; line, or an address only, or the string "FSF". If there is no maintainer
;;
;; * Maintainer line --- should be a single name/address as in the Author
;; line, or an address only, or the string "FSF". If there is no maintainer
-;; line, the person(s) in the Author field are presumed to be it. The example
-;; in this file is mildly bogus because the maintainer line is redundant.
+;; line, the person(s) in the Author field are presumed to be it.
;; The idea behind these two fields is to be able to write a Lisp function
;; that does "send mail to the author" without having to mine the name out by
;; hand. Please be careful about surrounding the network address with <> if
;; The idea behind these two fields is to be able to write a Lisp function
;; that does "send mail to the author" without having to mine the name out by
;; hand. Please be careful about surrounding the network address with <> if
@@
-95,8
+93,8
@@
;; package for the distribution. (This file doesn't have one because the
;; author *is* one of the maintainers.)
;;
;; package for the distribution. (This file doesn't have one because the
;; author *is* one of the maintainers.)
;;
-;; * Keywords line --- used by the finder code
(now under construction)
-;;
for finding Emacs
Lisp code related to a topic.
+;; * Keywords line --- used by the finder code
for finding Emacs
+;; Lisp code related to a topic.
;;
;; * X-Bogus-Bureaucratic-Cruft line --- this is a joke and an example
;; of a comment header. Headers starting with `X-' should never be used
;;
;; * X-Bogus-Bureaucratic-Cruft line --- this is a joke and an example
;; of a comment header. Headers starting with `X-' should never be used
@@
-305,12
+303,12
@@
If FILE is nil, execute BODY in the current buffer."
(if ,filesym
(with-temp-buffer
(insert-file-contents ,filesym)
(if ,filesym
(with-temp-buffer
(insert-file-contents ,filesym)
- (lisp-mode)
+ (
emacs-
lisp-mode)
,@body)
(save-excursion
;; Switching major modes is too drastic, so just switch
,@body)
(save-excursion
;; Switching major modes is too drastic, so just switch
- ;; temporarily to the Lisp mode syntax table.
- (with-syntax-table lisp-mode-syntax-table
+ ;; temporarily to the
Emacs
Lisp mode syntax table.
+ (with-syntax-table
emacs-
lisp-mode-syntax-table
,@body))))))
(put 'lm-with-file 'lisp-indent-function 1)
,@body))))))
(put 'lm-with-file 'lisp-indent-function 1)
@@
-447,16
+445,20
@@
This can be found in an RCS or SCCS header."
(match-string-no-properties 1)))))))
(defun lm-keywords (&optional file)
(match-string-no-properties 1)))))))
(defun lm-keywords (&optional file)
- "Return the keywords given in file FILE, or current buffer if FILE is nil."
+ "Return the keywords given in file FILE, or current buffer if FILE is nil.
+The return is a `downcase'-ed string, or nil if no keywords
+header. Multi-line keywords are joined up with a space between
+each line."
(lm-with-file file
(lm-with-file file
- (let ((keywords (lm-header "keywords")))
- (and keywords (downcase keywords)))))
+ (let ((keywords (lm-header-multiline "keywords")))
+ (and keywords
+ (mapconcat 'downcase keywords " ")))))
(defun lm-keywords-list (&optional file)
"Return list of keywords given in file FILE."
(let ((keywords (lm-keywords file)))
(if keywords
(defun lm-keywords-list (&optional file)
"Return list of keywords given in file FILE."
(let ((keywords (lm-keywords file)))
(if keywords
- (split-string keywords "
,?[ \t]"
))))
+ (split-string keywords "
[, \t\n]+" t
))))
(defvar finder-known-keywords)
(defun lm-keywords-finder-p (&optional file)
(defvar finder-known-keywords)
(defun lm-keywords-finder-p (&optional file)
@@
-585,12
+587,12
@@
which do not include a recognizable synopsis."
(let ((must-kill (and file (not (get-file-buffer file)))))
(when file (find-file file))
(prog1
(let ((must-kill (and file (not (get-file-buffer file)))))
(when file (find-file file))
(prog1
- (if (
interactive-p
)
+ (if (
called-interactively-p 'interactive
)
(message "%s" (lm-summary))
(lm-summary))
(when must-kill (kill-buffer (current-buffer))))))))
(message "%s" (lm-summary))
(lm-summary))
(when must-kill (kill-buffer (current-buffer))))))))
-(
eval-when-compile (defvar report-emacs-bug-address)
)
+(
defvar report-emacs-bug-address
)
(defun lm-report-bug (topic)
"Report a bug in the package currently being visited to its maintainer.
(defun lm-report-bug (topic)
"Report a bug in the package currently being visited to its maintainer.
@@
-614,5
+616,5
@@
Prompts for bug subject TOPIC. Leaves you in a mail buffer."
(provide 'lisp-mnt)
(provide 'lisp-mnt)
-;;
;
arch-tag: fa3c5ab4-a37b-4e46-b7cf-b6d78b90e69e
+;; arch-tag: fa3c5ab4-a37b-4e46-b7cf-b6d78b90e69e
;;; lisp-mnt.el ends here
;;; lisp-mnt.el ends here