aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2001-05-31 14:34:37 +0000
committerStefan Monnier2001-05-31 14:34:37 +0000
commit1ea98518d8922e3f9b3c7cb08c2a710e4fb63fa1 (patch)
treef36b6f90037cc67ee6cccdf922f0f60a9821854f
parent0894672ffabccfea2ddeb2d01bb27d12c4853191 (diff)
downloademacs-1ea98518d8922e3f9b3c7cb08c2a710e4fb63fa1.tar.gz
emacs-1ea98518d8922e3f9b3c7cb08c2a710e4fb63fa1.zip
(tags-compression-info-list): Fix docstring
and :type spec.
-rw-r--r--lisp/ChangeLog24
-rw-r--r--lisp/progmodes/etags.el46
2 files changed, 37 insertions, 33 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cbff1279a2..e74655cee59 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
12001-05-31 Stefan Monnier <monnier@cs.yale.edu>
2
3 * progmodes/etags.el (tags-compression-info-list): Fix docstring
4 and :type spec.
5
12001-05-31 Gerd Moellmann <gerd@gnu.org> 62001-05-31 Gerd Moellmann <gerd@gnu.org>
2 7
3 * international/mule-cmds.el (inactivate-input-method): Set 8 * international/mule-cmds.el (inactivate-input-method):
4 input-method-function to nil. 9 Set input-method-function to nil.
5 10
6 * xml.el (xml-parse-tag): The document may contain invalid characters. 11 * xml.el (xml-parse-tag): The document may contain invalid characters.
7 From ShengHuo ZHU <zsh@cs.rochester.edu> 12 From ShengHuo ZHU <zsh@cs.rochester.edu>
@@ -9,14 +14,13 @@
92001-05-31 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp> 142001-05-31 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
10 15
11 * mail/rmailsum.el (rmail-message-subject-p): Don't call 16 * mail/rmailsum.el (rmail-message-subject-p): Don't call
12 `rmail-summary-line-decoder' if the message does not have Subject: 17 `rmail-summary-line-decoder' if the message does not have
13 field. 18 a Subject: field.
14 19
15 * mail/rmail.el (rmail-revert): Modify to work in 20 * mail/rmail.el (rmail-revert): Modify to work in rmail-view-buffer.
16 rmail-view-buffer.
17 21
18 * mail/rmail.el (rmail-insert-mime-resent-message-function): New 22 * mail/rmail.el (rmail-insert-mime-resent-message-function):
19 variable. 23 New variable.
20 (rmail-resend): Modify to work in `rmail-view-buffer'; call 24 (rmail-resend): Modify to work in `rmail-view-buffer'; call
21 `rmail-insert-mime-resent-message-function' if `rmail-enable-mime' 25 `rmail-insert-mime-resent-message-function' if `rmail-enable-mime'
22 is non-nil. 26 is non-nil.
@@ -36,8 +40,8 @@
36 40
372001-05-29 Gerd Moellmann <gerd@gnu.org> 412001-05-29 Gerd Moellmann <gerd@gnu.org>
38 42
39 * international/utf-8.el (ccl-decode-mule-utf-8): Handle 43 * international/utf-8.el (ccl-decode-mule-utf-8): Handle invalid
40 invalid UTF-8 sequences. 44 UTF-8 sequences.
41 45
422001-05-28 Miles Bader <miles@gnu.org> 462001-05-28 Miles Bader <miles@gnu.org>
43 47
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 5efd54a9867..8731bb5a896 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -69,19 +69,19 @@ Use the `etags' program to make a tags table file."
69 "*List of extensions tried by etags when jka-compr is used. 69 "*List of extensions tried by etags when jka-compr is used.
70An empty string means search the non-compressed file. 70An empty string means search the non-compressed file.
71These extensions will be tried only if jka-compr was activated 71These extensions will be tried only if jka-compr was activated
72(i.e. via customize of auto-compression-mode or by calling the function 72\(i.e. via customize of `auto-compression-mode' or by calling the function
73auto-compression-mode)." 73`auto-compression-mode')."
74 :type 'sexp ;;; what should be put here to have a list of strings ? 74 :type '(repeat string)
75 :group 'etags) 75 :group 'etags)
76 76
77;;; !!! tags-compression-info-list should probably be replaced by access 77;; !!! tags-compression-info-list should probably be replaced by access
78;;; to directory list and matching jka-compr-compression-info-list. Currently, 78;; to directory list and matching jka-compr-compression-info-list. Currently,
79;;; this implementation forces each modification of 79;; this implementation forces each modification of
80;;; jka-compr-compression-info-list to be reflected in this var. 80;; jka-compr-compression-info-list to be reflected in this var.
81;;; An alternative could be to say that introducing a special 81;; An alternative could be to say that introducing a special
82;;; element in this list (e.g. t) means : try at this point 82;; element in this list (e.g. t) means : try at this point
83;;; using directory listing and regexp matching using 83;; using directory listing and regexp matching using
84;;; jka-compr-compression-info-list. 84;; jka-compr-compression-info-list.
85 85
86 86
87;;;###autoload 87;;;###autoload
@@ -1503,25 +1503,25 @@ where they were found."
1503 (save-excursion (backward-char (length tag)) 1503 (save-excursion (backward-char (length tag))
1504 (looking-at "\\b")))) 1504 (looking-at "\\b"))))
1505 1505
1506;;; exact file name match, i.e. searched tag must match complete file 1506;; exact file name match, i.e. searched tag must match complete file
1507;;; name including directories parts if there are some. 1507;; name including directories parts if there are some.
1508(defun tag-exact-file-name-match-p (tag) 1508(defun tag-exact-file-name-match-p (tag)
1509 (and (looking-at ",") 1509 (and (looking-at ",")
1510 (save-excursion (backward-char (+ 2 (length tag))) 1510 (save-excursion (backward-char (+ 2 (length tag)))
1511 (looking-at "\f\n")))) 1511 (looking-at "\f\n"))))
1512;;; file name match as above, but searched tag must match the file 1512;; file name match as above, but searched tag must match the file
1513;;; name not including the directories if there are some. 1513;; name not including the directories if there are some.
1514(defun tag-file-name-match-p (tag) 1514(defun tag-file-name-match-p (tag)
1515 (and (looking-at ",") 1515 (and (looking-at ",")
1516 (save-excursion (backward-char (1+ (length tag))) 1516 (save-excursion (backward-char (1+ (length tag)))
1517 (looking-at "/")))) 1517 (looking-at "/"))))
1518;;; this / to detect we are after a directory separator is ok for unix, 1518;; this / to detect we are after a directory separator is ok for unix,
1519;;; is there a variable that contains the regexp for directory separator 1519;; is there a variable that contains the regexp for directory separator
1520;;; on whatever operating system ? 1520;; on whatever operating system ?
1521;;; Looks like ms-win will lose here :). 1521;; Looks like ms-win will lose here :).
1522 1522
1523;;; partial file name match, i.e. searched tag must match a substring 1523;; partial file name match, i.e. searched tag must match a substring
1524;;; of the file name (potentially including a directory separator). 1524;; of the file name (potentially including a directory separator).
1525(defun tag-partial-file-name-match-p (tag) 1525(defun tag-partial-file-name-match-p (tag)
1526 (and (looking-at ".*,") 1526 (and (looking-at ".*,")
1527 (save-excursion (beginning-of-line) 1527 (save-excursion (beginning-of-line)
@@ -1802,7 +1802,7 @@ directory specification."
1802 (setq buffer-read-only t) 1802 (setq buffer-read-only t)
1803 (apropos-mode))) 1803 (apropos-mode)))
1804 1804
1805;;; XXX Kludge interface. 1805;; XXX Kludge interface.
1806 1806
1807;; XXX If a file is in multiple tables, selection may get the wrong one. 1807;; XXX If a file is in multiple tables, selection may get the wrong one.
1808;;;###autoload 1808;;;###autoload
@@ -1890,7 +1890,7 @@ see the doc of that variable if you want to add names to the list."
1890 (interactive) 1890 (interactive)
1891 (quit-window t (selected-window))) 1891 (quit-window t (selected-window)))
1892 1892
1893;;; Note, there is another definition of this function in bindings.el. 1893;; Note, there is another definition of this function in bindings.el.
1894;;;###autoload 1894;;;###autoload
1895(defun complete-tag () 1895(defun complete-tag ()
1896 "Perform tags completion on the text around point. 1896 "Perform tags completion on the text around point.