From 9ee2d9f92a9097c468fb4e938a14b2f569feb453 Mon Sep 17 00:00:00 2001 From: Elias Oltmanns Date: Thu, 29 Jan 2015 01:20:00 +0000 Subject: [PATCH 001/457] [Backport] lisp/gnus/nnimap.el (nnimap-find-expired-articles): nnimap `never' expiration fix --- lisp/gnus/ChangeLog | 7 ++++++- lisp/gnus/nnimap.el | 27 ++++++++++++++------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2bdbfcc5c23..d0a68b7f0ce 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,10 +1,15 @@ +2015-01-28 Elias Oltmanns + + * nnimap.el (nnimap-find-expired-articles): Fix handling of + (expiry-wait . never). + 2014-12-19 Andreas Schwab * gnus-group.el (gnus-read-ephemeral-bug-group): Bind coding-system-for-read and coding-system-for-write only around with-temp-file, and make buffer unibyte. Don't write temp file twice. -2014-11-26 John Mastro (tiny change) +2014-11-26 John Mastro (tiny change) * auth-source.el (auth-source-macos-keychain-search-items): Return result of `auth-source-macos-keychain-result-append' (bug#19074). diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 8ed5143b243..199cf4eb740 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -979,19 +979,20 @@ textual parts.") (defun nnimap-find-expired-articles (group) (let ((cutoff (nnmail-expired-article-p group nil nil))) - (with-current-buffer (nnimap-buffer) - (let ((result - (nnimap-command - "UID SEARCH SENTBEFORE %s" - (format-time-string - (format "%%d-%s-%%Y" - (upcase - (car (rassoc (nth 4 (decode-time cutoff)) - parse-time-months)))) - cutoff)))) - (and (car result) - (delete 0 (mapcar #'string-to-number - (cdr (assoc "SEARCH" (cdr result)))))))))) + (when cutoff + (with-current-buffer (nnimap-buffer) + (let ((result + (nnimap-command + "UID SEARCH SENTBEFORE %s" + (format-time-string + (format "%%d-%s-%%Y" + (upcase + (car (rassoc (nth 4 (decode-time cutoff)) + parse-time-months)))) + cutoff)))) + (and (car result) + (delete 0 (mapcar #'string-to-number + (cdr (assoc "SEARCH" (cdr result))))))))))) (defun nnimap-find-article-by-message-id (group server message-id From 7779da6fc1ff3628e1b754a5bef898d8fbdb4b7b Mon Sep 17 00:00:00 2001 From: Elias Oltmanns Date: Thu, 29 Jan 2015 01:41:44 +0000 Subject: [PATCH 002/457] lisp/gnus/nimap.el (nnimap-find-expired-articles): nnimap `never' expiration fix --- lisp/gnus/nnimap.el | 1 - 1 file changed, 1 deletion(-) diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 199cf4eb740..a2dd38fafb9 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -994,7 +994,6 @@ textual parts.") (delete 0 (mapcar #'string-to-number (cdr (assoc "SEARCH" (cdr result))))))))))) - (defun nnimap-find-article-by-message-id (group server message-id &optional limit) "Search for message with MESSAGE-ID in GROUP from SERVER. From 972282f3bdb12188193e453aa470591d7d52cb7e Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 29 Jan 2015 02:22:34 +0000 Subject: [PATCH 003/457] [Backport] lisp/gnus/message.el (message-smtpmail-send-it): Make non-standard mail header separators work with smtpmail --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/message.el | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index d0a68b7f0ce..592f34d6fbf 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-01-29 Lars Ingebrigtsen + + * message.el (message-smtpmail-send-it): Remove the mail header + separator before sending. + 2015-01-28 Elias Oltmanns * nnimap.el (nnimap-find-expired-articles): Fix handling of diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index c37b9397529..646aa8ffeee 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4828,6 +4828,11 @@ evaluates `message-send-mail-hook' just before sending a message. It is useful if your ISP requires the POP-before-SMTP authentication. See the Gnus manual for details." (run-hooks 'message-send-mail-hook) + ;; Change header-delimiter to be what smtpmail expects. + (goto-char (point-min)) + (when (re-search-forward + (concat "^" (regexp-quote mail-header-separator) "\n")) + (replace-match "\n")) (smtpmail-send-it)) (defun message-send-mail-with-mailclient () From c96c93fad1bc0c15a6e680ac38c2cbc56e55bed9 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 29 Jan 2015 02:28:18 +0000 Subject: [PATCH 004/457] [Backport] lisp/gnus/message.el (message-smtpmail-send-it): Make non-standard mail header separators work with smtpmail --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/message.el | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index d0a68b7f0ce..592f34d6fbf 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-01-29 Lars Ingebrigtsen + + * message.el (message-smtpmail-send-it): Remove the mail header + separator before sending. + 2015-01-28 Elias Oltmanns * nnimap.el (nnimap-find-expired-articles): Fix handling of diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index c37b9397529..646aa8ffeee 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4828,6 +4828,11 @@ evaluates `message-send-mail-hook' just before sending a message. It is useful if your ISP requires the POP-before-SMTP authentication. See the Gnus manual for details." (run-hooks 'message-send-mail-hook) + ;; Change header-delimiter to be what smtpmail expects. + (goto-char (point-min)) + (when (re-search-forward + (concat "^" (regexp-quote mail-header-separator) "\n")) + (replace-match "\n")) (smtpmail-send-it)) (defun message-send-mail-with-mailclient () From c4c447d8cca960513428eb3cfde73adca627d566 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Thu, 29 Jan 2015 15:51:40 +0100 Subject: [PATCH 005/457] Restore XEmacs compatibility * textmodes/reftex-vars.el (featurep): Conditionalize value of reftex-label-regexps in order to stay compatible with XEmacs 25 which has no explicitly numbered groups in regexps (bug#19714). --- lisp/ChangeLog | 6 ++++++ lisp/textmodes/reftex-vars.el | 32 ++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2c852f9a40a..2811556c71c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-01-29 Tassilo Horn + + * textmodes/reftex-vars.el (featurep): Conditionalize value of + reftex-label-regexps in order to stay compatible with XEmacs 25 + which has no explicitly numbered groups in regexps (bug#19714). + 2015-01-28 Tassilo Horn * textmodes/reftex.el (reftex-syntax-table-for-bib): Give ( and ) diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 115c1e0cde4..96d76fb011b 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -866,13 +866,17 @@ DOWNCASE t: Downcase words before using them." (string :tag "")) (option (boolean :tag "Downcase words ")))) -(defcustom reftex-label-regexps - '(;; Normal \\label{foo} labels - "\\\\label{\\(?1:[^}]*\\)}" - ;; keyvals [..., label = {foo}, ...] forms used by ctable, - ;; listings, minted, ... - "\\[[^]]*\\ Date: Thu, 29 Jan 2015 18:51:24 +0200 Subject: [PATCH 006/457] Fix refilling of list of language environments in User Manual (Bug#19697) doc/emacs/mule.texi (Language Environments): Work around refill bug in makeinfo 4.x. --- doc/emacs/ChangeLog | 5 +++ doc/emacs/mule.texi | 86 +++++++++++++++++---------------------------- 2 files changed, 37 insertions(+), 54 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 93ae618d1bc..24d94f95454 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2015-01-29 Eli Zaretskii + + * mule.texi (Language Environments): Work around refill bug in + makeinfo 4.x. (Bug#19697) + 2015-01-26 Eli Zaretskii * cmdargs.texi (Action Arguments): Clarify into which buffer diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index bea06f5ff5a..f8b06bdb5d9 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -265,123 +265,101 @@ the list of supported language environments, and use the command for more information about the language environment @var{lang-env}. Supported language environments include: +@c @cindex entries below are split between portions of the list to +@c make them more accurate, i.e. land on the line that mentions the +@c language. However, makeinfo 4.x doesn't fill inside @quotation +@c lines that follow a @cindex entry and whose text has no whitespace. +@c To work around, we group the language environments together, so +@c that the blank that separates them triggers refill. @quotation @cindex ASCII -ASCII, @cindex Arabic -Arabic, +ASCII, Arabic, @cindex Belarusian -Belarusian, @cindex Bengali -Bengali, +Belarusian, Bengali, @cindex Brazilian Portuguese -Brazilian Portuguese, @cindex Bulgarian -Bulgarian, +Brazilian Portuguese, Bulgarian, @cindex Burmese -Burmese, @cindex Cham -Cham, +Burmese, Cham, @cindex Chinese Chinese-BIG5, Chinese-CNS, Chinese-EUC-TW, Chinese-GB, Chinese-GB18030, Chinese-GBK, @cindex Croatian -Croatian, @cindex Cyrillic -Cyrillic-ALT, Cyrillic-ISO, Cyrillic-KOI8, +Croatian, Cyrillic-ALT, Cyrillic-ISO, Cyrillic-KOI8, @cindex Czech -Czech, @cindex Devanagari -Devanagari, +Czech, Devanagari, @cindex Dutch -Dutch, @cindex English -English, +Dutch, English, @cindex Esperanto -Esperanto, @cindex Ethiopic -Ethiopic, +Esperanto, Ethiopic, @cindex French -French, @cindex Georgian -Georgian, +French, Georgian, @cindex German -German, @cindex Greek -Greek, @cindex Gujarati -Gujarati, +German, Greek, Gujarati, @cindex Hebrew -Hebrew, @cindex IPA -IPA, +Hebrew, IPA, @cindex Italian Italian, @cindex Japanese -Japanese, @cindex Kannada -Kannada, +Japanese, Kannada, @cindex Khmer -Khmer, @cindex Korean -Korean, @cindex Lao -Lao, +Khmer, Korean, Lao, @cindex Latin Latin-1, Latin-2, Latin-3, Latin-4, Latin-5, Latin-6, Latin-7, Latin-8, Latin-9, @cindex Latvian -Latvian, @cindex Lithuanian -Lithuanian, +Latvian, Lithuanian, @cindex Malayalam -Malayalam, @cindex Oriya -Oriya, +Malayalam, Oriya, @cindex Persian -Persian, @cindex Polish -Polish, +Persian, Polish, @cindex Punjabi -Punjabi, @cindex Romanian -Romanian, +Punjabi, Romanian, @cindex Russian -Russian, @cindex Sinhala -Sinhala, +Russian, Sinhala, @cindex Slovak -Slovak, @cindex Slovenian -Slovenian, @cindex Spanish -Spanish, +Slovak, Slovenian, Spanish, @cindex Swedish -Swedish, @cindex TaiViet -TaiViet, +Swedish, TaiViet, @cindex Tajik -Tajik, @cindex Tamil -Tamil, +Tajik, Tamil, @cindex Telugu -Telugu, @cindex Thai -Thai, +Telugu, Thai, @cindex Tibetan -Tibetan, @cindex Turkish -Turkish, +Tibetan, Turkish, @cindex UTF-8 -UTF-8, @cindex Ukrainian -Ukrainian, +UTF-8, Ukrainian, @cindex Vietnamese -Vietnamese, @cindex Welsh -Welsh, and +Vietnamese, Welsh, @cindex Windows-1255 -Windows-1255. +and Windows-1255. @end quotation To display the script(s) used by your language environment on a From 989fb32064c890dd6df4aa77da5394e655af6f51 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 29 Jan 2015 20:43:08 +0200 Subject: [PATCH 007/457] Improve solution of bug #19701 src/w32.c (sys_readdir): Map ERROR_NOT_READY (as in "device not ready") to ENOENT. --- src/ChangeLog | 5 +++++ src/w32.c | 1 + 2 files changed, 6 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index dc495089739..08779405acb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-01-29 Eli Zaretskii + + * w32.c (sys_readdir): Map ERROR_NOT_READY (as in "device not + ready") to ENOENT. + 2015-01-28 Eli Zaretskii * dired.c (directory_files_internal, file_name_completion) diff --git a/src/w32.c b/src/w32.c index 2faa742f9d7..f8284f3e4cc 100644 --- a/src/w32.c +++ b/src/w32.c @@ -3454,6 +3454,7 @@ sys_readdir (DIR *dirp) break; case ERROR_PATH_NOT_FOUND: case ERROR_INVALID_DRIVE: + case ERROR_NOT_READY: case ERROR_BAD_NETPATH: case ERROR_BAD_NET_NAME: errno = ENOENT; From b28c97942e29eb193951e56b6b8c2b7f21763333 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Thu, 29 Jan 2015 20:28:16 +0100 Subject: [PATCH 008/457] Fix XEmacs version typo in comment and ChangeLog --- lisp/ChangeLog | 2 +- lisp/textmodes/reftex-vars.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2811556c71c..0d0f7aa2f9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,7 @@ 2015-01-29 Tassilo Horn * textmodes/reftex-vars.el (featurep): Conditionalize value of - reftex-label-regexps in order to stay compatible with XEmacs 25 + reftex-label-regexps in order to stay compatible with XEmacs 21.5 which has no explicitly numbered groups in regexps (bug#19714). 2015-01-28 Tassilo Horn diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 96d76fb011b..b471707e7ba 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -867,8 +867,8 @@ DOWNCASE t: Downcase words before using them." (option (boolean :tag "Downcase words ")))) (if (featurep 'xemacs) - ;; XEmacs 25 doesn't have explicitly numbered matching groups, so - ;; this list mustn't get any more items. + ;; XEmacs 21.5 doesn't have explicitly numbered matching groups, + ;; so this list mustn't get any more items. (defconst reftex-label-regexps '("\\\\label{\\([^}]*\\)}")) (defcustom reftex-label-regexps '(;; Normal \\label{foo} labels From 868df451530c294cff3d4ccb98873626aa8105df Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 29 Jan 2015 21:31:14 +0200 Subject: [PATCH 009/457] Avoid compiler warnings in decode_env_path. src/emacs.c (decode_env_path): Add parentheses around ternary operator to increase readability and pacify compiler warnings. --- src/ChangeLog | 5 +++++ src/emacs.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 08779405acb..949ea741e1d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-01-29 Hans Wennborg (tiny change) + + * emacs.c (decode_env_path): Add parentheses around ternary + operator to increase readability and pacify compiler warnings. + 2015-01-29 Eli Zaretskii * w32.c (sys_readdir): Map ERROR_NOT_READY (as in "device not diff --git a/src/emacs.c b/src/emacs.c index 0b7adbd0967..9b78a70428e 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2300,7 +2300,7 @@ decode_env_path (const char *evarname, const char *defalt, bool empty) p = strchr (path, SEPCHAR); if (!p) p = path + strlen (path); - element = (p - path ? make_unibyte_string (path, p - path) + element = ((p - path) ? make_unibyte_string (path, p - path) : empty_element); if (! NILP (element)) { From 41c3b9241cd78a1eaeb159572b6f4e546b1f8d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Fri, 30 Jan 2015 00:19:55 -0300 Subject: [PATCH 010/457] * lisp/progmodes/python.el (python-indent-context): Respect user indentation after comment. * test/automated/python-tests.el (python-indent-pep8-1) (python-indent-pep8-2, python-indent-pep8-3) (python-indent-after-comment-2): Fix tests. (python-indent-after-comment-3): New test. --- lisp/ChangeLog | 5 ++++ lisp/progmodes/python.el | 40 ++++++++++--------------- test/ChangeLog | 7 +++++ test/automated/python-tests.el | 55 +++++++++++++++++++++++----------- 4 files changed, 66 insertions(+), 41 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0d0f7aa2f9f..20686014bf3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-30 Fabián Ezequiel Gallina + + * progmodes/python.el (python-indent-context): Respect user + indentation after comment. + 2015-01-29 Tassilo Horn * textmodes/reftex-vars.el (featurep): Conditionalize value of diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index d0a83087554..5842be7cf64 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -810,15 +810,6 @@ keyword ;; Beginning of buffer. ((= (line-number-at-pos) 1) (cons :no-indent 0)) - ;; Comment continuation (maybe). - ((save-excursion - (when (and - (or - (python-info-current-line-comment-p) - (python-info-current-line-empty-p)) - (forward-comment -1) - (python-info-current-line-comment-p)) - (cons :after-comment (point))))) ;; Inside a string. ((let ((start (python-syntax-context 'string ppss))) (when start @@ -930,21 +921,22 @@ keyword ((let ((start (python-info-dedenter-statement-p))) (when start (cons :at-dedenter-block-start start)))) - ;; After normal line. - ((let ((start (save-excursion - (back-to-indentation) - (skip-chars-backward " \t\n") - (python-nav-beginning-of-statement) - (point)))) - (when start - (if (save-excursion - (python-util-forward-comment -1) - (python-nav-beginning-of-statement) - (looking-at (python-rx block-ender))) - (cons :after-block-end start) - (cons :after-line start))))) - ;; Default case: do not indent. - (t (cons :no-indent 0)))))) + ;; After normal line, comment or ender (default case). + ((save-excursion + (back-to-indentation) + (skip-chars-backward " \t\n") + (python-nav-beginning-of-statement) + (cons + (cond ((python-info-current-line-comment-p) + :after-comment) + ((save-excursion + (goto-char (line-end-position)) + (python-util-forward-comment -1) + (python-nav-beginning-of-statement) + (looking-at (python-rx block-ender))) + :after-block-end) + (t :after-line)) + (point)))))))) (defun python-indent--calculate-indentation () "Internal implementation of `python-indent-calculate-indentation'. diff --git a/test/ChangeLog b/test/ChangeLog index 62876e9ecae..72e1b854fd9 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2015-01-30 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-indent-pep8-1) + (python-indent-pep8-2, python-indent-pep8-3) + (python-indent-after-comment-2): Fix tests. + (python-indent-after-comment-3): New test. + 2015-01-26 Fabián Ezequiel Gallina * automated/python-tests.el (python-indent-pep8-1) diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el index 5bddfe845ed..4972731d0d2 100644 --- a/test/automated/python-tests.el +++ b/test/automated/python-tests.el @@ -177,7 +177,7 @@ foo = long_function_name(var_one, var_two, (should (eq (car (python-indent-context)) :no-indent)) (should (= (python-indent-calculate-indentation) 0)) (python-tests-look-at "foo = long_function_name(var_one, var_two,") - (should (eq (car (python-indent-context)) :after-line)) + (should (eq (car (python-indent-context)) :after-comment)) (should (= (python-indent-calculate-indentation) 0)) (python-tests-look-at "var_three, var_four)") (should (eq (car (python-indent-context)) :inside-paren)) @@ -195,7 +195,7 @@ def long_function_name( (should (eq (car (python-indent-context)) :no-indent)) (should (= (python-indent-calculate-indentation) 0)) (python-tests-look-at "def long_function_name(") - (should (eq (car (python-indent-context)) :after-line)) + (should (eq (car (python-indent-context)) :after-comment)) (should (= (python-indent-calculate-indentation) 0)) (python-tests-look-at "var_one, var_two, var_three,") (should (eq (car (python-indent-context)) @@ -221,7 +221,7 @@ foo = long_function_name( (should (eq (car (python-indent-context)) :no-indent)) (should (= (python-indent-calculate-indentation) 0)) (python-tests-look-at "foo = long_function_name(") - (should (eq (car (python-indent-context)) :after-line)) + (should (eq (car (python-indent-context)) :after-comment)) (should (= (python-indent-calculate-indentation) 0)) (python-tests-look-at "var_one, var_two,") (should (eq (car (python-indent-context)) :inside-paren-newline-start)) @@ -286,10 +286,10 @@ class Blag(object): def func(arg): # I don't do much return arg - # This comment is badly indented just because. - # But we won't mess with the user in this line. + # This comment is badly indented because the user forced so. + # At this line python.el wont dedent, user is always right. -now_we_do_mess_cause_this_is_not_a_comment = 1 +comment_wins_over_ender = True # yeah, that. " @@ -301,28 +301,49 @@ now_we_do_mess_cause_this_is_not_a_comment = 1 ;; the rules won't apply here. (should (eq (car (python-indent-context)) :after-block-start)) (should (= (python-indent-calculate-indentation) 4)) - (python-tests-look-at "# This comment is badly") + (python-tests-look-at "# This comment is badly indented") (should (eq (car (python-indent-context)) :after-block-end)) - ;; The return keyword moves indentation backwards 4 spaces, but - ;; let's assume this comment was placed there because the user - ;; wanted to (manually adding spaces or whatever). + ;; The return keyword do make indentation lose a level... (should (= (python-indent-calculate-indentation) 0)) - (python-tests-look-at "# but we won't mess") + ;; ...but the current indentation was forced by the user. + (python-tests-look-at "# At this line python.el wont dedent") (should (eq (car (python-indent-context)) :after-comment)) (should (= (python-indent-calculate-indentation) 4)) - ;; Behave the same for blank lines: potentially a comment. + ;; Should behave the same for blank lines: potentially a comment. (forward-line 1) (should (eq (car (python-indent-context)) :after-comment)) (should (= (python-indent-calculate-indentation) 4)) - (python-tests-look-at "now_we_do_mess") - ;; Here is where comment indentation starts to get ignored and - ;; where the user can't freely indent anymore. - (should (eq (car (python-indent-context)) :after-block-end)) - (should (= (python-indent-calculate-indentation) 0)) + (python-tests-look-at "comment_wins_over_ender") + ;; The comment won over the ender because the user said so. + (should (eq (car (python-indent-context)) :after-comment)) + (should (= (python-indent-calculate-indentation) 4)) + ;; The indentation calculated fine for the assignment, but the user + ;; choose to force it back to the first column. Next line should + ;; be aware of that. (python-tests-look-at "# yeah, that.") (should (eq (car (python-indent-context)) :after-line)) (should (= (python-indent-calculate-indentation) 0)))) +(ert-deftest python-indent-after-comment-3 () + "Test after-comment in buggy case." + (python-tests-with-temp-buffer + " +class A(object): + + def something(self, arg): + if True: + return arg + + # A comment + + @adecorator + def method(self, a, b): + pass +" + (python-tests-look-at "@adecorator") + (should (eq (car (python-indent-context)) :after-comment)) + (should (= (python-indent-calculate-indentation) 4)))) + (ert-deftest python-indent-inside-paren-1 () "The most simple inside-paren case that shouldn't fail." (python-tests-with-temp-buffer From 6c8231ee8ce527b779df81249c0e597b9a04a17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Fri, 30 Jan 2015 00:41:52 -0300 Subject: [PATCH 011/457] python.el: Handle tabs in python-indent-dedent-line. Fixes: debbugs:19730 * lisp/progmodes/python.el (python-indent-dedent-line): Fixes for indentation with tabs. Thanks to . * test/automated/python-tests.el (python-indent-dedent-line-backspace-2) (python-indent-dedent-line-backspace-3): New tests. --- lisp/ChangeLog | 7 +++++ lisp/progmodes/python.el | 4 +-- test/ChangeLog | 6 +++++ test/automated/python-tests.el | 49 ++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20686014bf3..51d47a791ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-01-30 Fabián Ezequiel Gallina + + python.el: Handle tabs in python-indent-dedent-line. + + * progmodes/python.el (python-indent-dedent-line): Fixes for + indentation with tabs. Thanks to (Bug#19730). + 2015-01-30 Fabián Ezequiel Gallina * progmodes/python.el (python-indent-context): Respect user diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 5842be7cf64..0d314d669eb 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1067,9 +1067,7 @@ indentation levels from right to left." (interactive "*") (when (and (not (bolp)) (not (python-syntax-comment-or-string-p)) - (= (+ (line-beginning-position) - (current-indentation)) - (point))) + (= (current-indentation) (current-column))) (python-indent-line t) t)) diff --git a/test/ChangeLog b/test/ChangeLog index 72e1b854fd9..f33cf84cf98 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-01-30 Fabián Ezequiel Gallina + + * automated/python-tests.el + (python-indent-dedent-line-backspace-2) + (python-indent-dedent-line-backspace-3): New tests. + 2015-01-30 Fabián Ezequiel Gallina * automated/python-tests.el (python-indent-pep8-1) diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el index 4972731d0d2..42c26fc3482 100644 --- a/test/automated/python-tests.el +++ b/test/automated/python-tests.el @@ -2127,6 +2127,55 @@ if True: (call-interactively #'python-indent-dedent-line-backspace) (should (zerop (current-indentation))))) +(ert-deftest python-indent-dedent-line-backspace-2 () + "Check de-indentation with tabs. Bug#19730." + (let ((tab-width 8)) + (python-tests-with-temp-buffer + " +if x: +\tabcdefg +" + (python-tests-look-at "abcdefg") + (goto-char (line-end-position)) + (call-interactively #'python-indent-dedent-line-backspace) + (should + (string= (buffer-substring-no-properties + (line-beginning-position) (line-end-position)) + "\tabcdef"))))) + +(ert-deftest python-indent-dedent-line-backspace-3 () + "Paranoid check of de-indentation with tabs. Bug#19730." + (let ((tab-width 8)) + (python-tests-with-temp-buffer + " +if x: +\tif y: +\t abcdefg +" + (python-tests-look-at "abcdefg") + (goto-char (line-end-position)) + (call-interactively #'python-indent-dedent-line-backspace) + (should + (string= (buffer-substring-no-properties + (line-beginning-position) (line-end-position)) + "\t abcdef")) + (back-to-indentation) + (call-interactively #'python-indent-dedent-line-backspace) + (should + (string= (buffer-substring-no-properties + (line-beginning-position) (line-end-position)) + "\tabcdef")) + (call-interactively #'python-indent-dedent-line-backspace) + (should + (string= (buffer-substring-no-properties + (line-beginning-position) (line-end-position)) + " abcdef")) + (call-interactively #'python-indent-dedent-line-backspace) + (should + (string= (buffer-substring-no-properties + (line-beginning-position) (line-end-position)) + "abcdef"))))) + ;;; Shell integration From 33c4409a8edb03d686ab41d493ec3668e5cd597f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 29 Jan 2015 19:45:04 -0800 Subject: [PATCH 012/457] Spelling fixes --- lisp/progmodes/python.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 0d314d669eb..dea316ec32d 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -943,7 +943,7 @@ keyword May return an integer for the maximum possible indentation at current context or a list of integers. The latter case is only happening for :at-dedenter-block-start context since the -possibilities can be narrowed to especific indentation points." +possibilities can be narrowed to specific indentation points." (save-restriction (widen) (save-excursion @@ -1032,7 +1032,7 @@ minimum." (defun python-indent-line (&optional previous) "Internal implementation of `python-indent-line-function'. Use the PREVIOUS level when argument is non-nil, otherwise indent -to the maxium available level. When indentation is the minimum +to the maximum available level. When indentation is the minimum possible and PREVIOUS is non-nil, cycle back to the maximum level." (let ((follow-indentation-p From be7fb822b8bfee77c705fb5bccdc35d4212cfde0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 30 Jan 2015 13:47:47 +0200 Subject: [PATCH 013/457] src/dispextern.h (FACE_FOR_CHAR): Fix the commentary. --- src/ChangeLog | 4 ++++ src/dispextern.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 949ea741e1d..829eb25f4d9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-01-30 Eli Zaretskii + + * dispextern.h (FACE_FOR_CHAR): Fix the commentary. + 2015-01-29 Hans Wennborg (tiny change) * emacs.c (decode_env_path): Add parentheses around ternary diff --git a/src/dispextern.h b/src/dispextern.h index d6bbb0b4c6c..239c4425646 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1821,8 +1821,10 @@ struct face_cache ((FACE) == (FACE)->ascii_face) /* Return the id of the realized face on frame F that is like the face - with id ID but is suitable for displaying character CHAR. - This macro is only meaningful for multibyte character CHAR. */ + FACE, but is suitable for displaying character CHAR at buffer or + string position POS. OBJECT is the string object, or nil for + buffer. This macro is only meaningful for multibyte character + CHAR. */ #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) \ face_for_char ((F), (FACE), (CHAR), (POS), (OBJECT)) From 1c1d0b75e8b2650184c96476449a66884e663372 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 31 Jan 2015 17:50:36 +0200 Subject: [PATCH 014/457] Fix a typo in the Emacs manual's Hungry Delete description. doc/emacs/programs.texi (Hungry Delete): Fix a typo: "C-d" instead of "C-c C-d" in hungry-delete mode. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/programs.texi | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 24d94f95454..02e4845e0b8 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2015-01-31 Eli Zaretskii + + * programs.texi (Hungry Delete): Fix a typo: "C-d" instead of + "C-c C-d" in hungry-delete mode. + 2015-01-29 Eli Zaretskii * mule.texi (Language Environments): Work around refill bug in diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 547de42ed49..329175409bf 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1666,7 +1666,7 @@ Delete the entire block of whitespace after point (@code{c-hungry-delete-forward As an alternative to the above commands, you can enable @dfn{hungry delete mode}. When this feature is enabled (indicated by @samp{/h} in the mode line after the mode name), a single @key{DEL} deletes all -preceding whitespace, not just one space, and a single @kbd{C-c C-d} +preceding whitespace, not just one space, and a single @kbd{C-d} (but @emph{not} plain @key{Delete}) deletes all following whitespace. @table @kbd From f3faf4f0275d7f94011464ca35d4e7a7ce49b746 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 31 Jan 2015 18:05:38 +0200 Subject: [PATCH 015/457] Fix description of Customize buffer in Emacs manual. doc/emacs/custom.texi (Customization Groups): Update the looks of the Customize Group buffer. --- doc/emacs/ChangeLog | 3 +++ doc/emacs/custom.texi | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 02e4845e0b8..4e3c60efa03 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,8 @@ 2015-01-31 Eli Zaretskii + * custom.texi (Customization Groups): Update the looks of the + Customize Group buffer. + * programs.texi (Hungry Delete): Fix a typo: "C-d" instead of "C-c C-d" in hungry-delete mode. diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index d36e15ef92e..0e9c4fb941b 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -82,14 +82,12 @@ top-level @code{Emacs} group. It looks like this, in part: @c @page @smallexample @group -To apply changes, use the Save or Set buttons. -For details, see [Saving Customizations] in the [Emacs manual]. +For help, see [Easy Customization] in the [Emacs manual]. ________________________________________ [ Search ] Operate on all settings in this buffer: - [ Set for current session ] [ Save for future sessions ] - [ Undo edits ] [ Reset to saved ] [ Erase customizations ] [ Exit ] + [ Revert... ] [ Apply ] [ Apply and Save ] Emacs group: Customization of the One True Editor. @@ -97,7 +95,6 @@ Emacs group: Customization of the One True Editor. See also [Manual]. [Editing] : Basic text editing facilities. - [Convenience] : Convenience features for faster editing. @var{more second-level groups} From 017a03afc92ba084898fc897c7e3dbf90197e0b6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 31 Jan 2015 18:32:11 +0200 Subject: [PATCH 016/457] Document MS-Windows file-name idiosyncrasies (Bug#19463) doc/emacs/msdog.texi (Windows Files): Document characters invalid in Windows file names. --- doc/emacs/ChangeLog | 3 +++ doc/emacs/msdog.texi | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 4e3c60efa03..7d8fcf4cb6d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,8 @@ 2015-01-31 Eli Zaretskii + * msdog.texi (Windows Files): Document characters invalid in + Windows file names. (Bug#19463) + * custom.texi (Customization Groups): Update the looks of the Customize Group buffer. diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index bf130eba7c2..0245fed208c 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -249,7 +249,42 @@ removable and remote volumes, where this could potentially slow down Dired and other related features. The value of @code{nil} means never issue those system calls. Non-@code{nil} values are more useful on NTFS volumes, which support hard links and file security, than on FAT, -FAT32, and XFAT volumes. +FAT32, and exFAT volumes. + +@cindex file names, invalid characters on MS-Windows + Unlike Unix, MS-Windows file systems restrict the set of characters +that can be used in a file name. The following characters are not +allowed: + +@itemize @bullet +@item +Shell redirection symbols @samp{<}, @samp{>}, and @samp{|}. + +@item +Colon @samp{:} (except after the drive letter). + +@item +Forward slash @samp{/} and backslash @samp{\} (except as directory +separators). + +@item +Wildcard characters @samp{*} and @samp{?}. + +@item +Control characters whose codepoints are 1 through 31 decimal. In +particular, newlines in file names are not allowed. + +@item +The null character, whose codepoint is zero (this limitation exists on +Unix filesystems as well). +@end itemize + +@noindent +In addition, referencing any file whose name matches a DOS character +device, such as @file{NUL} or @file{LPT1} or @file{PRN} or @file{CON}, +with or without any file-name extension, will always resolve to those +character devices, in any directory. Therefore, only use such file +names when you want to use the corresponding character device. @node ls in Lisp @section Emulation of @code{ls} on MS-Windows From 618931b5b614df307cfe74c2175287e3f6dfa2a0 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 31 Jan 2015 19:38:58 +0100 Subject: [PATCH 017/457] Handle dead frame in menu-bar-non-minibuffer-window-p. (Bug#19728) * menu-bar.el (menu-bar-non-minibuffer-window-p): Return nil when the menu frame is dead. (Bug#19728) --- lisp/ChangeLog | 5 +++++ lisp/menu-bar.el | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 51d47a791ad..6cdaf14abe2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-31 Martin Rudalics + + * menu-bar.el (menu-bar-non-minibuffer-window-p): Return nil when + the menu frame is dead. (Bug#19728) + 2015-01-30 Fabián Ezequiel Gallina python.el: Handle tabs in python-indent-dedent-line. diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 25d41dcdd85..e82c089850a 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1737,12 +1737,14 @@ The menu frame is the frame for which we are updating the menu." (frame-visible-p menu-frame)))) (defun menu-bar-non-minibuffer-window-p () - "Return non-nil if selected window of the menu frame is not a minibuf window. - -See the documentation of `menu-bar-menu-frame-live-and-visible-p' -for the definition of the menu frame." + "Return non-nil if the menu frame's selected window is no minibuffer window. +Return nil if the menu frame is dead or its selected window is a +minibuffer window. The menu frame is the frame for which we are +updating the menu." (let ((menu-frame (or menu-updating-frame (selected-frame)))) - (not (window-minibuffer-p (frame-selected-window menu-frame))))) + (and (frame-live-p menu-frame) + (not (window-minibuffer-p + (frame-selected-window menu-frame)))))) (defun kill-this-buffer () ; for the menu bar "Kill the current buffer. From e726f2058c98e68c951bdb290fe68dac2a84ff65 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sat, 31 Jan 2015 21:44:47 +0000 Subject: [PATCH 018/457] Handle "#" operator properly inside macro. Fix coding bug. cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): On finding a "#" which looks like the start of a macro, check it isn't already inside a macro. cc-engine.el (c-state-safe-place): Don't record a new "safe" position into the list of them when this is beyond our current position. --- lisp/ChangeLog | 12 ++++++++++++ lisp/progmodes/cc-engine.el | 10 +++++++--- lisp/progmodes/cc-mode.el | 17 +++++++++++------ 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6cdaf14abe2..fd54c688640 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2015-01-31 Alan Mackenzie + + Handle "#" operator properly inside macro. Fix coding bug. + + * progmodes/cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): On + finding a "#" which looks like the start of a macro, check it + isn't already inside a macro. + + * progmodes/cc-engine.el (c-state-safe-place): Don't record a new + "safe" position into the list of them when this is beyond our + current position. + 2015-01-31 Martin Rudalics * menu-bar.el (menu-bar-non-minibuffer-window-p): Return nil when diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 1f4aa819a53..b8051b274d2 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2275,7 +2275,9 @@ comment at the start of cc-engine.el for more info." (while ;; Add an element to `c-state-nonlit-pos-cache' each iteration. (and - (<= (setq npos (+ pos c-state-nonlit-pos-interval)) here) + (setq npos + (when (<= (+ pos c-state-nonlit-pos-interval) here) + (+ pos c-state-nonlit-pos-interval))) ;; Test for being in a literal. If so, go to after it. (progn @@ -2302,7 +2304,9 @@ comment at the start of cc-engine.el for more info." ;; Add one extra element above HERE so as to to avoid the previous ;; expensive calculation when the next call is close to the current ;; one. This is especially useful when inside a large macro. - (setq c-state-nonlit-pos-cache (cons npos c-state-nonlit-pos-cache))) + (when npos + (setq c-state-nonlit-pos-cache + (cons npos c-state-nonlit-pos-cache)))) (if (> pos c-state-nonlit-pos-cache-limit) (setq c-state-nonlit-pos-cache-limit pos)) @@ -3066,7 +3070,7 @@ comment at the start of cc-engine.el for more info." (setq dropped-cons (consp (car c-state-cache))) (setq c-state-cache (cdr c-state-cache)) (setq pos pa)) - ;; At this stage, (> pos here); + ;; At this stage, (>= pos here); ;; (< (c-state-cache-top-lparen) here) (or is nil). (cond diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index c4f1efbfdb1..1cba5027f28 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -957,12 +957,17 @@ Note that the style variables are always made local to the buffer." (let ((pps-position (point)) pps-state mbeg) (while (and (< (point) c-new-END) (search-forward-regexp c-anchored-cpp-prefix c-new-END t)) - ;; If we've found a "#" inside a string/comment, ignore it. - (setq pps-state - (parse-partial-sexp pps-position (point) nil nil pps-state) - pps-position (point)) - (unless (or (nth 3 pps-state) ; in a string? - (nth 4 pps-state)) ; in a comment? + ;; If we've found a "#" inside a macro/string/comment, ignore it. + (unless + (or (save-excursion + (goto-char (match-beginning 0)) + (c-beginning-of-macro)) + (progn + (setq pps-state + (parse-partial-sexp pps-position (point) nil nil pps-state) + pps-position (point)) + (or (nth 3 pps-state) ; in a string? + (nth 4 pps-state)))) ; in a comment? (goto-char (match-beginning 1)) (setq mbeg (point)) (if (> (c-syntactic-end-of-macro) mbeg) From a78774a6b3faa4548997d75f52ba7320e3320c69 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 1 Feb 2015 07:24:05 -0500 Subject: [PATCH 019/457] # Auto-commit of loaddefs files. --- lisp/ldefs-boot.el | 2308 ++++++++++++++++++++++---------------------- 1 file changed, 1154 insertions(+), 1154 deletions(-) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 23e9b94d437..56b9f74bcd5 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3,7 +3,7 @@ ;;; Code: -;;;### (autoloads nil "5x5" "play/5x5.el" (21607 56025 301574 889000)) +;;;### (autoloads nil "5x5" "play/5x5.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -65,8 +65,8 @@ should return a grid vector array that is the new solution. ;;;*** -;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -85,8 +85,8 @@ Ada mode is the major mode for editing Ada code. ;;;*** -;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload 'ada-header "ada-stmt" "\ @@ -96,8 +96,8 @@ Insert a descriptive header at the top of the file. ;;;*** -;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -108,8 +108,8 @@ Completion is available. ;;;*** -;;;### (autoloads nil "add-log" "vc/add-log.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -238,8 +238,8 @@ old-style time formats for entries are supported. ;;;*** -;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21607 56023 -;;;;;; 800854 237000)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -374,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) ;;;*** -;;;### (autoloads nil "align" "align.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "align" "align.el" (21669 40236 816336 299000)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -477,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** -;;;### (autoloads nil "allout" "allout.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "allout" "allout.el" (21669 40236 816336 299000)) ;;; Generated autoloads from allout.el (push (purecopy '(allout 2 3)) package--builtin-versions) @@ -837,8 +837,8 @@ for details on preparing Emacs for automatic allout activation. ;;;*** -;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from allout-widgets.el (push (purecopy '(allout-widgets 1 0)) package--builtin-versions) @@ -896,8 +896,8 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** -;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -918,8 +918,8 @@ directory, so that Emacs will know its current contents. ;;;*** -;;;### (autoloads nil "animate" "play/animate.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "animate" "play/animate.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -951,8 +951,8 @@ the buffer *Birthday-Present-for-Name*. ;;;*** -;;;### (autoloads nil "ansi-color" "ansi-color.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from ansi-color.el (push (purecopy '(ansi-color 3 4 2)) package--builtin-versions) @@ -978,8 +978,8 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** -;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from progmodes/antlr-mode.el (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions) @@ -1015,8 +1015,8 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;*** -;;;### (autoloads nil "appt" "calendar/appt.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "appt" "calendar/appt.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1037,8 +1037,8 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "apropos" "apropos.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1153,8 +1153,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads nil "arc-mode" "arc-mode.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "arc-mode" "arc-mode.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1174,7 +1174,7 @@ archive. ;;;*** -;;;### (autoloads nil "array" "array.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "array" "array.el" (21669 40236 816336 299000)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1245,8 +1245,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads nil "artist" "textmodes/artist.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "artist" "textmodes/artist.el" (21695 39113 +;;;;;; 875318 913000)) ;;; Generated autoloads from textmodes/artist.el (push (purecopy '(artist 1 2 6)) package--builtin-versions) @@ -1452,8 +1452,8 @@ Keymap summary ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1480,8 +1480,8 @@ Special commands: ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21623 -;;;;;; 5708 80843 798000)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1493,8 +1493,8 @@ let-binding.") ;;;*** -;;;### (autoloads nil "autoarg" "autoarg.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "autoarg" "autoarg.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1554,8 +1554,8 @@ This is similar to `autoarg-mode' but rebinds the keypad keys ;;;*** -;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1565,8 +1565,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1604,8 +1604,8 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1654,8 +1654,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "autorevert" "autorevert.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1743,7 +1743,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "avoid" "avoid.el" (21669 40236 816336 299000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1781,8 +1781,8 @@ definition of \"random distance\".) ;;;*** -;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/bat-mode.el (add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode)) @@ -1800,8 +1800,8 @@ Run script using `bat-run' and `bat-run-args'. ;;;*** -;;;### (autoloads nil "battery" "battery.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "battery" "battery.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1836,8 +1836,8 @@ seconds. ;;;*** -;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21607 -;;;;;; 56023 800854 237000)) +;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1873,8 +1873,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1966,7 +1966,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'. ;;;*** ;;;### (autoloads nil "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (21607 56025 801549 101000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1976,8 +1976,8 @@ Major mode for editing BibTeX style files. ;;;*** -;;;### (autoloads nil "binhex" "mail/binhex.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "binhex" "mail/binhex.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -2001,8 +2001,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads nil "blackbox" "play/blackbox.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "blackbox" "play/blackbox.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2121,8 +2121,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "bookmark" "bookmark.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2314,8 +2314,8 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2630,7 +2630,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (21607 56058 801550 360000)) +;;;### (autoloads nil "bs" "bs.el" (21669 40236 816336 299000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2671,8 +2671,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2694,7 +2694,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (21607 56025 301574 889000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2714,8 +2714,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2835,8 +2835,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2845,8 +2845,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21607 56023 -;;;;;; 800854 237000)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2857,8 +2857,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2872,7 +2872,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (21607 56058 801550 360000)) +;;;### (autoloads nil "calc" "calc/calc.el" (21669 40236 816336 299000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2956,8 +2956,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21607 56023 -;;;;;; 800854 237000)) +;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from calc/calc-undo.el (autoload 'calc-undo "calc-undo" "\ @@ -2967,8 +2967,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "calculator" "calculator.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2979,8 +2979,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3023,8 +3023,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "canlock" "gnus/canlock.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "canlock" "gnus/canlock.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -3041,8 +3041,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from progmodes/cap-words.el (autoload 'capitalized-words-mode "cap-words" "\ @@ -3081,8 +3081,8 @@ Obsoletes `c-forward-into-nomenclature'. ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21710 +;;;;;; 6472 78891 397000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3092,8 +3092,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3191,8 +3191,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21710 6472 +;;;;;; 78891 397000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3349,8 +3349,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3401,8 +3401,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3410,8 +3410,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "ccl" "international/ccl.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3671,8 +3671,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3691,15 +3691,15 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cedet" "cedet/cedet.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "cedet" "cedet/cedet.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 3)) package--builtin-versions) @@ -3729,15 +3729,15 @@ on the buffer contents ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (21607 56024 300834 853000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3754,8 +3754,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (push (purecopy '(checkdoc 0 6 2)) package--builtin-versions) (put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp) @@ -3955,8 +3955,8 @@ checking of documentation strings. ;;;*** -;;;### (autoloads nil "china-util" "language/china-util.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "china-util" "language/china-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -3993,8 +3993,8 @@ Encode the text in the current buffer to HZ. ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "chistory" "chistory.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -4033,8 +4033,8 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4112,8 +4112,8 @@ For example, the function `case' has an indent property ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) @@ -4143,8 +4143,8 @@ a future Emacs interpreter will be able to use it.") ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4164,8 +4164,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4185,7 +4185,7 @@ is run). ;;;*** -;;;### (autoloads nil "color" "color.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "color" "color.el" (21669 40236 816336 299000)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4204,7 +4204,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21607 56058 801550 360000)) +;;;### (autoloads nil "comint" "comint.el" (21685 3267 195345 35000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4303,8 +4303,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4337,8 +4337,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4519,8 +4519,8 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** -;;;### (autoloads nil "completion" "completion.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "completion" "completion.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4542,8 +4542,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4698,8 +4698,8 @@ For details see `conf-mode'. Example: ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "cookie1" "play/cookie1.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4727,8 +4727,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4766,8 +4766,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4965,8 +4965,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4984,8 +4984,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -5011,8 +5011,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5022,8 +5022,8 @@ Major mode to edit Cascading Style Sheets. ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5068,8 +5068,8 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;*** -;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -5080,8 +5080,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5393,8 +5393,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5427,8 +5427,8 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** -;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5438,8 +5438,8 @@ Mode used for cvs status output. ;;;*** -;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) @@ -5483,8 +5483,8 @@ See `cwarn-mode' for more information on Cwarn mode. ;;;*** -;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5512,8 +5512,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5559,8 +5559,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21607 56023 -;;;;;; 800854 237000)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5570,7 +5570,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5583,8 +5583,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5710,8 +5710,8 @@ There is some minimal font-lock support (see vars ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5754,8 +5754,8 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** -;;;### (autoloads nil "decipher" "play/decipher.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "decipher" "play/decipher.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5783,8 +5783,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "delim-col" "delim-col.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5809,7 +5809,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "delsel" "delsel.el" (21669 40236 816336 299000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5837,8 +5837,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5904,8 +5904,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "descr-text" "descr-text.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5939,8 +5939,8 @@ relevant to POS. ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "desktop" "desktop.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6145,8 +6145,8 @@ Revert to the last loaded desktop. ;;;*** -;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -6178,8 +6178,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21617 -;;;;;; 53323 210147 705000)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6221,7 +6221,7 @@ Major mode for editing the diary file. ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "diff" "vc/diff.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6269,8 +6269,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6302,7 +6302,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "dig" "net/dig.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "dig" "net/dig.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6313,7 +6313,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21607 56058 801550 360000)) +;;;### (autoloads nil "dired" "dired.el" (21670 36217 665624 229000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6433,8 +6433,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6464,8 +6464,8 @@ from `default-directory'. ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6479,8 +6479,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "disp-table" "disp-table.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6601,8 +6601,8 @@ in `.emacs'. ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6618,7 +6618,7 @@ Default is 2. ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "dnd" "dnd.el" (21669 40236 816336 299000)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\ @@ -6638,8 +6638,8 @@ if some action was made, or nil if the URL is ignored.") ;;;*** -;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6662,8 +6662,8 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads nil "doc-view" "doc-view.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "doc-view" "doc-view.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6709,8 +6709,8 @@ See the command `doc-view-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "doctor" "play/doctor.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6720,7 +6720,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "double" "double.el" (21669 40236 816336 299000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6736,8 +6736,8 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) @@ -6748,8 +6748,8 @@ Switch to *dungeon* buffer and start game. ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6888,8 +6888,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7027,8 +7027,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7293,8 +7293,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7442,8 +7442,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7475,8 +7475,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "echistory" "echistory.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7487,8 +7487,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7498,7 +7498,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (21607 56058 801550 360000)) +;;;### (autoloads nil "ede" "cedet/ede.el" (21669 40236 816336 299000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7524,8 +7524,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7589,7 +7589,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -7861,8 +7861,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7872,8 +7872,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7885,8 +7885,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7905,8 +7905,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "edmacro" "edmacro.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -7955,8 +7955,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "edt" "emulation/edt.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -7973,7 +7973,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21607 56023 800854 237000)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21669 40236 816336 299000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8009,15 +8009,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21670 36216 +;;;;;; 665623 730000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8033,8 +8033,8 @@ It creates an autoload function for CNAME's constructor. ;;;*** -;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -8077,8 +8077,8 @@ Emacs Lisp mode) that support ElDoc.") ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "elec-pair" "elec-pair.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from elec-pair.el (defvar electric-pair-text-pairs '((34 . 34)) "\ @@ -8113,8 +8113,8 @@ closing parenthesis. (Likewise for brackets, etc.). ;;;*** -;;;### (autoloads nil "elide-head" "elide-head.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "elide-head" "elide-head.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -8129,8 +8129,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8165,8 +8165,8 @@ optional prefix argument REINIT is non-nil. ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8200,8 +8200,8 @@ displayed. ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8228,8 +8228,8 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8303,8 +8303,8 @@ Emerge two RCS revisions of a file, with another revision as ancestor. ;;;*** -;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -8339,7 +8339,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "epa" "epa.el" (21669 40236 816336 299000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8517,8 +8517,8 @@ Insert selected KEYS after the point. ;;;*** -;;;### (autoloads nil "epa-dired" "epa-dired.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "epa-dired" "epa-dired.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8543,8 +8543,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "epa-file" "epa-file.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8564,8 +8564,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-mail" "epa-mail.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "epa-mail" "epa-mail.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8642,7 +8642,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "epg" "epg.el" (21669 40236 816336 299000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8653,8 +8653,8 @@ Return a context object. ;;;*** -;;;### (autoloads nil "epg-config" "epg-config.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "epg-config" "epg-config.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8674,7 +8674,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21607 56024 300834 853000)) +;;;### (autoloads nil "erc" "erc/erc.el" (21669 40236 816336 299000)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8722,36 +8722,36 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8781,14 +8781,14 @@ that subcommand. ;;;*** ;;;### (autoloads nil "erc-desktop-notifications" "erc/erc-desktop-notifications.el" -;;;;;; (21607 56024 300834 853000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from erc/erc-desktop-notifications.el (autoload 'erc-notifications-mode "erc-desktop-notifications" "" t) ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8850,8 +8850,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8863,8 +8863,8 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'. ;;;*** -;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8885,8 +8885,8 @@ system. ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8896,22 +8896,22 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8940,8 +8940,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -8987,15 +8987,15 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9006,8 +9006,8 @@ Show who's gone. ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -9024,8 +9024,8 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9043,36 +9043,36 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9089,15 +9089,15 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9108,22 +9108,22 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9148,8 +9148,8 @@ keybindings will not do anything useful. ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9168,8 +9168,8 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9180,8 +9180,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9246,8 +9246,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** -;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9259,8 +9259,8 @@ Kill all test buffers that are still live. ;;;*** -;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9270,8 +9270,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9306,8 +9306,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9615,8 +9615,8 @@ for \\[find-tag] (which see). ;;;*** -;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9784,7 +9784,7 @@ With ARG, insert that many delimiters. ;;;*** -;;;### (autoloads nil "eudc" "net/eudc.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "eudc" "net/eudc.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9838,8 +9838,8 @@ This does nothing except loading eudc by autoload side-effect. ;;;*** -;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -9874,8 +9874,8 @@ Display a button for the JPEG DATA. ;;;*** -;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9891,8 +9891,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** -;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9902,8 +9902,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -9929,7 +9929,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "eww" "net/eww.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -9952,8 +9952,8 @@ Render a file using EWW. ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -9994,7 +9994,7 @@ file modes. ;;;*** -;;;### (autoloads nil "expand" "expand.el" (21607 56024 300834 853000)) +;;;### (autoloads nil "expand" "expand.el" (21669 40236 816336 299000)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -10043,8 +10043,8 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads nil "f90" "progmodes/f90.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "f90" "progmodes/f90.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10111,8 +10111,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "face-remap" "face-remap.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10326,7 +10326,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "ffap" "ffap.el" (21669 40236 816336 299000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10389,8 +10389,8 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "filecache" "filecache.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -10447,21 +10447,24 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads nil "filenotify" "filenotify.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "filenotify" "filenotify.el" (21686 24133 544625 +;;;;;; 151000)) ;;; Generated autoloads from filenotify.el (autoload 'file-notify-handle-event "filenotify" "\ Handle file system monitoring event. -If EVENT is a filewatch event, call its callback. +If EVENT is a filewatch event, call its callback. It has the format + + (file-notify (DESCRIPTOR ACTIONS FILE COOKIE) CALLBACK) + Otherwise, signal a `file-notify-error'. \(fn EVENT)" t nil) ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "files-x" "files-x.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10526,8 +10529,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "filesets" "filesets.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10538,8 +10541,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10559,8 +10562,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "find-dired" "find-dired.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10600,8 +10603,8 @@ use in place of \"-ls\" as the final argument. ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "find-file" "find-file.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\ @@ -10691,8 +10694,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10850,8 +10853,8 @@ Define some key bindings for the find-function family of functions. ;;;*** -;;;### (autoloads nil "find-lisp" "find-lisp.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "find-lisp" "find-lisp.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10871,7 +10874,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21607 56024 300834 853000)) +;;;### (autoloads nil "finder" "finder.el" (21669 40236 816336 299000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -10893,8 +10896,8 @@ Find packages matching a given keyword. ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -10915,8 +10918,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -10931,8 +10934,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -10962,8 +10965,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11033,14 +11036,14 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "foldout" "foldout.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21607 56024 300834 853000)) +;;;### (autoloads nil "follow" "follow.el" (21669 40236 816336 299000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11108,8 +11111,8 @@ selected if the original window is the first one in the frame. ;;;*** -;;;### (autoloads nil "footnote" "mail/footnote.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "footnote" "mail/footnote.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) @@ -11128,7 +11131,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (21607 56024 300834 853000)) +;;;### (autoloads nil "forms" "forms.el" (21669 40236 816336 299000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11164,8 +11167,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11242,8 +11245,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "fortune" "play/fortune.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "fortune" "play/fortune.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11291,8 +11294,8 @@ and choose the directory as the fortune-file. ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "frameset" "frameset.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from frameset.el (defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\ @@ -11472,15 +11475,15 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11557,8 +11560,8 @@ detailed description of this mode. ;;;*** -;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11638,8 +11641,8 @@ regular expression that can be used as an element of ;;;*** -;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11653,8 +11656,8 @@ add virtual separators (like underscores) at places they belong to. ;;;*** -;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11708,7 +11711,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11758,8 +11761,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11849,8 +11852,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11860,8 +11863,8 @@ Make the current buffer look like a nice article. ;;;*** -;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -11884,8 +11887,8 @@ deletion, or > if it is flagged for displaying. ;;;*** -;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -11926,8 +11929,8 @@ supported. ;;;*** -;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11962,8 +11965,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -11978,8 +11981,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -11989,8 +11992,8 @@ Convenience method to turn on gnus-dired-mode. ;;;*** -;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -12000,8 +12003,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus-random-x-face "gnus-fun" "\ @@ -12045,8 +12048,8 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to ;;;*** -;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -12063,8 +12066,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12081,8 +12084,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12097,8 +12100,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12111,8 +12114,8 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;*** -;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -12135,8 +12138,8 @@ Minor mode for providing mailing-list commands. ;;;*** -;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -12236,8 +12239,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12264,7 +12267,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads nil "gnus-notifications" "gnus/gnus-notifications.el" -;;;;;; (21607 56059 303525 127000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus-notifications.el (autoload 'gnus-notifications "gnus-notifications" "\ @@ -12280,8 +12283,8 @@ This is typically a function to add in ;;;*** -;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12304,8 +12307,8 @@ If picons are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12372,8 +12375,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12388,8 +12391,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12416,8 +12419,8 @@ See the documentation for these variables and functions for details. ;;;*** -;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12427,8 +12430,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12438,8 +12441,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12450,8 +12453,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12466,8 +12469,8 @@ Install the sync hooks. ;;;*** -;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12477,8 +12480,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12494,8 +12497,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12521,8 +12524,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12563,8 +12566,8 @@ Like `goto-address-mode', but only for comments and strings. ;;;*** -;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -12580,8 +12583,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "grep" "progmodes/grep.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12745,7 +12748,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'. ;;;*** -;;;### (autoloads nil "gs" "gs.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "gs" "gs.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12758,8 +12761,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "gud" "progmodes/gud.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12847,8 +12850,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -12950,8 +12953,8 @@ binding mode. ;;;*** -;;;### (autoloads nil "handwrite" "play/handwrite.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "handwrite" "play/handwrite.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -12996,8 +12999,8 @@ to be updated. ;;;*** -;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -13039,8 +13042,8 @@ Prefix arg sets default accept amount temporarily. ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -13167,8 +13170,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "help-fns" "help-fns.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13247,8 +13250,8 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file. ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "help-macro" "help-macro.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13262,8 +13265,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "help-mode" "help-mode.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13362,8 +13365,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13378,7 +13381,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "hexl" "hexl.el" (21669 40237 316336 766000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13472,8 +13475,8 @@ This discards the buffer's undo information. ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "hi-lock" "hi-lock.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13640,8 +13643,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13684,8 +13687,8 @@ Several variables affect how the hiding is done: ;;;*** -;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13747,8 +13750,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13879,8 +13882,8 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -13912,8 +13915,8 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "hl-line" "hl-line.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -13962,8 +13965,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -14111,8 +14114,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14122,8 +14125,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21670 36217 +;;;;;; 165621 979000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14156,8 +14159,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'. ;;;*** -;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14245,8 +14248,8 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21670 36217 165621 +;;;;;; 979000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14285,8 +14288,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14339,8 +14342,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "icomplete" "icomplete.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14375,8 +14378,8 @@ completions: ;;;*** -;;;### (autoloads nil "icon" "progmodes/icon.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "icon" "progmodes/icon.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14416,8 +14419,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14442,8 +14445,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14572,7 +14575,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "ido" "ido.el" (21669 40237 316336 766000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14834,7 +14837,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "ielm" "ielm.el" (21669 40237 316336 766000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -14846,7 +14849,7 @@ See `inferior-emacs-lisp-mode' for details. ;;;*** -;;;### (autoloads nil "iimage" "iimage.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "iimage" "iimage.el" (21669 40237 316336 766000)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -14862,7 +14865,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "image" "image.el" (21669 40237 316336 766000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15055,8 +15058,8 @@ If Emacs is compiled without ImageMagick support, this does nothing. ;;;*** -;;;### (autoloads nil "image-dired" "image-dired.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "image-dired" "image-dired.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) @@ -15193,8 +15196,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads nil "image-file" "image-file.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "image-file" "image-file.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\ @@ -15256,8 +15259,8 @@ An image file is one whose name has an extension in ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "image-mode" "image-mode.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15304,7 +15307,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "imenu" "imenu.el" (21669 40237 316336 766000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15442,8 +15445,8 @@ for more information. ;;;*** -;;;### (autoloads nil "ind-util" "language/ind-util.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "ind-util" "language/ind-util.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -15473,8 +15476,8 @@ Convert old Emacs Devanagari characters to UCS. ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15492,7 +15495,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "info" "info.el" (21669 40237 316336 766000)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -15702,8 +15705,8 @@ Otherwise, visit the manual in a new Info buffer. ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "info-look" "info-look.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15750,8 +15753,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "info-xref" "info-xref.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -15834,8 +15837,8 @@ the sources handy. ;;;*** -;;;### (autoloads nil "informat" "informat.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "informat" "informat.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15880,8 +15883,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inversion" "cedet/inversion.el" (21607 56023 -;;;;;; 800854 237000)) +;;;### (autoloads nil "inversion" "cedet/inversion.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) @@ -15893,8 +15896,8 @@ Only checks one based on which kind of Emacs is being run. ;;;*** -;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -15914,8 +15917,8 @@ Toggle input method in interactive search. ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "isearchb" "isearchb.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -15929,8 +15932,8 @@ accessed via isearchb. ;;;*** -;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -16021,15 +16024,15 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (21607 56024 801559 72000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from international/iso-transl.el (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap) ;;;*** -;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16262,8 +16265,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to ;;;*** -;;;### (autoloads nil "japan-util" "language/japan-util.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "japan-util" "language/japan-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -16340,8 +16343,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16364,8 +16367,8 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21609 59210 634406 -;;;;;; 998000)) +;;;### (autoloads nil "js" "progmodes/js.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16377,14 +16380,14 @@ Major mode for editing JavaScript. ;;;*** -;;;### (autoloads nil "json" "json.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "json" "json.el" (21669 40237 316336 766000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "keypad" "emulation/keypad.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "keypad" "emulation/keypad.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16439,8 +16442,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** -;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -16461,8 +16464,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "kkc" "international/kkc.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16484,7 +16487,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21669 40237 316336 766000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16596,8 +16599,8 @@ If kbd macro currently being defined end it before activating it. ;;;*** -;;;### (autoloads nil "korea-util" "language/korea-util.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "korea-util" "language/korea-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16611,8 +16614,8 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "landmark" "play/landmark.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "landmark" "play/landmark.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16642,8 +16645,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "lao-util" "language/lao-util.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "lao-util" "language/lao-util.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16680,8 +16683,8 @@ Transcribe Romanized Lao string STR to Lao character string. ;;;*** -;;;### (autoloads nil "latexenc" "international/latexenc.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "latexenc" "international/latexenc.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/latexenc.el (defvar latex-inputenc-coding-alist (purecopy '(("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ @@ -16713,7 +16716,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el" -;;;;;; (21607 56024 801559 72000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16754,8 +16757,8 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** -;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16765,7 +16768,7 @@ A major mode to edit GNU ld script files ;;;*** -;;;### (autoloads nil "life" "play/life.el" (21607 56025 301574 889000)) +;;;### (autoloads nil "life" "play/life.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -16778,7 +16781,7 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads nil "linum" "linum.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "linum" "linum.el" (21669 40237 316336 766000)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -16815,8 +16818,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "loadhist" "loadhist.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16847,7 +16850,7 @@ something strange, such as redefining an Emacs function. ;;;*** -;;;### (autoloads nil "locate" "locate.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "locate" "locate.el" (21669 40237 316336 766000)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -16899,8 +16902,8 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16931,8 +16934,8 @@ done. Otherwise, it uses the current buffer. ;;;*** -;;;### (autoloads nil "log-view" "vc/log-view.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "log-view" "vc/log-view.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -16942,7 +16945,7 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "lpr" "lpr.el" (21669 40237 316336 766000)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17037,8 +17040,8 @@ for further customization of the printer command. ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -17049,8 +17052,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads nil "lunar" "calendar/lunar.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "lunar" "calendar/lunar.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -17064,8 +17067,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17075,7 +17078,7 @@ A major mode to edit m4 macro files. ;;;*** -;;;### (autoloads nil "macros" "macros.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "macros" "macros.el" (21669 40237 316336 766000)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17164,8 +17167,8 @@ and then select the region of un-tablified names and use ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17195,8 +17198,8 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;*** -;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17225,8 +17228,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17300,8 +17303,8 @@ matches may be returned from the message body. ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17350,8 +17353,8 @@ double-quotes. ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17404,8 +17407,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any. ;;;*** -;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -17417,8 +17420,8 @@ The mail client is taken to be the handler of mailto URLs. ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17535,8 +17538,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "makesum" "makesum.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -17547,7 +17550,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads nil "man" "man.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "man" "man.el" (21669 40237 316336 766000)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17601,7 +17604,7 @@ Default bookmark handler for Man buffers. ;;;*** -;;;### (autoloads nil "master" "master.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "master" "master.el" (21669 40237 316336 766000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) @@ -17624,8 +17627,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads nil "mb-depth" "mb-depth.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "mb-depth" "mb-depth.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -17652,14 +17655,14 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "md4" "md4.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "md4" "md4.el" (21669 40237 316336 766000)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "message" "gnus/message.el" (21706 9418 86773 +;;;;;; 130000)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -17824,8 +17827,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) @@ -17841,8 +17844,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17885,8 +17888,8 @@ redisplayed as output is inserted. ;;;*** -;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -17976,7 +17979,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21669 40237 316336 766000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -17993,8 +17996,8 @@ Display version information about MH-E and the MH mail handling system. ;;;*** -;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18075,8 +18078,8 @@ perform the operation on all messages in that region. ;;;*** -;;;### (autoloads nil "midnight" "midnight.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "midnight" "midnight.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -18102,8 +18105,8 @@ to its second argument TM. ;;;*** -;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18132,7 +18135,7 @@ is modified to remove the default indication. ;;;*** -;;;### (autoloads nil "misc" "misc.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "misc" "misc.el" (21669 40237 316336 766000)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18160,8 +18163,8 @@ The return value is always nil. ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "misearch" "misearch.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18242,8 +18245,8 @@ whose file names match the specified wildcard. ;;;*** -;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) @@ -18254,8 +18257,8 @@ Major mode for the mixal asm language. ;;;*** -;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/mm-encode.el (autoload 'mm-default-file-encoding "mm-encode" "\ @@ -18265,8 +18268,8 @@ Return a default encoding for FILE. ;;;*** -;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -18284,8 +18287,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -18298,8 +18301,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18315,8 +18318,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18335,7 +18338,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** -;;;### (autoloads nil "mml" "gnus/mml.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "mml" "gnus/mml.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18360,8 +18363,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -18376,8 +18379,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18417,8 +18420,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21607 56023 -;;;;;; 800854 237000)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) @@ -18459,8 +18462,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "morse" "play/morse.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18485,8 +18488,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** -;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18533,7 +18536,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "mpc" "mpc.el" (21669 40237 316336 766000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18543,7 +18546,7 @@ Main entry point for MPC. ;;;*** -;;;### (autoloads nil "mpuz" "play/mpuz.el" (21607 56025 301574 889000)) +;;;### (autoloads nil "mpuz" "play/mpuz.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18553,7 +18556,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "msb" "msb.el" (21669 40237 316336 766000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18578,8 +18581,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -18711,8 +18714,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -18843,8 +18846,8 @@ per-character basis, this may not be accurate. ;;;*** -;;;### (autoloads nil "net-utils" "net/net-utils.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "net-utils" "net/net-utils.el" (21679 50887 +;;;;;; 336751 696000)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -18938,8 +18941,8 @@ Open a network connection to HOST on PORT. ;;;*** -;;;### (autoloads nil "netrc" "net/netrc.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "netrc" "net/netrc.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -18951,8 +18954,8 @@ listed in the PORTS list. ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19045,8 +19048,8 @@ a greeting from the server. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19068,7 +19071,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (21607 56059 303525 127000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19078,8 +19081,8 @@ Start newsticker plainview. ;;;*** -;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -19089,8 +19092,8 @@ Start reading news. You may want to bind this to a key. ;;;*** -;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -19110,8 +19113,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19121,15 +19124,15 @@ Start newsticker treeview. ;;;*** -;;;### (autoloads nil "newsticker" "net/newsticker.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "newsticker" "net/newsticker.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/newsticker.el (push (purecopy '(newsticker 1 99)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19139,8 +19142,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -19154,8 +19157,8 @@ symbol in the alist. ;;;*** -;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -19166,7 +19169,7 @@ This command does not work if you use short group names. ;;;*** -;;;### (autoloads nil "nnml" "gnus/nnml.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "nnml" "gnus/nnml.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19176,7 +19179,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21607 56025 301574 889000)) +;;;### (autoloads nil "novice" "novice.el" (21669 40237 316336 766000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19208,8 +19211,8 @@ future sessions. ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21607 -;;;;;; 56025 801549 101000)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19223,14 +19226,14 @@ closing requests for requests that are used in matched pairs. ;;;*** -;;;### (autoloads nil "ntlm" "net/ntlm.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "ntlm" "net/ntlm.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19242,8 +19245,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19303,8 +19306,8 @@ Many aspects this mode can be customized using ;;;*** -;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -19316,8 +19319,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19354,8 +19357,8 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/opascal.el (define-obsolete-function-alias 'delphi-mode 'opascal-mode "24.4") @@ -19390,7 +19393,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "org" "org/org.el" (21669 40237 316336 766000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19611,8 +19614,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -19885,8 +19888,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -19928,8 +19931,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "org-colview" "org/org-colview.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from org/org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -19992,8 +19995,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -20003,8 +20006,8 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "org-macs" "org/org-macs.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from org/org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -20032,7 +20035,8 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21623 5708 80843 798000)) +;;;### (autoloads nil "outline" "outline.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20093,8 +20097,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21676 11899 +;;;;;; 256354 520000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20166,7 +20170,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads nil "paren" "paren.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "paren" "paren.el" (21669 40237 316336 766000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20192,8 +20196,8 @@ matching parenthesis is highlighted in `show-paren-style' after ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20206,8 +20210,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20256,8 +20260,8 @@ See also the user variables `pascal-type-keywords', `pascal-start-keywords' and ;;;*** -;;;### (autoloads nil "password-cache" "password-cache.el" (21607 -;;;;;; 56025 301574 889000)) +;;;### (autoloads nil "password-cache" "password-cache.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20278,8 +20282,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20340,8 +20344,8 @@ of the form (UPAT EXP). ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20351,8 +20355,8 @@ Completion rules for the `cvs' command. ;;;*** -;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20379,8 +20383,8 @@ Completion for the GNU tar utility. ;;;*** -;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20400,8 +20404,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20411,8 +20415,8 @@ Completion for the `rpm' command. ;;;*** -;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20467,8 +20471,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20492,8 +20496,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (21689 338 694604 +;;;;;; 955000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20550,7 +20554,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -20625,8 +20629,8 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ @@ -20634,8 +20638,8 @@ Global menu used by PCL-CVS.") ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20696,8 +20700,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -20777,8 +20781,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "plstore" "gnus/plstore.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "plstore" "gnus/plstore.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -20793,8 +20797,8 @@ Major mode for editing PLSTORE files. ;;;*** -;;;### (autoloads nil "po" "textmodes/po.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "po" "textmodes/po.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -20805,7 +20809,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads nil "pong" "play/pong.el" (21607 56025 301574 889000)) +;;;### (autoloads nil "pong" "play/pong.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -20821,7 +20825,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -20832,8 +20836,8 @@ Use streaming commands. ;;;*** -;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21607 56058 801550 -;;;;;; 360000)) +;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -20883,8 +20887,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "printing" "printing.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21472,7 +21476,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (21607 56025 301574 889000)) +;;;### (autoloads nil "proced" "proced.el" (21669 40237 316336 766000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21490,8 +21494,8 @@ Proced buffers. ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "profiler" "profiler.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21519,8 +21523,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21553,7 +21557,7 @@ With prefix argument ARG, restart the Prolog process if running before. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21669 40237 826337 297000)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ @@ -21564,8 +21568,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) @@ -21612,8 +21616,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "ps-print" "ps-print.el" (21670 36217 165621 +;;;;;; 979000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -21810,15 +21814,15 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21627 2757 -;;;;;; 110119 58000)) +;;;### (autoloads nil "python" "progmodes/python.el" (21707 30279 +;;;;;; 916059 915000)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 4)) package--builtin-versions) @@ -21852,7 +21856,7 @@ Major mode for editing Python files. ;;;*** -;;;### (autoloads nil "qp" "gnus/qp.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "qp" "gnus/qp.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -21871,8 +21875,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "quail" "international/quail.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22102,8 +22106,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22116,7 +22120,7 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'. ;;;*** ;;;### (autoloads nil "quail/uni-input" "leim/quail/uni-input.el" -;;;;;; (21607 56024 801559 72000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from leim/quail/uni-input.el (autoload 'ucs-input-activate "quail/uni-input" "\ @@ -22130,8 +22134,8 @@ While this input method is active, the variable ;;;*** -;;;### (autoloads nil "quickurl" "net/quickurl.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "quickurl" "net/quickurl.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -22202,8 +22206,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22241,8 +22245,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22260,8 +22264,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "recentf" "recentf.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22287,7 +22291,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "rect" "rect.el" (21669 40237 826337 297000)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22427,8 +22431,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "refill" "textmodes/refill.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "refill" "textmodes/refill.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -22448,8 +22452,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21704 54100 +;;;;;; 244617 275000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -22498,8 +22502,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21607 -;;;;;; 56059 804396 982000)) +;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload 'reftex-citation "reftex-cite" "\ @@ -22529,7 +22533,7 @@ While entering the regexp, completion on knows citation keys is possible. ;;;*** ;;;### (autoloads nil "reftex-global" "textmodes/reftex-global.el" -;;;;;; (21607 56059 804396 982000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload 'reftex-isearch-minor-mode "reftex-global" "\ @@ -22546,7 +22550,7 @@ With no argument, this command toggles ;;;*** ;;;### (autoloads nil "reftex-index" "textmodes/reftex-index.el" -;;;;;; (21607 56059 804396 982000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload 'reftex-index-phrases-mode "reftex-index" "\ @@ -22579,7 +22583,7 @@ Here are all local bindings. ;;;*** ;;;### (autoloads nil "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (21623 5708 80843 798000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload 'reftex-all-document-files "reftex-parse" "\ @@ -22591,8 +22595,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21607 -;;;;;; 56025 801549 101000)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21707 +;;;;;; 30279 916059 915000)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22601,8 +22605,8 @@ of master file. ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22631,15 +22635,15 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -22693,7 +22697,7 @@ to turn the *scratch* buffer into your notes buffer. ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "repeat" "repeat.el" (21669 40237 826337 297000)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -22716,8 +22720,8 @@ recently executed command not bound to an input event\". ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -22748,8 +22752,8 @@ mail-sending package is used for editing and sending the message. ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "reposition" "reposition.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -22775,7 +22779,7 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads nil "reveal" "reveal.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "reveal" "reveal.el" (21669 40237 826337 297000)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -22810,8 +22814,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -22826,8 +22830,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -22871,8 +22875,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21670 36217 165621 +;;;;;; 979000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23069,8 +23073,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23134,8 +23138,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23146,8 +23150,8 @@ Return a pattern. ;;;*** -;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23159,8 +23163,8 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil. ;;;*** -;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23190,8 +23194,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23251,7 +23255,7 @@ Start using robin package NAME, which is a string. ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "rot13" "rot13.el" (21669 40237 826337 297000)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23288,8 +23292,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23319,8 +23323,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21607 -;;;;;; 56025 801549 101000)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23337,8 +23341,8 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23356,8 +23360,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -23668,15 +23672,15 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "savehist" "savehist.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -23708,8 +23712,8 @@ histories, which is probably undesirable. ;;;*** -;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -23748,8 +23752,8 @@ that variable's value is a string. ;;;*** -;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -23762,8 +23766,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "scroll-all" "scroll-all.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23788,8 +23792,8 @@ one window apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -23805,16 +23809,16 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "secrets" "net/secrets.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) ;;;*** -;;;### (autoloads nil "semantic" "cedet/semantic.el" (21607 56058 -;;;;;; 801550 360000)) +;;;### (autoloads nil "semantic" "cedet/semantic.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) @@ -23872,7 +23876,7 @@ Semantic mode. ;;;*** ;;;### (autoloads nil "semantic/bovine/grammar" "cedet/semantic/bovine/grammar.el" -;;;;;; (21607 56058 801550 360000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from cedet/semantic/bovine/grammar.el (autoload 'bovine-grammar-mode "semantic/bovine/grammar" "\ @@ -23883,7 +23887,7 @@ Major mode for editing Bovine grammars. ;;;*** ;;;### (autoloads nil "semantic/wisent/grammar" "cedet/semantic/wisent/grammar.el" -;;;;;; (21607 56023 800854 237000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from cedet/semantic/wisent/grammar.el (autoload 'wisent-grammar-mode "semantic/wisent/grammar" "\ @@ -23893,8 +23897,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24175,7 +24179,7 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "server" "server.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "server" "server.el" (21669 40237 826337 297000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24242,7 +24246,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "ses" "ses.el" (21669 40237 826337 297000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24286,8 +24290,8 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21607 -;;;;;; 56059 804396 982000)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24352,8 +24356,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21676 +;;;;;; 11881 756047 924000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24395,7 +24399,6 @@ buffer indents as it currently is indented. \\[backward-delete-char-untabify] Delete backward one position, even if it was a tab. -\\[newline-and-indent] Delete unquoted space and indent new line same as this one. \\[sh-end-of-command] Go to end of successive commands. \\[sh-beginning-of-command] Go to beginning of successive commands. \\[sh-set-shell] Set this buffer's shell, and maybe its magic number. @@ -24417,8 +24420,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24467,8 +24470,8 @@ function, `load-path-shadows-find'. ;;;*** -;;;### (autoloads nil "shadowfile" "shadowfile.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "shadowfile" "shadowfile.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -24506,7 +24509,7 @@ Set up file shadowing. ;;;*** -;;;### (autoloads nil "shell" "shell.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "shell" "shell.el" (21669 40237 826337 297000)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24554,7 +24557,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "shr" "net/shr.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24571,8 +24574,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24597,8 +24600,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -24613,8 +24616,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simula" "progmodes/simula.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "simula" "progmodes/simula.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -24662,8 +24665,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "skeleton" "skeleton.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -24781,8 +24784,8 @@ symmetrical ones, and the same character twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -24809,8 +24812,8 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** -;;;### (autoloads nil "smiley" "gnus/smiley.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "smiley" "gnus/smiley.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -24827,8 +24830,8 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** -;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -24843,8 +24846,8 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads nil "snake" "play/snake.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "snake" "play/snake.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -24867,8 +24870,8 @@ Snake mode keybindings: ;;;*** -;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -24897,8 +24900,8 @@ then `snmpv2-mode-hook'. ;;;*** -;;;### (autoloads nil "solar" "calendar/solar.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "solar" "calendar/solar.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -24913,8 +24916,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "solitaire" "play/solitaire.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "solitaire" "play/solitaire.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -24989,7 +24992,7 @@ Pick your favorite shortcuts: ;;;*** -;;;### (autoloads nil "sort" "sort.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "sort" "sort.el" (21669 40237 826337 297000)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25164,7 +25167,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "spam" "gnus/spam.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25178,8 +25181,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25221,8 +25224,8 @@ Spam reports will be queued with the method used when ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "speedbar" "speedbar.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25246,8 +25249,8 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "spook" "play/spook.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25262,8 +25265,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21607 56059 303525 -;;;;;; 127000)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 4)) package--builtin-versions) @@ -25724,15 +25727,15 @@ buffer. ;;;*** -;;;### (autoloads nil "srecode" "cedet/srecode.el" (21607 56023 800854 -;;;;;; 237000)) +;;;### (autoloads nil "srecode" "cedet/srecode.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (21607 56023 800854 237000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -25744,8 +25747,8 @@ Major-mode for writing SRecode macros. ;;;*** -;;;### (autoloads nil "starttls" "gnus/starttls.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "starttls" "gnus/starttls.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -25768,8 +25771,8 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "strokes" "strokes.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -25903,8 +25906,8 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (21607 56059 -;;;;;; 303525 127000)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/subword.el (autoload 'subword-mode "subword" "\ @@ -25998,8 +26001,8 @@ See `superword-mode' for more information on Superword mode. ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -26031,8 +26034,8 @@ and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "t-mouse" "t-mouse.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -26060,7 +26063,7 @@ It relies on the `gpm' daemon being activated. ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "tabify" "tabify.el" (21669 40237 826337 297000)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -26089,8 +26092,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "table" "textmodes/table.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -26682,7 +26685,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads nil "talk" "talk.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "talk" "talk.el" (21669 40237 826337 297000)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -26697,8 +26700,8 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "tar-mode" "tar-mode.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -26721,8 +26724,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -26770,8 +26773,8 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "telnet" "net/telnet.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/telnet.el (autoload 'telnet "telnet" "\ @@ -26796,7 +26799,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21607 56059 303525 127000)) +;;;### (autoloads nil "term" "term.el" (21669 40237 826337 297000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -26838,8 +26841,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -26849,8 +26852,8 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads nil "tetris" "play/tetris.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "tetris" "play/tetris.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) @@ -26875,8 +26878,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27177,8 +27180,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27217,8 +27220,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27302,8 +27305,8 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads nil "thai-util" "language/thai-util.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "thai-util" "language/thai-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27330,8 +27333,8 @@ Compose Thai characters in the current buffer. ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "thingatpt" "thingatpt.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27395,7 +27398,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21669 40237 826337 297000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27429,8 +27432,8 @@ In dired, call the setroot program on the image at point. ;;;*** -;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -27503,8 +27506,8 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/tildify.el (push (purecopy '(tildify 4 5)) package--builtin-versions) @@ -27528,7 +27531,7 @@ This function performs no refilling of the changed text. ;;;*** -;;;### (autoloads nil "time" "time.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "time" "time.el" (21669 40237 826337 297000)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -27590,8 +27593,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27702,8 +27705,8 @@ This function does not work for SECONDS greater than `most-positive-fixnum'. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -27743,8 +27746,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21607 -;;;;;; 56058 801550 360000)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -27854,7 +27857,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (21607 56024 801559 72000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -27876,7 +27879,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "tmm" "tmm.el" (21669 40237 826337 297000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27918,8 +27921,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21623 -;;;;;; 5708 80843 798000)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -27986,8 +27989,8 @@ Mode for displaying and reprioritizing top priority Todo. ;;;*** -;;;### (autoloads nil "tool-bar" "tool-bar.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "tool-bar" "tool-bar.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -28057,8 +28060,8 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -28071,8 +28074,8 @@ to a tcp server on another machine. ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -28117,8 +28120,7 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21617 53323 210147 -;;;;;; 705000)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21685 3267 694612 832000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28233,8 +28235,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28244,8 +28246,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "tutorial" "tutorial.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28280,8 +28282,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21607 -;;;;;; 56025 801549 101000)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28328,8 +28330,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "type-break" "type-break.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28461,7 +28463,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "uce" "mail/uce.el" (21669 40237 316336 766000)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -28475,7 +28477,7 @@ You might need to set `uce-mail-reader' before using this. ;;;*** ;;;### (autoloads nil "ucs-normalize" "international/ucs-normalize.el" -;;;;;; (21607 56024 801559 72000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -28540,8 +28542,8 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus. ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (21607 -;;;;;; 56025 801549 101000)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28561,8 +28563,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21607 56024 801559 -;;;;;; 72000)) +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -28582,8 +28584,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use. ;;;*** -;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21607 56024 -;;;;;; 300834 853000)) +;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -28595,7 +28597,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (21607 56059 804396 982000)) +;;;### (autoloads nil "url" "url/url.el" (21669 40237 826337 297000)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -28642,8 +28644,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -28684,8 +28686,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** -;;;### (autoloads nil "url-cache" "url/url-cache.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "url-cache" "url/url-cache.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -28706,8 +28708,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-cid" "url/url-cid.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "url-cid" "url/url-cid.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -28717,8 +28719,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-dav" "url/url-dav.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "url-dav" "url/url-dav.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -28752,8 +28754,8 @@ added to this list, so most requests can just pass in nil. ;;;*** -;;;### (autoloads nil "url-file" "url/url-file.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "url-file" "url/url-file.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -28763,8 +28765,8 @@ Handle file: and ftp: URLs. ;;;*** -;;;### (autoloads nil "url-gw" "url/url-gw.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "url-gw" "url/url-gw.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -28782,8 +28784,8 @@ Might do a non-blocking connection; use `process-status' to check. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21607 -;;;;;; 56059 804396 982000)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28837,8 +28839,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "url-http" "url/url-http.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -28850,8 +28852,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-irc" "url/url-irc.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "url-irc" "url/url-irc.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -28861,8 +28863,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -28875,8 +28877,8 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** -;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -28891,8 +28893,8 @@ Handle the mailto: URL syntax. ;;;*** -;;;### (autoloads nil "url-misc" "url/url-misc.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "url-misc" "url/url-misc.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -28923,8 +28925,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-news" "url/url-news.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "url-news" "url/url-news.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -28939,8 +28941,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-ns" "url/url-ns.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "url-ns" "url/url-ns.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -28980,8 +28982,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-parse" "url/url-parse.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "url-parse" "url/url-parse.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -29032,8 +29034,8 @@ parses to ;;;*** -;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -29043,8 +29045,8 @@ Setup variables that expose info about you and your system. ;;;*** -;;;### (autoloads nil "url-queue" "url/url-queue.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "url-queue" "url/url-queue.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -29058,8 +29060,8 @@ The variable `url-queue-timeout' sets a timeout. ;;;*** -;;;### (autoloads nil "url-util" "url/url-util.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "url-util" "url/url-util.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29227,8 +29229,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "userlock" "userlock.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29256,8 +29258,8 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29282,7 +29284,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf7" "gnus/utf7.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "utf7" "gnus/utf7.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29292,8 +29294,8 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;*** -;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29317,7 +29319,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (21613 56261 180128 217000)) +;;;### (autoloads nil "vc" "vc/vc.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29602,8 +29604,8 @@ Return the branch part of a revision number REV. ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21607 56059 -;;;;;; 804396 982000)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29640,8 +29642,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29651,8 +29653,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21619 8648 550151 -;;;;;; 780000)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -29668,8 +29670,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -29680,8 +29682,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -29705,8 +29707,8 @@ These are the commands available for use in the file status buffer: ;;;*** -;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21607 -;;;;;; 56059 804396 982000)) +;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -29729,8 +29731,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21615 11593 522981 -;;;;;; 49000)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -29741,7 +29743,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21619 8648 550151 780000)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -29752,8 +29754,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -29769,8 +29771,8 @@ Name of the monotone directory's format file.") ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -29783,8 +29785,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -29802,8 +29804,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29816,8 +29818,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/vera-mode.el (push (purecopy '(vera-mode 2 28)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -29876,7 +29878,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21607 56059 303525 127000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30015,8 +30017,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -30570,8 +30572,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "viet-util" "language/viet-util.el" (21607 -;;;;;; 56024 801559 72000)) +;;;### (autoloads nil "viet-util" "language/viet-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -30615,7 +30617,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics. ;;;*** -;;;### (autoloads nil "view" "view.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "view" "view.el" (21669 40237 826337 297000)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -30871,8 +30873,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "viper" "emulation/viper.el" (21607 56024 300834 -;;;;;; 853000)) +;;;### (autoloads nil "viper" "emulation/viper.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) @@ -30889,8 +30891,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21607 -;;;;;; 56024 300834 853000)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -30980,7 +30982,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "wdired" "wdired.el" (21669 40237 826337 297000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -30998,8 +31000,8 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads nil "webjump" "net/webjump.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "webjump" "net/webjump.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -31015,8 +31017,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21607 -;;;;;; 56059 303525 127000)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31046,8 +31048,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "whitespace" "whitespace.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31446,8 +31448,8 @@ cleaning up these problems. ;;;*** -;;;### (autoloads nil "wid-browse" "wid-browse.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "wid-browse" "wid-browse.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -31475,8 +31477,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31518,8 +31520,8 @@ Setup current buffer so editing string widgets works. ;;;*** -;;;### (autoloads nil "windmove" "windmove.el" (21607 56025 801549 -;;;;;; 101000)) +;;;### (autoloads nil "windmove" "windmove.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -31571,7 +31573,7 @@ Default MODIFIER is 'shift. ;;;*** -;;;### (autoloads nil "winner" "winner.el" (21607 56059 804396 982000)) +;;;### (autoloads nil "winner" "winner.el" (21669 40237 826337 297000)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -31594,7 +31596,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21607 56059 804396 982000)) +;;;### (autoloads nil "woman" "woman.el" (21669 40237 826337 297000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31643,7 +31645,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (21607 56025 801549 101000)) +;;;### (autoloads nil "xml" "xml.el" (21669 40237 826337 297000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -31699,8 +31701,8 @@ Both features can be combined by providing a cons cell ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -31718,8 +31720,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -31748,7 +31750,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** -;;;### (autoloads nil "yenc" "gnus/yenc.el" (21607 56024 801559 72000)) +;;;### (autoloads nil "yenc" "gnus/yenc.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -31763,7 +31765,7 @@ Extract file name from an yenc header. ;;;*** -;;;### (autoloads nil "zone" "play/zone.el" (21607 56025 301574 889000)) +;;;### (autoloads nil "zone" "play/zone.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -31779,34 +31781,33 @@ Zone out, completely. ;;;;;; "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el" ;;;;;; "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el" ;;;;;; "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el" -;;;;;; "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el" -;;;;;; "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el" -;;;;;; "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el" -;;;;;; "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el" -;;;;;; "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el" -;;;;;; "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el" -;;;;;; "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el" -;;;;;; "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el" -;;;;;; "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el" -;;;;;; "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el" -;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el" -;;;;;; "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el" -;;;;;; "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el" -;;;;;; "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el" -;;;;;; "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el" -;;;;;; "cedet/cedet-idutils.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" -;;;;;; "cedet/ede/base.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el" -;;;;;; "cedet/ede/dired.el" "cedet/ede/emacs.el" "cedet/ede/files.el" -;;;;;; "cedet/ede/generic.el" "cedet/ede/linux.el" "cedet/ede/loaddefs.el" -;;;;;; "cedet/ede/locate.el" "cedet/ede/make.el" "cedet/ede/makefile-edit.el" -;;;;;; "cedet/ede/pconf.el" "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" -;;;;;; "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" -;;;;;; "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" -;;;;;; "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" -;;;;;; "cedet/ede/proj.el" "cedet/ede/project-am.el" "cedet/ede/shell.el" -;;;;;; "cedet/ede/simple.el" "cedet/ede/source.el" "cedet/ede/speedbar.el" -;;;;;; "cedet/ede/srecode.el" "cedet/ede/system.el" "cedet/ede/util.el" -;;;;;; "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" +;;;;;; "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el" +;;;;;; "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el" +;;;;;; "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el" +;;;;;; "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el" +;;;;;; "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el" +;;;;;; "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el" +;;;;;; "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el" +;;;;;; "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el" +;;;;;; "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el" +;;;;;; "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el" +;;;;;; "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el" +;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el" +;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el" +;;;;;; "calendar/hol-loaddefs.el" "cdl.el" "cedet/cedet-cscope.el" +;;;;;; "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el" +;;;;;; "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" "cedet/ede/base.el" +;;;;;; "cedet/ede/cpp-root.el" "cedet/ede/custom.el" "cedet/ede/dired.el" +;;;;;; "cedet/ede/emacs.el" "cedet/ede/files.el" "cedet/ede/generic.el" +;;;;;; "cedet/ede/linux.el" "cedet/ede/locate.el" "cedet/ede/make.el" +;;;;;; "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" "cedet/ede/pmake.el" +;;;;;; "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" +;;;;;; "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" +;;;;;; "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" +;;;;;; "cedet/ede/proj-shared.el" "cedet/ede/proj.el" "cedet/ede/project-am.el" +;;;;;; "cedet/ede/shell.el" "cedet/ede/simple.el" "cedet/ede/source.el" +;;;;;; "cedet/ede/speedbar.el" "cedet/ede/srecode.el" "cedet/ede/system.el" +;;;;;; "cedet/ede/util.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" ;;;;;; "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el" ;;;;;; "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el" ;;;;;; "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el" @@ -31824,13 +31825,13 @@ Zone out, completely. ;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el" ;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el" ;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" -;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" -;;;;;; "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el" -;;;;;; "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el" -;;;;;; "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el" -;;;;;; "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el" -;;;;;; "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el" -;;;;;; "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" +;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" +;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" +;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" +;;;;;; "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el" +;;;;;; "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el" +;;;;;; "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" @@ -31840,13 +31841,12 @@ Zone out, completely. ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" -;;;;;; "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el" -;;;;;; "cedet/srecode/semantic.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" -;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" -;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el" -;;;;;; "dos-w32.el" "dynamic-setting.el" "emacs-lisp/authors.el" -;;;;;; "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" -;;;;;; "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el" +;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" +;;;;;; "cedet/srecode/srt.el" "cedet/srecode/table.el" "cedet/srecode/template.el" +;;;;;; "cedet/srecode/texi.el" "cus-dep.el" "dframe.el" "dired-aux.el" +;;;;;; "dired-x.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "dynamic-setting.el" +;;;;;; "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" +;;;;;; "emacs-lisp/byte-opt.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" ;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" ;;;;;; "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el" ;;;;;; "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el" @@ -31864,32 +31864,32 @@ Zone out, completely. ;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" ;;;;;; "eshell/em-term.el" "eshell/em-tramp.el" "eshell/em-unix.el" ;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" -;;;;;; "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el" -;;;;;; "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el" -;;;;;; "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "format-spec.el" -;;;;;; "fringe.el" "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" -;;;;;; "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el" -;;;;;; "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el" -;;;;;; "gnus/gnus-ems.el" "gnus/gnus-icalendar.el" "gnus/gnus-int.el" -;;;;;; "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el" -;;;;;; "gnus/gnus-score.el" "gnus/gnus-setup.el" "gnus/gnus-srvr.el" -;;;;;; "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el" -;;;;;; "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" -;;;;;; "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" "gnus/mail-prsvr.el" -;;;;;; "gnus/mail-source.el" "gnus/mailcap.el" "gnus/messcompat.el" -;;;;;; "gnus/mm-archive.el" "gnus/mm-bodies.el" "gnus/mm-decode.el" -;;;;;; "gnus/mm-util.el" "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" -;;;;;; "gnus/nnagent.el" "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" -;;;;;; "gnus/nneething.el" "gnus/nngateway.el" "gnus/nnheader.el" -;;;;;; "gnus/nnimap.el" "gnus/nnir.el" "gnus/nnmail.el" "gnus/nnmaildir.el" -;;;;;; "gnus/nnmairix.el" "gnus/nnmbox.el" "gnus/nnmh.el" "gnus/nnnil.el" -;;;;;; "gnus/nnoo.el" "gnus/nnregistry.el" "gnus/nnrss.el" "gnus/nnspool.el" -;;;;;; "gnus/nntp.el" "gnus/nnvirtual.el" "gnus/nnweb.el" "gnus/registry.el" -;;;;;; "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el" "gnus/rfc2104.el" -;;;;;; "gnus/rfc2231.el" "gnus/rtree.el" "gnus/sieve-manage.el" -;;;;;; "gnus/smime.el" "gnus/spam-stat.el" "gnus/spam-wash.el" "hex-util.el" -;;;;;; "hfy-cmap.el" "ibuf-ext.el" "international/cp51932.el" "international/eucjp-ms.el" -;;;;;; "international/fontset.el" "international/iso-ascii.el" "international/ja-dic-cnv.el" +;;;;;; "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-module.el" +;;;;;; "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el" +;;;;;; "eshell/esh-var.el" "ezimage.el" "format-spec.el" "fringe.el" +;;;;;; "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" +;;;;;; "gnus/gnus-cite.el" "gnus/gnus-cus.el" "gnus/gnus-demon.el" +;;;;;; "gnus/gnus-dup.el" "gnus/gnus-eform.el" "gnus/gnus-ems.el" +;;;;;; "gnus/gnus-icalendar.el" "gnus/gnus-int.el" "gnus/gnus-logic.el" +;;;;;; "gnus/gnus-mh.el" "gnus/gnus-salt.el" "gnus/gnus-score.el" +;;;;;; "gnus/gnus-setup.el" "gnus/gnus-srvr.el" "gnus/gnus-topic.el" +;;;;;; "gnus/gnus-undo.el" "gnus/gnus-util.el" "gnus/gnus-uu.el" +;;;;;; "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" "gnus/legacy-gnus-agent.el" +;;;;;; "gnus/mail-parse.el" "gnus/mail-prsvr.el" "gnus/mail-source.el" +;;;;;; "gnus/mailcap.el" "gnus/messcompat.el" "gnus/mm-archive.el" +;;;;;; "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-util.el" +;;;;;; "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" "gnus/nnagent.el" +;;;;;; "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" "gnus/nneething.el" +;;;;;; "gnus/nngateway.el" "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnir.el" +;;;;;; "gnus/nnmail.el" "gnus/nnmaildir.el" "gnus/nnmairix.el" "gnus/nnmbox.el" +;;;;;; "gnus/nnmh.el" "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnregistry.el" +;;;;;; "gnus/nnrss.el" "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnvirtual.el" +;;;;;; "gnus/nnweb.el" "gnus/registry.el" "gnus/rfc1843.el" "gnus/rfc2045.el" +;;;;;; "gnus/rfc2047.el" "gnus/rfc2104.el" "gnus/rfc2231.el" "gnus/rtree.el" +;;;;;; "gnus/sieve-manage.el" "gnus/smime.el" "gnus/spam-stat.el" +;;;;;; "gnus/spam-wash.el" "hex-util.el" "hfy-cmap.el" "ibuf-ext.el" +;;;;;; "international/cp51932.el" "international/eucjp-ms.el" "international/fontset.el" +;;;;;; "international/iso-ascii.el" "international/ja-dic-cnv.el" ;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "kermit.el" ;;;;;; "language/hanja-util.el" "language/thai-word.el" "ldefs-boot.el" ;;;;;; "leim/quail/arabic.el" "leim/quail/croatian.el" "leim/quail/cyril-jis.el" @@ -31950,14 +31950,14 @@ Zone out, completely. ;;;;;; "org/org-faces.el" "org/org-feed.el" "org/org-footnote.el" ;;;;;; "org/org-gnus.el" "org/org-habit.el" "org/org-id.el" "org/org-indent.el" ;;;;;; "org/org-info.el" "org/org-inlinetask.el" "org/org-install.el" -;;;;;; "org/org-irc.el" "org/org-list.el" "org/org-loaddefs.el" -;;;;;; "org/org-macro.el" "org/org-mhe.el" "org/org-mobile.el" "org/org-mouse.el" -;;;;;; "org/org-pcomplete.el" "org/org-plot.el" "org/org-protocol.el" -;;;;;; "org/org-rmail.el" "org/org-src.el" "org/org-table.el" "org/org-timer.el" -;;;;;; "org/org-w3m.el" "org/ox-ascii.el" "org/ox-beamer.el" "org/ox-html.el" -;;;;;; "org/ox-icalendar.el" "org/ox-latex.el" "org/ox-man.el" "org/ox-md.el" -;;;;;; "org/ox-odt.el" "org/ox-org.el" "org/ox-publish.el" "org/ox-texinfo.el" -;;;;;; "org/ox.el" "play/gametree.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" +;;;;;; "org/org-irc.el" "org/org-list.el" "org/org-macro.el" "org/org-mhe.el" +;;;;;; "org/org-mobile.el" "org/org-mouse.el" "org/org-pcomplete.el" +;;;;;; "org/org-plot.el" "org/org-protocol.el" "org/org-rmail.el" +;;;;;; "org/org-src.el" "org/org-table.el" "org/org-timer.el" "org/org-w3m.el" +;;;;;; "org/ox-ascii.el" "org/ox-beamer.el" "org/ox-html.el" "org/ox-icalendar.el" +;;;;;; "org/ox-latex.el" "org/ox-man.el" "org/ox-md.el" "org/ox-odt.el" +;;;;;; "org/ox-org.el" "org/ox-publish.el" "org/ox-texinfo.el" "org/ox.el" +;;;;;; "play/gametree.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" ;;;;;; "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el" ;;;;;; "progmodes/cc-defs.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el" ;;;;;; "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" @@ -31979,8 +31979,8 @@ Zone out, completely. ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21628 23968 97140 -;;;;;; 527000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21710 6806 326933 +;;;;;; 550000)) ;;;*** From d69e9f1c24f37f36af33b0468c5a4e100dbb09b6 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sun, 1 Feb 2015 21:20:35 +0000 Subject: [PATCH 020/457] CC Mode: Stop Font Lock forcing fontification from BOL. Fixes debbugs#19669. cc-mode.el (c-font-lock-init): Setq font-lock-extend-region-functions to nil. --- lisp/ChangeLog | 8 ++++++++ lisp/progmodes/cc-mode.el | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fd54c688640..2d4f71f6cec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-02-01 Alan Mackenzie + + CC Mode: Stop Font Lock forcing fontification from BOL. Fixes + debbugs#19669. + + * progmodes/cc-mode.el (c-font-lock-init): Setq + font-lock-extend-region-functions to nil. + 2015-01-31 Alan Mackenzie Handle "#" operator properly inside macro. Fix coding bug. diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 1cba5027f28..50a700425bf 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1237,6 +1237,14 @@ This function is called from `c-common-init', once per mode initialization." (font-lock-mark-block-function . c-mark-function))) + ;; Prevent `font-lock-default-fontify-region' extending the region it will + ;; fontify to whole lines by removing `font-lock-extend-region-whole-lines' + ;; (and, coincidentally, `font-lock-extend-region-multiline' (which we do + ;; not need)) from `font-lock-extend-region-functions'. (Emacs only). This + ;; fixes Emacs bug #19669. + (when (boundp 'font-lock-extend-region-functions) + (setq font-lock-extend-region-functions nil)) + (make-local-variable 'font-lock-fontify-region-function) (setq font-lock-fontify-region-function 'c-font-lock-fontify-region) From d3852a99c99f0785425a3a4c9d48d31e9aeec7c9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 1 Feb 2015 16:55:24 -0800 Subject: [PATCH 021/457] * admin/admin.el (manual-meta-string): Use bug-gnu-emacs@gnu rather than webmasters@gnu --- admin/ChangeLog | 5 +++++ admin/admin.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index b1d8ed858da..f5490013544 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2015-02-02 Glenn Morris + + * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address + rather than webmasters@gnu. + 2015-01-03 Glenn Morris * update_autogen (commit): Prepend "# " to commit message. diff --git a/admin/admin.el b/admin/admin.el index fcdb6cb1444..bb0fbd31f13 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -297,7 +297,7 @@ Optional argument TYPE is type of output (nil means all)." (defconst manual-meta-string " - + \n\n") From 9e22ff02ed9e0e448ee372cadbcecbc3e7d2dad8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 1 Feb 2015 17:08:51 -0800 Subject: [PATCH 022/457] # ChangeLog fixes, backported --- admin/ChangeLog | 13 +++++++------ doc/misc/ChangeLog | 5 ++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index f5490013544..88d996532e0 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -19,7 +19,7 @@ 2014-11-17 Oscar Fuentes - * admin/CPP-DEFINES: Mention MINGW_W64. + * CPP-DEFINES: Mention MINGW_W64. 2014-11-15 Glenn Morris @@ -29,9 +29,10 @@ 2014-11-11 Eric S. Raymond - * make-tarball.txt, update-copyright, admin/notes/bugtracker, - admin/notes/tags, admin/update-copyright, admin/update_autogen: - admin/repo.notes: git transition. + * make-tarball.txt, notes/bugtracker, notes/repo, notes/tags: + Git transition. + * update-copyright: Use git ls-files. + * update_autogen: Remove some bzr conditionals. 2014-11-09 Eli Zaretskii @@ -52,8 +53,8 @@ 2014-10-31 Eric S. Raymond - * notes/bzr: Renamed to notes/repo, reorganized to separate - VCS-dependent from VCS-independent stuff. Added guidance about + * notes/bzr: Rename to notes/repo, reorganize to separate + VCS-dependent from VCS-independent stuff. Add guidance about commit-comment format under DVCSes. * notes/BRANCH: Merged into notes/repo. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 58b5d1d281c..71469b51808 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -41,9 +41,8 @@ 2014-10-31 Eric S. Raymond - * efaq-w32.texi: Neutralized language specific to a repository type. - - * gnus-coding.txt: Neutralized language specific to a repository type. + * efaq-w32.texi, gnus-coding.texi: + Neutralize language specific to a repository type. 2014-10-30 Glenn Morris From 43b82baa79132b4ad8ae123532c8f49467d93cb1 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 1 Feb 2015 17:17:57 -0800 Subject: [PATCH 023/457] authors.el: backport some additions * lisp/emacs-lisp/authors.el (authors-obsolete-files-regexps) (authors-valid-file-names, authors-renamed-files-alist): Additions. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/authors.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2d4f71f6cec..cc42bcecc9c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-02 Glenn Morris + + * emacs-lisp/authors.el (authors-obsolete-files-regexps) + (authors-valid-file-names, authors-renamed-files-alist): Additions. + 2015-02-01 Alan Mackenzie CC Mode: Stop Font Lock forcing fontification from BOL. Fixes diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index e20ae9543cd..762b0a3a2f5 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -240,7 +240,7 @@ If REALNAME is nil, ignore that author.") (defvar authors-obsolete-files-regexps '(".*loaddefs.el$" ; not obsolete, but auto-generated - "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting + "\\.\\(bzr\\|cvs\\|git\\)ignore$" ; obsolete or uninteresting "\\.arch-inventory$" "automated/data/" ; not interesting ;; TODO lib/? Matches other things? @@ -632,6 +632,7 @@ Changes to files in this list are not listed.") "images/page-down.xpm" "images/widen.pbm" "images/widen.xpm" "images/gnus/bar.xbm" "images/gnus/bar.xpm" "images/gnus/reverse-smile.xpm" + "notes/changelogs" "revdiff" ; admin/ "vcdiff" "rcs-checkin" "tindex.pl" "mainmake" "sed1.inp" "sed2.inp" "sed3.inp" ; msdos/ @@ -848,6 +849,8 @@ in the repository.") ("grammars/wisent-grammar.el" . "wisent/grammar.el") ;; Moved from admin/nt/ to nt/. ("nt/README.W32" . "README.W32") + ("notes/BRANCH" . "notes/repo") + ("notes/bzr" . "notes/repo") ) "Alist of files which have been renamed during their lifetime. Elements are (OLDNAME . NEWNAME).") From 50f3811883c7082b3c2a5a10bcfe77a3adfcb6ff Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 2 Feb 2015 10:16:04 +0100 Subject: [PATCH 024/457] net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" Fixes: debbugs:19702 * net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for ControlPath if possible. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp.el | 24 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc42bcecc9c..8ef533e1aa6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-02 Michael Albinus + + * net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for + ControlPath if possible. (Bug#19702) + 2015-02-02 Glenn Morris * emacs-lisp/authors.el (authors-obsolete-files-regexps) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 3afb487ec3d..c442806b90f 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -311,17 +311,25 @@ useful only in combination with `tramp-default-proxies-alist'.") (let ((result "") (case-fold-search t)) (ignore-errors - (with-temp-buffer - (call-process "ssh" nil t nil "-o" "ControlMaster") - (goto-char (point-min)) - (when (search-forward-regexp "missing.+argument" nil t) - (setq result "-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto"))) - (unless (zerop (length result)) + (when (executable-find "ssh") (with-temp-buffer - (call-process "ssh" nil t nil "-o" "ControlPersist") + (call-process "ssh" nil t nil "-o" "ControlMaster") (goto-char (point-min)) (when (search-forward-regexp "missing.+argument" nil t) - (setq result (concat result " -o ControlPersist=no")))))) + (setq result "-o ControlMaster=auto"))) + (unless (zerop (length result)) + (with-temp-buffer + (call-process + "ssh" nil t nil "-o" "ControlPath=%C" "host.does.not.exist") + (goto-char (point-min)) + (if (search-forward-regexp "unknown.+key" nil t) + (setq result (concat result " -o ControlPath=%t.%%r@%%h:%%p")) + (setq result (concat result " -o ControlPath=%t.%%C")))) + (with-temp-buffer + (call-process "ssh" nil t nil "-o" "ControlPersist") + (goto-char (point-min)) + (when (search-forward-regexp "missing.+argument" nil t) + (setq result (concat result " -o ControlPersist=no"))))))) result) "Call ssh to detect whether it supports the Control* arguments. Return a string to be used in `tramp-methods'.") From e9a7e10b1818b484af0a36631d2ee6034ac752dc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 2 Feb 2015 18:15:13 +0200 Subject: [PATCH 025/457] Fix redrawing of mode lines when exposed (Bug#19721) src/dispnew.c (adjust_glyph_matrix): Set the update_mode_line flag of the window whose current glyph matrix was resized, which disables the mode-line row as side effect. src/xdisp.c (redisplay_window): Don't avoid redisplay of a window whose update_mode_line flag is set. --- src/ChangeLog | 9 +++++++++ src/dispnew.c | 6 ++++++ src/xdisp.c | 1 + 3 files changed, 16 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 829eb25f4d9..c8ea8b586ed 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2015-02-02 Eli Zaretskii + + * dispnew.c (adjust_glyph_matrix): Set the update_mode_line flag + of the window whose current glyph matrix was resized, which + disables the mode-line row as side effect. + + * xdisp.c (redisplay_window): Don't avoid redisplay of a window + whose update_mode_line flag is set. (Bug#19721) + 2015-01-30 Eli Zaretskii * dispextern.h (FACE_FOR_CHAR): Fix the commentary. diff --git a/src/dispnew.c b/src/dispnew.c index f73ea58b7f3..6517c9b5d19 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -570,6 +570,12 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y for (i = 0; i < matrix->nrows; ++i) matrix->rows[i].enabled_p = false; } + /* We've disabled the mode-line row, so force redrawing of + the mode line, if any, since otherwise it will remain + disabled in the current matrix, and expose events won't + redraw it. */ + if (WINDOW_WANTS_MODELINE_P (w)) + w->update_mode_line = 1; } else if (matrix == w->desired_matrix) { diff --git a/src/xdisp.c b/src/xdisp.c index b1125d324c2..2ebf06d5c34 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -15964,6 +15964,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p) if (!just_this_one_p && REDISPLAY_SOME_P () && !w->redisplay + && !w->update_mode_line && !f->redisplay && !buffer->text->redisplay && BUF_PT (buffer) == w->last_point) From 27e11c01859e0d60c4c8502421a5d363d0153dfb Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 2 Feb 2015 18:23:32 +0200 Subject: [PATCH 026/457] Fix display of overlay strings with faces after ellipsis (Bug#19307) src/xdisp.c (set_iterator_to_next): Set value of stop_charpos according to the object we are about to resume iterating. --- src/ChangeLog | 4 ++++ src/xdisp.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c8ea8b586ed..6f678d481a6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2015-02-02 Eli Zaretskii + * xdisp.c (set_iterator_to_next): Set value of stop_charpos + according to the object we are about to resume iterating. + (Bug#19307) + * dispnew.c (adjust_glyph_matrix): Set the update_mode_line flag of the window whose current glyph matrix was resized, which disables the mode-line row as side effect. diff --git a/src/xdisp.c b/src/xdisp.c index 2ebf06d5c34..6a1e3ee2dc2 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -7488,7 +7488,12 @@ set_iterator_to_next (struct it *it, int reseat_p) /* Maybe recheck faces after display vector. */ if (recheck_faces) - it->stop_charpos = IT_CHARPOS (*it); + { + if (it->method == GET_FROM_STRING) + it->stop_charpos = IT_STRING_CHARPOS (*it); + else + it->stop_charpos = IT_CHARPOS (*it); + } } break; From d6fee01589a0f10b3d761bd9bdf582730c92a171 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 3 Feb 2015 10:32:00 +0100 Subject: [PATCH 027/457] Tramp: Don't use a tempfile for ControlPath. Fixes: debbugs:19702 * net/tramp.el (tramp-ssh-controlmaster-options): Don't use a tempfile for ControlPath. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ef533e1aa6..a61c2403dd3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-03 Michael Albinus + + * net/tramp.el (tramp-ssh-controlmaster-options): Don't use a + tempfile for ControlPath. (Bug#19702) + 2015-02-02 Michael Albinus * net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c442806b90f..b746bca5804 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -323,8 +323,9 @@ useful only in combination with `tramp-default-proxies-alist'.") "ssh" nil t nil "-o" "ControlPath=%C" "host.does.not.exist") (goto-char (point-min)) (if (search-forward-regexp "unknown.+key" nil t) - (setq result (concat result " -o ControlPath=%t.%%r@%%h:%%p")) - (setq result (concat result " -o ControlPath=%t.%%C")))) + (setq result + (concat result " -o ControlPath=tramp.%%r@%%h:%%p")) + (setq result (concat result " -o ControlPath=tramp.%%C")))) (with-temp-buffer (call-process "ssh" nil t nil "-o" "ControlPersist") (goto-char (point-min)) From 4e8d586076f412b9dfe43241e455a7c76b117020 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 3 Feb 2015 10:42:13 +0100 Subject: [PATCH 028/457] Fix last commit --- lisp/net/tramp.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index b746bca5804..2e1fe69460a 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -324,8 +324,8 @@ useful only in combination with `tramp-default-proxies-alist'.") (goto-char (point-min)) (if (search-forward-regexp "unknown.+key" nil t) (setq result - (concat result " -o ControlPath=tramp.%%r@%%h:%%p")) - (setq result (concat result " -o ControlPath=tramp.%%C")))) + (concat result " -o ControlPath='tramp.%%r@%%h:%%p'")) + (setq result (concat result " -o ControlPath='tramp.%%C'")))) (with-temp-buffer (call-process "ssh" nil t nil "-o" "ControlPersist") (goto-char (point-min)) From e589765b881e64c26b29509dd99f2dc51ad44153 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 3 Feb 2015 20:52:18 +0200 Subject: [PATCH 029/457] A more thorough fix for bug#19307 src/xdisp.c (handle_stop, handle_single_display_spec) (next-element_from_image): Don't reset the ignore_overlay_strings_at_pos_p flag here. (next_element_from_buffer): Reset ignore_overlay_strings_at_pos_p here. (next_overlay_string): Set ignore_overlay_strings_at_pos_p here, after we've exhausted all the overlay strings at the current position. --- src/ChangeLog | 11 +++++++++++ src/xdisp.c | 26 ++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6f678d481a6..8e7ab9363f6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2015-02-03 Eli Zaretskii + + * xdisp.c (handle_stop, handle_single_display_spec) + (next-element_from_image): Don't reset the + ignore_overlay_strings_at_pos_p flag here. + (next_element_from_buffer): Reset ignore_overlay_strings_at_pos_p + here. + (next_overlay_string): Set ignore_overlay_strings_at_pos_p here, + after we've exhausted all the overlay strings at the current + position. (Bug#19307) + 2015-02-02 Eli Zaretskii * xdisp.c (set_iterator_to_next): Set value of stop_charpos diff --git a/src/xdisp.c b/src/xdisp.c index 6a1e3ee2dc2..5e552ca2fdb 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -3434,7 +3434,6 @@ handle_stop (struct it *it) it->dpvec = NULL; it->current.dpvec_index = -1; handle_overlay_change_p = !it->ignore_overlay_strings_at_pos_p; - it->ignore_overlay_strings_at_pos_p = 0; it->ellipsis_p = 0; /* Use face of preceding text for ellipsis (if invisible) */ @@ -3525,7 +3524,6 @@ handle_stop (struct it *it) pop_it (it); else { - it->ignore_overlay_strings_at_pos_p = true; it->string_from_display_prop_p = 0; it->from_disp_prop_p = 0; handle_overlay_change_p = 0; @@ -5121,11 +5119,6 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, iterate_out_of_display_property (it); *position = it->position; } - /* If we were to display this fringe bitmap, - next_element_from_image would have reset this flag. - Do the same, to avoid affecting overlays that - follow. */ - it->ignore_overlay_strings_at_pos_p = 0; return 1; } } @@ -5145,9 +5138,6 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, iterate_out_of_display_property (it); *position = it->position; } - if (it) - /* Reset this flag like next_element_from_image would. */ - it->ignore_overlay_strings_at_pos_p = 0; return 1; } @@ -5640,6 +5630,12 @@ next_overlay_string (struct it *it) if (it->sp > 0 && STRINGP (it->string) && !SCHARS (it->string)) pop_it (it); + /* Since we've exhausted overlay strings at this buffer + position, set the flag to ignore overlays until we move to + another position. The flag is reset in + next_element_from_buffer. */ + it->ignore_overlay_strings_at_pos_p = true; + /* If we're at the end of the buffer, record that we have processed the overlay strings there already, so that next_element_from_buffer doesn't try it again. */ @@ -7478,10 +7474,6 @@ set_iterator_to_next (struct it *it, int reseat_p) reseat_at_next_visible_line_start (it, 1); else if (it->dpvec_char_len > 0) { - if (it->method == GET_FROM_STRING - && it->current.overlay_string_index >= 0 - && it->n_overlay_strings > 0) - it->ignore_overlay_strings_at_pos_p = true; it->len = it->dpvec_char_len; set_iterator_to_next (it, reseat_p); } @@ -8110,7 +8102,6 @@ static int next_element_from_image (struct it *it) { it->what = IT_IMAGE; - it->ignore_overlay_strings_at_pos_p = 0; return 1; } @@ -8280,6 +8271,7 @@ next_element_from_buffer (struct it *it) and handle the last stop_charpos that precedes our current position. */ handle_stop_backwards (it, it->stop_charpos); + it->ignore_overlay_strings_at_pos_p = false; return GET_NEXT_DISPLAY_ELEMENT (it); } else @@ -8296,6 +8288,7 @@ next_element_from_buffer (struct it *it) it->base_level_stop = it->stop_charpos; } handle_stop (it); + it->ignore_overlay_strings_at_pos_p = false; return GET_NEXT_DISPLAY_ELEMENT (it); } } @@ -8323,6 +8316,7 @@ next_element_from_buffer (struct it *it) } else handle_stop_backwards (it, it->base_level_stop); + it->ignore_overlay_strings_at_pos_p = false; return GET_NEXT_DISPLAY_ELEMENT (it); } else @@ -8334,7 +8328,7 @@ next_element_from_buffer (struct it *it) /* We moved to the next buffer position, so any info about previously seen overlays is no longer valid. */ - it->ignore_overlay_strings_at_pos_p = 0; + it->ignore_overlay_strings_at_pos_p = false; /* Maybe run the redisplay end trigger hook. Performance note: This doesn't seem to cost measurable time. */ From ec26c23f4815fbc6bbd16d20f400721bc7b58344 Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Wed, 4 Feb 2015 01:11:13 +0100 Subject: [PATCH 030/457] authors.el: Add missing ignored and renamed files * emacs-lisp/authors.el (authors-ignored-files) (authors-renamed-files-alist): Additions. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/authors.el | 2 ++ 2 files changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a61c2403dd3..e52f9a35b47 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-04 Nicolas Petton + + * emacs-lisp/authors.el (authors-ignored-files) + (authors-renamed-files-alist): Additions. + 2015-02-03 Michael Albinus * net/tramp.el (tramp-ssh-controlmaster-options): Don't use a diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 762b0a3a2f5..b44f7aa7146 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -354,6 +354,7 @@ Changes to files matching one of the regexps in this list are not listed.") "All" "Version" "Everywhere" "Many" "Various" "files" ;; Directories. "vms" "mac" "url" "tree-widget" + "info/dir" ) "List of files and directories to ignore. Changes to files in this list are not listed.") @@ -779,6 +780,7 @@ in the repository.") ("play/bruce.el" . "bruce.el") ("play/yow.el" . "yow.el") ("patcomp.el" . "patcomp.el") + ("emulation/ws-mode.el" . "ws-mode.el") ;; From lisp to etc/forms. ("forms-d2.el" . "forms-d2.el") ("forms-pass.el" . "forms-pass.el") From 4779a4bbcc2ce7599a546cc61aab6106376680fa Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Wed, 4 Feb 2015 01:14:26 +0100 Subject: [PATCH 031/457] Bump version to 24.4.90 --- README | 2 +- configure.ac | 2 +- doc/emacs/emacsver.texi | 2 +- doc/man/emacs.1 | 2 +- etc/AUTHORS | 252 +++-- lisp/ldefs-boot.el | 2269 ++++++++++++++++++++------------------- msdos/sed2v2.inp | 2 +- nt/config.nt | 2 +- nt/emacs.rc | 8 +- nt/emacsclient.rc | 8 +- nt/makefile.w32-in | 2 +- 11 files changed, 1293 insertions(+), 1258 deletions(-) diff --git a/README b/README index 87335e72fc3..3331ec4075a 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2015 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 24.4.51 of GNU Emacs, the extensible, +This directory tree holds version 24.4.90 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure.ac b/configure.ac index 9c8df9dcdb5..776b7a02931 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) -AC_INIT(emacs, 24.4.51) +AC_INIT(emacs, 24.4.90) dnl We get MINGW64 with MSYS2 if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64" diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index cef51213d5e..310565d1ec6 100644 --- a/doc/emacs/emacsver.texi +++ b/doc/emacs/emacsver.texi @@ -1,4 +1,4 @@ @c It would be nicer to generate this using configure and @version@. @c However, that would mean emacsver.texi would always be newer @c then the info files in release tarfiles. -@set EMACSVER 24.4.51 +@set EMACSVER 24.4.90 diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index e68c89ff83d..78d9e82bb5f 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 24.4.51" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.4.90" . . .SH NAME diff --git a/etc/AUTHORS b/etc/AUTHORS index d2d6e53f6ca..798866bda8c 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -32,7 +32,7 @@ Adam Gołębiowski: changed lib-src/Makefile.in Adam Hupp: changed emacs.py emacs2.py emacs3.py gud.el progmodes/python.el -Adam Sjøgren: changed spam.el mml2015.el shr.el xterm.c blink.xpm +Adam Sjøgren: changed mml2015.el spam.el shr.el xterm.c blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm frown.xpm grin.xpm gtkutil.c indifferent.xpm reverse-smile.xpm sad.xpm smile.xpm wry.xpm gnus-html.el gnus-spec.el gnus-start.el and 5 other files @@ -86,8 +86,8 @@ and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-fonts.el cc-langs.el cc-mode.el cc-styles.el cc-vars.el and changed cc-mode.texi lread.c programs.texi font-lock.el isearch.el font-core.el lisp.el modes.texi search.texi cc-menus.el cc-subword.el - display.texi easy-mmode.el os.texi startup.el subr.el text.texi - INSTALL.REPO add-log.el buffers.texi bytecomp.el and 24 other files + display.texi easy-mmode.el os.texi startup.el subr.el syntax.c + text.texi INSTALL.REPO add-log.el buffers.texi and 24 other files Alan Schmitt: changed ob-ocaml.el org-faces.el @@ -230,7 +230,7 @@ Andreas Rottmann: changed emacsclient.1 emacsclient.c misc.texi server.el Andreas Schwab: changed configure.ac lisp.h xdisp.c process.c alloc.c coding.c Makefile.in keyboard.c files.el fileio.c xterm.c editfns.c emacs.c print.c src/Makefile.in fns.c lread.c eval.c xfns.c font.c - sysdep.c and 632 other files + sysdep.c and 633 other files Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus-sum.el gnus.el nnslashdot.el gnus-srvr.el gnus-util.el mm-url.el mm-uu.el @@ -359,10 +359,10 @@ Barry O'Reilly: changed simple.el lisp.h keyboard.c markers.texi Bastien Guerry: wrote gnus-bookmark.el and co-wrote org-bibtex.el org-list.el org-protocol.el org-src.el and changed org.el org-agenda.el org.texi ox-html.el org-clock.el - org-capture.el org-table.el ox-latex.el ox.el ox-odt.el org-compat.el - ox-publish.el ob.el org-mobile.el org-colview.el org-macs.el - org-pcomplete.el org-timer.el org-faces.el ox-ascii.el org-archive.el - and 116 other files + org-capture.el org-table.el ox-latex.el org-exp.el ox-odt.el + org-compat.el ob.el org-mobile.el org-colview.el org-publish.el ox.el + org-macs.el org-pcomplete.el org-timer.el org-faces.el ox-ascii.el + and 119 other files Ben A. Mesander: co-wrote erc-dcc.el @@ -425,7 +425,7 @@ and changed mh-customize.el mh-search.el mh-alias.el Makefile mh-e.texi mh-identity.el README mh-speed.el mh-init.el mh-acros.el mh-gnus.el mh-unit.el mh-inc.el mh-xemacs-compat.el mh-print.el lisp/Makefile.in image.el mh-tool-bar.el mh-xemacs.el display.texi makefile.w32-in - and 87 other files + and 86 other files Bjorn Solberg: changed nnimap.el @@ -540,11 +540,11 @@ Carsten Dominik: wrote idlw-complete-structtag.el idlw-toolbar.el and co-wrote idlw-help.el idlw-shell.el idlwave.el org-bbdb.el org-bibtex.el org-entities.el org-gnus.el org-list.el org-pcomplete.el org-src.el ox-beamer.el ox-html.el ox-icalendar.el -and changed ox.el ox-latex.el org.texi org-remember.el orgcard.tex - ox-publish.el org-docbook.el ox-ascii.el org-attach.el org-protocol.el - org-mouse.el org-mac-message.el org-wl.el ox-jsinfo.el org-crypt.el - org-freemind.el idlw-rinfo.el org-exp-blocks.el org-habit.el org-mhe.el - org-plot.el and 35 other files +and changed org-exp.el ox-latex.el org.texi org-publish.el + org-remember.el orgcard.tex org-export-latex.el org-docbook.el + ox-ascii.el org-attach.el org-protocol.el org-mouse.el org-jsinfo.el + org-mac-message.el org-wl.el org-crypt.el org-freemind.el idlw-rinfo.el + org-exp-blocks.el org-habit.el org-mhe.el and 35 other files Caveh Jalali: changed configure.ac intel386.h sol2-4.h @@ -576,7 +576,7 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el and changed simple.el display.texi xdisp.c files.el frames.texi cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c startup.el package.el misc.texi emacs.texi modes.texi mouse.el - custom.texi image.c window.el and 949 other files + custom.texi image.c window.el and 948 other files Chris Chase: co-wrote idlw-shell.el idlwave.el @@ -659,7 +659,7 @@ and changed format.el gnus-art.el gnus-picon.el message.el register.el Christophe Junke: changed org-agenda.el org.el -Christophe Rhodes: changed ox-latex.el ox.el +Christophe Rhodes: changed org-exp.el ox-latex.el Christophe de Dinechin: co-wrote ns-win.el @@ -749,10 +749,10 @@ Dan Christensen: changed gnus-sum.el nndoc.el nnfolder.el gnus-art.el Dan Davison: wrote ob-matlab.el ob-octave.el and co-wrote ob-R.el ob-core.el ob-exp.el ob-lob.el ob-perl.el ob-python.el ob-ref.el org-src.el -and changed ob.el ob-sh.el org.el ox.el ox-latex.el ob-tangle.el ob-C.el - ob-asymptote.el ob-clojure.el ob-haskell.el ob-ruby.el ob-scheme.el - ob-table.el ob-ditaa.el ob-dot.el ob-gnuplot.el ob-js.el ob-mscgen.el - ob-ocaml.el ob-org.el ob-plantuml.el and 14 other files +and changed ob.el ob-sh.el org-exp.el org.el ox-latex.el ob-tangle.el + ob-C.el ob-asymptote.el ob-clojure.el ob-haskell.el ob-ruby.el + ob-scheme.el ob-table.el ob-ditaa.el ob-dot.el ob-gnuplot.el ob-js.el + ob-mscgen.el ob-ocaml.el ob-org.el ob-plantuml.el and 14 other files Dan Nicolaescu: wrote iris-ansi.el romanian.el vc-dir.el and co-wrote hideshow.el @@ -764,9 +764,10 @@ and changed vc.el configure.ac vc-hg.el vc-git.el src/Makefile.in Dan Rosenberg: changed movemail.c Dani Moncayo: changed Makefile.in buffers.texi configure.ac lists.texi - mini.texi msys-to-w32 nt/makefile.w32-in INSTALL basic.texi custom.texi - dired.texi display.texi emacs-lisp-intro.texi killing.texi make-dist - mark.texi msysconfig.sh simple.el text.texi version.el zipdist.bat + mini.texi msys-to-w32 nt/makefile.w32-in INSTALL README.W32 basic.texi + custom.texi dired.texi display.texi emacs-lisp-intro.texi killing.texi + make-dist mark.texi msysconfig.sh simple.el text.texi version.el + zipdist.bat Daniel Bergey: changed indian.el @@ -778,9 +779,9 @@ Daniel Colascione: co-wrote js.el and changed w32fns.c emacs.c image.c keyboard.c configure.ac cygw32.c process.c src/Makefile.in w32term.h cygw32.h dbusbind.c sh-script.el unexw32.c w32term.c alloc.c cl-macs.el coding.c conf_post.h menu.c - w32-win.el w32.c and 100 other files + w32-win.el w32.c and 99 other files -Daniel Dehennin: changed mml2015.el gnus-msg.el mm-decode.el ox.el +Daniel Dehennin: changed mml2015.el gnus-msg.el mm-decode.el org-exp.el Daniel E. Doherty: changed calc.texi @@ -799,6 +800,8 @@ and changed package-x.el ange-ftp.el automated/Makefile.in browse-url.el Daniel Jensen: changed apropos.el +Daniel Koning: changed artist.el commands.texi subr.el + Daniel LaLiberte: wrote cust-print.el edebug.el isearch.el and co-wrote hideif.el and changed mlconvert.el eval-region.el @@ -950,9 +953,9 @@ and changed display.texi David M. Smith: wrote ielm.el and changed imenu.el pgg-def.el xterm.c -David Maus: changed org.el org-agenda.el ox.el org-feed.el org-wl.el +David Maus: changed org.el org-agenda.el org-exp.el org-feed.el org-wl.el org-macs.el ox-html.el org-capture.el org.texi org-gnus.el org-bbdb.el - org-clock.el org-protocol.el ox-publish.el ob-haskell.el ob.el + org-clock.el org-protocol.el org-publish.el ob-haskell.el ob.el org-bibtex.el org-compat.el org-footnote.el org-id.el org-list.el and 20 other files @@ -1065,7 +1068,8 @@ and changed nntp.el message.el gnus-group.el gnus-sum.el gnus-msg.el Dieter Schuster: changed etags.c -Dima Kogan: changed hideshow.el subword.el gud.el simple.el +Dima Kogan: changed hideshow.el subword.el erc-backend.el gud.el + simple.el xgselect.c Dirk Herrmann: co-wrote bibtex.el @@ -1088,10 +1092,10 @@ Dmitry Dzhus: changed gdb-mi.el gud.el fadr.el all.xpm building.texi Dmitry Gorbik: changed org.el Dmitry Gutov: changed ruby-mode.el ruby-mode-tests.el ruby.rb package.el - log-edit.el vc-git.el package-test.el newcomment.el archive-contents - js.el lisp.el minibuffer.el package-x-test.el whitespace.el + vc-git.el log-edit.el package-test.el js.el newcomment.el + archive-contents lisp.el minibuffer.el package-x-test.el whitespace.el lisp-mode.el package-x.el programs.texi simple.el smie.el vc.el - .dir-locals.el and 21 other files + .dir-locals.el and 24 other files Dmitry Kurochkin: changed isearch.el @@ -1165,13 +1169,13 @@ Eli Tziperman: wrote rmail-spam-filter.el Eli Zaretskii: wrote [bidirectional display in xdisp.c] [tty menus in term.c] bidi.c rxvt.el tty-colors.el -and changed xdisp.c msdos.c w32.c w32fns.c files.el fileio.c simple.el - display.texi w32proc.c dispnew.c sed1v2.inp src/makefile.w32-in - config.bat msdos.h emacs.c term.c process.c dispextern.h - src/Makefile.in info.el mainmake.v2 and 796 other files +and changed xdisp.c msdos.c w32.c w32fns.c fileio.c files.el simple.el + display.texi dispnew.c w32proc.c sed1v2.inp src/makefile.w32-in + config.bat emacs.c msdos.h dispextern.h term.c process.c + src/Makefile.in info.el mainmake.v2 and 799 other files Elias Oltmanns: changed tls.el gnus-agent.el gnus-cite.el gnus-int.el - gnus-srvr.el gnus.el + gnus-srvr.el gnus.el nnimap.el Elias Pipping: changed doc-view.el XDelAssoc.c XMakeAssoc.c files.el shr.el @@ -1186,7 +1190,7 @@ Emilio C. Lopes: changed woman.el cmuscheme.el help.el vc.el advice.el animate.el apropos.el artist.el bookmark.el cal-menu.el calc-prog.el calc-store.el calcalg3.el calendar.el calendar.texi checkdoc.el code-pages.el codepage.el completion.el cus-edit.el diff.el - and 54 other files + and 55 other files Emmanuel Briot: wrote ada-prj.el xml.el and co-wrote ada-mode.el ada-xref.el @@ -1247,7 +1251,7 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el cedet.el ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm - sb-tag-type.xpm and 30 other files + sb-tag-type.xpm and 29 other files Eric Marsden: changed gnus-cache.el url-util.el @@ -1261,7 +1265,7 @@ and co-wrote make-mode.el and changed vc.el vc-hooks.el vc-svn.el vc-cvs.el vc-git.el files.texi vc-bzr.el vc-dispatcher.el vc-hg.el vc-sccs.el vc-rcs.el vc-mcvs.el files.el comint.el emacsbug.el simple.el vc-arch.el vc-mtn.el - add-log.el cust-print.el dired.el and 257 other files + Makefile.in add-log.el cust-print.el and 267 other files Eric Schulte: wrote ob-C.el ob-asymptote.el ob-awk.el ob-calc.el ob-comint.el ob-css.el ob-ditaa.el ob-dot.el ob-emacs-lisp.el @@ -1272,7 +1276,7 @@ Eric Schulte: wrote ob-C.el ob-asymptote.el ob-awk.el ob-calc.el and co-wrote ob-R.el ob-clojure.el ob-core.el ob-exp.el ob-fortran.el ob-lisp.el ob-lob.el ob-maxima.el ob-perl.el ob-picolisp.el ob-python.el ob-ref.el ob-scheme.el org-bibtex.el -and changed org.texi org.el org-exp-blocks.el ox.el ox-latex.el +and changed org.texi org.el org-exp-blocks.el org-exp.el ox-latex.el org-src.el ob-plantuml.el ob-screen.el org-macs.el org-table.el org-agenda.el org-mouse.el orgcard.tex ob-lilypond.el ob-mscgen.el ob-octave.el org-clock.el org-compat.el org-footnote.el ox-ascii.el @@ -1345,13 +1349,14 @@ Felix S. T. Wu: co-wrote vi.el (public domain) Feng Li: changed calc-ext.el pascal.el which-func.el -Feng Shu: changed org.el org.texi ox.el ox-html.el ox-latex.el ox-odt.el +Feng Shu: changed org.el org.texi org-exp.el ox-html.el ox-latex.el + ox-odt.el ox.el Ferenc Wagner: changed nnweb.el Filipe Cabecinhas: changed nsterm.m -Filipp Gunbin: changed cc-menus.el +Filipp Gunbin: changed autorevert.el cc-menus.el Flemming Hoejstrup Hansen: changed forms.el @@ -1496,9 +1501,9 @@ Germano Caronni: changed ralloc.c Gernot Heiser: changed refer.el -Giorgos Keramidas: changed configure.ac erc-backend.el erc.el .bzrignore - alloc.c amdx86-64.h apropos.el display.texi erc-services.el filelock.c - fringe.c fringe.el lisp.h rcirc.el windows.texi xmenu.c +Giorgos Keramidas: changed configure.ac erc-backend.el erc.el alloc.c + amdx86-64.h apropos.el display.texi erc-services.el filelock.c fringe.c + fringe.el lisp.h rcirc.el windows.texi xmenu.c Giovanni Ridolfi: changed org.texi @@ -1508,10 +1513,10 @@ Giuseppe Scrivano: changed browse-url.el buffer.c configure.ac sysdep.c xsmfns.c Glenn Morris: wrote automated/f90.el automated/vc-bzr.el check-declare.el -and changed configure.ac src/Makefile.in calendar.el Makefile.in +and changed configure.ac src/Makefile.in Makefile.in calendar.el diary-lib.el files.el lisp/Makefile.in rmail.el progmodes/f90.el bytecomp.el emacs.texi simple.el make-dist misc/Makefile.in ack.texi - cal-menu.el display.texi appt.el cal-hebrew.el startup.el calendar.texi + cal-menu.el display.texi startup.el appt.el cal-hebrew.el calendar.texi and 1537 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -1579,6 +1584,8 @@ and changed bytecomp.el Hans Henrik Eriksen: wrote simula.el +Hans Wennborg: changed emacs.c + Hans de Graaff: changed mml.el Hans-Peter Deifel: changed ob.el @@ -1588,7 +1595,7 @@ Harald Maier: changed w32heap.c Harald Meland: changed gnus-art.el gnus-salt.el gnus-score.el gnus-util.el gnus-win.el mail-source.el -Harri Kiiskinen: changed org-protocol.el ox-publish.el +Harri Kiiskinen: changed org-protocol.el org-publish.el Heiko Muenkel: changed b2m.c @@ -1704,13 +1711,15 @@ Istvan Marko: changed gnus-agent.el xfns.c Itai Zukerman: changed mm-decode.el Ivan Andrus: changed find-file.el ibuf-ext.el ibuffer.el + progmodes/python.el Ivan Boldyrev: changed mml1991.el Ivan Kanis: wrote vc-hg.el and changed eww.el shr.el appt.el dired.el saveplace.el term.el time.el -Ivan Shmakov: changed desktop.el diff-mode.el nndoc.el tcl.el tex-mode.el +Ivan Shmakov: changed desktop.el diff-mode.el erc-track.el nndoc.el + tcl.el tex-mode.el Ivan Vilata i Balaguer: changed org-clock.el org.texi @@ -1745,7 +1754,7 @@ Jaeyoun Chung: changed hangul3.el hanja3.el gnus-mule.el hangul.el Jambunathan K: wrote ox-odt.el and co-wrote ox-html.el -and changed org-lparse.el org.el org.texi ox.el icomplete.el +and changed org-lparse.el org.el org-exp.el org.texi icomplete.el OrgOdtContentTemplate.xml OrgOdtStyles.xml hi-lock.el replace.el minibuffer.el org-footnote.el org-inlinetask.el register.el doc-view.el etags.el htmlfontify.el ido.el indian.el iswitchb.el org-bbdb.el @@ -1802,7 +1811,7 @@ Jan Rychter: changed gnus-msg.el Jan Schormann: wrote solitaire.el -Jan Seeger: changed ox-publish.el parse-time.el +Jan Seeger: changed org-publish.el parse-time.el Jan Tatarik: wrote gnus-icalendar.el and changed gnus-score.el gnus-logic.el @@ -2046,6 +2055,8 @@ John K. Luebs: changed org.el John Marino: changed configure.ac +John Mastro: changed auth-source.el + John Mongan: changed progmodes/f90.el John Paul Wallington: changed ibuffer.el ibuf-ext.el subr.el help-fns.el @@ -2078,7 +2089,7 @@ John Williams: changed etags.el John Yates: changed hideshow.el -Jon Anders Skorpen: changed ox-publish.el +Jon Anders Skorpen: changed org-publish.el Jon Ericson: changed gnus.el spam-report.el @@ -2149,8 +2160,8 @@ Jouni K. Seppänen: changed gnus.texi nnimap.el mm-url.el João Cachopo: changed spam.el João Távora: wrote elec-pair.el electric-tests.el -and changed shr.el electric.el emacs.texi lisp-mode.el - progmodes/python.el python-tests.el simple.el tex-mode.el tls.el vc.el +and changed shr.el tex-mode.el electric.el emacs.texi lisp-mode.el + progmodes/python.el python-tests.el simple.el tls.el vc.el Juan León Lahoz García: wrote wdired.el and changed files.el perl-mode.el @@ -2162,7 +2173,7 @@ Juanma Barranquero: wrote emacs-lock.el frameset.el and changed src/makefile.w32-in subr.el desktop.el config.nt w32fns.c lib-src/makefile.w32-in server.el emacsclient.c files.el simple.el bs.el faces.el help-fns.el org.el w32term.c xdisp.c buffer.c keyboard.c - w32.c ido.el makefile.w32-in and 1130 other files + w32.c ido.el makefile.w32-in and 1129 other files Juergen Kreileder: changed imap.el nnimap.el @@ -2194,8 +2205,8 @@ Juri Linkov: wrote files-x.el misearch.el occur-tests.el and changed isearch.el info.el replace.el simple.el dired-aux.el progmodes/grep.el dired.el progmodes/compile.el startup.el faces.el files.el menu-bar.el display.texi descr-text.el desktop.el bindings.el - image-mode.el cus-edit.el ispell.el man.el comint.el - and 355 other files + image-mode.el cus-edit.el ispell.el comint.el man.el + and 353 other files Justin Bogner: changed fortune.el @@ -2207,8 +2218,8 @@ Justus Piater: changed org-agenda.el smtpmail.el Jérémie Courrèges-Anglas: changed org.texi ox-latex.el -Jérémy Compostella: changed battery.el keyboard.c windmove.el window.el - xdisp.c +Jérémy Compostella: changed battery.el keyboard.c tramp-sh.el windmove.el + window.el xdisp.c Jérôme Marant: changed make-dist Makefile.in bindings.el configure.ac emacsclient.c leim/Makefile.in misc.texi @@ -2231,9 +2242,9 @@ and co-wrote longlines.el tramp-sh.el tramp.el and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL - Makefile.in crisp.el fileio.c and 45 other files + Makefile.in crisp.el fileio.c and 44 other files -Kai Tetzlaff: changed ox-publish.el url-http.el +Kai Tetzlaff: changed org-publish.el url-http.el Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el lisp/Makefile.in loadup.el makefile.w32-in @@ -2316,6 +2327,8 @@ Keith Packard: changed font.c Kelly Dean: changed simple.el fileio.c help-macro.el +Kelvin White: changed erc.el erc-backend.el erc-ring.el erc-stamp.el + Ken Brown: changed configure.ac gmalloc.c sheap.c cygwin.h browse-url.el emacs.c emacs.rc conf_post.h dispextern.h frame.c src/Makefile.in unexcw.c vm-limit.c w32term.c xgselect.c CPP-DEFINES alloc.c callproc.c @@ -2345,7 +2358,7 @@ and co-wrote ps-def.el ps-mule.el ps-print.el ps-samp.el quail.el and changed coding.c mule-cmds.el mule.el fontset.c charset.c xdisp.c font.c fontset.el xterm.c fileio.c mule-conf.el characters.el fns.c ftfont.c mule-diag.el coding.h charset.h ccl.c xfaces.c editfns.c - composite.c and 392 other files + composite.c and 391 other files Kenichi Okada: co-wrote sasl-cram.el sasl-digest.el @@ -2402,7 +2415,7 @@ Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el and changed xdisp.c dispextern.h process.c simple.el window.c keyboard.c xterm.c dispnew.c subr.el w32term.c lisp.h fringe.c display.texi macterm.c alloc.c fns.c xfaces.c keymap.c xfns.c xterm.h .gdbinit - and 250 other files + and 251 other files Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el gnus-win.el gnus-xmas.el gnus.texi imap.el message.el nndraft.el @@ -2507,10 +2520,11 @@ Lasse Rasinen: changed gnus-start.el Laurent Martelli: changed mm-decode.el Lawrence Mitchell: wrote erc-backend.el erc-log.el -and changed erc.el ox-latex.el org.el ox.el erc-match.el erc-nets.el - erc-nickserv.el ox-html.el browse-url.el erc-button.el erc-compat.el - erc-dcc.el erc-fill.el erc-list.el erc-track.el ielm.el ob.el Makefile - cl-macs.el erc-autoaway.el erc-autojoin.el and 25 other files +and changed erc.el ox-latex.el org.el erc-match.el erc-nets.el + erc-nickserv.el org-exp.el ox-html.el browse-url.el erc-button.el + erc-compat.el erc-dcc.el erc-fill.el erc-list.el erc-track.el ielm.el + ob.el Makefile cl-macs.el erc-autoaway.el erc-autojoin.el + and 26 other files Lawrence R. Dodd: co-wrote dired-x.el and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el @@ -2520,6 +2534,8 @@ and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el Le Wang: changed org-src.el comint.el hilit-chg.el misc.el +Lee Duhem: changed eval.c + Leigh Stoller: changed emacsclient.c server.el Lennart Borgman: co-wrote ert-x.el @@ -2536,14 +2552,14 @@ and changed octave.el ido.el rcirc.el subr.el files.el simple.el flymake.el smie.el abbrev.el eldoc.el progmodes/python.el progmodes/compile.el register.el rng-valid.el bindings.el comint.el diff-mode.el dired-x.el font-lock.el indent.el kmacro.el - and 132 other files + and 133 other files Leo P. White: changed eieio-custom.el Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el rmailout.el sendmail.el -Leonard Randall: changed org-bibtex.el +Leonard Randall: changed org-bibtex.el reftex-parse.el Leonardo Nobrega: changed progmodes/python.el @@ -2565,7 +2581,7 @@ Luc Teirlinck: wrote help-at-pt.el and changed files.el autorevert.el cus-edit.el subr.el simple.el frames.texi startup.el display.texi files.texi dired.el comint.el modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi - variables.texi buffers.texi commands.texi and 215 other files + variables.texi buffers.texi commands.texi and 214 other files Luca Capello: changed mm-encode.el @@ -2605,7 +2621,7 @@ Malcolm Purvis: changed spam-stat.el Manoj Srivastava: wrote manoj-dark-theme.el -Manuel Giraud: changed ox-html.el ox-publish.el org.texi +Manuel Giraud: changed ox-html.el org-publish.el org.texi Manuel Gómez: changed speedbar.el @@ -2855,11 +2871,11 @@ Michael Albinus: wrote dbus-tests.el dbus.el file-notify-tests.el tramp-gvfs.el tramp-gw.el tramp-smb.el tramp-tests.el xesam.el zeroconf.el and co-wrote tramp-cache.el tramp-sh.el tramp.el -and changed tramp.texi dbusbind.c trampver.texi trampver.el ange-ftp.el - tramp-adb.el dbus.texi tramp-fish.el files.el autorevert.el files.texi +and changed tramp.texi dbusbind.c trampver.texi tramp-adb.el trampver.el + ange-ftp.el dbus.texi files.el tramp-fish.el autorevert.el files.texi tramp-imap.el notifications.el tramp-vc.el configure.ac - lisp/Makefile.in tramp-uu.el em-unix.el keyboard.c simple.el - tramp-util.el and 102 other files + lisp/Makefile.in simple.el tramp-uu.el em-unix.el keyboard.c + tramp-util.el and 106 other files Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h unexec.c @@ -2917,7 +2933,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el erc-list.el erc-compat.el erc-identd.el erc.texi ERC-NEWS erc-bbdb.el erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el - erc-button.el and 63 other files + erc-button.el and 62 other files Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el @@ -3109,7 +3125,7 @@ Nicholas Maniscalco: changed term.el Nick Alcock: changed gnus.el -Nick Dokos: changed org-table.el ox.el icalendar.el mh-search.el +Nick Dokos: changed org-exp.el org-table.el icalendar.el mh-search.el org-mobile.el org.el ox-ascii.el url-cache.el Nick Roberts: wrote gdb-mi.el t-mouse.el @@ -3128,10 +3144,12 @@ Nicolas Goaziou: wrote org-element.el org-macro.el ox-ascii.el ox-latex.el ox-md.el ox-org.el ox.el and co-wrote ox-beamer.el ox-icalendar.el ox-man.el and changed org-list.el org.el ox-html.el org-footnote.el ox-texinfo.el - org.texi ox-publish.el ox-odt.el org-inlinetask.el org-indent.el - org-docbook.el ob-exp.el org-agenda.el org-timer.el ob.el + org-exp.el org.texi ox-publish.el ox-odt.el org-inlinetask.el + org-indent.el org-docbook.el ob-exp.el org-agenda.el org-timer.el ob.el org-capture.el ob-asymptote.el org-clock.el org-macs.el - org-pcomplete.el org-table.el and 22 other files + org-pcomplete.el and 25 other files + +Nicolas Petton: changed authors.el Nicolas Richard: changed org.el simple.el align.el battery.el eieio-opt.el ispell.el minibuffer.el ob.el package.el @@ -3222,6 +3240,9 @@ Oscar Figueiredo: wrote eudc-bob.el eudc-export.el eudc-hotlist.el eudc-vars.el eudc.el eudcb-bbdb.el eudcb-ldap.el eudcb-ph.el ldap.el and changed ph.el +Oscar Fuentes: changed CPP-DEFINES addpm.c addsection.c ms-w32.h + preprep.c w32.c w32term.c + P. E. Jareth Hein: changed gnus-util.el Pascal Dupuis: changed octave.el @@ -3243,8 +3264,8 @@ Paul Eggert: wrote rcs2log and co-wrote cal-dst.el and changed lisp.h configure.ac alloc.c process.c fileio.c sysdep.c xdisp.c image.c editfns.c keyboard.c emacs.c data.c lread.c callproc.c - xterm.c fns.c eval.c Makefile.in dispextern.h dispnew.c gnulib.mk - and 1016 other files + xterm.c fns.c Makefile.in eval.c dispextern.h dispnew.c gnulib.mk + and 1026 other files Paul Fisher: changed fns.c @@ -3285,7 +3306,7 @@ Pavel Janík: changed keyboard.c xterm.c COPYING xdisp.c process.c emacs.c Pavel Kobiakov: wrote flymake.el and changed flymake.texi -Peder O. Klingenberg: changed gnus.texi +Peder O. Klingenberg: changed emacsbug.el gnus.texi Per Abrahamsen: wrote cus-dep.el cus-edit.el cus-face.el cus-start.el custom.el double.el gnus-cite.el gnus-cus.el progmodes/cpp.el @@ -3417,8 +3438,8 @@ Prestoo Ten: changed screen.el Primoz Peterlin: changed TUTORIAL.sl -Puneeth Chaganti: changed org.texi ox.el org-agenda.el org-capture.el - ox-html.el +Puneeth Chaganti: changed org.texi org-exp.el org-agenda.el + org-capture.el ox-html.el R. Bernstein: changed gud.el @@ -3494,7 +3515,7 @@ Reto Zimmermann: wrote vera-mode.el and co-wrote vhdl-mode.el Reuben Thomas: changed remember.el files.el flymake.el indent.c - loading.texi pcvs-defs.el rect.el simple.el + loading.texi pcvs-defs.el rect.el simple.el tramp-ftp.el tramp.el Riccardo Murri: changed vc-bzr.el tls.el @@ -3595,7 +3616,7 @@ Roger Breitenstein: changed smtpmail.el Roland B. Roberts: changed buffer.h callproc.c dired.c files.el gnus-group.el gnus-sum.el process.c sort.el sysdep.c systty.h -Roland Kaufmann: changed ox.el +Roland Kaufmann: changed org-exp.el Roland McGrath: wrote autoload.el etags.el map-ynp.el progmodes/grep.el and co-wrote find-dired.el progmodes/compile.el @@ -3683,8 +3704,10 @@ and changed progmodes/compile.el cl-indent.el vc-cvs.el vc.el mouse.el window.el add-log.el bindings.el bookmark.el bug-reference.el calendar.el diary-lib.el dired.el etags.el pcvs.el and 145 other files +Samer Masterson: changed pcomplete.el + Samuel Bronson: changed custom.el emacsclient.c keyboard.c - progmodes/grep.el + progmodes/grep.el unexmacosx.c Samuel Loury: changed org.el @@ -3748,7 +3771,7 @@ and co-wrote dired-x.el find-dired.el and changed add-log.el Sebastian Rose: co-wrote org-protocol.el -and changed ox-publish.el ftfont.c ox-jsinfo.el +and changed org-publish.el ftfont.c org-jsinfo.el Sebastian Tennant: changed desktop.el @@ -3877,7 +3900,7 @@ and co-wrote font-lock.el and changed subr.el simple.el lisp.h keyboard.c files.el vc.el bytecomp.el xdisp.c alloc.c eval.c cl-macs.el progmodes/compile.el keymap.c pcvs.el sh-script.el newcomment.el tex-mode.el buffer.c - vc-hooks.el window.c lread.c and 1207 other files + vc-hooks.el window.c lread.c and 1211 other files Stefan Reichör: changed gnus-agent.el @@ -3902,9 +3925,9 @@ Stephen A. Wood: changed fortran.el Stephen Berman: co-wrote todo-mode.el and changed todo-mode.texi diary-lib.el minibuffer.el info.el - otodo-mode.el allout.el dframe.el dir dired-aux.el dired.el doc-view.el + otodo-mode.el allout.el dframe.el dired-aux.el dired.el doc-view.el elpa files.el find-dired.el frame.c gamegrid.el gnus-group.el gomoku.el - gtkutil.c misc/Makefile.in newcomment.el and 8 other files + gtkutil.c misc/Makefile.in newcomment.el outline.el and 8 other files Stephen C. Gilardi: changed configure.ac @@ -3937,7 +3960,7 @@ Steve Grubb: changed vcdiff Steve Nygard: changed unexnext.c -Steve Purcell: changed nnimap.el nsterm.m +Steve Purcell: changed nnimap.el nsterm.m package.el Steve Strassmann: wrote spook.el @@ -3985,7 +4008,8 @@ Sun Yijiang: changed TUTORIAL.cn Sundar Narasimhan: changed rnews.el -Suvayu Ali: changed org.texi org-inlinetask.el org-src.el org.el ox.el +Suvayu Ali: changed org.texi org-exp.el org-inlinetask.el org-src.el + org.el Sven Joachim: changed files.el de-refcard.tex dired-aux.el emacs.1 arc-mode.el dired-x.el em-cmpl.el em-hist.el em-ls.el esh-cmd.el @@ -4003,7 +4027,7 @@ Sébastien Gross: changed hideshow.el Sébastien Vauban: changed org.el org-agenda.el ox-latex.el ob-core.el org-clock.el ox-ascii.el ox-html.el -T.F. Torrey: changed org-rmail.el ox.el +T.F. Torrey: changed org-exp.el org-rmail.el T.V. Raman: changed completion.el files.el json.el mairix.el mspools.el xml.c @@ -4036,11 +4060,11 @@ and changed arc-mode.el Tassilo Horn: wrote doc-view.el and co-wrote org-gnus.el -and changed reftex-vars.el gnus-sum.el tsdh-dark-theme.el gnus.texi - subword.el image-mode.el reftex.el tsdh-light-theme.el cc-cmds.el - display.texi em-term.el emacsbug.el files.el gnus-art.el misc.texi +and changed reftex-vars.el gnus-sum.el gnus.texi tsdh-dark-theme.el + misc.texi reftex.el subword.el image-mode.el tsdh-light-theme.el + cc-cmds.el display.texi em-term.el emacsbug.el files.el gnus-art.el nnimap.el reftex-cite.el buffers.texi control.texi help.texi info.el - and 53 other files + and 55 other files Tatsuya Ichikawa: changed gnus-agent.el gnus-cache.el @@ -4058,9 +4082,9 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-sync.el gnus-tests.el gnutls.el registry.el spam-report.el url-future-tests.el url-future.el url-util-tests.el and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el cfengine.el - auth.texi gnutls.c gnus-util.el netrc.el gnus-start.el message.el - spam-stat.el encrypt.el nnir.el nnmail.el gnutls.h imap.el - mail-source.el nnmairix.el nntp.el and 110 other files + gnutls.c auth.texi gnus-util.el netrc.el gnus-start.el message.el + spam-stat.el encrypt.el gnutls.h nnir.el nnmail.el imap.el + mail-source.el nnmairix.el nntp.el and 109 other files Terje Rosten: changed xfns.c version.el xterm.c xterm.h @@ -4250,8 +4274,8 @@ Tsuchiya Masatoshi: changed gnus-art.el mm-view.el gnus-sum.el Tsugutomo Enami: changed frame.c keyboard.c configure.ac dispnew.c fileio.c process.c simple.el sysdep.c xdisp.c add-log.el bytecomp.el - editfns.c emacs.c frame.h gnus-group.el netbsd.h nnheader.el - perl-mode.el regex.c regex.h rmailsum.el and 5 other files + editfns.c emacs.c frame.h gnus-group.el netbsd.h nnheader.el nnimap.el + perl-mode.el regex.c regex.h and 6 other files Tsuyoshi Akiho: changed gnus-sum.el nnrss.el @@ -4273,10 +4297,10 @@ and changed org-gnus.el smime.el Ulrich Leodolter: changed w32proc.c -Ulrich Müller: changed configure.ac doctor.el emacs.1 files.el gud.el - server.el src/Makefile.in ChgPane.c ChgSel.c HELLO INSTALL Makefile.in +Ulrich Müller: changed configure.ac src/Makefile.in doctor.el emacs.1 + files.el gud.el server.el ChgPane.c ChgSel.c HELLO INSTALL Makefile.in XMakeAssoc.c authors.el bytecomp.el calc-units.el case-table.el - configure descr-text.el em-ls.el emacs.c and 34 other files + configure descr-text.el em-ls.el emacs.c and 35 other files Ulrich Neumerkel: changed xterm.c @@ -4407,10 +4431,10 @@ Wolfgang Glas: changed unexsgi.c Wolfgang Jenkner: wrote man-tests.el and changed gnus-agent.el image-mode.el man.el ansi-color.el gnus-spec.el - gnus-sum.el gnus-util.el conf-mode.el functions.texi gnus-group.el - gnus-picon.el gnus-salt.el gnus-start.el gnus.texi intro.texi lread.c - network-stream.el nntp.el pcvs.el pop3.el progmodes/grep.el - and 3 other files + gnus-sum.el gnus-util.el calc-tests.el calc-units.el conf-mode.el + functions.texi gnus-group.el gnus-picon.el gnus-salt.el gnus-start.el + gnus.texi intro.texi lread.c network-stream.el nntp.el pcvs.el + and 6 other files Wolfgang Lux: changed nsterm.m keyboard.c @@ -4447,7 +4471,7 @@ and changed macterm.c macfns.c mac-win.el mac.c macterm.h macmenu.c Yann Dirson: changed imenu.el -Yann Hodique: changed ox-publish.el package.el rcirc.el +Yann Hodique: changed org-publish.el package.el rcirc.el Yasushi Shoji: changed org-clock.el org.texi ox-ascii.el @@ -4506,6 +4530,8 @@ Zoltan Kemenczy: changed gud.el Zoran Milojevic: changed avoid.el +Álvar Ibeas: changed TUTORIAL.es + Álvar Jesús Ibeas Martín: changed emacs-lisp-intro.texi Ævar Arnfjörð Bjarmason: changed rcirc.el @@ -4520,7 +4546,7 @@ Zoran Milojevic: changed avoid.el Łukasz Demianiuk: changed erc.el Łukasz Stelmach: changed cookie1.el gtkutil.c message.el org-agenda.el - org-bbdb.el org.el ox-html.el ox.el + org-bbdb.el org-exp.el org.el ox-html.el Štěpán Němec: changed INSTALL calc-ext.el cl.texi comint.el edebug.texi font-lock.el loading.texi maps.texi mark.texi message.texi mini.texi diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 56b9f74bcd5..e511aa40342 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3,7 +3,7 @@ ;;; Code: -;;;### (autoloads nil "5x5" "play/5x5.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "5x5" "play/5x5.el" (21710 25465 294934 381000)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -65,8 +65,8 @@ should return a grid vector array that is the new solution. ;;;*** -;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21710 25547 +;;;;;; 169569 365000)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -85,8 +85,8 @@ Ada mode is the major mode for editing Ada code. ;;;*** -;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21710 25465 +;;;;;; 300934 355000)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload 'ada-header "ada-stmt" "\ @@ -96,8 +96,8 @@ Insert a descriptive header at the top of the file. ;;;*** -;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21710 25547 +;;;;;; 169569 365000)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -108,8 +108,8 @@ Completion is available. ;;;*** -;;;### (autoloads nil "add-log" "vc/add-log.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (21710 25547 218569 +;;;;;; 146000)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -238,8 +238,8 @@ old-style time formats for entries are supported. ;;;*** -;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21710 25465 +;;;;;; 124935 139000)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -374,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) ;;;*** -;;;### (autoloads nil "align" "align.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "align" "align.el" (21710 25465 76935 353000)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -477,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** -;;;### (autoloads nil "allout" "allout.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "allout" "allout.el" (21710 25465 78935 344000)) ;;; Generated autoloads from allout.el (push (purecopy '(allout 2 3)) package--builtin-versions) @@ -837,8 +837,8 @@ for details on preparing Emacs for automatic allout activation. ;;;*** -;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21710 +;;;;;; 25547 51569 891000)) ;;; Generated autoloads from allout-widgets.el (push (purecopy '(allout-widgets 1 0)) package--builtin-versions) @@ -896,8 +896,8 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** -;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21710 25547 141569 +;;;;;; 489000)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -918,8 +918,8 @@ directory, so that Emacs will know its current contents. ;;;*** -;;;### (autoloads nil "animate" "play/animate.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "animate" "play/animate.el" (21710 25465 294934 +;;;;;; 381000)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -951,8 +951,8 @@ the buffer *Birthday-Present-for-Name*. ;;;*** -;;;### (autoloads nil "ansi-color" "ansi-color.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21710 25465 78935 +;;;;;; 344000)) ;;; Generated autoloads from ansi-color.el (push (purecopy '(ansi-color 3 4 2)) package--builtin-versions) @@ -978,8 +978,8 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** -;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21710 +;;;;;; 25465 301934 350000)) ;;; Generated autoloads from progmodes/antlr-mode.el (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions) @@ -1015,8 +1015,8 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;*** -;;;### (autoloads nil "appt" "calendar/appt.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "appt" "calendar/appt.el" (21710 25547 57569 +;;;;;; 864000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1037,8 +1037,7 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "apropos" "apropos.el" (21710 25547 52569 886000)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1153,8 +1152,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads nil "arc-mode" "arc-mode.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "arc-mode" "arc-mode.el" (21710 25547 52569 +;;;;;; 886000)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1174,7 +1173,7 @@ archive. ;;;*** -;;;### (autoloads nil "array" "array.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "array" "array.el" (21710 25465 79935 340000)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1245,8 +1244,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads nil "artist" "textmodes/artist.el" (21695 39113 -;;;;;; 875318 913000)) +;;;### (autoloads nil "artist" "textmodes/artist.el" (21710 25465 +;;;;;; 348934 141000)) ;;; Generated autoloads from textmodes/artist.el (push (purecopy '(artist 1 2 6)) package--builtin-versions) @@ -1452,8 +1451,8 @@ Keymap summary ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21710 25465 +;;;;;; 301934 350000)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1480,8 +1479,8 @@ Special commands: ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21710 +;;;;;; 25547 99569 677000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1493,8 +1492,7 @@ let-binding.") ;;;*** -;;;### (autoloads nil "autoarg" "autoarg.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "autoarg" "autoarg.el" (21710 25465 79935 340000)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1554,8 +1552,8 @@ This is similar to `autoarg-mode' but rebinds the keypad keys ;;;*** -;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21710 25465 +;;;;;; 301934 350000)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1565,8 +1563,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21710 25547 52569 +;;;;;; 886000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1604,8 +1602,8 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21710 +;;;;;; 25547 75569 784000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1654,8 +1652,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "autorevert" "autorevert.el" (21710 25465 79935 +;;;;;; 340000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1743,7 +1741,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "avoid" "avoid.el" (21710 25465 80935 335000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1781,8 +1779,8 @@ definition of \"random distance\".) ;;;*** -;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21710 25465 +;;;;;; 301934 350000)) ;;; Generated autoloads from progmodes/bat-mode.el (add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode)) @@ -1800,8 +1798,7 @@ Run script using `bat-run' and `bat-run-args'. ;;;*** -;;;### (autoloads nil "battery" "battery.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "battery" "battery.el" (21710 25465 80935 335000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1836,8 +1833,8 @@ seconds. ;;;*** -;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21710 +;;;;;; 25465 124935 139000)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1873,8 +1870,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21710 25547 +;;;;;; 208569 191000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1966,7 +1963,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'. ;;;*** ;;;### (autoloads nil "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25465 348934 141000)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1976,8 +1973,8 @@ Major mode for editing BibTeX style files. ;;;*** -;;;### (autoloads nil "binhex" "mail/binhex.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "binhex" "mail/binhex.el" (21710 25465 224934 +;;;;;; 693000)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -2001,8 +1998,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads nil "blackbox" "play/blackbox.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "blackbox" "play/blackbox.el" (21710 25465 +;;;;;; 294934 381000)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2121,8 +2118,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "bookmark" "bookmark.el" (21710 25547 53569 +;;;;;; 882000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2314,8 +2311,8 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (21710 25547 +;;;;;; 141569 489000)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2630,7 +2627,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "bs" "bs.el" (21710 25547 53569 882000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2671,8 +2668,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21710 25547 165569 +;;;;;; 382000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2694,7 +2691,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 301934 350000)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2714,8 +2711,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21710 +;;;;;; 25547 77569 775000)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2835,8 +2832,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21710 +;;;;;; 25547 57569 864000)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2845,8 +2842,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21710 25547 +;;;;;; 58569 859000)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2857,8 +2854,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21710 +;;;;;; 25547 58569 859000)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2872,7 +2869,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "calc" "calc/calc.el" (21710 25547 57569 864000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2956,8 +2953,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21710 25465 +;;;;;; 87935 304000)) ;;; Generated autoloads from calc/calc-undo.el (autoload 'calc-undo "calc-undo" "\ @@ -2967,8 +2964,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "calculator" "calculator.el" (21710 25547 57569 +;;;;;; 864000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2979,8 +2976,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21710 25547 +;;;;;; 59569 855000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3023,8 +3020,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "canlock" "gnus/canlock.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "canlock" "gnus/canlock.el" (21710 25465 166934 +;;;;;; 952000)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -3041,8 +3038,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21710 +;;;;;; 25547 170569 360000)) ;;; Generated autoloads from progmodes/cap-words.el (autoload 'capitalized-words-mode "cap-words" "\ @@ -3082,7 +3079,7 @@ Obsoletes `c-forward-into-nomenclature'. ;;;*** ;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21710 -;;;;;; 6472 78891 397000)) +;;;;;; 25547 173569 347000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3092,8 +3089,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21710 25547 +;;;;;; 174569 342000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3191,8 +3188,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21710 6472 -;;;;;; 78891 397000)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21713 24233 +;;;;;; 279494 843000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3349,8 +3346,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21710 +;;;;;; 25547 175569 338000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3401,8 +3398,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21710 25547 +;;;;;; 176569 334000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3410,8 +3407,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "ccl" "international/ccl.el" (21710 25547 123569 +;;;;;; 570000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3671,8 +3668,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21710 25547 +;;;;;; 77569 775000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3691,15 +3688,15 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cedet" "cedet/cedet.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "cedet" "cedet/cedet.el" (21710 25465 97935 +;;;;;; 260000)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21710 25547 +;;;;;; 176569 334000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 3)) package--builtin-versions) @@ -3729,15 +3726,15 @@ on the buffer contents ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21710 25547 +;;;;;; 77569 775000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25465 126935 130000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3754,8 +3751,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21710 +;;;;;; 25465 126935 130000)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (push (purecopy '(checkdoc 0 6 2)) package--builtin-versions) (put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp) @@ -3955,8 +3952,8 @@ checking of documentation strings. ;;;*** -;;;### (autoloads nil "china-util" "language/china-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "china-util" "language/china-util.el" (21710 +;;;;;; 25465 206934 774000)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -3993,8 +3990,8 @@ Encode the text in the current buffer to HZ. ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "chistory" "chistory.el" (21710 25465 115935 +;;;;;; 179000)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -4033,8 +4030,8 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21710 +;;;;;; 25547 78569 770000)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4112,8 +4109,8 @@ For example, the function `case' has an indent property ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21710 25547 +;;;;;; 78569 770000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) @@ -4143,8 +4140,8 @@ a future Emacs interpreter will be able to use it.") ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21710 25465 +;;;;;; 307934 323000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4164,8 +4161,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21710 25465 115935 +;;;;;; 179000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4185,7 +4182,7 @@ is run). ;;;*** -;;;### (autoloads nil "color" "color.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "color" "color.el" (21710 25465 115935 179000)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4204,7 +4201,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21685 3267 195345 35000)) +;;;### (autoloads nil "comint" "comint.el" (21710 25547 70569 806000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4303,8 +4300,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21710 25547 +;;;;;; 218569 146000)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4337,8 +4334,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21710 25547 +;;;;;; 177569 329000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4519,8 +4516,8 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** -;;;### (autoloads nil "completion" "completion.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "completion" "completion.el" (21710 25547 71569 +;;;;;; 802000)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4542,8 +4539,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21710 +;;;;;; 25547 208569 191000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4698,8 +4695,8 @@ For details see `conf-mode'. Example: ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "cookie1" "play/cookie1.el" (21710 25465 294934 +;;;;;; 381000)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4727,8 +4724,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21710 +;;;;;; 25465 128935 122000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4766,8 +4763,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21710 +;;;;;; 25547 178569 324000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4965,8 +4962,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21710 25465 310934 +;;;;;; 310000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4984,8 +4981,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21710 25465 128935 +;;;;;; 122000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -5011,8 +5008,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21710 25547 +;;;;;; 208569 191000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5022,8 +5019,8 @@ Major mode to edit Cascading Style Sheets. ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21710 25547 +;;;;;; 86569 735000)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5068,8 +5065,8 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;*** -;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21710 25465 +;;;;;; 138935 77000)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -5080,8 +5077,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21710 25547 72569 +;;;;;; 797000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5393,8 +5390,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21710 25465 118935 +;;;;;; 166000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5427,8 +5424,8 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** -;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21710 25465 +;;;;;; 366934 60000)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5438,8 +5435,8 @@ Mode used for cvs status output. ;;;*** -;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21710 25547 178569 +;;;;;; 324000)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) @@ -5483,8 +5480,8 @@ See `cwarn-mode' for more information on Cwarn mode. ;;;*** -;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21710 +;;;;;; 25465 206934 774000)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5512,8 +5509,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (21710 25465 118935 +;;;;;; 166000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5559,8 +5556,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21710 25465 +;;;;;; 97935 260000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5570,7 +5567,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21710 25547 142569 485000)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5583,8 +5580,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21710 25465 +;;;;;; 310934 310000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5710,8 +5707,8 @@ There is some minimal font-lock support (see vars ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21710 25465 +;;;;;; 129935 117000)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5754,8 +5751,8 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** -;;;### (autoloads nil "decipher" "play/decipher.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "decipher" "play/decipher.el" (21710 25465 +;;;;;; 294934 381000)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5783,8 +5780,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "delim-col" "delim-col.el" (21710 25465 118935 +;;;;;; 166000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5809,7 +5806,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "delsel" "delsel.el" (21710 25465 118935 166000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5837,8 +5834,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21710 25547 +;;;;;; 79569 766000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5904,8 +5901,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "descr-text" "descr-text.el" (21710 25547 72569 +;;;;;; 797000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5939,8 +5936,7 @@ relevant to POS. ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "desktop" "desktop.el" (21710 25547 73569 793000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6145,8 +6141,8 @@ Revert to the last loaded desktop. ;;;*** -;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21710 25465 +;;;;;; 166934 952000)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -6178,8 +6174,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21710 +;;;;;; 25547 60569 851000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6221,7 +6217,7 @@ Major mode for editing the diary file. ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "diff" "vc/diff.el" (21710 25465 367934 56000)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6269,8 +6265,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21710 25547 +;;;;;; 218569 146000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6302,7 +6298,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "dig" "net/dig.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "dig" "net/dig.el" (21710 25465 242934 613000)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6313,7 +6309,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21670 36217 665624 229000)) +;;;### (autoloads nil "dired" "dired.el" (21710 25547 74569 788000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6433,8 +6429,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (21710 25465 121935 +;;;;;; 153000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6464,8 +6460,8 @@ from `default-directory'. ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21710 25465 +;;;;;; 129935 117000)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6479,8 +6475,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "disp-table" "disp-table.el" (21710 25465 121935 +;;;;;; 153000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6601,8 +6597,8 @@ in `.emacs'. ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (21710 25465 +;;;;;; 294934 381000)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6618,7 +6614,7 @@ Default is 2. ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "dnd" "dnd.el" (21710 25547 74569 788000)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\ @@ -6638,8 +6634,8 @@ if some action was made, or nil if the URL is ignored.") ;;;*** -;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21710 25465 +;;;;;; 350934 132000)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6662,8 +6658,8 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads nil "doc-view" "doc-view.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "doc-view" "doc-view.el" (21710 25547 75569 +;;;;;; 784000)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6709,8 +6705,8 @@ See the command `doc-view-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "doctor" "play/doctor.el" (21710 25465 295934 +;;;;;; 377000)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6720,7 +6716,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "double" "double.el" (21710 25465 122935 148000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6736,8 +6732,8 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21710 25547 166569 +;;;;;; 378000)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) @@ -6748,8 +6744,8 @@ Switch to *dungeon* buffer and start game. ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21710 +;;;;;; 25547 79569 766000)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6888,8 +6884,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21710 +;;;;;; 25465 129935 117000)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7027,8 +7023,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21710 25465 +;;;;;; 312934 301000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7293,8 +7289,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21710 25465 +;;;;;; 313934 297000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7442,8 +7438,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21710 25465 122935 +;;;;;; 148000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7475,8 +7471,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "echistory" "echistory.el" (21710 25465 122935 +;;;;;; 148000)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7487,8 +7483,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21710 25465 +;;;;;; 166934 952000)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7498,7 +7494,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "ede" "cedet/ede.el" (21710 25547 62569 842000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7524,8 +7520,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21710 25547 +;;;;;; 80569 762000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7589,7 +7585,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (21710 25465 369934 47000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -7861,8 +7857,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21710 25465 +;;;;;; 367934 56000)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7872,8 +7868,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21710 25465 +;;;;;; 368934 51000)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7885,8 +7881,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21710 25547 +;;;;;; 219569 142000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7905,8 +7901,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "edmacro" "edmacro.el" (21710 25465 122935 +;;;;;; 148000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -7955,8 +7951,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "edt" "emulation/edt.el" (21710 25547 86569 +;;;;;; 735000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -7973,7 +7969,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21710 25465 122935 148000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8009,15 +8005,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21670 36216 -;;;;;; 665623 730000)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21710 25547 +;;;;;; 82569 753000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21710 +;;;;;; 25547 81569 757000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8033,8 +8029,8 @@ It creates an autoload function for CNAME's constructor. ;;;*** -;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21710 25547 +;;;;;; 82569 753000)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -8077,8 +8073,8 @@ Emacs Lisp mode) that support ElDoc.") ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "elec-pair" "elec-pair.el" (21710 25465 122935 +;;;;;; 148000)) ;;; Generated autoloads from elec-pair.el (defvar electric-pair-text-pairs '((34 . 34)) "\ @@ -8113,8 +8109,8 @@ closing parenthesis. (Likewise for brackets, etc.). ;;;*** -;;;### (autoloads nil "elide-head" "elide-head.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "elide-head" "elide-head.el" (21710 25465 123935 +;;;;;; 144000)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -8129,8 +8125,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21710 25465 +;;;;;; 132935 104000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8165,8 +8161,8 @@ optional prefix argument REINIT is non-nil. ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21710 25465 132935 +;;;;;; 104000)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8200,8 +8196,8 @@ displayed. ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21710 25465 138935 +;;;;;; 77000)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8228,8 +8224,8 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21710 25547 +;;;;;; 134569 521000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8242,8 +8238,8 @@ Prompts for bug subject. Leaves you in a mail buffer. ;;;*** -;;;### (autoloads nil "emerge" "vc/emerge.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "emerge" "vc/emerge.el" (21710 25547 220569 +;;;;;; 137000)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -8303,8 +8299,8 @@ Emerge two RCS revisions of a file, with another revision as ancestor. ;;;*** -;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21710 25547 +;;;;;; 208569 191000)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -8339,7 +8335,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "epa" "epa.el" (21710 25547 86569 735000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8517,8 +8513,8 @@ Insert selected KEYS after the point. ;;;*** -;;;### (autoloads nil "epa-dired" "epa-dired.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "epa-dired" "epa-dired.el" (21710 25465 142935 +;;;;;; 59000)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8543,8 +8539,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "epa-file" "epa-file.el" (21710 25547 86569 +;;;;;; 735000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8564,8 +8560,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-mail" "epa-mail.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "epa-mail" "epa-mail.el" (21710 25547 86569 +;;;;;; 735000)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8642,7 +8638,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "epg" "epg.el" (21710 25547 87569 730000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8653,8 +8649,8 @@ Return a context object. ;;;*** -;;;### (autoloads nil "epg-config" "epg-config.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "epg-config" "epg-config.el" (21710 25465 142935 +;;;;;; 59000)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8674,7 +8670,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "erc" "erc/erc.el" (21710 25465 149935 28000)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8722,36 +8718,36 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21710 +;;;;;; 25465 145935 46000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21710 25465 +;;;;;; 145935 46000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21710 25465 +;;;;;; 145935 46000)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21710 25465 +;;;;;; 145935 46000)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21710 25547 87569 +;;;;;; 730000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8781,14 +8777,14 @@ that subcommand. ;;;*** ;;;### (autoloads nil "erc-desktop-notifications" "erc/erc-desktop-notifications.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25547 87569 730000)) ;;; Generated autoloads from erc/erc-desktop-notifications.el (autoload 'erc-notifications-mode "erc-desktop-notifications" "" t) ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21710 +;;;;;; 25465 146935 41000)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8850,8 +8846,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8863,8 +8859,8 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'. ;;;*** -;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21710 25465 +;;;;;; 146935 41000)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8885,8 +8881,8 @@ system. ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21710 25465 +;;;;;; 146935 41000)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8896,22 +8892,22 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8940,8 +8936,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21710 25465 +;;;;;; 146935 41000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -8987,15 +8983,15 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21710 +;;;;;; 25465 146935 41000)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9006,8 +9002,8 @@ Show who's gone. ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -9024,8 +9020,8 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9043,36 +9039,36 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21710 25465 147935 +;;;;;; 37000)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21710 25465 147935 +;;;;;; 37000)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9089,15 +9085,15 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9108,22 +9104,22 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9148,8 +9144,8 @@ keybindings will not do anything useful. ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21710 +;;;;;; 25465 148935 32000)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9168,8 +9164,8 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21710 25465 148935 +;;;;;; 32000)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9180,8 +9176,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21710 25547 82569 +;;;;;; 753000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9246,8 +9242,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** -;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21710 25465 +;;;;;; 132935 104000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9259,8 +9255,8 @@ Kill all test buffers that are still live. ;;;*** -;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21710 25465 +;;;;;; 151935 19000)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9270,8 +9266,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (21710 25547 88569 +;;;;;; 726000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9306,8 +9302,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (21710 25547 179569 +;;;;;; 320000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9615,8 +9611,8 @@ for \\[find-tag] (which see). ;;;*** -;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21710 +;;;;;; 25465 206934 774000)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9784,7 +9780,7 @@ With ARG, insert that many delimiters. ;;;*** -;;;### (autoloads nil "eudc" "net/eudc.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "eudc" "net/eudc.el" (21710 25547 142569 485000)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9838,8 +9834,8 @@ This does nothing except loading eudc by autoload side-effect. ;;;*** -;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21710 25547 142569 +;;;;;; 485000)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -9874,8 +9870,8 @@ Display a button for the JPEG DATA. ;;;*** -;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21710 25547 +;;;;;; 142569 485000)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9891,8 +9887,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** -;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21710 +;;;;;; 25547 142569 485000)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9902,8 +9898,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21710 25465 133935 +;;;;;; 99000)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -9929,7 +9925,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "eww" "net/eww.el" (21710 25547 143569 481000)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -9952,8 +9948,8 @@ Render a file using EWW. ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (21710 +;;;;;; 25465 313934 297000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -9994,7 +9990,7 @@ file modes. ;;;*** -;;;### (autoloads nil "expand" "expand.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "expand" "expand.el" (21710 25465 152935 14000)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -10043,8 +10039,8 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads nil "f90" "progmodes/f90.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "f90" "progmodes/f90.el" (21710 25547 179569 +;;;;;; 320000)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10111,8 +10107,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "face-remap" "face-remap.el" (21710 25465 152935 +;;;;;; 14000)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10271,8 +10267,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;*** -;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21710 25465 +;;;;;; 225934 689000)) ;;; Generated autoloads from mail/feedmail.el (push (purecopy '(feedmail 11)) package--builtin-versions) @@ -10326,7 +10322,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "ffap" "ffap.el" (21710 25547 89569 721000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10389,8 +10385,8 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "filecache" "filecache.el" (21710 25465 153935 +;;;;;; 10000)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -10447,8 +10443,8 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads nil "filenotify" "filenotify.el" (21686 24133 544625 -;;;;;; 151000)) +;;;### (autoloads nil "filenotify" "filenotify.el" (21710 25465 153935 +;;;;;; 10000)) ;;; Generated autoloads from filenotify.el (autoload 'file-notify-handle-event "filenotify" "\ @@ -10463,8 +10459,8 @@ Otherwise, signal a `file-notify-error'. ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "files-x" "files-x.el" (21710 25465 153935 +;;;;;; 10000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10529,8 +10525,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "filesets" "filesets.el" (21710 25465 155935 +;;;;;; 1000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10541,8 +10537,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (21710 25547 90569 +;;;;;; 717000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10562,8 +10558,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "find-dired" "find-dired.el" (21710 25465 155935 +;;;;;; 1000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10603,8 +10599,8 @@ use in place of \"-ls\" as the final argument. ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "find-file" "find-file.el" (21710 25465 156934 +;;;;;; 997000)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\ @@ -10694,8 +10690,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21710 +;;;;;; 25547 82569 753000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10853,8 +10849,8 @@ Define some key bindings for the find-function family of functions. ;;;*** -;;;### (autoloads nil "find-lisp" "find-lisp.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "find-lisp" "find-lisp.el" (21710 25465 156934 +;;;;;; 997000)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10874,7 +10870,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "finder" "finder.el" (21710 25465 156934 997000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -10896,8 +10892,8 @@ Find packages matching a given keyword. ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21710 25465 156934 +;;;;;; 997000)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -10918,8 +10914,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21710 25465 +;;;;;; 166934 952000)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -10934,8 +10930,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21710 25465 +;;;;;; 314934 292000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -10965,8 +10961,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21710 25465 +;;;;;; 350934 132000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11036,14 +11032,14 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "foldout" "foldout.el" (21710 25465 156934 +;;;;;; 997000)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "follow" "follow.el" (21710 25465 156934 997000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11111,8 +11107,8 @@ selected if the original window is the first one in the frame. ;;;*** -;;;### (autoloads nil "footnote" "mail/footnote.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "footnote" "mail/footnote.el" (21710 25465 +;;;;;; 225934 689000)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) @@ -11131,7 +11127,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "forms" "forms.el" (21710 25465 158934 988000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11167,8 +11163,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21710 25465 +;;;;;; 315934 288000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11245,8 +11241,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "fortune" "play/fortune.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "fortune" "play/fortune.el" (21710 25465 295934 +;;;;;; 377000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11294,8 +11290,8 @@ and choose the directory as the fortune-file. ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "frameset" "frameset.el" (21710 25547 92569 +;;;;;; 708000)) ;;; Generated autoloads from frameset.el (defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\ @@ -11475,15 +11471,15 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21710 25547 +;;;;;; 166569 378000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21710 25465 +;;;;;; 315934 288000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11560,8 +11556,8 @@ detailed description of this mode. ;;;*** -;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21710 25465 +;;;;;; 133935 99000)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11641,8 +11637,8 @@ regular expression that can be used as an element of ;;;*** -;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21710 25465 +;;;;;; 315934 288000)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11656,8 +11652,8 @@ add virtual separators (like underscores) at places they belong to. ;;;*** -;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21710 25547 +;;;;;; 99569 677000)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11711,7 +11707,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (21710 25547 110569 628000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11761,8 +11757,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21710 25465 +;;;;;; 167934 948000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11852,8 +11848,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21710 25547 +;;;;;; 100569 672000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11863,8 +11859,8 @@ Make the current buffer look like a nice article. ;;;*** -;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21710 +;;;;;; 25547 101569 668000)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -11887,8 +11883,8 @@ deletion, or > if it is flagged for displaying. ;;;*** -;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21710 25547 +;;;;;; 101569 668000)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -11929,8 +11925,8 @@ supported. ;;;*** -;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21710 25547 +;;;;;; 102569 663000)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11965,8 +11961,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21710 25465 +;;;;;; 170934 934000)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -11981,8 +11977,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21710 25465 +;;;;;; 170934 934000)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -11992,8 +11988,8 @@ Convenience method to turn on gnus-dired-mode. ;;;*** -;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21710 25465 +;;;;;; 170934 934000)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -12003,8 +11999,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21710 25547 +;;;;;; 102569 663000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus-random-x-face "gnus-fun" "\ @@ -12048,8 +12044,8 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to ;;;*** -;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21710 +;;;;;; 25465 171934 930000)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -12066,8 +12062,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21710 25547 +;;;;;; 102569 663000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12084,8 +12080,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21710 25547 +;;;;;; 103569 659000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12100,8 +12096,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21710 25465 +;;;;;; 172934 925000)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12114,8 +12110,8 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;*** -;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21710 25465 172934 +;;;;;; 925000)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -12138,8 +12134,8 @@ Minor mode for providing mailing-list commands. ;;;*** -;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21710 25547 +;;;;;; 103569 659000)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -12239,8 +12235,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21710 25547 +;;;;;; 103569 659000)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12267,7 +12263,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads nil "gnus-notifications" "gnus/gnus-notifications.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25547 103569 659000)) ;;; Generated autoloads from gnus/gnus-notifications.el (autoload 'gnus-notifications "gnus-notifications" "\ @@ -12283,8 +12279,8 @@ This is typically a function to add in ;;;*** -;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21710 25547 +;;;;;; 104569 654000)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12307,8 +12303,8 @@ If picons are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21710 25465 +;;;;;; 173934 921000)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12375,8 +12371,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21710 +;;;;;; 25547 104569 654000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12391,8 +12387,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21710 25465 +;;;;;; 174934 916000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12419,8 +12415,8 @@ See the documentation for these variables and functions for details. ;;;*** -;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21710 25547 +;;;;;; 104569 654000)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12430,8 +12426,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21710 25547 +;;;;;; 106569 646000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12441,8 +12437,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21710 25547 +;;;;;; 109569 632000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12453,8 +12449,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21710 25465 +;;;;;; 179934 894000)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12469,8 +12465,8 @@ Install the sync hooks. ;;;*** -;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21710 25465 +;;;;;; 180934 890000)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12480,8 +12476,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (21710 25547 143569 +;;;;;; 481000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12497,8 +12493,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21710 25465 296934 +;;;;;; 372000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12524,8 +12520,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21710 25465 +;;;;;; 243934 609000)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12566,8 +12562,8 @@ Like `goto-address-mode', but only for comments and strings. ;;;*** -;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21710 25547 +;;;;;; 110569 628000)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -12583,8 +12579,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "grep" "progmodes/grep.el" (21710 25547 180569 +;;;;;; 316000)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12748,7 +12744,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'. ;;;*** -;;;### (autoloads nil "gs" "gs.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "gs" "gs.el" (21710 25465 192934 836000)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12761,8 +12757,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "gud" "progmodes/gud.el" (21710 25547 180569 +;;;;;; 316000)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12850,8 +12846,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21710 25547 83569 +;;;;;; 748000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -12953,8 +12949,8 @@ binding mode. ;;;*** -;;;### (autoloads nil "handwrite" "play/handwrite.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "handwrite" "play/handwrite.el" (21710 25465 +;;;;;; 296934 372000)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -12971,8 +12967,8 @@ Variables: `handwrite-linespace' (default 12) ;;;*** -;;;### (autoloads nil "hanoi" "play/hanoi.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "hanoi" "play/hanoi.el" (21710 25465 296934 +;;;;;; 372000)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -12999,8 +12995,8 @@ to be updated. ;;;*** -;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21710 25547 +;;;;;; 134569 521000)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -13042,8 +13038,8 @@ Prefix arg sets default accept amount temporarily. ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21710 25465 192934 +;;;;;; 836000)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -13170,8 +13166,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "help-fns" "help-fns.el" (21710 25547 118569 +;;;;;; 592000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13250,8 +13246,8 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file. ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "help-macro" "help-macro.el" (21710 25465 192934 +;;;;;; 836000)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13265,8 +13261,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "help-mode" "help-mode.el" (21710 25547 118569 +;;;;;; 592000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13365,8 +13361,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21710 25465 +;;;;;; 133935 99000)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13381,7 +13377,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "hexl" "hexl.el" (21710 25547 119569 588000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13475,8 +13471,8 @@ This discards the buffer's undo information. ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "hi-lock" "hi-lock.el" (21710 25547 119569 +;;;;;; 588000)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13643,8 +13639,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21710 25547 +;;;;;; 180569 316000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13687,8 +13683,8 @@ Several variables affect how the hiding is done: ;;;*** -;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21710 25547 +;;;;;; 181569 311000)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13750,8 +13746,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21710 25465 194934 +;;;;;; 827000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13882,8 +13878,8 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21710 25547 119569 +;;;;;; 588000)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -13915,8 +13911,8 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "hl-line" "hl-line.el" (21710 25465 194934 +;;;;;; 827000)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -13965,8 +13961,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (21710 25547 +;;;;;; 60569 851000)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -14114,8 +14110,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (21710 25465 +;;;;;; 181934 885000)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14125,8 +14121,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21670 36217 -;;;;;; 165621 979000)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21710 25547 +;;;;;; 119569 588000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14159,8 +14155,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'. ;;;*** -;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21710 25547 120569 +;;;;;; 583000)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14248,8 +14244,8 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21670 36217 165621 -;;;;;; 979000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21710 25547 120569 +;;;;;; 583000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14288,8 +14284,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21710 +;;;;;; 25547 61569 846000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14342,8 +14338,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "icomplete" "icomplete.el" (21710 25547 120569 +;;;;;; 583000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14378,8 +14374,8 @@ completions: ;;;*** -;;;### (autoloads nil "icon" "progmodes/icon.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "icon" "progmodes/icon.el" (21710 25465 317934 +;;;;;; 279000)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14419,8 +14415,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21710 +;;;;;; 25547 182569 307000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14445,8 +14441,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21710 25547 +;;;;;; 183569 302000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14575,7 +14571,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "ido" "ido.el" (21710 25547 121569 579000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14837,7 +14833,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "ielm" "ielm.el" (21710 25547 121569 579000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -14849,7 +14845,7 @@ See `inferior-emacs-lisp-mode' for details. ;;;*** -;;;### (autoloads nil "iimage" "iimage.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "iimage" "iimage.el" (21710 25465 196934 818000)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -14865,7 +14861,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "image" "image.el" (21710 25465 197934 814000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15058,8 +15054,8 @@ If Emacs is compiled without ImageMagick support, this does nothing. ;;;*** -;;;### (autoloads nil "image-dired" "image-dired.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "image-dired" "image-dired.el" (21710 25465 +;;;;;; 197934 814000)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) @@ -15196,8 +15192,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads nil "image-file" "image-file.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "image-file" "image-file.el" (21710 25465 197934 +;;;;;; 814000)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\ @@ -15259,8 +15255,8 @@ An image file is one whose name has an extension in ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "image-mode" "image-mode.el" (21710 25547 122569 +;;;;;; 574000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15307,7 +15303,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "imenu" "imenu.el" (21710 25547 122569 574000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15445,8 +15441,8 @@ for more information. ;;;*** -;;;### (autoloads nil "ind-util" "language/ind-util.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ind-util" "language/ind-util.el" (21710 25465 +;;;;;; 210934 756000)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -15476,8 +15472,8 @@ Convert old Emacs Devanagari characters to UCS. ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21710 25547 +;;;;;; 183569 302000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15495,7 +15491,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "info" "info.el" (21710 25547 123569 570000)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -15705,8 +15701,8 @@ Otherwise, visit the manual in a new Info buffer. ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "info-look" "info-look.el" (21710 25465 198934 +;;;;;; 809000)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15753,8 +15749,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "info-xref" "info-xref.el" (21710 25465 198934 +;;;;;; 809000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -15837,8 +15833,8 @@ the sources handy. ;;;*** -;;;### (autoloads nil "informat" "informat.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "informat" "informat.el" (21710 25465 199934 +;;;;;; 805000)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15883,8 +15879,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inversion" "cedet/inversion.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "inversion" "cedet/inversion.el" (21710 25465 +;;;;;; 100935 246000)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) @@ -15896,8 +15892,8 @@ Only checks one based on which kind of Emacs is being run. ;;;*** -;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21710 +;;;;;; 25465 200934 800000)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -15917,8 +15913,8 @@ Toggle input method in interactive search. ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "isearchb" "isearchb.el" (21710 25465 204934 +;;;;;; 783000)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -15932,8 +15928,8 @@ accessed via isearchb. ;;;*** -;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21710 +;;;;;; 25465 200934 800000)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -16024,15 +16020,15 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 200934 800000)) ;;; Generated autoloads from international/iso-transl.el (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap) ;;;*** -;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21710 25547 +;;;;;; 209569 186000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16265,8 +16261,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to ;;;*** -;;;### (autoloads nil "japan-util" "language/japan-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "japan-util" "language/japan-util.el" (21710 +;;;;;; 25465 211934 751000)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -16343,8 +16339,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (21710 25465 205934 +;;;;;; 778000)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16367,8 +16363,8 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "js" "progmodes/js.el" (21710 25547 184569 +;;;;;; 298000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16380,14 +16376,14 @@ Major mode for editing JavaScript. ;;;*** -;;;### (autoloads nil "json" "json.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "json" "json.el" (21710 25465 205934 778000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "keypad" "emulation/keypad.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "keypad" "emulation/keypad.el" (21710 25465 +;;;;;; 139935 72000)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16442,8 +16438,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** -;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21710 +;;;;;; 25465 200934 800000)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -16464,8 +16460,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "kkc" "international/kkc.el" (21710 25465 201934 +;;;;;; 796000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16487,7 +16483,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21710 25465 205934 778000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16599,8 +16595,8 @@ If kbd macro currently being defined end it before activating it. ;;;*** -;;;### (autoloads nil "korea-util" "language/korea-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "korea-util" "language/korea-util.el" (21710 +;;;;;; 25465 211934 751000)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16614,8 +16610,8 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "landmark" "play/landmark.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "landmark" "play/landmark.el" (21710 25547 +;;;;;; 167569 373000)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16645,8 +16641,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "lao-util" "language/lao-util.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "lao-util" "language/lao-util.el" (21710 25465 +;;;;;; 211934 751000)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16683,8 +16679,8 @@ Transcribe Romanized Lao string STR to Lao character string. ;;;*** -;;;### (autoloads nil "latexenc" "international/latexenc.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "latexenc" "international/latexenc.el" (21710 +;;;;;; 25465 201934 796000)) ;;; Generated autoloads from international/latexenc.el (defvar latex-inputenc-coding-alist (purecopy '(("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ @@ -16716,7 +16712,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 201934 796000)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16757,8 +16753,8 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** -;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21710 +;;;;;; 25465 321934 261000)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16768,7 +16764,7 @@ A major mode to edit GNU ld script files ;;;*** -;;;### (autoloads nil "life" "play/life.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "life" "play/life.el" (21710 25465 296934 372000)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -16781,7 +16777,7 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads nil "linum" "linum.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "linum" "linum.el" (21710 25547 134569 521000)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -16818,8 +16814,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "loadhist" "loadhist.el" (21710 25465 223934 +;;;;;; 698000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16850,7 +16846,7 @@ something strange, such as redefining an Emacs function. ;;;*** -;;;### (autoloads nil "locate" "locate.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "locate" "locate.el" (21710 25465 224934 693000)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -16902,8 +16898,8 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21710 25465 370934 +;;;;;; 43000)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16934,8 +16930,8 @@ done. Otherwise, it uses the current buffer. ;;;*** -;;;### (autoloads nil "log-view" "vc/log-view.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "log-view" "vc/log-view.el" (21710 25465 370934 +;;;;;; 43000)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -16945,7 +16941,7 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "lpr" "lpr.el" (21710 25465 224934 693000)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17040,8 +17036,8 @@ for further customization of the printer command. ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21710 25547 134569 +;;;;;; 521000)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -17052,8 +17048,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads nil "lunar" "calendar/lunar.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "lunar" "calendar/lunar.el" (21710 25547 61569 +;;;;;; 846000)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -17067,8 +17063,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21710 25547 +;;;;;; 184569 298000)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17078,7 +17074,7 @@ A major mode to edit m4 macro files. ;;;*** -;;;### (autoloads nil "macros" "macros.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "macros" "macros.el" (21710 25465 224934 693000)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17167,8 +17163,8 @@ and then select the region of un-tablified names and use ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17198,8 +17194,8 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;*** -;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17228,8 +17224,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17303,8 +17299,8 @@ matches may be returned from the message body. ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17353,8 +17349,8 @@ double-quotes. ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17407,8 +17403,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any. ;;;*** -;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -17420,8 +17416,8 @@ The mail client is taken to be the handler of mailto URLs. ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21710 +;;;;;; 25465 321934 261000)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17538,8 +17534,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "makesum" "makesum.el" (21710 25465 230934 +;;;;;; 667000)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -17550,7 +17546,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads nil "man" "man.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "man" "man.el" (21710 25547 136569 512000)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17604,7 +17600,7 @@ Default bookmark handler for Man buffers. ;;;*** -;;;### (autoloads nil "master" "master.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "master" "master.el" (21710 25465 230934 667000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) @@ -17627,8 +17623,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads nil "mb-depth" "mb-depth.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mb-depth" "mb-depth.el" (21710 25465 230934 +;;;;;; 667000)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -17655,14 +17651,14 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "md4" "md4.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "md4" "md4.el" (21710 25465 230934 667000)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21706 9418 86773 -;;;;;; 130000)) +;;;### (autoloads nil "message" "gnus/message.el" (21710 25547 111569 +;;;;;; 623000)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -17827,8 +17823,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21710 +;;;;;; 25465 321934 261000)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) @@ -17844,8 +17840,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17888,8 +17884,8 @@ redisplayed as output is inserted. ;;;*** -;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21710 25465 234934 +;;;;;; 649000)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -17979,7 +17975,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21710 25547 138569 503000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -17996,8 +17992,8 @@ Display version information about MH-E and the MH mail handling system. ;;;*** -;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21710 25465 +;;;;;; 235934 644000)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18078,8 +18074,8 @@ perform the operation on all messages in that region. ;;;*** -;;;### (autoloads nil "midnight" "midnight.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "midnight" "midnight.el" (21710 25465 238934 +;;;;;; 631000)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -18105,8 +18101,8 @@ to its second argument TM. ;;;*** -;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21710 25465 +;;;;;; 238934 631000)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18135,7 +18131,7 @@ is modified to remove the default indication. ;;;*** -;;;### (autoloads nil "misc" "misc.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "misc" "misc.el" (21710 25465 239934 627000)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18163,8 +18159,8 @@ The return value is always nil. ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "misearch" "misearch.el" (21710 25547 139569 +;;;;;; 498000)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18245,8 +18241,8 @@ whose file names match the specified wildcard. ;;;*** -;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21710 +;;;;;; 25465 322934 257000)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) @@ -18257,8 +18253,8 @@ Major mode for the mixal asm language. ;;;*** -;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21710 25465 +;;;;;; 183934 876000)) ;;; Generated autoloads from gnus/mm-encode.el (autoload 'mm-default-file-encoding "mm-encode" "\ @@ -18268,8 +18264,8 @@ Return a default encoding for FILE. ;;;*** -;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21710 25547 +;;;;;; 112569 619000)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -18287,8 +18283,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21710 25465 +;;;;;; 183934 876000)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -18301,8 +18297,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21710 25547 112569 +;;;;;; 619000)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18318,8 +18314,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21710 25547 112569 +;;;;;; 619000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18338,7 +18334,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** -;;;### (autoloads nil "mml" "gnus/mml.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "mml" "gnus/mml.el" (21710 25547 113569 614000)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18363,8 +18359,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21710 25547 113569 +;;;;;; 614000)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -18379,8 +18375,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21710 25547 113569 +;;;;;; 614000)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18420,16 +18416,16 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21710 25465 +;;;;;; 101935 242000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) ;;;*** -;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21710 25465 +;;;;;; 322934 257000)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18462,8 +18458,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "morse" "play/morse.el" (21710 25547 167569 +;;;;;; 373000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18488,8 +18484,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** -;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21710 25465 239934 +;;;;;; 627000)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18536,7 +18532,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "mpc" "mpc.el" (21710 25547 140569 494000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18546,7 +18542,7 @@ Main entry point for MPC. ;;;*** -;;;### (autoloads nil "mpuz" "play/mpuz.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "mpuz" "play/mpuz.el" (21710 25465 297934 368000)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18556,7 +18552,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "msb" "msb.el" (21710 25547 140569 494000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18581,8 +18577,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21710 +;;;;;; 25547 124569 565000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -18714,8 +18710,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (21710 +;;;;;; 25547 124569 565000)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -18846,8 +18842,8 @@ per-character basis, this may not be accurate. ;;;*** -;;;### (autoloads nil "net-utils" "net/net-utils.el" (21679 50887 -;;;;;; 336751 696000)) +;;;### (autoloads nil "net-utils" "net/net-utils.el" (21710 25465 +;;;;;; 244934 604000)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -18941,8 +18937,8 @@ Open a network connection to HOST on PORT. ;;;*** -;;;### (autoloads nil "netrc" "net/netrc.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "netrc" "net/netrc.el" (21710 25465 244934 +;;;;;; 604000)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -18954,8 +18950,8 @@ listed in the PORTS list. ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (21710 +;;;;;; 25547 143569 481000)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19048,8 +19044,8 @@ a greeting from the server. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21710 +;;;;;; 25547 144569 476000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19071,7 +19067,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25547 144569 476000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19081,8 +19077,8 @@ Start newsticker plainview. ;;;*** -;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21710 +;;;;;; 25547 144569 476000)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -19092,8 +19088,8 @@ Start reading news. You may want to bind this to a key. ;;;*** -;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21710 +;;;;;; 25547 145569 472000)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -19113,8 +19109,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21710 +;;;;;; 25547 145569 472000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19124,15 +19120,15 @@ Start newsticker treeview. ;;;*** -;;;### (autoloads nil "newsticker" "net/newsticker.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "newsticker" "net/newsticker.el" (21710 25547 +;;;;;; 145569 472000)) ;;; Generated autoloads from net/newsticker.el (push (purecopy '(newsticker 1 99)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21710 25465 185934 +;;;;;; 867000)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19142,8 +19138,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21710 25465 185934 +;;;;;; 867000)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -19157,8 +19153,8 @@ symbol in the alist. ;;;*** -;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21710 25547 +;;;;;; 114569 610000)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -19169,7 +19165,7 @@ This command does not work if you use short group names. ;;;*** -;;;### (autoloads nil "nnml" "gnus/nnml.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "nnml" "gnus/nnml.el" (21710 25465 188934 854000)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19179,7 +19175,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "novice" "novice.el" (21710 25465 254934 560000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19211,8 +19207,8 @@ future sessions. ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21710 +;;;;;; 25465 352934 123000)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19226,14 +19222,14 @@ closing requests for requests that are used in matched pairs. ;;;*** -;;;### (autoloads nil "ntlm" "net/ntlm.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "ntlm" "net/ntlm.el" (21710 25547 146569 467000)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21710 25465 +;;;;;; 254934 560000)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19245,8 +19241,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21710 25547 +;;;;;; 150569 450000)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19306,8 +19302,8 @@ Many aspects this mode can be customized using ;;;*** -;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21710 25465 +;;;;;; 255934 555000)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -19319,8 +19315,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21710 25547 +;;;;;; 185569 293000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19357,8 +19353,8 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21710 25547 +;;;;;; 185569 293000)) ;;; Generated autoloads from progmodes/opascal.el (define-obsolete-function-alias 'delphi-mode 'opascal-mode "24.4") @@ -19393,7 +19389,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "org" "org/org.el" (21710 25547 163569 392000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19614,8 +19610,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21710 25465 +;;;;;; 277934 457000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -19888,8 +19884,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (21710 25465 +;;;;;; 278934 453000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -19931,8 +19927,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "org-colview" "org/org-colview.el" (21710 25465 +;;;;;; 278934 453000)) ;;; Generated autoloads from org/org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -19995,8 +19991,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21710 25547 +;;;;;; 157569 418000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -20006,8 +20002,8 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "org-macs" "org/org-macs.el" (21710 25465 281934 +;;;;;; 439000)) ;;; Generated autoloads from org/org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -20017,8 +20013,8 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** -;;;### (autoloads nil "org-version" "org/org-version.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "org-version" "org/org-version.el" (21710 25465 +;;;;;; 284934 426000)) ;;; Generated autoloads from org/org-version.el (autoload 'org-release "org-version" "\ @@ -20035,8 +20031,8 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "outline" "outline.el" (21710 25547 165569 +;;;;;; 382000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20097,8 +20093,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21676 11899 -;;;;;; 256354 520000)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21710 25547 +;;;;;; 84569 744000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20170,7 +20166,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads nil "paren" "paren.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "paren" "paren.el" (21710 25547 165569 382000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20196,8 +20192,8 @@ matching parenthesis is highlighted in `show-paren-style' after ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21710 +;;;;;; 25547 61569 846000)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20210,8 +20206,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21710 25465 +;;;;;; 323934 252000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20260,8 +20256,8 @@ See also the user variables `pascal-type-keywords', `pascal-start-keywords' and ;;;*** -;;;### (autoloads nil "password-cache" "password-cache.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "password-cache" "password-cache.el" (21710 +;;;;;; 25465 293934 386000)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20282,8 +20278,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21710 25547 +;;;;;; 84569 744000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20344,8 +20340,8 @@ of the form (UPAT EXP). ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20355,8 +20351,8 @@ Completion rules for the `cvs' command. ;;;*** -;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21710 25547 165569 +;;;;;; 382000)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20383,8 +20379,8 @@ Completion for the GNU tar utility. ;;;*** -;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21710 25465 +;;;;;; 293934 386000)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20404,8 +20400,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20415,8 +20411,8 @@ Completion for the `rpm' command. ;;;*** -;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20471,8 +20467,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20496,8 +20492,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (21689 338 694604 -;;;;;; 955000)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20554,7 +20550,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21710 25465 371934 38000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -20629,8 +20625,8 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21710 25465 +;;;;;; 370934 43000)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ @@ -20638,8 +20634,8 @@ Global menu used by PCL-CVS.") ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21710 +;;;;;; 25547 185569 293000)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20700,8 +20696,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21710 25465 +;;;;;; 352934 123000)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -20781,8 +20777,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "plstore" "gnus/plstore.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "plstore" "gnus/plstore.el" (21710 25465 190934 +;;;;;; 845000)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -20797,8 +20793,8 @@ Major mode for editing PLSTORE files. ;;;*** -;;;### (autoloads nil "po" "textmodes/po.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "po" "textmodes/po.el" (21710 25465 352934 +;;;;;; 123000)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -20809,7 +20805,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads nil "pong" "play/pong.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "pong" "play/pong.el" (21710 25465 297934 368000)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -20825,7 +20821,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21710 25547 117569 596000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -20836,8 +20832,8 @@ Use streaming commands. ;;;*** -;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21710 25547 84569 +;;;;;; 744000)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -20887,8 +20883,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "printing" "printing.el" (21710 25547 168569 +;;;;;; 369000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21476,7 +21472,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "proced" "proced.el" (21710 25547 168569 369000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21494,8 +21490,8 @@ Proced buffers. ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "profiler" "profiler.el" (21710 25465 299934 +;;;;;; 359000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21523,8 +21519,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21710 25547 +;;;;;; 186569 289000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21557,7 +21553,7 @@ With prefix argument ARG, restart the Prolog process if running before. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21710 25465 334934 203000)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ @@ -21568,8 +21564,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21710 25547 +;;;;;; 186569 289000)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) @@ -21616,8 +21612,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (21670 36217 165621 -;;;;;; 979000)) +;;;### (autoloads nil "ps-print" "ps-print.el" (21710 25547 197569 +;;;;;; 240000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -21814,15 +21810,15 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21710 25547 64569 +;;;;;; 833000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21707 30279 -;;;;;; 916059 915000)) +;;;### (autoloads nil "python" "progmodes/python.el" (21710 25547 +;;;;;; 187569 284000)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 4)) package--builtin-versions) @@ -21856,7 +21852,7 @@ Major mode for editing Python files. ;;;*** -;;;### (autoloads nil "qp" "gnus/qp.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "qp" "gnus/qp.el" (21710 25465 190934 845000)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -21875,8 +21871,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "quail" "international/quail.el" (21710 25547 +;;;;;; 125569 561000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22106,8 +22102,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21710 +;;;;;; 25465 220934 711000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22120,7 +22116,7 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'. ;;;*** ;;;### (autoloads nil "quail/uni-input" "leim/quail/uni-input.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 223934 698000)) ;;; Generated autoloads from leim/quail/uni-input.el (autoload 'ucs-input-activate "quail/uni-input" "\ @@ -22134,8 +22130,8 @@ While this input method is active, the variable ;;;*** -;;;### (autoloads nil "quickurl" "net/quickurl.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "quickurl" "net/quickurl.el" (21710 25465 247934 +;;;;;; 591000)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -22206,8 +22202,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21710 25547 146569 +;;;;;; 467000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22245,8 +22241,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21710 +;;;;;; 25465 135935 90000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22264,8 +22260,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "recentf" "recentf.el" (21710 25465 336934 +;;;;;; 194000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22291,7 +22287,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "rect" "rect.el" (21710 25547 197569 240000)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22431,8 +22427,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "refill" "textmodes/refill.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "refill" "textmodes/refill.el" (21710 25465 +;;;;;; 353934 118000)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -22452,8 +22448,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21704 54100 -;;;;;; 244617 275000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21710 25547 +;;;;;; 212569 173000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -22502,8 +22498,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21710 +;;;;;; 25547 209569 186000)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload 'reftex-citation "reftex-cite" "\ @@ -22533,7 +22529,7 @@ While entering the regexp, completion on knows citation keys is possible. ;;;*** ;;;### (autoloads nil "reftex-global" "textmodes/reftex-global.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25547 209569 186000)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload 'reftex-isearch-minor-mode "reftex-global" "\ @@ -22550,7 +22546,7 @@ With no argument, this command toggles ;;;*** ;;;### (autoloads nil "reftex-index" "textmodes/reftex-index.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25547 210569 182000)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload 'reftex-index-phrases-mode "reftex-index" "\ @@ -22583,7 +22579,7 @@ Here are all local bindings. ;;;*** ;;;### (autoloads nil "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25547 210569 182000)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload 'reftex-all-document-files "reftex-parse" "\ @@ -22595,8 +22591,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21707 -;;;;;; 30279 916059 915000)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21710 +;;;;;; 25547 211569 177000)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22605,8 +22601,8 @@ of master file. ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21710 +;;;;;; 25547 84569 744000)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22635,15 +22631,15 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21710 25465 136935 +;;;;;; 86000)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21710 25547 +;;;;;; 213569 169000)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -22697,7 +22693,7 @@ to turn the *scratch* buffer into your notes buffer. ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "repeat" "repeat.el" (21710 25465 336934 194000)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -22720,8 +22716,8 @@ recently executed command not bound to an input event\". ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -22752,8 +22748,8 @@ mail-sending package is used for editing and sending the message. ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "reposition" "reposition.el" (21710 25465 337934 +;;;;;; 190000)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -22779,7 +22775,7 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads nil "reveal" "reveal.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "reveal" "reveal.el" (21710 25547 197569 240000)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -22814,8 +22810,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21710 25465 136935 +;;;;;; 86000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -22830,8 +22826,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (21710 25465 247934 +;;;;;; 591000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -22875,8 +22871,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21670 36217 165621 -;;;;;; 979000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21710 25547 135569 +;;;;;; 516000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23073,8 +23069,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21710 25465 +;;;;;; 228934 676000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23138,8 +23134,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21710 25465 +;;;;;; 255934 555000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23150,8 +23146,8 @@ Return a pattern. ;;;*** -;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21710 25465 +;;;;;; 255934 555000)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23163,8 +23159,8 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil. ;;;*** -;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21710 25465 +;;;;;; 256934 551000)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23194,8 +23190,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21710 25465 256934 +;;;;;; 551000)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23222,8 +23218,8 @@ must be equal. ;;;*** -;;;### (autoloads nil "robin" "international/robin.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "robin" "international/robin.el" (21710 25465 +;;;;;; 203934 787000)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -23255,7 +23251,7 @@ Start using robin package NAME, which is a string. ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "rot13" "rot13.el" (21710 25465 337934 190000)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23292,8 +23288,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (21710 25547 213569 +;;;;;; 169000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23323,8 +23319,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21710 +;;;;;; 25547 188569 280000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23341,8 +23337,8 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21710 25547 198569 +;;;;;; 235000)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23360,8 +23356,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21710 25465 136935 +;;;;;; 86000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -23672,15 +23668,15 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21710 25465 +;;;;;; 248934 587000)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "savehist" "savehist.el" (21710 25547 198569 +;;;;;; 235000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -23712,8 +23708,8 @@ histories, which is probably undesirable. ;;;*** -;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21710 25547 +;;;;;; 188569 280000)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -23752,8 +23748,8 @@ that variable's value is a string. ;;;*** -;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21710 25465 +;;;;;; 190934 845000)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -23766,8 +23762,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "scroll-all" "scroll-all.el" (21710 25547 198569 +;;;;;; 235000)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23792,8 +23788,8 @@ one window apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21710 25465 +;;;;;; 337934 190000)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -23809,16 +23805,16 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "secrets" "net/secrets.el" (21710 25465 248934 +;;;;;; 587000)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) ;;;*** -;;;### (autoloads nil "semantic" "cedet/semantic.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "semantic" "cedet/semantic.el" (21710 25547 +;;;;;; 64569 833000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) @@ -23876,7 +23872,7 @@ Semantic mode. ;;;*** ;;;### (autoloads nil "semantic/bovine/grammar" "cedet/semantic/bovine/grammar.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25547 65569 828000)) ;;; Generated autoloads from cedet/semantic/bovine/grammar.el (autoload 'bovine-grammar-mode "semantic/bovine/grammar" "\ @@ -23887,7 +23883,7 @@ Major mode for editing Bovine grammars. ;;;*** ;;;### (autoloads nil "semantic/wisent/grammar" "cedet/semantic/wisent/grammar.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25465 113935 188000)) ;;; Generated autoloads from cedet/semantic/wisent/grammar.el (autoload 'wisent-grammar-mode "semantic/wisent/grammar" "\ @@ -23897,8 +23893,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21710 25465 +;;;;;; 229934 671000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24179,7 +24175,7 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "server" "server.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "server" "server.el" (21710 25547 198569 235000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24246,7 +24242,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "ses" "ses.el" (21710 25547 199569 231000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24290,8 +24286,8 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21710 +;;;;;; 25547 214569 164000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24356,8 +24352,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21676 -;;;;;; 11881 756047 924000)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21710 +;;;;;; 25547 188569 280000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24420,8 +24416,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21710 25465 +;;;;;; 136935 86000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24470,8 +24466,8 @@ function, `load-path-shadows-find'. ;;;*** -;;;### (autoloads nil "shadowfile" "shadowfile.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "shadowfile" "shadowfile.el" (21710 25465 339934 +;;;;;; 181000)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -24509,7 +24505,7 @@ Set up file shadowing. ;;;*** -;;;### (autoloads nil "shell" "shell.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "shell" "shell.el" (21710 25547 199569 231000)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24557,7 +24553,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "shr" "net/shr.el" (21710 25547 147569 463000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24574,8 +24570,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (21710 25465 191934 +;;;;;; 841000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24600,8 +24596,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21710 25465 +;;;;;; 191934 841000)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -24616,8 +24612,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simula" "progmodes/simula.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "simula" "progmodes/simula.el" (21710 25465 +;;;;;; 326934 239000)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -24665,8 +24661,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "skeleton" "skeleton.el" (21710 25547 201569 +;;;;;; 222000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -24784,8 +24780,8 @@ symmetrical ones, and the same character twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21710 25547 +;;;;;; 220569 137000)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -24812,8 +24808,8 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** -;;;### (autoloads nil "smiley" "gnus/smiley.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "smiley" "gnus/smiley.el" (21710 25465 191934 +;;;;;; 841000)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -24830,8 +24826,8 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** -;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21710 25547 +;;;;;; 136569 512000)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -24846,8 +24842,8 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads nil "snake" "play/snake.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "snake" "play/snake.el" (21710 25465 297934 +;;;;;; 368000)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -24870,8 +24866,8 @@ Snake mode keybindings: ;;;*** -;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21710 25465 +;;;;;; 248934 587000)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -24900,8 +24896,8 @@ then `snmpv2-mode-hook'. ;;;*** -;;;### (autoloads nil "solar" "calendar/solar.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "solar" "calendar/solar.el" (21710 25465 95935 +;;;;;; 269000)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -24916,8 +24912,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "solitaire" "play/solitaire.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "solitaire" "play/solitaire.el" (21710 25465 +;;;;;; 297934 368000)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -24992,7 +24988,7 @@ Pick your favorite shortcuts: ;;;*** -;;;### (autoloads nil "sort" "sort.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "sort" "sort.el" (21710 25465 341934 172000)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25167,7 +25163,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "spam" "gnus/spam.el" (21710 25547 118569 592000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25181,8 +25177,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21710 +;;;;;; 25465 191934 841000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25224,8 +25220,8 @@ Spam reports will be queued with the method used when ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "speedbar" "speedbar.el" (21710 25547 202569 +;;;;;; 218000)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25249,8 +25245,8 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "spook" "play/spook.el" (21710 25465 297934 +;;;;;; 368000)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25265,8 +25261,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21710 25547 189569 +;;;;;; 276000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 4)) package--builtin-versions) @@ -25727,15 +25723,15 @@ buffer. ;;;*** -;;;### (autoloads nil "srecode" "cedet/srecode.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "srecode" "cedet/srecode.el" (21710 25465 113935 +;;;;;; 188000)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25547 69569 810000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -25747,8 +25743,8 @@ Major-mode for writing SRecode macros. ;;;*** -;;;### (autoloads nil "starttls" "gnus/starttls.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "starttls" "gnus/starttls.el" (21710 25465 +;;;;;; 192934 836000)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -25771,8 +25767,8 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "strokes" "strokes.el" (21710 25465 343934 +;;;;;; 163000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -25885,8 +25881,8 @@ Read a complex stroke and insert its glyph into the current buffer. ;;;*** -;;;### (autoloads nil "studly" "play/studly.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "studly" "play/studly.el" (21710 25465 297934 +;;;;;; 368000)) ;;; Generated autoloads from play/studly.el (autoload 'studlify-region "studly" "\ @@ -25906,8 +25902,8 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (21710 25547 +;;;;;; 189569 276000)) ;;; Generated autoloads from progmodes/subword.el (autoload 'subword-mode "subword" "\ @@ -26001,8 +25997,8 @@ See `superword-mode' for more information on Superword mode. ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (21710 25465 +;;;;;; 229934 671000)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -26034,8 +26030,8 @@ and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "t-mouse" "t-mouse.el" (21710 25465 344934 +;;;;;; 158000)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -26063,7 +26059,7 @@ It relies on the `gpm' daemon being activated. ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "tabify" "tabify.el" (21710 25465 344934 158000)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -26092,8 +26088,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "table" "textmodes/table.el" (21710 25465 358934 +;;;;;; 96000)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -26685,7 +26681,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads nil "talk" "talk.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "talk" "talk.el" (21710 25465 344934 158000)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -26700,8 +26696,8 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "tar-mode" "tar-mode.el" (21710 25547 204569 +;;;;;; 209000)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -26724,8 +26720,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21710 25465 328934 +;;;;;; 230000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -26773,8 +26769,8 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "telnet" "net/telnet.el" (21710 25465 249934 +;;;;;; 582000)) ;;; Generated autoloads from net/telnet.el (autoload 'telnet "telnet" "\ @@ -26799,7 +26795,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "term" "term.el" (21710 25547 205569 204000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -26841,8 +26837,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21710 +;;;;;; 25465 137935 81000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -26852,8 +26848,8 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads nil "tetris" "play/tetris.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "tetris" "play/tetris.el" (21710 25465 297934 +;;;;;; 368000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) @@ -26878,8 +26874,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21710 25547 +;;;;;; 214569 164000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27180,8 +27176,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21710 25465 +;;;;;; 360934 87000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27220,8 +27216,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21710 25465 +;;;;;; 360934 87000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27305,8 +27301,8 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads nil "thai-util" "language/thai-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "thai-util" "language/thai-util.el" (21710 +;;;;;; 25465 211934 751000)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27333,8 +27329,8 @@ Compose Thai characters in the current buffer. ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "thingatpt" "thingatpt.el" (21710 25465 361934 +;;;;;; 83000)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27398,7 +27394,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21710 25465 361934 83000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27432,8 +27428,8 @@ In dired, call the setroot program on the image at point. ;;;*** -;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21710 +;;;;;; 25465 212934 747000)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -27506,8 +27502,8 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21710 25547 +;;;;;; 215569 160000)) ;;; Generated autoloads from textmodes/tildify.el (push (purecopy '(tildify 4 5)) package--builtin-versions) @@ -27531,7 +27527,7 @@ This function performs no refilling of the changed text. ;;;*** -;;;### (autoloads nil "time" "time.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "time" "time.el" (21710 25465 361934 83000)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -27593,8 +27589,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21710 +;;;;;; 25547 61569 846000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27705,8 +27701,8 @@ This function does not work for SECONDS greater than `most-positive-fixnum'. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (21710 25465 361934 +;;;;;; 83000)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -27746,8 +27742,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21710 +;;;;;; 25547 61569 846000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -27857,7 +27853,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 204934 783000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -27879,7 +27875,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "tmm" "tmm.el" (21710 25547 215569 160000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27921,8 +27917,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21710 +;;;;;; 25465 96935 264000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -27989,8 +27985,8 @@ Mode for displaying and reprioritizing top priority Todo. ;;;*** -;;;### (autoloads nil "tool-bar" "tool-bar.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "tool-bar" "tool-bar.el" (21710 25465 362934 +;;;;;; 78000)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -28060,8 +28056,8 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21710 25465 137935 +;;;;;; 81000)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -28074,8 +28070,8 @@ to a tcp server on another machine. ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21710 25465 +;;;;;; 137935 81000)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -28120,7 +28116,8 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21685 3267 694612 832000)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21713 24233 279494 +;;;;;; 843000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28235,8 +28232,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21710 25465 +;;;;;; 250934 578000)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28246,8 +28243,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "tutorial" "tutorial.el" (21710 25465 362934 +;;;;;; 78000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28271,8 +28268,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "tv-util" "language/tv-util.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "tv-util" "language/tv-util.el" (21710 25465 +;;;;;; 212934 747000)) ;;; Generated autoloads from language/tv-util.el (autoload 'tai-viet-composition-function "tv-util" "\ @@ -28282,8 +28279,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21710 +;;;;;; 25465 361934 83000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28330,8 +28327,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "type-break" "type-break.el" (21710 25547 216569 +;;;;;; 155000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28463,7 +28460,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "uce" "mail/uce.el" (21710 25465 230934 667000)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -28477,7 +28474,7 @@ You might need to set `uce-mail-reader' before using this. ;;;*** ;;;### (autoloads nil "ucs-normalize" "international/ucs-normalize.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 204934 783000)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -28542,8 +28539,8 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus. ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (21710 +;;;;;; 25465 361934 83000)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28563,8 +28560,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21710 25465 230934 +;;;;;; 667000)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -28584,8 +28581,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use. ;;;*** -;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21710 25465 +;;;;;; 137935 81000)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -28597,7 +28594,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "url" "url/url.el" (21710 25547 217569 151000)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -28644,8 +28641,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (21710 25465 363934 +;;;;;; 74000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -28686,8 +28683,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** -;;;### (autoloads nil "url-cache" "url/url-cache.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-cache" "url/url-cache.el" (21710 25547 +;;;;;; 216569 155000)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -28708,8 +28705,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-cid" "url/url-cid.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-cid" "url/url-cid.el" (21710 25465 363934 +;;;;;; 74000)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -28719,8 +28716,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-dav" "url/url-dav.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-dav" "url/url-dav.el" (21710 25547 216569 +;;;;;; 155000)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -28754,8 +28751,8 @@ added to this list, so most requests can just pass in nil. ;;;*** -;;;### (autoloads nil "url-file" "url/url-file.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-file" "url/url-file.el" (21710 25465 364934 +;;;;;; 69000)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -28765,8 +28762,8 @@ Handle file: and ftp: URLs. ;;;*** -;;;### (autoloads nil "url-gw" "url/url-gw.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-gw" "url/url-gw.el" (21710 25547 217569 +;;;;;; 151000)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -28784,8 +28781,8 @@ Might do a non-blocking connection; use `process-status' to check. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21710 +;;;;;; 25547 217569 151000)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28839,8 +28836,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-http" "url/url-http.el" (21710 25547 217569 +;;;;;; 151000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -28852,8 +28849,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-irc" "url/url-irc.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-irc" "url/url-irc.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -28863,8 +28860,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -28877,8 +28874,8 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** -;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21710 25465 +;;;;;; 365934 65000)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -28893,8 +28890,8 @@ Handle the mailto: URL syntax. ;;;*** -;;;### (autoloads nil "url-misc" "url/url-misc.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-misc" "url/url-misc.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -28925,8 +28922,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-news" "url/url-news.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-news" "url/url-news.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -28941,8 +28938,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-ns" "url/url-ns.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-ns" "url/url-ns.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -28982,8 +28979,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-parse" "url/url-parse.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-parse" "url/url-parse.el" (21710 25465 +;;;;;; 365934 65000)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -29034,8 +29031,8 @@ parses to ;;;*** -;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21710 25465 +;;;;;; 365934 65000)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -29045,8 +29042,8 @@ Setup variables that expose info about you and your system. ;;;*** -;;;### (autoloads nil "url-queue" "url/url-queue.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-queue" "url/url-queue.el" (21710 25547 +;;;;;; 217569 151000)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -29060,8 +29057,8 @@ The variable `url-queue-timeout' sets a timeout. ;;;*** -;;;### (autoloads nil "url-util" "url/url-util.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-util" "url/url-util.el" (21710 25547 217569 +;;;;;; 151000)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29229,8 +29226,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "userlock" "userlock.el" (21710 25465 366934 +;;;;;; 60000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29258,8 +29255,8 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (21710 25465 +;;;;;; 204934 783000)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29284,7 +29281,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf7" "gnus/utf7.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "utf7" "gnus/utf7.el" (21710 25465 192934 836000)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29294,8 +29291,8 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;*** -;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21710 25465 +;;;;;; 230934 667000)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29319,7 +29316,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "vc" "vc/vc.el" (21710 25547 224569 119000)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29604,8 +29601,8 @@ Return the branch part of a revision number REV. ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21710 25547 +;;;;;; 220569 137000)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29642,8 +29639,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21710 25547 221569 +;;;;;; 133000)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29653,8 +29650,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21710 25547 221569 +;;;;;; 133000)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -29670,8 +29667,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21710 25547 221569 +;;;;;; 133000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -29682,8 +29679,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21710 25547 221569 +;;;;;; 133000)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -29707,8 +29704,8 @@ These are the commands available for use in the file status buffer: ;;;*** -;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21710 +;;;;;; 25547 222569 128000)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -29731,8 +29728,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21710 25547 222569 +;;;;;; 128000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -29743,7 +29740,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21710 25547 222569 128000)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -29754,8 +29751,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21710 25547 223569 +;;;;;; 124000)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -29771,8 +29768,8 @@ Name of the monotone directory's format file.") ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21710 25547 223569 +;;;;;; 124000)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -29785,8 +29782,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21710 25547 223569 +;;;;;; 124000)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -29804,8 +29801,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21710 25547 223569 +;;;;;; 124000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29818,8 +29815,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21710 +;;;;;; 25547 190569 271000)) ;;; Generated autoloads from progmodes/vera-mode.el (push (purecopy '(vera-mode 2 28)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -29878,7 +29875,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25547 192569 262000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30017,8 +30014,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21710 +;;;;;; 25547 195569 249000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -30572,8 +30569,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "viet-util" "language/viet-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "viet-util" "language/viet-util.el" (21710 +;;;;;; 25465 212934 747000)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -30617,7 +30614,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics. ;;;*** -;;;### (autoloads nil "view" "view.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "view" "view.el" (21710 25465 376934 16000)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -30873,8 +30870,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "viper" "emulation/viper.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "viper" "emulation/viper.el" (21710 25465 141935 +;;;;;; 64000)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) @@ -30891,8 +30888,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21710 +;;;;;; 25465 138935 77000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -30982,7 +30979,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "wdired" "wdired.el" (21710 25465 377934 11000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -31000,8 +30997,8 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads nil "webjump" "net/webjump.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "webjump" "net/webjump.el" (21710 25465 253934 +;;;;;; 564000)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -31017,8 +31014,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21710 +;;;;;; 25547 195569 249000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31048,8 +31045,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "whitespace" "whitespace.el" (21710 25547 225569 +;;;;;; 115000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31448,8 +31445,8 @@ cleaning up these problems. ;;;*** -;;;### (autoloads nil "wid-browse" "wid-browse.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "wid-browse" "wid-browse.el" (21710 25465 377934 +;;;;;; 11000)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -31477,8 +31474,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21710 25547 226569 +;;;;;; 111000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31520,8 +31517,8 @@ Setup current buffer so editing string widgets works. ;;;*** -;;;### (autoloads nil "windmove" "windmove.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "windmove" "windmove.el" (21710 25465 378934 +;;;;;; 7000)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -31573,7 +31570,7 @@ Default MODIFIER is 'shift. ;;;*** -;;;### (autoloads nil "winner" "winner.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "winner" "winner.el" (21710 25547 227569 106000)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -31596,7 +31593,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "woman" "woman.el" (21710 25547 228569 102000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31645,7 +31642,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "xml" "xml.el" (21710 25465 380933 998000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -31701,8 +31698,8 @@ Both features can be combined by providing a cons cell ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21710 25465 256934 +;;;;;; 551000)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -31720,8 +31717,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21710 25547 228569 +;;;;;; 102000)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -31750,7 +31747,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** -;;;### (autoloads nil "yenc" "gnus/yenc.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "yenc" "gnus/yenc.el" (21710 25465 192934 836000)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -31765,7 +31762,7 @@ Extract file name from an yenc header. ;;;*** -;;;### (autoloads nil "zone" "play/zone.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "zone" "play/zone.el" (21710 25465 297934 368000)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -31810,14 +31807,16 @@ Zone out, completely. ;;;;;; "cedet/ede/util.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" ;;;;;; "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el" ;;;;;; "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el" -;;;;;; "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el" -;;;;;; "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el" -;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm.el" -;;;;;; "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" -;;;;;; "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el" -;;;;;; "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" -;;;;;; "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el" -;;;;;; "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" +;;;;;; "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el" +;;;;;; "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el" +;;;;;; "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el" +;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el" +;;;;;; "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el" +;;;;;; "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el" +;;;;;; "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el" +;;;;;; "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el" +;;;;;; "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el" +;;;;;; "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" ;;;;;; "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el" ;;;;;; "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el" ;;;;;; "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el" @@ -31835,39 +31834,42 @@ Zone out, completely. ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" -;;;;;; "cedet/semantic/wisent/python.el" "cedet/semantic/wisent/wisent.el" -;;;;;; "cedet/srecode/args.el" "cedet/srecode/compile.el" "cedet/srecode/cpp.el" -;;;;;; "cedet/srecode/ctxt.el" "cedet/srecode/dictionary.el" "cedet/srecode/document.el" +;;;;;; "cedet/semantic/wisent/javat-wy.el" "cedet/semantic/wisent/js-wy.el" +;;;;;; "cedet/semantic/wisent/python-wy.el" "cedet/semantic/wisent/python.el" +;;;;;; "cedet/semantic/wisent/wisent.el" "cedet/srecode/args.el" +;;;;;; "cedet/srecode/compile.el" "cedet/srecode/cpp.el" "cedet/srecode/ctxt.el" +;;;;;; "cedet/srecode/dictionary.el" "cedet/srecode/document.el" ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" ;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" -;;;;;; "cedet/srecode/srt.el" "cedet/srecode/table.el" "cedet/srecode/template.el" -;;;;;; "cedet/srecode/texi.el" "cus-dep.el" "dframe.el" "dired-aux.el" -;;;;;; "dired-x.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "dynamic-setting.el" -;;;;;; "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" -;;;;;; "emacs-lisp/byte-opt.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" -;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" -;;;;;; "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el" -;;;;;; "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el" -;;;;;; "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" -;;;;;; "emacs-lisp/smie.el" "emacs-lisp/subr-x.el" "emacs-lisp/tcover-ses.el" -;;;;;; "emacs-lisp/tcover-unsafep.el" "emulation/cua-gmrk.el" "emulation/edt-lk201.el" -;;;;;; "emulation/edt-mapper.el" "emulation/edt-pc.el" "emulation/edt-vt100.el" -;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el" -;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el" -;;;;;; "emulation/viper-util.el" "erc/erc-backend.el" "erc/erc-goodies.el" -;;;;;; "erc/erc-ibuffer.el" "erc/erc-lang.el" "eshell/em-alias.el" -;;;;;; "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el" -;;;;;; "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el" -;;;;;; "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el" -;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" -;;;;;; "eshell/em-term.el" "eshell/em-tramp.el" "eshell/em-unix.el" -;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" -;;;;;; "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-module.el" -;;;;;; "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el" -;;;;;; "eshell/esh-var.el" "ezimage.el" "format-spec.el" "fringe.el" -;;;;;; "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" +;;;;;; "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" +;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" +;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el" +;;;;;; "dos-w32.el" "dynamic-setting.el" "emacs-lisp/authors.el" +;;;;;; "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" +;;;;;; "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" +;;;;;; "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-custom.el" +;;;;;; "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-opt.el" +;;;;;; "emacs-lisp/eieio-speedbar.el" "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" +;;;;;; "emacs-lisp/package-x.el" "emacs-lisp/smie.el" "emacs-lisp/subr-x.el" +;;;;;; "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el" +;;;;;; "emulation/cua-gmrk.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el" +;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/viper-cmd.el" +;;;;;; "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el" +;;;;;; "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el" +;;;;;; "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el" +;;;;;; "erc/erc-lang.el" "eshell/em-alias.el" "eshell/em-banner.el" +;;;;;; "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el" +;;;;;; "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el" +;;;;;; "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el" +;;;;;; "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el" +;;;;;; "eshell/em-tramp.el" "eshell/em-unix.el" "eshell/em-xtra.el" +;;;;;; "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el" +;;;;;; "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el" +;;;;;; "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el" +;;;;;; "ezimage.el" "format-spec.el" "fringe.el" "generic-x.el" +;;;;;; "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" ;;;;;; "gnus/gnus-cite.el" "gnus/gnus-cus.el" "gnus/gnus-demon.el" ;;;;;; "gnus/gnus-dup.el" "gnus/gnus-eform.el" "gnus/gnus-ems.el" ;;;;;; "gnus/gnus-icalendar.el" "gnus/gnus-int.el" "gnus/gnus-logic.el" @@ -31890,8 +31892,15 @@ Zone out, completely. ;;;;;; "gnus/spam-wash.el" "hex-util.el" "hfy-cmap.el" "ibuf-ext.el" ;;;;;; "international/cp51932.el" "international/eucjp-ms.el" "international/fontset.el" ;;;;;; "international/iso-ascii.el" "international/ja-dic-cnv.el" -;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "kermit.el" -;;;;;; "language/hanja-util.el" "language/thai-word.el" "ldefs-boot.el" +;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "international/uni-bidi.el" +;;;;;; "international/uni-category.el" "international/uni-combining.el" +;;;;;; "international/uni-comment.el" "international/uni-decimal.el" +;;;;;; "international/uni-decomposition.el" "international/uni-digit.el" +;;;;;; "international/uni-lowercase.el" "international/uni-mirrored.el" +;;;;;; "international/uni-name.el" "international/uni-numeric.el" +;;;;;; "international/uni-old-name.el" "international/uni-titlecase.el" +;;;;;; "international/uni-uppercase.el" "kermit.el" "language/hanja-util.el" +;;;;;; "language/thai-word.el" "ldefs-boot.el" "leim/ja-dic/ja-dic.el" ;;;;;; "leim/quail/arabic.el" "leim/quail/croatian.el" "leim/quail/cyril-jis.el" ;;;;;; "leim/quail/cyrillic.el" "leim/quail/czech.el" "leim/quail/ethiopic.el" ;;;;;; "leim/quail/georgian.el" "leim/quail/greek.el" "leim/quail/hanja-jis.el" @@ -31979,8 +31988,8 @@ Zone out, completely. ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21710 6806 326933 -;;;;;; 550000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21713 25981 85824 +;;;;;; 32000)) ;;;*** diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 63a9dfccedc..34ef96c7a04 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -70,7 +70,7 @@ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ -/^#undef VERSION/s/^.*$/#define VERSION "24.4.51"/ +/^#undef VERSION/s/^.*$/#define VERSION "24.4.90"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ diff --git a/nt/config.nt b/nt/config.nt index c3e46513cc6..c67d2a50df7 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -1576,7 +1576,7 @@ along with GNU Emacs. If not, see . */ #undef USG_SUBTTY_WORKS /* Version number of package */ -#define VERSION "24.4.51" +#define VERSION "24.4.90" /* Define to 1 if unsetenv returns void instead of int. */ #undef VOID_UNSETENV diff --git a/nt/emacs.rc b/nt/emacs.rc index b45ef6b7479..a87bf79964a 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -11,8 +11,8 @@ Emacs ICON icons/emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,4,50,0 - PRODUCTVERSION 24,4,50,0 + FILEVERSION 24,4,90,0 + PRODUCTVERSION 24,4,90,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -29,12 +29,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 4, 50, 0\0" + VALUE "FileVersion", "24, 4, 90, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 4, 50, 0\0" + VALUE "ProductVersion", "24, 4, 90, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index ba2f490bcb4..cb82ae2cf49 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,4,50,0 - PRODUCTVERSION 24,4,50,0 + FILEVERSION 24,4,90,0 + PRODUCTVERSION 24,4,90,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 4, 50, 0\0" + VALUE "FileVersion", "24, 4, 90, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 4, 50, 0\0" + VALUE "ProductVersion", "24, 4, 90, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 43a32579f24..2cce573df6f 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -22,7 +22,7 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). -VERSION = 24.4.51 +VERSION = 24.4.90 TMP_DIST_DIR = emacs-$(VERSION) From d825f66db83501588f1c84aa4d78e644e0d5f896 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 4 Feb 2015 17:31:37 +0200 Subject: [PATCH 032/457] Fix filling circle/ellipse in Artist Mode (Bug#19763) lisp/textmodes/artist.el (artist-ellipse-compute-fill-info): Use mapcar, not mapc, to create the other half of fill-info. --- lisp/ChangeLog | 6 ++++++ lisp/textmodes/artist.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e52f9a35b47..e0c8815c648 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-04 Eli Zaretskii + + * textmodes/artist.el (artist-ellipse-compute-fill-info): Use + mapcar, not mapc, to create the other half of fill-info. + (Bug#19763) + 2015-02-04 Nicolas Petton * emacs-lisp/authors.el (authors-ignored-files) diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 85d9410868a..930c39c82cc 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -3372,7 +3372,7 @@ The POINT-LIST is expected to cover the first quadrant." ;; Create the other half by mirroring the first half. (setq both-halves (append first-half - (mapc + (mapcar (lambda (i) (artist-new-fill-item (artist-fill-item-get-x i) (- (artist-fill-item-get-y i)) From c6487170e39e5b58872e935c95e8d033554501f7 Mon Sep 17 00:00:00 2001 From: kwhite Date: Wed, 4 Feb 2015 11:23:10 -0500 Subject: [PATCH 033/457] Update ERC docs and update MAINTANERS to include myself --- admin/ChangeLog | 4 ++++ admin/MAINTAINERS | 5 +++++ doc/misc/ChangeLog | 5 +++++ doc/misc/erc.texi | 31 ++++++++++++++++++++++++------- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 88d996532e0..0f70469fc0c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2015-02-04 Kelvin White + + * MAINTAINERS: Add myself to section 2 + 2015-02-02 Glenn Morris * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 1a5c64191ff..04942a8c3c9 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -78,6 +78,11 @@ Bastien Guerry 2. ============================================================================== +Kelvin White + ERC + lisp/erc/* + doc/misc/erc.texi + Eli Zaretskii doc/* lispref/* diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 71469b51808..616b3574037 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2015-02-04 Kelvin White + + * erc.texi (Advanced Usage, Options): Add descriptions and examples + for erc-format-nick-function and erc-rename-buffers options. + 2014-12-29 Michael Albinus Sync with Tramp 2.2.11. diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index ffb8cd6455c..866d8486969 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -588,6 +588,16 @@ In the latter case, if the first nick in the list is already in use, other nicks are tried in the list order. @end defopt +@defopt erc-format-nick-function +A function to format a nickname for message display + +You can set this to @code{erc-format-@OA@nick} to display user mode prefix +@end defopt + +@example +(setq erc-format-nick-function 'erc-format-@@nick) +@end example + @defopt erc-nick-uniquifier The string to append to the nick if it is already in use. @end defopt @@ -657,13 +667,6 @@ your Emacs configuration file. Everything after the @code{(require @lisp ;;; Sample ERC configuration -;; Add the ERC directory to load path -- you don't need this if you are -;; using the version of ERC that comes with Emacs -(add-to-list 'load-path "~/elisp/erc") - -;; Load ERC -(require 'erc) - ;; Load authentication info from an external source. Put sensitive ;; passwords and the like in here. (load "~/.emacs.d/.erc-auth") @@ -712,6 +715,12 @@ stuff, to the current ERC buffer." ;; Join the #emacs and #erc channels whenever connecting to Freenode. (setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc"))) +;; Rename server buffers to reflect the current network name instead +;; of SERVER:PORT. (e.g. "freenode" instead of "irc.freenode.net:6667"). This +;; is useful when using a bouncer like ZNC where you have multiple +;; connections to the same server. +(setq erc-rename-buffers t) + ;; Interpret mIRC-style color commands in IRC chats (setq erc-interpret-mirc-color t) @@ -750,6 +759,14 @@ lurkers. The function @code{erc-lurker-p} determines whether a given nickname is considered a lurker. @end defopt +@defopt erc-rename-buffers +If non, @code{nil}, this will rename server buffers to reflect the +current network name instead of IP:PORT + +@example +(setq erc-rename-buffers t) +@end example +@end defopt @node Getting Help and Reporting Bugs @chapter Getting Help and Reporting Bugs From 9615c0dead1b5828fa6a599eb7fa18551921938b Mon Sep 17 00:00:00 2001 From: kwhite Date: Wed, 4 Feb 2015 14:33:07 -0500 Subject: [PATCH 034/457] doc/misc/erc.texi: fix typo --- doc/misc/ChangeLog | 1 + doc/misc/erc.texi | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 616b3574037..0e43b9ffe4d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -2,6 +2,7 @@ * erc.texi (Advanced Usage, Options): Add descriptions and examples for erc-format-nick-function and erc-rename-buffers options. + (Connecting): fix typo 2014-12-29 Michael Albinus diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 866d8486969..1c733bd03ac 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -591,7 +591,7 @@ other nicks are tried in the list order. @defopt erc-format-nick-function A function to format a nickname for message display -You can set this to @code{erc-format-@OA@nick} to display user mode prefix +You can set this to @code{erc-format-@@nick} to display user mode prefix @end defopt @example From 008a04ac9af20540d6e7ee4b61fb5bb3b21ef0e6 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Wed, 4 Feb 2015 22:38:52 +0100 Subject: [PATCH 035/457] todo-mode.el: Restore point on setting item done (Bug#19727) calendar/todo-mode.el (todo-item-done): When done items are hidden, restore point to its location prior to invoking this command. --- lisp/ChangeLog | 6 ++++++ lisp/calendar/todo-mode.el | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e0c8815c648..0e00cb2f17f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-04 Robert Pluim (tiny change) + + * calendar/todo-mode.el (todo-item-done): When done items are + hidden, restore point to its location prior to invoking this + command. (Bug#19727) + 2015-02-04 Eli Zaretskii * textmodes/artist.el (artist-ellipse-compute-fill-info): Use diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 7ca57a42b76..dcc960fb9bf 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -2816,7 +2816,8 @@ visible." (goto-char (point-min)) (re-search-forward todo-done-string-start nil t))) (buffer-read-only nil) - item done-item opoint) + item done-item + (opoint (point))) ;; Don't add empty comment to done item. (setq comment (unless (zerop (length comment)) (concat " [" todo-comment-string ": " comment "]"))) @@ -2854,7 +2855,9 @@ visible." (todo-update-categories-sexp) (let ((todo-show-with-done show-done)) (todo-category-select) - ;; When done items are shown, put cursor on first just done item. + ;; When done items are visible, put point at the top of the + ;; done items section. When done items are hidden, restore + ;; point to its location prior to invoking this command. (when opoint (goto-char opoint))))))) (defun todo-item-undone () From a323b93d466c403cbef96184d510b134549c7806 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 5 Feb 2015 02:52:41 +0200 Subject: [PATCH 036/457] Better multi-line input support in comint.el Revert the change of comint-line-beginning-position callers, and modify comint-line-beginning-position instead. * lisp/comint.el (comint-history-isearch-search) (comint-history-isearch-message, comint-history-isearch-wrap): Use comint-line-beginning-position instead of field-beginning. (comint-send-input): Use either end-of-line or field-end depending on comint-use-prompt-regexp. (comint-line-beginning-position): Search backward for comint-prompt-regexp if comint-use-prompt-regexp is non-nil. Use field-beginning instead of line-beginning-position if comint-use-prompt-regexp is nil. Fixes: debbugs:19710 --- lisp/ChangeLog | 15 +++++++++++++++ lisp/comint.el | 24 ++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e00cb2f17f..6c3caa826e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2015-02-05 Juri Linkov + + Revert the previous change of comint-line-beginning-position callers, + and modify comint-line-beginning-position instead. + + * comint.el (comint-history-isearch-search) + (comint-history-isearch-message, comint-history-isearch-wrap): + Use comint-line-beginning-position instead of field-beginning. + (comint-send-input): Use either end-of-line or field-end + depending on comint-use-prompt-regexp. + (comint-line-beginning-position): Search backward + for comint-prompt-regexp if comint-use-prompt-regexp is non-nil. + Use field-beginning instead of line-beginning-position + if comint-use-prompt-regexp is nil. (Bug#19710) + 2015-02-04 Robert Pluim (tiny change) * calendar/todo-mode.el (todo-item-done): When done items are diff --git a/lisp/comint.el b/lisp/comint.el index f33034bdb57..419938ea684 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1475,7 +1475,7 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'." (or ;; 1. First try searching in the initial comint text (funcall search-fun string - (if isearch-forward bound (field-beginning)) + (if isearch-forward bound (comint-line-beginning-position)) noerror) ;; 2. If the above search fails, start putting next/prev history ;; elements in the comint successively, and search the string @@ -1491,7 +1491,7 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'." (when (null comint-input-ring-index) (error "End of history; no next item")) (comint-next-input 1) - (goto-char (field-beginning))) + (goto-char (comint-line-beginning-position))) (t ;; Signal an error here explicitly, because ;; `comint-previous-input' doesn't signal an error. @@ -1509,7 +1509,7 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'." (unless isearch-forward ;; For backward search, don't search ;; in the comint prompt - (field-beginning)) + (comint-line-beginning-position)) noerror))) ;; Return point of the new search result (point)) @@ -1533,16 +1533,16 @@ the function `isearch-message'." (if (overlayp comint-history-isearch-message-overlay) (move-overlay comint-history-isearch-message-overlay (save-excursion - (goto-char (field-beginning)) + (goto-char (comint-line-beginning-position)) (forward-line 0) (point)) - (field-beginning)) + (comint-line-beginning-position)) (setq comint-history-isearch-message-overlay (make-overlay (save-excursion - (goto-char (field-beginning)) + (goto-char (comint-line-beginning-position)) (forward-line 0) (point)) - (field-beginning))) + (comint-line-beginning-position))) (overlay-put comint-history-isearch-message-overlay 'evaporate t)) (overlay-put comint-history-isearch-message-overlay 'display (isearch-message-prefix ellipsis isearch-nonincremental)) @@ -1563,7 +1563,7 @@ or to the last history element for a backward search." (comint-goto-input (1- (ring-length comint-input-ring))) (comint-goto-input nil)) (setq isearch-success t) - (goto-char (if isearch-forward (field-beginning) (point-max)))) + (goto-char (if isearch-forward (comint-line-beginning-position) (point-max)))) (defun comint-history-isearch-push-state () "Save a function restoring the state of input history search. @@ -1781,7 +1781,10 @@ Similarly for Soar, Scheme, etc." (widen) (let* ((pmark (process-mark proc)) (intxt (if (>= (point) (marker-position pmark)) - (progn (if comint-eol-on-send (goto-char (field-end))) + (progn (if comint-eol-on-send + (if comint-use-prompt-regexp + (end-of-line) + (goto-char (field-end)))) (buffer-substring pmark (point))) (let ((copy (funcall comint-get-old-input))) (goto-char pmark) @@ -2260,6 +2263,7 @@ a buffer local variable." (if comint-use-prompt-regexp ;; Use comint-prompt-regexp (save-excursion + (re-search-backward comint-prompt-regexp nil t) (beginning-of-line) (comint-skip-prompt) (point)) @@ -2270,7 +2274,7 @@ a buffer local variable." ;; if there are two fields on a line, then the first one is the ;; prompt, and the second one is an input field, and is front-sticky ;; (as input fields should be). - (constrain-to-field (line-beginning-position) (line-end-position)))) + (constrain-to-field (field-beginning) (line-end-position)))) (defun comint-bol (&optional arg) "Go to the beginning of line, then skip past the prompt, if any. From c0ba5908b117170995df36e839a087af7c5f79db Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 5 Feb 2015 19:07:15 +0200 Subject: [PATCH 037/457] Fix vertical-motion and posn-at-point when word-wrap is on (Bug#19769) src/xdisp.c (move_it_in_display_line_to): Handle the case where the last character of a screen line is whitespace, and we are under word-wrap with overflow-newline-into-fringe turned on. --- src/ChangeLog | 7 +++++++ src/xdisp.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8e7ab9363f6..135f28fb20f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-02-05 Eli Zaretskii + + * xdisp.c (move_it_in_display_line_to): Handle the case where the + last character of a screen line is whitespace, and we are under + word-wrap with overflow-newline-into-fringe turned on. + (Bug#19769) + 2015-02-03 Eli Zaretskii * xdisp.c (handle_stop, handle_single_display_spec) diff --git a/src/xdisp.c b/src/xdisp.c index 5e552ca2fdb..8cb43538dcc 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -8798,7 +8798,16 @@ move_it_in_display_line_to (struct it *it, if (BUFFER_POS_REACHED_P ()) { if (it->line_wrap != WORD_WRAP - || wrap_it.sp < 0) + || wrap_it.sp < 0 + /* If we've just found whitespace to + wrap, effectively ignore the + previous wrap point -- it is no + longer relevant, but we won't + have an opportunity to update it, + since we've reached the edge of + this screen line. */ + || (may_wrap + && IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))) { it->hpos = hpos_before_this_char; it->current_x = x_before_this_char; @@ -8862,7 +8871,26 @@ move_it_in_display_line_to (struct it *it, else IT_RESET_X_ASCENT_DESCENT (it); - if (wrap_it.sp >= 0) + /* If the screen line ends with whitespace, and we + are under word-wrap, don't use wrap_it: it is no + longer relevant, but we won't have an opportunity + to update it, since we are done with this screen + line. */ + if (may_wrap && IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)) + { + /* If we've found TO_X, go back there, as we now + know the last word fits on this screen line. */ + if ((op & MOVE_TO_X) && new_x == it->last_visible_x + && atx_it.sp >= 0) + { + RESTORE_IT (it, &atx_it, atx_data); + atpos_it.sp = -1; + atx_it.sp = -1; + result = MOVE_X_REACHED; + break; + } + } + else if (wrap_it.sp >= 0) { RESTORE_IT (it, &wrap_it, wrap_data); atpos_it.sp = -1; From 4f5033faf26c69c123452d750bb2adfa2e77666b Mon Sep 17 00:00:00 2001 From: Wolfgang Jenkner Date: Fri, 6 Feb 2015 13:43:58 +1100 Subject: [PATCH 038/457] Backport the :end-of-capability fix * lisp/net/network-stream.el (network-stream-open-tls): Respect the :end-of-capability setting (backport) --- lisp/ChangeLog | 5 +++++ lisp/net/network-stream.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c3caa826e8..17b3d112432 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-06 Wolfgang Jenkner + + * net/network-stream.el (network-stream-open-tls): Respect the + :end-of-capability setting. + 2015-02-05 Juri Linkov Revert the previous change of comint-line-beginning-position callers, diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index ea03bc65499..8bf169dea70 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -363,10 +363,12 @@ a greeting from the server. (when (re-search-forward eoc nil t) (goto-char (match-beginning 0)) (delete-region (point-min) (line-beginning-position)))) - (let* ((capability-command (plist-get parameters :capability-command))) + (let ((capability-command (plist-get parameters :capability-command)) + (eo-capa (or (plist-get parameters :end-of-capability) + eoc))) (list stream (network-stream-get-response stream start eoc) - (network-stream-command stream capability-command eoc) + (network-stream-command stream capability-command eo-capa) 'tls)))))) (defun network-stream-open-shell (name buffer host service parameters) From eca7da109248c40963c285417b878a8abcd84049 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 7 Feb 2015 11:04:52 +0200 Subject: [PATCH 039/457] Complete the remaining documentation updates for 24.5 doc/lispref/processes.texi (Synchronous Processes): Update documentation of call-process-shell-command and process-file-shell-command. etc/NEWS: Mark the entry for changed calling sequence of call-process-shell-command and process-file-shell-command as documented. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/processes.texi | 16 ++++++++++------ etc/NEWS | 2 ++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 911e698ad49..be2bb3e79ed 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2015-02-07 Eli Zaretskii + + * processes.texi (Synchronous Processes): Update documentation of + call-process-shell-command and process-file-shell-command. + 2015-01-24 Eli Zaretskii * searching.texi (Regexp Search): Add a cross-reference to "Syntax diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 621e8a1bfba..cbc9ce4696c 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -503,17 +503,21 @@ inputinput@point{} @c It actually uses shell-command-switch, but no need to mention that here. @end defun -@defun call-process-shell-command command &optional infile destination display &rest args +@defun call-process-shell-command command &optional infile destination display This function executes the shell command @var{command} synchronously. -The final arguments @var{args} are additional arguments to add at the -end of @var{command}. The other arguments are handled as in -@code{call-process}. +The arguments are handled as in @code{call-process}. An old calling +convention allowed to pass any number of additional arguments after +@var{display}, which were concatenated to @var{command}; this is still +supported, but strongly discouraged. @end defun -@defun process-file-shell-command command &optional infile destination display &rest args +@defun process-file-shell-command command &optional infile destination display This function is like @code{call-process-shell-command}, but uses @code{process-file} internally. Depending on @code{default-directory}, -@var{command} can be executed also on remote hosts. +@var{command} can be executed also on remote hosts. An old calling +convention allowed to pass any number of additional arguments after +@var{display}, which were concatenated to @var{command}; this is still +supported, but strongly discouraged. @end defun @defun shell-command-to-string command diff --git a/etc/NEWS b/etc/NEWS index ae0d402a3d5..c25f663ae62 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -33,11 +33,13 @@ otherwise leave it unmarked. * Changes in Specialized Modes and Packages in Emacs 24.5 ++++ ** `call-process-shell-command' and `process-file-shell-command' don't take "&rest args" any more. ** Obsolete packages +--- *** cc-compat.el --- From 20c817d3657ec67792edafd75f34d829144e8590 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 8 Feb 2015 18:17:40 +0200 Subject: [PATCH 040/457] Fix handling of frame color parameters in TTY sessions (Bug#19802) src/xfaces.c (map_tty_color): Use assoc_no_quit instead of assq_no_quit to fetch color definition by its string name. lisp/frame.el (frame-notice-user-settings): Refresh the value of frame parameters after calling tty-handle-reverse-video. Call face-set-after-frame-default with the actual parameters, to avoid resetting colors back to unspecified. (set-background-color, set-foreground-color): Pass the selected color to face-set-after-frame-default. --- lisp/ChangeLog | 9 +++++++++ lisp/frame.el | 14 +++++++++++--- src/ChangeLog | 6 ++++++ src/xfaces.c | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 17b3d112432..79e3378b2e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-02-08 Eli Zaretskii + + * frame.el (frame-notice-user-settings): Refresh the value of + frame parameters after calling tty-handle-reverse-video. Call + face-set-after-frame-default with the actual parameters, to avoid + resetting colors back to unspecified. + (set-background-color, set-foreground-color): Pass the selected + color to face-set-after-frame-default. (Bug#19802) + 2015-02-06 Wolfgang Jenkner * net/network-stream.el (network-stream-open-tls): Respect the diff --git a/lisp/frame.el b/lisp/frame.el index c77df558da8..eea5c24a82d 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -251,6 +251,10 @@ there (in decreasing order of priority)." (let ((newparms (frame-parameters)) (frame (selected-frame))) (tty-handle-reverse-video frame newparms) + ;; tty-handle-reverse-video might change the frame's + ;; color parameters, and we need to use the updated + ;; value below. + (setq newparms (frame-parameters)) ;; If we changed the background color, we need to update ;; the background-mode parameter, and maybe some faces, ;; too. @@ -258,7 +262,7 @@ there (in decreasing order of priority)." (unless (or (assq 'background-mode initial-frame-alist) (assq 'background-mode default-frame-alist)) (frame-set-background-mode frame)) - (face-set-after-frame-default frame)))))) + (face-set-after-frame-default frame newparms)))))) ;; If the initial frame is still around, apply initial-frame-alist ;; and default-frame-alist to it. @@ -1185,7 +1189,9 @@ To get the frame's current background color, use `frame-parameters'." (modify-frame-parameters (selected-frame) (list (cons 'background-color color-name))) (or window-system - (face-set-after-frame-default (selected-frame)))) + (face-set-after-frame-default (selected-frame) + (list + (cons 'background-color color-name))))) (defun set-foreground-color (color-name) "Set the foreground color of the selected frame to COLOR-NAME. @@ -1195,7 +1201,9 @@ To get the frame's current foreground color, use `frame-parameters'." (modify-frame-parameters (selected-frame) (list (cons 'foreground-color color-name))) (or window-system - (face-set-after-frame-default (selected-frame)))) + (face-set-after-frame-default (selected-frame) + (list + (cons 'foreground-color color-name))))) (defun set-cursor-color (color-name) "Set the text cursor color of the selected frame to COLOR-NAME. diff --git a/src/ChangeLog b/src/ChangeLog index 135f28fb20f..7a7fd23d43d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-08 Eli Zaretskii + + * xfaces.c (map_tty_color): Use assoc_no_quit instead of + assq_no_quit to fetch color definition by its string name. + (Bug#19802) + 2015-02-05 Eli Zaretskii * xdisp.c (move_it_in_display_line_to): Handle the case where the diff --git a/src/xfaces.c b/src/xfaces.c index 44c72aa4944..29c91f7169f 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -5793,7 +5793,7 @@ map_tty_color (struct frame *f, struct face *face, if (STRINGP (color) && SCHARS (color) && CONSP (Vtty_defined_color_alist) - && (def = assq_no_quit (color, call1 (Qtty_color_alist, frame)), + && (def = assoc_no_quit (color, call1 (Qtty_color_alist, frame)), CONSP (def))) { /* Associations in tty-defined-color-alist are of the form From a7b1c2f88f06bbeda16117c0aa1caffac1b4ebe1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 8 Feb 2015 20:09:19 +0200 Subject: [PATCH 041/457] Don't lose frame's background color when setting foreground (Bug#19802) lisp/frame.el ((set-background-color, set-foreground-color): Pass the other color, if defined, to face-set-after-frame-default. --- lisp/ChangeLog | 4 ++-- lisp/frame.el | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 79e3378b2e8..728b9833c9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,8 +4,8 @@ frame parameters after calling tty-handle-reverse-video. Call face-set-after-frame-default with the actual parameters, to avoid resetting colors back to unspecified. - (set-background-color, set-foreground-color): Pass the selected - color to face-set-after-frame-default. (Bug#19802) + (set-background-color, set-foreground-color): Pass the foreground + and background colors to face-set-after-frame-default. (Bug#19802) 2015-02-06 Wolfgang Jenkner diff --git a/lisp/frame.el b/lisp/frame.el index eea5c24a82d..1a584fa0e2c 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1191,7 +1191,13 @@ To get the frame's current background color, use `frame-parameters'." (or window-system (face-set-after-frame-default (selected-frame) (list - (cons 'background-color color-name))))) + (cons 'background-color color-name) + ;; Pass the foreground-color as + ;; well, if defined, to avoid + ;; losing it when faces are reset + ;; to their defaults. + (assq 'foreground-color + (frame-parameters)))))) (defun set-foreground-color (color-name) "Set the foreground color of the selected frame to COLOR-NAME. @@ -1203,7 +1209,13 @@ To get the frame's current foreground color, use `frame-parameters'." (or window-system (face-set-after-frame-default (selected-frame) (list - (cons 'foreground-color color-name))))) + (cons 'foreground-color color-name) + ;; Pass the background-color as + ;; well, if defined, to avoid + ;; losing it when faces are reset + ;; to their defaults. + (assq 'background-color + (frame-parameters)))))) (defun set-cursor-color (color-name) "Set the text cursor color of the selected frame to COLOR-NAME. From 87fc99fee17ef1df4c22db15ec783a7735d3fc6b Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 10 Feb 2015 02:38:09 +0200 Subject: [PATCH 042/457] Better support for the case of typing RET on the prompt in comint. * lisp/comint.el (comint-get-old-input-default): Go to the field end when comint-use-prompt-regexp is nil. (comint-line-beginning-position): Check if point is already on the prompt before searching for the prompt when comint-use-prompt-regexp is non-nil. Fixes: debbugs:19710 --- lisp/ChangeLog | 10 ++++++++++ lisp/comint.el | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 728b9833c9f..ea428b1de15 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2015-02-10 Juri Linkov + + Better support for the case of typing RET on the prompt in comint. + + * comint.el (comint-get-old-input-default): Go to the field end + when comint-use-prompt-regexp is nil. + (comint-line-beginning-position): Check if point is already + on the prompt before searching for the prompt when + comint-use-prompt-regexp is non-nil. (Bug#19710) + 2015-02-08 Eli Zaretskii * frame.el (frame-notice-user-settings): Refresh the value of diff --git a/lisp/comint.el b/lisp/comint.el index 419938ea684..c81551acd5f 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2215,7 +2215,10 @@ the current line with any initial string matching the regexp (null (get-char-property (setq bof (field-beginning)) 'field))) (field-string-no-properties bof) (comint-bol) - (buffer-substring-no-properties (point) (line-end-position))))) + (buffer-substring-no-properties (point) + (if comint-use-prompt-regexp + (line-end-position) + (field-end)))))) (defun comint-copy-old-input () "Insert after prompt old input at point as new input to be edited. @@ -2263,8 +2266,9 @@ a buffer local variable." (if comint-use-prompt-regexp ;; Use comint-prompt-regexp (save-excursion - (re-search-backward comint-prompt-regexp nil t) (beginning-of-line) + (unless (looking-at comint-prompt-regexp) + (re-search-backward comint-prompt-regexp nil t)) (comint-skip-prompt) (point)) ;; Use input fields. Note that, unlike the behavior of From 4b0b27d0018f040bda6a2ec885fa54c666d9c083 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 10 Feb 2015 18:26:23 +0200 Subject: [PATCH 043/457] Fix invocation of commands whose file name includes extension (Bug#19817) nt/cmdproxy.c (get_next_token): Don't make backslashes disappear without a trace when they are not followed by a quote. (search_dir): Support searching programs whose file name already has an arbitrary extension. (main): When passing a command line to the shell, use cmd.exe rules for quoting command-line tail. --- nt/ChangeLog | 9 +++++++ nt/cmdproxy.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 75 insertions(+), 6 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index cac8e054068..d1f953f9ac5 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,12 @@ +2015-02-10 Eli Zaretskii + + * cmdproxy.c (get_next_token): Don't make backslashes disappear + without a trace when they are not followed by a quote. + (search_dir): Support searching programs whose file name already + has an arbitrary extension. (Bug#19817) + (main): When passing a command line to the shell, use cmd.exe + rules for quoting command-line tail. + 2014-11-17 Oscar Fuentes * inc/ms-w32.h: Define MINGW_W64. diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 7dbb529a6c9..ce5815291df 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -135,7 +135,10 @@ skip_nonspace (const char *str) return str; } -int escape_char = '\\'; +/* This value is never changed by the code. We keep the code that + supports also the value of '"', but let's allow the compiler to + optimize it out, until someone actually uses that. */ +const int escape_char = '\\'; /* Get next token from input, advancing pointer. */ int @@ -196,11 +199,31 @@ get_next_token (char * buf, const char ** pSrc) /* End of string, but no ending quote found. We might want to flag this as an error, but for now will consider the end as the end of the token. */ + if (escape_char == '\\') + { + /* Output literal backslashes. Note that if the + token ends with an unpaired backslash, we eat it + up here. But since this case invokes undefined + behavior anyway, it's okay. */ + while (escape_char_run > 1) + { + *o++ = escape_char; + escape_char_run -= 2; + } + } *o = '\0'; break; } else { + if (escape_char == '\\') + { + /* Output literal backslashes. Note that we don't + treat a backslash as an escape character here, + since it doesn't preceed a quote. */ + for ( ; escape_char_run > 0; escape_char_run--) + *o++ = escape_char; + } *o++ = *p++; } } @@ -229,13 +252,44 @@ search_dir (const char *dir, const char *exec, int bufsize, char *buffer) int n_exts = sizeof (exts) / sizeof (char *); char *dummy; int i, rc; + const char *pext = strrchr (exec, '\\'); + + /* Does EXEC already include an extension? */ + if (!pext) + pext = exec; + pext = strchr (pext, '.'); /* Search the directory for the program. */ - for (i = 0; i < n_exts; i++) + if (pext) { - rc = SearchPath (dir, exec, exts[i], bufsize, buffer, &dummy); + /* SearchPath will not append an extension if the file already + has an extension, so we must append it ourselves. */ + char exec_ext[MAX_PATH], *p; + + p = strcpy (exec_ext, exec) + strlen (exec); + + /* Search first without any extension; if found, we are done. */ + rc = SearchPath (dir, exec_ext, NULL, bufsize, buffer, &dummy); if (rc > 0) return rc; + + /* Try the known extensions. */ + for (i = 0; i < n_exts; i++) + { + strcpy (p, exts[i]); + rc = SearchPath (dir, exec_ext, NULL, bufsize, buffer, &dummy); + if (rc > 0) + return rc; + } + } + else + { + for (i = 0; i < n_exts; i++) + { + rc = SearchPath (dir, exec, exts[i], bufsize, buffer, &dummy); + if (rc > 0) + return rc; + } } return 0; @@ -769,7 +823,7 @@ main (int argc, char ** argv) quotes, since they are illegal in path names). */ remlen = maxlen = - strlen (progname) + extra_arg_space + strlen (cmdline) + 16; + strlen (progname) + extra_arg_space + strlen (cmdline) + 16 + 2; buf = p = alloca (maxlen + 1); /* Quote progname in case it contains spaces. */ @@ -784,10 +838,16 @@ main (int argc, char ** argv) remlen = maxlen - (p - buf); } + /* Now that we know we will be invoking the shell, quote the + command line after the "/c" switch as the shell expects: + a single pair of quotes enclosing the entire command + tail, no matter whether quotes are used in the command + line, and how many of them are there. See the output of + "cmd /?" for how cmd.exe treats quotes. */ if (run_command_dot_com) - _snprintf (p, remlen, " /e:%d /c %s", envsize, cmdline); + _snprintf (p, remlen, " /e:%d /c \"%s\"", envsize, cmdline); else - _snprintf (p, remlen, " /c %s", cmdline); + _snprintf (p, remlen, " /c \"%s\"", cmdline); cmdline = buf; } else From 680ee61d04e220e0b2eb4246c8f33773e0185852 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Tue, 10 Feb 2015 18:51:14 +0200 Subject: [PATCH 044/457] Backport fix for bug#18745 from master. nt/cmdproxy.c (batch_file_p): New function. (spawn): If calling a quoted batch file pass NULL for progname. --- nt/ChangeLog | 6 ++++++ nt/cmdproxy.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/nt/ChangeLog b/nt/ChangeLog index d1f953f9ac5..861cb18f0b2 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2015-02-10 Noam Postavsky + + * nt/cmdproxy.c (batch_file_p): New function. + (spawn): If calling a quoted batch file pass NULL for progname. + (Bug#18745) + 2015-02-10 Eli Zaretskii * cmdproxy.c (get_next_token): Don't make backslashes disappear diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index ce5815291df..16956288fef 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -243,6 +243,28 @@ get_next_token (char * buf, const char ** pSrc) return o - buf; } +/* Return TRUE if PROGNAME is a batch file. */ +BOOL +batch_file_p (const char *progname) +{ + const char *exts[] = {".bat", ".cmd"}; + int n_exts = sizeof (exts) / sizeof (char *); + int i; + + const char *ext = strrchr (progname, '.'); + + if (ext) + { + for (i = 0; i < n_exts; i++) + { + if (stricmp (ext, exts[i]) == 0) + return TRUE; + } + } + + return FALSE; +} + /* Search for EXEC file in DIR. If EXEC does not have an extension, DIR is searched for EXEC with the standard extensions appended. */ int @@ -524,6 +546,13 @@ spawn (const char *progname, char *cmdline, const char *dir, int *retcode) memset (&start, 0, sizeof (start)); start.cb = sizeof (start); + /* CreateProcess handles batch files as progname specially. This + special handling fails when both the batch file and arguments are + quoted. We pass NULL as progname to avoid the special + handling. */ + if (progname != NULL && cmdline[0] == '"' && batch_file_p (progname)) + progname = NULL; + if (CreateProcess (progname, cmdline, &sec_attrs, NULL, TRUE, 0, envblock, dir, &start, &child)) { From c49e769d8f141b0307db19ed2a5fa80e0696b1dc Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Mon, 9 Feb 2015 13:14:52 +0100 Subject: [PATCH 045/457] Improve seq-group-by to return sequence elements in correct order * lisp/emacs-lisp/seq.el (seq-group-by): Improves seq-group-by to return sequence elements in correct order * tests/automated/seq-tests.el: Update test for seq-group-by * doc/lispref/sequences.texi (Sequence Functions): Update documentation examples for seq-group-by --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/sequences.texi | 4 ++-- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/seq.el | 23 +++++++++++------------ test/ChangeLog | 6 ++++++ test/automated/seq-tests.el | 6 +++--- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index d82be3c83e7..285c725caef 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -4,6 +4,11 @@ fullscreen frame parameter. Describe `fullscreen-restore' parameter. +2015-02-09 Nicolas Petton + + * sequences.texi (Sequence Functions): Update documentation + examples for seq-group-by. + 2015-02-09 Eli Zaretskii * positions.texi (Screen Lines): Update the documentation of diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index f268c0d11e2..04404f886e0 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -731,11 +731,11 @@ of @var{sequence}. Keys are compared using @code{equal}. @example @group (seq-group-by #'integerp '(1 2.1 3 2 3.2)) -@result{} ((t 2 3 1) (nil 3.2 2.1)) +@result{} ((t 1 3 2) (nil 2.1 3.2)) @end group @group (seq-group-by #'car '((a 1) (b 2) (a 3) (c 4))) -@result{} ((a (a 3) (a 1)) (b (b 2)) (c (c 4))) +@result{} ((b (b 2)) (a (a 1) (a 3)) (c (c 4))) @end group @end example @end defun diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a6e5f59503e..ece253b1336 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-09 Nicolas Petton + + * emacs-lisp/seq.el (seq-group-by): Improves seq-group-by to + return sequence elements in correct order. + 2015-02-11 Martin Rudalics * frame.el (toggle-frame-maximized, toggle-frame-fullscreen): diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index 025d94e10b9..5fbec185b76 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -4,7 +4,7 @@ ;; Author: Nicolas Petton ;; Keywords: sequences -;; Version: 1.1 +;; Version: 1.1.1 ;; Maintainer: emacs-devel@gnu.org @@ -245,17 +245,16 @@ negative integer or 0, nil is returned." "Apply FUNCTION to each element of SEQ. Separate the elements of SEQ into an alist using the results as keys. Keys are compared using `equal'." - (nreverse - (seq-reduce - (lambda (acc elt) - (let* ((key (funcall function elt)) - (cell (assoc key acc))) - (if cell - (setcdr cell (push elt (cdr cell))) - (push (list key elt) acc)) - acc)) - seq - nil))) + (seq-reduce + (lambda (acc elt) + (let* ((key (funcall function elt)) + (cell (assoc key acc))) + (if cell + (setcdr cell (push elt (cdr cell))) + (push (list key elt) acc)) + acc)) + (seq-reverse seq) + nil)) (defun seq--drop-list (list n) "Return a list from LIST without its first N elements. diff --git a/test/ChangeLog b/test/ChangeLog index 74fc7cebd56..b080961f681 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -3,6 +3,12 @@ * automated/package-test.el (package-test-signed): More informative failure messages. +2015-02-09 Nicolas Petton + + * automated/seq-tests.el (test-seq-group-by): Update test for + seq-group-by to check that sequence elements are returned in the + correct order. + 2015-02-07 Fabián Ezequiel Gallina * automated/python-tests.el (python-eldoc--get-symbol-at-point-1) diff --git a/test/automated/seq-tests.el b/test/automated/seq-tests.el index ecbc0043210..b92a15cacc5 100644 --- a/test/automated/seq-tests.el +++ b/test/automated/seq-tests.el @@ -216,10 +216,10 @@ Evaluate BODY for each created sequence. (should (equal (seq-partition '(1 2 3) -1) '()))) (ert-deftest test-seq-group-by () - (should (equal (seq-group-by #'test-sequences-oddp [1 2 3 4]) - '((t 3 1) (nil 4 2)))) + (should (equal (seq-group-by #'test-sequences-oddp '(1 2 3 4)) + '((t 1 3) (nil 2 4)))) (should (equal (seq-group-by #'car '((a 1) (b 3) (c 4) (a 2))) - '((a (a 2) (a 1)) (b (b 3)) (c (c 4)))))) + '((b (b 3)) (c (c 4)) (a (a 1) (a 2)))))) (provide 'seq-tests) ;;; seq-tests.el ends here From 4fb5565d0a0cd9640a242028c92b8b4e2bd4683e Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Wed, 11 Feb 2015 09:21:03 +0100 Subject: [PATCH 046/457] Add a backward-compatible version of seq-reverse * lisp/emacs-lisp/seq.el (seq-reverse): Add a backward-compatible version of seq-reverse that works on sequences in Emacs 24. Bump version to 1.2. * test/automated/seq-tests.el (test-seq-reverse, test-seq-group-by): Add a test for seq-reverse and update test for seq-group-by to test vectors and strings, not only lists. --- lisp/ChangeLog | 12 +++++++++--- lisp/emacs-lisp/seq.el | 28 +++++++++++++++++++++++----- test/ChangeLog | 6 ++++++ test/automated/seq-tests.el | 11 +++++++++-- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ece253b1336..7e45b9db64c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,8 @@ -2015-02-09 Nicolas Petton +2015-02-11 Nicolas Petton - * emacs-lisp/seq.el (seq-group-by): Improves seq-group-by to - return sequence elements in correct order. + * emacs-lisp/seq.el (seq-reverse): Add a backward-compatible + version of seq-reverse that works on sequences in Emacs 24. + Bump seq.el version to 1.2. 2015-02-11 Martin Rudalics @@ -74,6 +75,11 @@ (python-shell-font-lock-turn-off): Fix typo. (python-util-text-properties-replace-name): Delete function. +2015-02-09 Nicolas Petton + + * emacs-lisp/seq.el (seq-group-by): Improves seq-group-by to + return sequence elements in correct order. + 2015-02-09 Simen Heggestøyl (tiny change) * textmodes/css-mode.el (css-smie-rules): Fix paren indent (bug#19815). diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index 5fbec185b76..ad4c3536b44 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -4,7 +4,7 @@ ;; Author: Nicolas Petton ;; Keywords: sequences -;; Version: 1.1.1 +;; Version: 1.2 ;; Maintainer: emacs-devel@gnu.org @@ -171,9 +171,7 @@ The result is a sequence of the same type as SEQ." (if (listp seq) (sort (seq-copy seq) pred) (let ((result (seq-sort pred (append seq nil)))) - (cond ((stringp seq) (concat result)) - ((vectorp seq) (vconcat result)) - (t (error "Unsupported sequence: %s" seq)))))) + (seq--into result (type-of seq))))) (defun seq-contains-p (seq elt &optional testfn) "Return the first element in SEQ that equals to ELT. @@ -256,6 +254,27 @@ keys. Keys are compared using `equal'." (seq-reverse seq) nil)) +(defalias 'seq-reverse + (if (ignore-errors (reverse [1 2])) + #'reverse + (lambda (seq) + "Return the reversed copy of list, vector, or string SEQ. +See also the function `nreverse', which is used more often." + (let ((result '())) + (seq-map (lambda (elt) (push elt result)) + seq) + (if (listp seq) + result + (seq--into result (type-of seq))))))) + +(defun seq--into (seq type) + "Convert the sequence SEQ into a sequence of type TYPE." + (pcase type + (`vector (vconcat seq)) + (`string (concat seq)) + (`list (append seq nil)) + (t (error "Not a sequence type name: %s" type)))) + (defun seq--drop-list (list n) "Return a list from LIST without its first N elements. This is an optimization for lists in `seq-drop'." @@ -299,7 +318,6 @@ This is an optimization for lists in `seq-take-while'." (defalias 'seq-copy #'copy-sequence) (defalias 'seq-elt #'elt) -(defalias 'seq-reverse #'reverse) (defalias 'seq-length #'length) (defalias 'seq-do #'mapc) (defalias 'seq-each #'seq-do) diff --git a/test/ChangeLog b/test/ChangeLog index b080961f681..979214c45da 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-02-11 Nicolas Petton + + * automated/seq-tests.el (test-seq-reverse, test-seq-group-by): + Add a test for seq-reverse and update test for seq-group-by to + test vectors and strings, not only lists. + 2015-02-10 Glenn Morris * automated/package-test.el (package-test-signed): diff --git a/test/automated/seq-tests.el b/test/automated/seq-tests.el index b92a15cacc5..badb3267f43 100644 --- a/test/automated/seq-tests.el +++ b/test/automated/seq-tests.el @@ -216,10 +216,17 @@ Evaluate BODY for each created sequence. (should (equal (seq-partition '(1 2 3) -1) '()))) (ert-deftest test-seq-group-by () - (should (equal (seq-group-by #'test-sequences-oddp '(1 2 3 4)) - '((t 1 3) (nil 2 4)))) + (with-test-sequences (seq '(1 2 3 4)) + (should (equal (seq-group-by #'test-sequences-oddp seq) + '((t 1 3) (nil 2 4))))) (should (equal (seq-group-by #'car '((a 1) (b 3) (c 4) (a 2))) '((b (b 3)) (c (c 4)) (a (a 1) (a 2)))))) +(ert-deftest test-seq-reverse () + (with-test-sequences (seq '(1 2 3 4)) + (should (same-contents-p (seq-reverse seq) '(4 3 2 1))) + (should (equal (type-of (seq-reverse seq)) + (type-of seq))))) + (provide 'seq-tests) ;;; seq-tests.el ends here From f5d1e1f5509b23959f92117c5e1d1a09e05661d1 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 11 Feb 2015 13:18:45 -0500 Subject: [PATCH 047/457] Backport NEWS typo fix --- etc/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index c25f663ae62..584c9bae332 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3557,7 +3557,7 @@ frame or window as an Elisp object. *** New variable `completion-extra-properties' used to specify extra properties of the current completion: -- :annotate-function, same as the old completion-annotate-function. +- :annotation-function, same as the old completion-annotate-function. - :exit-function, function to call after completion took place. *** Functions on `completion-at-point-functions' can return any of the From 517fc7b612344535087dc54178bd464fe9a74d1f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 11 Feb 2015 16:37:49 -0500 Subject: [PATCH 048/457] * lisp/hi-lock.el: Don't call font-lock-remove-keywords if not needed. Fixes: debbugs:19737 (hi-lock-unface-buffer): Don't call font-lock-remove-keywords if not needed. --- lisp/ChangeLog | 12 ++++++++---- lisp/hi-lock.el | 7 ++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7e45b9db64c..34e4e9d1c2b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-11 Stefan Monnier + + * hi-lock.el (hi-lock-unface-buffer): Don't call + font-lock-remove-keywords if not needed (bug#19737). + 2015-02-11 Nicolas Petton * emacs-lisp/seq.el (seq-reverse): Add a backward-compatible @@ -8,8 +13,7 @@ * frame.el (toggle-frame-maximized, toggle-frame-fullscreen): Rename frame parameter `maximized' to `fullscreen-restore'. - Restore fullwidth/-height after fullboth state. Update - doc-strings. + Restore fullwidth/-height after fullboth state. Update doc-strings. 2015-02-11 Lars Ingebrigtsen @@ -23,8 +27,8 @@ * net/shr.el (shr-use-fonts): New variable. (shr-fill-text): Rename from "fold". - (shr-pixel-column, shr-pixel-region, shr-string-pixel-width): New - functions. + (shr-pixel-column, shr-pixel-region, shr-string-pixel-width): + New functions. (shr-insert): Just insert, don't fill the text. Filling is now done afterwards per display unit. (shr-fill-lines, shr-fill-line): New functions to fill text on a diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 65a4561e3ab..d74664a845f 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -596,7 +596,12 @@ then remove all hi-lock highlighting." ;; Make `face' the next one to use by default. (when (symbolp face) ;Don't add it if it's a list (bug#13297). (add-to-list 'hi-lock--unused-faces (face-name face)))) - (font-lock-remove-keywords nil (list keyword)) + ;; FIXME: Calling `font-lock-remove-keywords' causes + ;; `font-lock-specified-p' to go from nil to non-nil (because it + ;; calls font-lock-set-defaults). This is yet-another bug in + ;; font-lock-add/remove-keywords, which we circumvent here by + ;; testing `font-lock-fontified' (bug#19737). + (if font-lock-fontified (font-lock-remove-keywords nil (list keyword))) (setq hi-lock-interactive-patterns (delq keyword hi-lock-interactive-patterns)) (remove-overlays From 0a66ca36fa052fbd7c0c751c96c22b5d81dec658 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Wed, 11 Feb 2015 14:53:43 +0000 Subject: [PATCH 049/457] emacs-lisp/package.el (package-install): Invert the second argument. --- lisp/ChangeLog | 7 +++++++ lisp/emacs-lisp/package.el | 28 +++++++++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34e4e9d1c2b..def4620db02 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,13 @@ * hi-lock.el (hi-lock-unface-buffer): Don't call font-lock-remove-keywords if not needed (bug#19737). +2015-02-11 Artur Malabarba + + * emacs-lisp/package.el (package-install): Invert the second + argument, for better backwards compatibility. + (package-install-button-action, package-reinstall) + (package-menu-execute): Account for the change. + 2015-02-11 Nicolas Petton * emacs-lisp/seq.el (seq-reverse): Add a backward-compatible diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c3a2061aae2..60cf65d2305 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1221,15 +1221,15 @@ using `package-compute-transaction'." (mapc #'package-install-from-archive packages)) ;;;###autoload -(defun package-install (pkg &optional mark-selected) +(defun package-install (pkg &optional dont-select) "Install the package PKG. PKG can be a package-desc or the package name of one the available packages in an archive in `package-archives'. Interactively, prompt for its name. -If called interactively or if MARK-SELECTED is non-nil, add PKG -to `package-selected-packages'. +If called interactively or if DONT-SELECT nil, add PKG to +`package-selected-packages'. -if PKG is a package-desc and it is already installed, don't try +If PKG is a package-desc and it is already installed, don't try to install it but still mark it as selected." (interactive (progn @@ -1247,11 +1247,11 @@ to install it but still mark it as selected." (symbol-name (car elt)))) package-archive-contents)) nil t)) - t))) + nil))) (let ((name (if (package-desc-p pkg) (package-desc-name pkg) pkg))) - (when (and mark-selected (not (package--user-selected-p name))) + (unless (or dont-select (package--user-selected-p name)) (customize-save-variable 'package-selected-packages (cons name package-selected-packages)))) (if (package-desc-p pkg) @@ -1276,7 +1276,7 @@ object." (package-delete (if (package-desc-p pkg) pkg (cadr (assq pkg package-alist))) 'force 'nosave) - (package-install pkg)) + (package-install pkg 'dont-select)) (defun package-strip-rcs-id (str) "Strip RCS version ID from the version string STR. @@ -1929,7 +1929,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." (let ((pkg-desc (button-get button 'package-desc))) (when (y-or-n-p (format "Install package `%s'? " (package-desc-full-name pkg-desc))) - (package-install pkg-desc 1) + (package-install pkg-desc nil) (revert-buffer nil t) (goto-char (point-min))))) @@ -2427,13 +2427,11 @@ Optional argument NOQUERY non-nil means do not ask the user to confirm." (mapconcat #'package-desc-full-name install-list ", "))))) (mapc (lambda (p) - ;; Mark as selected if it's the exact version of a - ;; package that's already installed, or if it's not - ;; installed at all. Don't mark if it's a new - ;; version of an installed package. - (package-install p (or (package-installed-p p) - (not (package-installed-p - (package-desc-name p)))))) + ;; Don't mark as selected if it's a new version of + ;; an installed package. + (package-install p (and (not (package-installed-p p)) + (package-installed-p + (package-desc-name p))))) install-list))) ;; Delete packages, prompting if necessary. (when delete-list From 511acc77a4b0be3ed997c335f270b346a4ed0d5f Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Wed, 11 Feb 2015 14:53:21 +0000 Subject: [PATCH 050/457] emacs-lisp/package.el: Indicate incompatible packages. These are packages which require a higher emacs version than the current one. --- lisp/ChangeLog | 9 +++++++++ lisp/emacs-lisp/package.el | 27 ++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index def4620db02..6c51e2aee98 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -16,6 +16,15 @@ version of seq-reverse that works on sequences in Emacs 24. Bump seq.el version to 1.2. +2015-02-11 Artur Malabarba + + * emacs-lisp/package.el (package--incompatible-p): New function. + Return non-nil if PKG has no chance of being installable. + (package--emacs-version-list): New variable. + (describe-package-1, package-desc-status) + (package-menu--print-info, package-menu--status-predicate): + Account for the "incompat" status. + 2015-02-11 Martin Rudalics * frame.el (toggle-frame-maximized, toggle-frame-fullscreen): diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 60cf65d2305..67e2f4050a7 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1796,7 +1796,9 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." (pkg-dir (insert (propertize (if (member status '("unsigned" "dependency")) "Installed" - (capitalize status)) ;FIXME: Why comment-face? + (if (equal status "incompat") + "Incompatible" + (capitalize status))) ;FIXME: Why comment-face? 'font-lock-face 'font-lock-comment-face)) (insert " in `") ;; Todo: Add button for uninstalling. @@ -2054,6 +2056,25 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC." (defvar package-list-unsigned nil "If non-nil, mention in the list which packages were installed w/o signature.") +(defvar package--emacs-version-list (version-to-list emacs-version) + "`emacs-version', as a list.") + +(defun package--incompatible-p (pkg) + "Return non-nil if PKG has no chance of being installable. +PKG is a package-desc object. +Return value is a string describing the reason why the package is +incompatible. + +Currently, this only checks if PKG depends on a higher +`emacs-version' than the one being used." + (let* ((reqs (package-desc-reqs pkg)) + (version (cadr (assq 'emacs reqs)))) + (if (and version (version-list-< package--emacs-version-list version)) + (format "`%s' requires Emacs %s, but current version is %s" + (package-desc-full-name pkg) + (package-version-join version) + emacs-version)))) + (defun package-desc-status (pkg-desc) (let* ((name (package-desc-name pkg-desc)) (dir (package-desc-dir pkg-desc)) @@ -2072,6 +2093,7 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC." ((version-list-< version hv) "obsolete") (t "disabled")))) ((package-built-in-p name version) "obsolete") + ((package--incompatible-p pkg-desc) "incompat") (dir ;One of the installed packages. (cond ((not (file-exists-p (package-desc-dir pkg-desc))) "deleted") @@ -2222,6 +2244,7 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])." (`"installed" 'font-lock-comment-face) (`"dependency" 'font-lock-comment-face) (`"unsigned" 'font-lock-warning-face) + (`"incompat" 'font-lock-comment-face) (_ 'font-lock-warning-face)))) ; obsolete. (list pkg-desc `[,(list (symbol-name (package-desc-name pkg-desc)) @@ -2492,6 +2515,8 @@ Optional argument NOQUERY non-nil means do not ask the user to confirm." ((string= sB "built-in") nil) ((string= sA "obsolete") t) ((string= sB "obsolete") nil) + ((string= sA "incompat") t) + ((string= sB "incompat") nil) (t (string< sA sB))))) (defun package-menu--description-predicate (A B) From da726ad0c6177a3442a374a135f40a24945d362c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Thu, 12 Feb 2015 00:41:07 -0300 Subject: [PATCH 051/457] python.el: Allow killing shell buffer if process is dead. Fixes: debbugs:19823 * lisp/progmodes/python.el (python-shell-font-lock-kill-buffer): Don't require a running process. (python-shell-font-lock-post-command-hook): Fontify only if the shell process is running. --- lisp/ChangeLog | 9 +++++++++ lisp/progmodes/python.el | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c51e2aee98..b56a5d1f512 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-02-12 Fabián Ezequiel Gallina + + python.el: Allow killing shell buffer if process is dead. (Bug#19823) + + * progmodes/python.el (python-shell-font-lock-kill-buffer): Don't + require a running process. + (python-shell-font-lock-post-command-hook): Fontify only if the + shell process is running. + 2015-02-11 Stefan Monnier * hi-lock.el (hi-lock-unface-buffer): Don't call diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index be747d008dd..20266097fed 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2301,12 +2301,11 @@ Signals an error if no shell buffer is available for current buffer." (defun python-shell-font-lock-kill-buffer () "Kill the font-lock buffer safely." - (python-shell-with-shell-buffer - (when (and python-shell--font-lock-buffer - (buffer-live-p python-shell--font-lock-buffer)) - (kill-buffer python-shell--font-lock-buffer) - (when (derived-mode-p 'inferior-python-mode) - (setq python-shell--font-lock-buffer nil))))) + (when (and python-shell--font-lock-buffer + (buffer-live-p python-shell--font-lock-buffer)) + (kill-buffer python-shell--font-lock-buffer) + (when (derived-mode-p 'inferior-python-mode) + (setq python-shell--font-lock-buffer nil)))) (defmacro python-shell-font-lock-with-font-lock-buffer (&rest body) "Execute the forms in BODY in the font-lock buffer. @@ -2357,7 +2356,8 @@ goes wrong and syntax highlighting in the shell gets messed up." (defun python-shell-font-lock-post-command-hook () "Fontifies current line in shell buffer." (let ((prompt-end (cdr (python-util-comint-last-prompt)))) - (when (and prompt-end (> (point) prompt-end)) + (when (and prompt-end (> (point) prompt-end) + (process-live-p (get-buffer-process (current-buffer)))) (let* ((input (buffer-substring-no-properties prompt-end (point-max))) (start-pos prompt-end) From c7d9dec837b0e372032ce2f103967e120729c7b4 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 12 Feb 2015 09:39:24 +0000 Subject: [PATCH 052/457] lisp/gnus/gnus-art.el (gnus-article-browse-html-save-cid-content, gnus-article-browse-html-parts): Make cid file names relative if and only if html doesn't specify directory --- lisp/gnus/ChangeLog | 6 +++++ lisp/gnus/gnus-art.el | 52 ++++++++++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f21d01f9fef..f29a53e1aac 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2015-02-12 Katsumi Yamaoka + + * gnus-art.el (gnus-article-browse-html-save-cid-content) + (gnus-article-browse-html-parts): Make cid file names relative if and + only if html doesn't specify directory. + 2015-02-11 Lars Ingebrigtsen * gnus-art.el (gnus-treat-buttonize): Don't re-buttonize URLs in HTML diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 4ad0601099d..b3121bf7518 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -2792,11 +2792,12 @@ summary buffer." (setq gnus-article-browse-html-temp-list nil)) gnus-article-browse-html-temp-list) -(defun gnus-article-browse-html-save-cid-content (cid handles directory) +(defun gnus-article-browse-html-save-cid-content (cid handles directory abs) "Find CID content in HANDLES and save it in a file in DIRECTORY. -Return file name." +Return absolute file name if ABS is non-nil, otherwise relative to +the parent of DIRECTORY." (save-match-data - (let (file) + (let (file afile) (catch 'found (dolist (handle handles) (cond @@ -2806,19 +2807,21 @@ Return file name." ((not (or (bufferp (car handle)) (stringp (car handle))))) ((equal (mm-handle-media-supertype handle) "multipart") (when (setq file (gnus-article-browse-html-save-cid-content - cid handle directory)) + cid handle directory abs)) (throw 'found file))) ((equal (concat "<" cid ">") (mm-handle-id handle)) - (setq file - (expand-file-name - (or (mm-handle-filename handle) - (concat - (make-temp-name "cid") - (car (rassoc (car (mm-handle-type handle)) - mailcap-mime-extensions)))) - directory)) - (mm-save-part-to-file handle file) - (throw 'found file)))))))) + (setq file (or (mm-handle-filename handle) + (concat + (make-temp-name "cid") + (car (rassoc (car (mm-handle-type handle)) + mailcap-mime-extensions)))) + afile (expand-file-name file directory)) + (mm-save-part-to-file handle afile) + (throw 'found (if abs + afile + (concat (file-name-nondirectory + (directory-file-name directory)) + "/" file)))))))))) (defun gnus-article-browse-html-parts (list &optional header) "View all \"text/html\" parts from LIST. @@ -2854,8 +2857,13 @@ message header will be added to the bodies of the \"text/html\" parts." (insert content) ;; resolve cid contents (let ((case-fold-search t) - cid-file) + abs st cid-file) (goto-char (point-min)) + (when (re-search-forward "]" nil t) + (setq st (match-end 0) + abs (or + (not (re-search-forward "]" nil t)) + (re-search-backward "]" st t)))) (while (re-search-forward "\ ]+[\t\n ]+\\)*src=\"\\(cid:\\([^\"]+\\)\\)\"" nil t) @@ -2869,17 +2877,19 @@ message header will be added to the bodies of the \"text/html\" parts." (match-string 2) (with-current-buffer gnus-article-buffer gnus-article-mime-handles) - cid-dir)) - (when (eq system-type 'cygwin) + cid-dir abs)) + (when abs (setq cid-file - (concat "/" (substring + (if (eq system-type 'cygwin) + (concat "file:///" + (substring (with-output-to-string (call-process "cygpath" nil standard-output nil "-m" cid-file)) - 0 -1)))) - (replace-match (concat "file://" cid-file) - nil nil nil 1)))) + 0 -1)) + (concat "file://" cid-file)))) + (replace-match cid-file nil nil nil 1)))) (unless content (setq content (buffer-string)))) (when (or charset header (not file)) (setq tmp-file (mm-make-temp-file From e39d96ebe4c342885433afc28232197ce398fe71 Mon Sep 17 00:00:00 2001 From: Oleh Krehel Date: Thu, 12 Feb 2015 11:22:16 +0100 Subject: [PATCH 053/457] gdb-mi.el (gdb-display-io-nopopup): New defcustom. * lisp/progmodes/gdb-mi.el (gdb-inferior-filter): Don't pop up the buried output buffer when `gdb-display-io-nopopup' is non-nil. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/gdb-mi.el | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b56a5d1f512..ff2755df630 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-12 Oleh Krehel + + * progmodes/gdb-mi.el (gdb-display-io-nopopup): New defcustom. + (gdb-inferior-filter): Don't pop up the buried output buffer when + `gdb-display-io-nopopup' is non-nil. + 2015-02-12 Fabián Ezequiel Gallina python.el: Allow killing shell buffer if process is dead. (Bug#19823) diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 27846ede332..486d67297a9 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -1629,9 +1629,19 @@ this trigger is subscribed to `gdb-buf-publisher' and called with :syntax-table nil :abbrev-table nil (make-comint-in-buffer "gdb-inferior" (current-buffer) nil)) +(defcustom gdb-display-io-nopopup nil + "When non-nil, and the 'gdb-inferior-io buffer is buried, don't pop it up." + :type 'boolean + :group 'gdb + :version "25.1") + (defun gdb-inferior-filter (proc string) (unless (string-equal string "") - (gdb-display-buffer (gdb-get-buffer-create 'gdb-inferior-io))) + (let (buf) + (unless (and gdb-display-io-nopopup + (setq buf (gdb-get-buffer 'gdb-inferior-io)) + (null (get-buffer-window buf))) + (gdb-display-buffer (gdb-get-buffer-create 'gdb-inferior-io))))) (with-current-buffer (gdb-get-buffer-create 'gdb-inferior-io) (comint-output-filter proc string))) From a7254bbf99d9c9a55c93aae840c9d97598d4ce73 Mon Sep 17 00:00:00 2001 From: Agustin Martin Domingo Date: Thu, 12 Feb 2015 18:38:11 +0100 Subject: [PATCH 054/457] Improve string search in `flyspell-word-search-*`. (Bug#16800) * flyspell.el (flyspell-duplicate-distance): Limit default search distance for duplicated words to 40000. (flyspell-word-search-backward, flyspell-word-search-forward): Search as full word with defined casechars, not as substring. Fixes: debbugs:16800 --- lisp/ChangeLog | 9 +++++ lisp/textmodes/flyspell.el | 70 +++++++++++++++++++++++++++----------- 2 files changed, 59 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ea428b1de15..6fb752a48a9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-02-12 Agustín Martín Domingo + + Improve string search in `flyspell-word-search-*`. (Bug#16800) + + * flyspell.el (flyspell-duplicate-distance): Limit default search + distance for duplicated words to 40000. + (flyspell-word-search-backward, flyspell-word-search-forward): + Search as full word with defined casechars, not as substring. + 2015-02-10 Juri Linkov Better support for the case of typing RET on the prompt in comint. diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 66243b42102..cd64a806778 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -92,7 +92,7 @@ downcased before comparing with these exceptions." :version "21.1" :type 'boolean) -(defcustom flyspell-duplicate-distance -1 +(defcustom flyspell-duplicate-distance 400000 "The maximum distance for finding duplicates of unrecognized words. This applies to the feature that when a word is not found in the dictionary, if the same spelling occurs elsewhere in the buffer, @@ -1010,17 +1010,33 @@ Mostly we check word delimiters." ;;*---------------------------------------------------------------------*/ (defun flyspell-word-search-backward (word bound &optional ignore-case) (save-excursion - (let ((r '()) - (inhibit-point-motion-hooks t) - p) - (while (and (not r) (setq p (search-backward word bound t))) - (let ((lw (flyspell-get-word))) - (if (and (consp lw) - (if ignore-case - (string-equal (downcase (car lw)) (downcase word)) - (string-equal (car lw) word))) - (setq r p) - (goto-char p)))) + (let* ((r '()) + (inhibit-point-motion-hooks t) + (flyspell-not-casechars (flyspell-get-not-casechars)) + (bound (if (and bound + (> bound (point-min))) + (- bound 1))) + (word-re (concat + "\\(?:" flyspell-not-casechars "\\|\\`\\)" + (regexp-quote word) + flyspell-not-casechars)) + p) + (while + (and (not r) + (setq p + (and + (re-search-backward word-re bound t) + (if (bobp) + (point) + (forward-char) + (point))))) + (let ((lw (flyspell-get-word))) + (if (and (consp lw) + (if ignore-case + (string-equal (downcase (car lw)) (downcase word)) + (string-equal (car lw) word))) + (setq r p) + (goto-char p)))) r))) ;;*---------------------------------------------------------------------*/ @@ -1028,14 +1044,28 @@ Mostly we check word delimiters." ;;*---------------------------------------------------------------------*/ (defun flyspell-word-search-forward (word bound) (save-excursion - (let ((r '()) - (inhibit-point-motion-hooks t) - p) - (while (and (not r) (setq p (search-forward word bound t))) - (let ((lw (flyspell-get-word))) - (if (and (consp lw) (string-equal (car lw) word)) - (setq r p) - (goto-char (1+ p))))) + (let* ((r '()) + (inhibit-point-motion-hooks t) + (flyspell-not-casechars (flyspell-get-not-casechars)) + (bound (if (and bound + (< bound (point-max))) + (+ bound 1))) + (word-re (concat flyspell-not-casechars + (regexp-quote word) + "\\(?:" flyspell-not-casechars "\\|\\'\\)")) + p) + (while + (and (not r) + (setq p (and + (re-search-forward word-re bound t) + (if (eobp) + (point) + (backward-char) + (point))))) + (let ((lw (flyspell-get-word))) + (if (and (consp lw) (string-equal (car lw) word)) + (setq r p) + (goto-char (1+ p))))) r))) ;;*---------------------------------------------------------------------*/ From 72fd047e6878f1db44e4d64a2b5049ecf7bac079 Mon Sep 17 00:00:00 2001 From: kwhite Date: Thu, 12 Feb 2015 13:41:10 -0500 Subject: [PATCH 055/457] NEWS: Add section to include ERC changes --- etc/ChangeLog | 4 ++++ etc/NEWS | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/etc/ChangeLog b/etc/ChangeLog index a801c52d7eb..41e44be9593 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2015-02-12 Kelvin White + + * NEWS: Add section to include ERC changes + 2015-01-17 Eli Zaretskii * tutorials/TUTORIAL.he: Use u+05f4 HEBREW PUNCTUATION GERSHAYIM diff --git a/etc/NEWS b/etc/NEWS index 584c9bae332..3a071ede8be 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -53,6 +53,23 @@ These emulations of old editors are believed to be no longer relevant --- *** vi.el, vip.el (try M-x viper instead) + +* ERC Changes in Emacs 24.5 + ++++ +** `erc-rename-buffers' if non-nil will rename buffers to reflect the +current network name instead of using SERVER:PORT +--- +** `erc-version' now follows current emacs version ++++ +** `erc-format-@nick' displays all user modes instead of only op and +voice +--- +** `erc-my-nick-prefix-face' and `erc-nick-prefix-face' for changing +the faces for user mode prefixes +--- +** display of irc commands in current buffer has been disabled + * Installation Changes in Emacs 24.4 From 65563fd7714271582d5146c09202c0f7a0631fe5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 12 Feb 2015 18:20:12 -0800 Subject: [PATCH 056/457] Better support for future plugins See the thread containing: http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00720.html * lib-src/make-docfile.c (write_globals): Generate code that #defines Qxxx macros other than Qnil only if DEFINE_NONNIL_Q_SYMBOL_MACROS. Qnil is safe to define even in plugins, since it must be zero for other reasons. * src/lisp.h (DEFINE_LISP_SYMBOL): New macro, replacing and simplifying DEFINE_LISP_SYMBOL_BEGIN / DEFINE_LISP_SYMBOL_END. All uses changed. (DEFINE_NONNIL_Q_SYMBOL_MACROS): New macro, defaulting to true. --- lib-src/ChangeLog | 10 ++++++++++ lib-src/make-docfile.c | 27 ++++++++++++++------------- src/ChangeLog | 7 +++++++ src/lisp.h | 13 ++++++++++--- 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 8d2c95e671c..534d253cabb 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,13 @@ +2015-02-13 Paul Eggert + + Better support for future plugins + See the thread containing: + http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00720.html + * make-docfile.c (write_globals): Generate code that #defines + Qxxx macros other than Qnil only if DEFINE_NONNIL_Q_SYMBOL_MACROS. + Qnil is safe to define even in plugins, since it must be zero for + other reasons. + 2015-01-24 Paul Eggert Fix a couple of AM_V_GEN bugs diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 79d421a0a8e..a7943e3118c 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -707,12 +707,9 @@ write_globals (void) globals[i].name, globals[i].name); } else if (globals[i].type == SYMBOL) - printf (("DEFINE_LISP_SYMBOL_BEGIN (%s)\n" - "#define i%s %d\n" - "#define %s builtin_lisp_symbol (i%s)\n" - "DEFINE_LISP_SYMBOL_END (%s)\n\n"), - globals[i].name, globals[i].name, symnum++, - globals[i].name, globals[i].name, globals[i].name); + printf (("#define i%s %d\n" + "DEFINE_LISP_SYMBOL (%s)\n"), + globals[i].name, symnum++, globals[i].name); else { if (globals[i].flags & DEFUN_noreturn) @@ -740,15 +737,19 @@ write_globals (void) puts ("#ifdef DEFINE_SYMBOLS"); puts ("static char const *const defsym_name[] = {"); for (int i = 0; i < num_globals; i++) - { - if (globals[i].type == SYMBOL) - printf ("\t\"%s\",\n", globals[i].v.svalue); - while (i + 1 < num_globals - && strcmp (globals[i].name, globals[i + 1].name) == 0) - i++; - } + if (globals[i].type == SYMBOL) + printf ("\t\"%s\",\n", globals[i].v.svalue); puts ("};"); puts ("#endif"); + + puts ("#define Qnil builtin_lisp_symbol (0)"); + puts ("#if DEFINE_NONNIL_Q_SYMBOL_MACROS"); + num_symbols = 0; + for (int i = 0; i < num_globals; i++) + if (globals[i].type == SYMBOL && num_symbols++ != 0) + printf ("# define %s builtin_lisp_symbol (%d)\n", + globals[i].name, num_symbols - 1); + puts ("#endif"); } diff --git a/src/ChangeLog b/src/ChangeLog index f8e65d5d91d..6d246fb52c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-02-13 Paul Eggert + + Better support for future plugins + * lisp.h (DEFINE_LISP_SYMBOL): New macro, replacing and simplifying + DEFINE_LISP_SYMBOL_BEGIN / DEFINE_LISP_SYMBOL_END. All uses changed. + (DEFINE_NONNIL_Q_SYMBOL_MACROS): New macro, defaulting to true. + 2015-02-11 Martin Rudalics * w32term.c (w32_read_socket): In SIZE_MAXIMIZED and diff --git a/src/lisp.h b/src/lisp.h index 6c7b51fea06..7795c90e5cc 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -740,11 +740,18 @@ struct Lisp_Symbol /* Declare extern constants for Lisp symbols. These can be helpful when using a debugger like GDB, on older platforms where the debug format does not represent C macros. */ -#define DEFINE_LISP_SYMBOL_BEGIN(name) \ - DEFINE_GDB_SYMBOL_BEGIN (Lisp_Object, name) -#define DEFINE_LISP_SYMBOL_END(name) \ +#define DEFINE_LISP_SYMBOL(name) \ + DEFINE_GDB_SYMBOL_BEGIN (Lisp_Object, name) \ DEFINE_GDB_SYMBOL_END (LISP_INITIALLY (XLI_BUILTIN_LISPSYM (i##name))) +/* By default, define macros for Qt, etc., as this leads to a bit + better performance in the core Emacs interpreter. A plugin can + define DEFINE_NONNIL_Q_SYMBOL_MACROS to be false, to be portable to + other Emacs instances that assign different values to Qt, etc. */ +#ifndef DEFINE_NONNIL_Q_SYMBOL_MACROS +# define DEFINE_NONNIL_Q_SYMBOL_MACROS true +#endif + #include "globals.h" /* Convert a Lisp_Object to the corresponding EMACS_INT and vice versa. From 10a5a054ac7b1767623ed7e7f3ff5d7ae4ffe906 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Fri, 13 Feb 2015 15:51:23 +1100 Subject: [PATCH 057/457] * lisp/net/shr.el (shr-tag-li): Speed up rendering pages with lots of
    --- lisp/ChangeLog | 5 +++++ lisp/net/shr.el | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ff2755df630..8393009c061 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-13 Lars Ingebrigtsen + + * net/shr.el (shr-tag-li): Speed up rendering pages with lots of +
      . + 2015-02-12 Oleh Krehel * progmodes/gdb-mi.el (gdb-display-io-nopopup): New defcustom. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index cf35a1287d6..f6a390e4d0a 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -157,6 +157,7 @@ cid: URL as the argument.") (defvar shr-table-separator-pixel-width 0) (defvar shr-table-id nil) (defvar shr-current-font nil) +(defvar shr-internal-bullet nil) (defvar shr-map (let ((map (make-sparse-keymap))) @@ -216,6 +217,8 @@ DOM should be a parse tree as generated by (shr-table-id 0) (shr-warning nil) (shr-table-separator-pixel-width (shr-string-pixel-width "-")) + (shr-internal-bullet (cons shr-bullet + (shr-string-pixel-width shr-bullet))) (shr-internal-width (or (and shr-width (if (not shr-use-fonts) shr-width @@ -1408,11 +1411,13 @@ The preference is a float determined from `shr-prefer-media-type'." (prog1 (format "%d " shr-list-mode) (setq shr-list-mode (1+ shr-list-mode))) - shr-bullet))) + (car shr-internal-bullet))) + (width (if (numberp shr-list-mode) + (shr-string-pixel-width bullet) + (cdr shr-internal-bullet)))) (insert bullet) (shr-mark-fill start) - (let ((shr-indentation (+ shr-indentation - (shr-string-pixel-width bullet)))) + (let ((shr-indentation (+ shr-indentation width))) (put-text-property start (1+ start) 'shr-continuation-indentation shr-indentation) (put-text-property start (1+ start) 'shr-prefix-length (length bullet)) From a8f93d14cbc7a54bc09c7e4d841331588e86afa6 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Fri, 13 Feb 2015 06:44:40 +0000 Subject: [PATCH 058/457] lisp/gnus/nnmail.el (nnmail-expiry-target-group): Allow expiring nnimap to a group again --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnmail.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f29a53e1aac..9ff191d05c0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-02-13 Lars Ingebrigtsen + + * nnmail.el (nnmail-expiry-target-group): Supply the info structure to + `gnus-request-group'. + 2015-02-12 Katsumi Yamaoka * gnus-art.el (gnus-article-browse-html-save-cid-content) diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 62fcc2d8bd5..5c5481095e2 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1921,7 +1921,7 @@ If TIME is nil, then return the cutoff time for oldness instead." (when (functionp target) (setq target (funcall target group))) (unless (eq target 'delete) - (when (or (gnus-request-group target) + (when (or (gnus-request-group target nil nil (gnus-get-info target)) (gnus-request-create-group target)) (let ((group-art (gnus-request-accept-article target nil nil t))) (when (and (consp group-art) From f61c87f12a36bb2063c25b6742380b5916618ab5 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Fri, 13 Feb 2015 08:16:39 +0000 Subject: [PATCH 059/457] lisp/gnus/gnus-msg.el (gnus-msg-mail): Buffer-local warning fix (bug#19573) --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/gnus-msg.el | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9ff191d05c0..67929a30186 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,9 @@ 2015-02-13 Lars Ingebrigtsen + * gnus-msg.el (gnus-msg-mail): Don't let-bind `gnus-newsgroup-name' so + that we don't get a warning when setting the buffer-local variable + (bug#19573). + * nnmail.el (nnmail-expiry-target-group): Supply the info structure to `gnus-request-group'. diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 6c80c0daca6..bfd3da2e69d 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -541,11 +541,15 @@ instead." nil yank-action send-actions return-action)) (let ((buf (current-buffer)) ;; Don't use posting styles corresponding to any existing group. - (gnus-newsgroup-name "") + (group-name gnus-newsgroup-name) mail-buf) - (gnus-setup-message 'message - (message-mail to subject other-headers continue - nil yank-action send-actions return-action)) + (unwind-protect + (progn + (setq gnus-newsgroup-name "") + (gnus-setup-message 'message + (message-mail to subject other-headers continue + nil yank-action send-actions return-action))) + (setq gnus-newsgroup-name group-name)) (when switch-action (setq mail-buf (current-buffer)) (switch-to-buffer buf) From e7d21b4ab11e73c709420eeeb32ffe2421fafe98 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Fri, 13 Feb 2015 19:54:57 +1100 Subject: [PATCH 060/457] Implement SCRAM-SHA-1 SASL mechanism Fixes: debbugs:17636 * lisp/net/sasl-scram-rfc.el: New file. * lisp/net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5. Add SCRAM-SHA-1 first. (sasl-mechanism-alist): Remove SCRAM-MD5 entry. Add SCRAM-SHA-1 entry. * test/automated/sasl-scram-rfc-tests.el: New file. --- lisp/ChangeLog | 9 ++ lisp/net/sasl-scram-rfc.el | 160 +++++++++++++++++++++++++ lisp/net/sasl.el | 6 +- test/ChangeLog | 4 + test/automated/sasl-scram-rfc-tests.el | 50 ++++++++ 5 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 lisp/net/sasl-scram-rfc.el create mode 100644 test/automated/sasl-scram-rfc-tests.el diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8393009c061..02a7c3a7e9c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-02-13 Magnus Henoch + + * net/sasl-scram-rfc.el: New file. + + * net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5. Add + SCRAM-SHA-1 first. + (sasl-mechanism-alist): Remove SCRAM-MD5 entry. Add SCRAM-SHA-1 + entry (bug#17636). + 2015-02-13 Lars Ingebrigtsen * net/shr.el (shr-tag-li): Speed up rendering pages with lots of diff --git a/lisp/net/sasl-scram-rfc.el b/lisp/net/sasl-scram-rfc.el new file mode 100644 index 00000000000..3d86da43f35 --- /dev/null +++ b/lisp/net/sasl-scram-rfc.el @@ -0,0 +1,160 @@ +;;; sasl-scram-rfc.el --- SCRAM-SHA-1 module for the SASL client framework -*- lexical-binding: t; -*- + +;; Copyright (C) 2014 Free Software Foundation, Inc. + +;; Author: Magnus Henoch + +;; This file is part of GNU Emacs. + +;; 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 +;; 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This program is implemented from RFC 5802. It implements the +;; SCRAM-SHA-1 SASL mechanism. +;; +;; RFC 5802 foresees "hash agility", i.e. new mechanisms based on the +;; same protocol but using a different hash function. Likewise, this +;; module attempts to separate generic and specific functions, which +;; should make it easy to implement any future SCRAM-* SASL mechanism. +;; It should be as simple as copying the SCRAM-SHA-1 section below and +;; replacing all SHA-1 references. +;; +;; This module does not yet implement the variants with channel +;; binding, i.e. SCRAM-*-PLUS. That would require cooperation from +;; the TLS library. + +;;; Code: + +(require 'cl-lib) +(require 'sasl) + +;;; SCRAM-SHA-1 + +(require 'hex-util) +(require 'rfc2104) + +(defconst sasl-scram-sha-1-steps + '(sasl-scram-client-first-message + sasl-scram-sha-1-client-final-message + sasl-scram-sha-1-authenticate-server)) + +(defun sasl-scram-sha-1-client-final-message (client step) + (sasl-scram--client-final-message + ;; HMAC-SHA1 uses block length 64 and hash length 20; see RFC 2104. + 'sha1 64 20 client step)) + +(defun sasl-scram-sha-1-authenticate-server (client step) + (sasl-scram--authenticate-server + 'sha1 64 20 client step)) + +(put 'sasl-scram-sha-1 'sasl-mechanism + (sasl-make-mechanism "SCRAM-SHA-1" sasl-scram-sha-1-steps)) + +(provide 'sasl-scram-sha-1) + +;;; Generic for SCRAM-* + +(defun sasl-scram-client-first-message (client _step) + (let ((c-nonce (sasl-unique-id))) + (sasl-client-set-property client 'c-nonce c-nonce)) + (concat + ;; n = client doesn't support channel binding + "n," + ;; TODO: where would we get authorization id from? + "," + (sasl-scram--client-first-message-bare client))) + +(defun sasl-scram--client-first-message-bare (client) + (let ((c-nonce (sasl-client-property client 'c-nonce))) + (concat + ;; TODO: saslprep username or disallow non-ASCII characters + "n=" (sasl-client-name client) "," + "r=" c-nonce))) + +(defun sasl-scram--client-final-message (hash-fun block-length hash-length client step) + (unless (string-match + "^r=\\([^,]+\\),s=\\([^,]+\\),i=\\([0-9]+\\)\\(?:$\\|,\\)" + (sasl-step-data step)) + (sasl-error "Unexpected server response")) + (let* ((hmac-fun (lambda (text key) + (decode-hex-string + (rfc2104-hash hash-fun block-length hash-length key text)))) + (step-data (sasl-step-data step)) + (nonce (match-string 1 step-data)) + (salt-base64 (match-string 2 step-data)) + (iteration-count (string-to-number (match-string 3 step-data))) + + (c-nonce (sasl-client-property client 'c-nonce)) + ;; no channel binding, no authorization id + (cbind-input "n,,")) + (unless (string-prefix-p c-nonce nonce) + (sasl-error "Invalid nonce from server")) + (let* ((client-final-message-without-proof + (concat "c=" (base64-encode-string cbind-input) "," + "r=" nonce)) + (password + ;; TODO: either apply saslprep or disallow non-ASCII characters + (sasl-read-passphrase + (format "%s passphrase for %s: " + (sasl-mechanism-name (sasl-client-mechanism client)) + (sasl-client-name client)))) + (salt (base64-decode-string salt-base64)) + (salted-password + ;; Hi(str, salt, i): + (let ((digest (concat salt (string 0 0 0 1))) + (xored nil)) + (dotimes (_i iteration-count xored) + (setq digest (funcall hmac-fun digest password)) + (setq xored (if (null xored) + digest + (cl-map 'string 'logxor xored digest)))))) + (client-key + (funcall hmac-fun "Client Key" salted-password)) + (stored-key (decode-hex-string (funcall hash-fun client-key))) + (auth-message + (concat + (sasl-scram--client-first-message-bare client) "," + step-data "," + client-final-message-without-proof)) + (client-signature (funcall hmac-fun (encode-coding-string auth-message 'utf-8) stored-key)) + (client-proof (cl-map 'string 'logxor client-key client-signature)) + (client-final-message + (concat client-final-message-without-proof "," + "p=" (base64-encode-string client-proof)))) + (sasl-client-set-property client 'auth-message auth-message) + (sasl-client-set-property client 'salted-password salted-password) + client-final-message))) + +(defun sasl-scram--authenticate-server (hash-fun block-length hash-length client step) + (cond + ((string-match "^e=\\([^,]+\\)" (sasl-step-data step)) + (sasl-error (format "Server error: %s" (match-string 1 (sasl-step-data step))))) + ((string-match "^v=\\([^,]+\\)" (sasl-step-data step)) + (let* ((hmac-fun (lambda (text key) + (decode-hex-string + (rfc2104-hash hash-fun block-length hash-length key text)))) + (verifier (base64-decode-string (match-string 1 (sasl-step-data step)))) + (auth-message (sasl-client-property client 'auth-message)) + (salted-password (sasl-client-property client 'salted-password)) + (server-key (funcall hmac-fun "Server Key" salted-password)) + (expected-server-signature + (funcall hmac-fun (encode-coding-string auth-message 'utf-8) server-key))) + (unless (string= expected-server-signature verifier) + (sasl-error "Server not authenticated")))) + (t + (sasl-error "Invalid response from server")))) + +(provide 'sasl-scram-rfc) +;;; sasl-scram-rfc.el ends here diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el index 648e6227497..e59ed5d43aa 100644 --- a/lisp/net/sasl.el +++ b/lisp/net/sasl.el @@ -35,8 +35,8 @@ ;;; Code: (defvar sasl-mechanisms - '("CRAM-MD5" "DIGEST-MD5" "PLAIN" "LOGIN" "ANONYMOUS" - "NTLM" "SCRAM-MD5")) + '("SCRAM-SHA-1" "CRAM-MD5" "DIGEST-MD5" "PLAIN" "LOGIN" "ANONYMOUS" + "NTLM")) (defvar sasl-mechanism-alist '(("CRAM-MD5" sasl-cram) @@ -45,7 +45,7 @@ ("LOGIN" sasl-login) ("ANONYMOUS" sasl-anonymous) ("NTLM" sasl-ntlm) - ("SCRAM-MD5" sasl-scram))) + ("SCRAM-SHA-1" sasl-scram-sha-1))) (defvar sasl-unique-id-function #'sasl-unique-id-function) diff --git a/test/ChangeLog b/test/ChangeLog index 979214c45da..29b7c7d59ea 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2015-02-13 Magnus Henoch + + * automated/sasl-scram-rfc-tests.el: New file. + 2015-02-11 Nicolas Petton * automated/seq-tests.el (test-seq-reverse, test-seq-group-by): diff --git a/test/automated/sasl-scram-rfc-tests.el b/test/automated/sasl-scram-rfc-tests.el new file mode 100644 index 00000000000..c747e5f65c3 --- /dev/null +++ b/test/automated/sasl-scram-rfc-tests.el @@ -0,0 +1,50 @@ +;;; sasl-scram-rfc-tests.el --- tests for SCRAM-SHA-1 -*- lexical-binding: t; -*- + +;; Copyright (C) 2014 Free Software Foundation, Inc. + +;; Author: Magnus Henoch + +;; 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 +;; 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; Test cases from RFC 5802. + +;;; Code: + +(require 'sasl) +(require 'sasl-scram-rfc) + +(ert-deftest sasl-scram-sha-1-test () + ;; The following strings are taken from section 5 of RFC 5802. + (let ((client + (sasl-make-client (sasl-find-mechanism '("SCRAM-SHA-1")) + "user" + "imap" + "localhost")) + (data "r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096") + (c-nonce "fyko+d2lbbFgONRv9qkxdawL") + (sasl-read-passphrase + (lambda (_prompt) (copy-sequence "pencil")))) + (sasl-client-set-property client 'c-nonce c-nonce) + (should + (equal + (sasl-scram-sha-1-client-final-message client (vector nil data)) + "c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=")) + + ;; This should not throw an error: + (sasl-scram-sha-1-authenticate-server client (vector nil "v=rmF9pqV8S7suAoZWja4dJRkFsKQ= +")))) + +;;; sasl-scram-rfc-tests.el ends here From 69e38a5b1fdb5ac20440b6ce7ba1fc2cd575f4e6 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Fri, 13 Feb 2015 19:57:13 +1100 Subject: [PATCH 061/457] Move rfc2104 from gnus to net * net/rfc2104.el: Moved here from lisp/gnus. --- lisp/ChangeLog | 4 ++++ lisp/{gnus => net}/rfc2104.el | 0 2 files changed, 4 insertions(+) rename lisp/{gnus => net}/rfc2104.el (100%) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 02a7c3a7e9c..d0038f43708 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-13 Lars Ingebrigtsen + + * net/rfc2104.el: Moved here from lisp/gnus. + 2015-02-13 Magnus Henoch * net/sasl-scram-rfc.el: New file. diff --git a/lisp/gnus/rfc2104.el b/lisp/net/rfc2104.el similarity index 100% rename from lisp/gnus/rfc2104.el rename to lisp/net/rfc2104.el From 8b3ba7ae659571897f270a657379dce38e59a718 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 13 Feb 2015 11:09:21 +0200 Subject: [PATCH 062/457] Improve docs of transient-mark-mode (Bug#19841) src/buffer.c (syms_of_buffer): Doc fix. lisp/simple.el (transient-mark-mode): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/simple.el | 9 +++++---- src/ChangeLog | 4 ++++ src/buffer.c | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6fb752a48a9..9852068ed68 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-13 Eli Zaretskii + + * simple.el (transient-mark-mode): Doc fix. (Bug#19841) + 2015-02-12 Agustín Martín Domingo Improve string search in `flyspell-word-search-*`. (Bug#16800) diff --git a/lisp/simple.el b/lisp/simple.el index 497e4a1604f..ae07f6237ce 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4810,10 +4810,11 @@ positive, and disable it otherwise. If called from Lisp, enable Transient Mark mode if ARG is omitted or nil. Transient Mark mode is a global minor mode. When enabled, the -region is highlighted whenever the mark is active. The mark is -\"deactivated\" by changing the buffer, and after certain other -operations that set the mark but whose main purpose is something -else--for example, incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]. +region is highlighted with the `region' face whenever the mark +is active. The mark is \"deactivated\" by changing the buffer, +and after certain other operations that set the mark but whose +main purpose is something else--for example, incremental search, +\\[beginning-of-buffer], and \\[end-of-buffer]. You can also deactivate the mark by typing \\[keyboard-quit] or \\[keyboard-escape-quit]. diff --git a/src/ChangeLog b/src/ChangeLog index 7a7fd23d43d..20d3fb34034 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-02-13 Eli Zaretskii + + * buffer.c (syms_of_buffer): Doc fix. (Bug#19841) + 2015-02-08 Eli Zaretskii * xfaces.c (map_tty_color): Use assoc_no_quit instead of diff --git a/src/buffer.c b/src/buffer.c index 250d8d24d7b..b3b971633dd 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6242,6 +6242,7 @@ If the buffer has never been shown in a window, the value is nil. */); See the command `transient-mark-mode' for a description of this minor mode. Non-nil also enables highlighting of the region whenever the mark is active. +The region is highlighted with the `region' face. The variable `highlight-nonselected-windows' controls whether to highlight all windows or just the selected window. From 3b8b549ffff5b5e774266a9662f738a9335997f2 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Fri, 13 Feb 2015 12:10:42 +0000 Subject: [PATCH 063/457] emacs-lisp/package.el (package--incompatible-p): Check dependencies. --- lisp/ChangeLog | 7 +++++ lisp/emacs-lisp/package.el | 60 +++++++++++++++++++++++++++++++------- 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0038f43708..75adddb038d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-13 Artur Malabarba + + * emacs-lisp/package.el (package--compatibility-table): New var. + (package--add-to-compatibility-table): New function. + (package-read-all-archive-contents): Populate compatibility table. + (package--incompatible-p): Also look in dependencies. + 2015-02-13 Lars Ingebrigtsen * net/rfc2104.el: Moved here from lisp/gnus. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 67e2f4050a7..d9340e1494d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -468,6 +468,19 @@ called via `package-initialize'. To change which packages are loaded and/or activated, customize `package-load-list'.") (put 'package-alist 'risky-local-variable t) +(defvar package--compatibility-table nil + "Hash table connecting package names to their compatibility. +Each key is a symbol, the name of a package. + +The value is either nil, representing an incompatible package, or +a version list, representing the highest compatible version of +that package which is available. + +A package is considered incompatible if it requires an Emacs +version higher than the one being used. To check for package +\(in)compatibility, don't read this table directly, use +`package--incompatible-p' which also checks dependencies.") + (defvar package-activated-list nil ;; FIXME: This should implicitly include all builtin packages. "List of the names of currently activated packages.") @@ -1131,7 +1144,10 @@ Will throw an error if the archive version is too new." If successful, set `package-archive-contents'." (setq package-archive-contents nil) (dolist (archive package-archives) - (package-read-archive-contents (car archive)))) + (package-read-archive-contents (car archive))) + ;; Build compat table. + (setq package--compatibility-table (make-hash-table :test 'eq)) + (package--mapc #'package--add-to-compatibility-table)) (defun package-read-archive-contents (archive) "Re-read archive contents for ARCHIVE. @@ -1728,6 +1744,19 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." (package-activate (car elt)))) (setq package--initialized t)) +(defun package--add-to-compatibility-table (pkg) + "If PKG is compatible (without dependencies), add to the compatibility table. +PKG is a package-desc object. +Only adds if its version is higher than what's already stored in +the table." + (unless (package--incompatible-p pkg 'shallow) + (let* ((name (package-desc-name pkg)) + (version (or (package-desc-version pkg) '(0))) + (table-version (gethash name package--compatibility-table))) + (when (or (not table-version) + (version-list-< table-version version)) + (puthash name version package--compatibility-table))))) + ;;;; Package description buffer. @@ -2059,21 +2088,32 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC." (defvar package--emacs-version-list (version-to-list emacs-version) "`emacs-version', as a list.") -(defun package--incompatible-p (pkg) +(defun package--incompatible-p (pkg &optional shallow) "Return non-nil if PKG has no chance of being installable. PKG is a package-desc object. -Return value is a string describing the reason why the package is -incompatible. -Currently, this only checks if PKG depends on a higher -`emacs-version' than the one being used." +If SHALLOW is non-nil, this only checks if PKG depends on a +higher `emacs-version' than the one being used. Otherwise, also +checks the viability of dependencies, according to +`package--compatibility-table'. + +If PKG requires an incompatible Emacs version, the return value +is this version (as a string). +If PKG requires incompatible packages, the return value is a list +of these dependencies, similar to the list returned by +`package-desc-reqs'." (let* ((reqs (package-desc-reqs pkg)) (version (cadr (assq 'emacs reqs)))) (if (and version (version-list-< package--emacs-version-list version)) - (format "`%s' requires Emacs %s, but current version is %s" - (package-desc-full-name pkg) - (package-version-join version) - emacs-version)))) + (package-version-join version) + (unless shallow + (let (out) + (dolist (dep (package-desc-reqs pkg) out) + (let ((dep-name (car dep))) + (unless (eq 'emacs dep-name) + (let ((cv (gethash dep-name package--compatibility-table))) + (when (version-list-< (or cv '(0)) (or (cadr dep) '(0))) + (push dep out))))))))))) (defun package-desc-status (pkg-desc) (let* ((name (package-desc-name pkg-desc)) From a03ab7eaf532075d2948ece70b8f3c97cd26b577 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Fri, 13 Feb 2015 13:08:38 +0000 Subject: [PATCH 064/457] emacs-lisp/package.el (describe-package-1): Fix "incompat" handling. --- lisp/ChangeLog | 1 + lisp/emacs-lisp/package.el | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 75adddb038d..030d572d90f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,6 +4,7 @@ (package--add-to-compatibility-table): New function. (package-read-all-archive-contents): Populate compatibility table. (package--incompatible-p): Also look in dependencies. + (describe-package-1): Fix "incompat" handling. 2015-02-13 Lars Ingebrigtsen diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index d9340e1494d..d8b4595b6e6 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1811,6 +1811,8 @@ the table." (installable (and archive (not built-in))) (status (if desc (package-desc-status desc) "orphan")) (signed (if desc (package-desc-signed desc)))) + (when (string= status "incompat") + (setq status "incompatible")) (prin1 name) (princ " is ") (princ (if (memq (aref status 0) '(?a ?e ?i ?o ?u)) "an " "a ")) @@ -1825,9 +1827,7 @@ the table." (pkg-dir (insert (propertize (if (member status '("unsigned" "dependency")) "Installed" - (if (equal status "incompat") - "Incompatible" - (capitalize status))) ;FIXME: Why comment-face? + (capitalize status)) ;FIXME: Why comment-face? 'font-lock-face 'font-lock-comment-face)) (insert " in `") ;; Todo: Add button for uninstalling. From decb48d3f73cc7db1604cd1276beef2b09a2f2ac Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 13 Feb 2015 17:44:51 +0200 Subject: [PATCH 065/457] Augment text-mode syntax table for a few special characters lips/textmodes/text-mode.el (text-mode-syntax-table): Make some punctuation character behave as word-constituent, for more compatibility with Unicode. --- lisp/ChangeLog | 4 ++++ lisp/textmodes/text-mode.el | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9852068ed68..a7b6b1be92f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2015-02-13 Eli Zaretskii + * textmodes/text-mode.el (text-mode-syntax-table): Make some + punctuation character behave as word-constituent, for more + compatibility with Unicode. + * simple.el (transient-mark-mode): Doc fix. (Bug#19841) 2015-02-12 Agustín Martín Domingo diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 5f2f671993c..84b578b5059 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -45,6 +45,23 @@ Use (derived-mode-p 'text-mode) instead.") (modify-syntax-entry ?\\ ". " st) ;; We add `p' so that M-c on 'hello' leads to 'Hello' rather than 'hello'. (modify-syntax-entry ?' "w p" st) + ;; UAX #29 says HEBREW PUNCTUATION GERESH behaves like a letter + ;; for the purposes of finding word boundaries. + (modify-syntax-entry #x5f3 "w ") ; GERESH + ;; UAX #29 says HEBREW PUNCTUATION GERSHAYIM should not be a word + ;; boundary when surrounded by letters. Our infrastructure for + ;; finding a word boundary doesn't support 3-character + ;; definitions, so for now simply make this a word-constituent + ;; character. This leaves a problem of having GERSHAYIM at the + ;; beginning or end of a word, where it should be a boundary; + ;; FIXME. + (modify-syntax-entry #x5f4 "w ") ; GERSHAYIM + ;; These all should not be a word boundary when between letters, + ;; according to UAX #29, so they again are prone to the same + ;; problem as GERSHAYIM; FIXME. + (modify-syntax-entry #xb7 "w ") ; MIDDLE DOT + (modify-syntax-entry #x2027 "w ") ; HYPHENATION POINT + (modify-syntax-entry #xff1a "w ") ; FULLWIDTH COLON st) "Syntax table used while in `text-mode'.") From b9d8edcf6dbe5651919bfb42687d16794f2d86f8 Mon Sep 17 00:00:00 2001 From: Jan D Date: Fri, 13 Feb 2015 17:44:26 +0100 Subject: [PATCH 066/457] Fixes: debbugs:19850 * configure.ac: Set locallisppath to empty for NS self contained, unless --enable-loadllisppath was given. --- ChangeLog | 5 +++++ configure.ac | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a574ac86e24..43656680f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-13 Jan Djärv + + * configure.ac: Set locallisppath to empty for NS self contained, + unless --enable-loadllisppath was given (Bug#19850). + 2015-02-09 Paul Eggert * configure.ac (HAVE_LIBXML2): Add missing comma. diff --git a/configure.ac b/configure.ac index 68291b8950b..0bcc55c4c20 100644 --- a/configure.ac +++ b/configure.ac @@ -423,6 +423,7 @@ AC_ARG_ENABLE(ns-self-contained, EN_NS_SELF_CONTAINED=$enableval, EN_NS_SELF_CONTAINED=yes) +locallisppathset=no AC_ARG_ENABLE(locallisppath, [AS_HELP_STRING([--enable-locallisppath=PATH], [directories Emacs should search for lisp files specific @@ -430,7 +431,7 @@ AC_ARG_ENABLE(locallisppath, if test "${enableval}" = "no"; then locallisppath= elif test "${enableval}" != "yes"; then - locallisppath=${enableval} + locallisppath=${enableval} locallisppathset=yes fi) AC_ARG_ENABLE(checking, @@ -1871,6 +1872,7 @@ if test "${HAVE_NS}" = yes; then infodir="\${ns_appresdir}/info" mandir="\${ns_appresdir}/man" lispdir="\${ns_appresdir}/lisp" + test "$locallisppathset" = no && locallisppath="" INSTALL_ARCH_INDEP_EXTRA= fi From b85523fea0b77a25b6afae8bdd6215acaf4455a1 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Feb 2015 13:17:07 -0500 Subject: [PATCH 067/457] * lisp/textmodes/flyspell.el (flyspell-duplicate-distance): Bump :version. --- lisp/ChangeLog | 7 +++++-- lisp/textmodes/flyspell.el | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a7b6b1be92f..ef145390a24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-13 Glenn Morris + + * textmodes/flyspell.el (flyspell-duplicate-distance): + Bump :version. + 2015-02-13 Eli Zaretskii * textmodes/text-mode.el (text-mode-syntax-table): Make some @@ -9,7 +14,6 @@ 2015-02-12 Agustín Martín Domingo Improve string search in `flyspell-word-search-*`. (Bug#16800) - * flyspell.el (flyspell-duplicate-distance): Limit default search distance for duplicated words to 40000. (flyspell-word-search-backward, flyspell-word-search-forward): @@ -18,7 +22,6 @@ 2015-02-10 Juri Linkov Better support for the case of typing RET on the prompt in comint. - * comint.el (comint-get-old-input-default): Go to the field end when comint-use-prompt-regexp is nil. (comint-line-beginning-position): Check if point is already diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index cd64a806778..e5d722cb8f3 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -101,7 +101,7 @@ This variable specifies how far to search to find such a duplicate. -1 means no limit (search the whole buffer). 0 means do not search for duplicate unrecognized spellings." :group 'flyspell - :version "21.1" + :version "24.5" ; -1 -> 400000 :type '(choice (const :tag "no limit" -1) number)) From 3ca2ff367aa09db7b122ee73d168f47fb8a8f819 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Feb 2015 13:19:20 -0500 Subject: [PATCH 068/457] * lisp/erc/erc.el (erc-rename-buffers): Doc fix. Add :version. --- lisp/erc/ChangeLog | 6 +++++- lisp/erc/erc.el | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 8e0c31a7dec..b8357d1de6b 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,7 +1,11 @@ +2015-02-13 Glenn Morris + + * erc.el (erc-rename-buffers): Doc fix. Add :version. + 2015-01-14 Dima Kogan * erc-backend.el (define-erc-response-handler): Give hook-name - default value of nil and add-to-list (bug#19363) + default value of nil and add-to-list (bug#19363). 2014-11-10 Kelvin White diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 7b9a3eb8620..e2366a1b58f 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -197,7 +197,8 @@ parameters and authentication." (set sym (if (functionp val) (funcall val) val)))) (defcustom erc-rename-buffers nil - "When this is set to t, buffers will be renamed to network name if available" + "Non-nil means rename buffers with network name, if available." + :version "24.5" :group 'erc :type 'boolean) @@ -1148,6 +1149,7 @@ which the local user typed." "Faces for ERC." :group 'erc) +;; FIXME faces should not end in "-face". (defface erc-default-face '((t)) "ERC default face." :group 'erc-faces) From 0077b36e2ed14e484c1f736496db9314ef7ca177 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Feb 2015 13:20:06 -0500 Subject: [PATCH 069/457] # NEWS copyedits --- etc/NEWS | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 3a071ede8be..cec45fa8339 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -28,7 +28,7 @@ otherwise leave it unmarked. ** The default value of `history-length' has increased to 100. +++ -** `redisplay-dont-pause' is declared as obsolete. +** The variable `redisplay-dont-pause' is obsolete. * Changes in Specialized Modes and Packages in Emacs 24.5 @@ -37,6 +37,23 @@ otherwise leave it unmarked. ** `call-process-shell-command' and `process-file-shell-command' don't take "&rest args" any more. +** ERC + ++++ +*** New option `erc-rename-buffers'. + +--- +*** New faces `erc-my-nick-prefix-face' and `erc-nick-prefix-face'. + ++++ +*** `erc-format-@nick' displays all user modes instead of only op and voice. + +--- +*** The display of irc commands in the current buffer has been disabled. + +--- +*** `erc-version' now follows the Emacs version. + ** Obsolete packages --- @@ -53,23 +70,6 @@ These emulations of old editors are believed to be no longer relevant --- *** vi.el, vip.el (try M-x viper instead) - -* ERC Changes in Emacs 24.5 - -+++ -** `erc-rename-buffers' if non-nil will rename buffers to reflect the -current network name instead of using SERVER:PORT ---- -** `erc-version' now follows current emacs version -+++ -** `erc-format-@nick' displays all user modes instead of only op and -voice ---- -** `erc-my-nick-prefix-face' and `erc-nick-prefix-face' for changing -the faces for user mode prefixes ---- -** display of irc commands in current buffer has been disabled - * Installation Changes in Emacs 24.4 From 03306795dd19a07ea3ed845b508b5ef0638048e0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Feb 2015 18:45:40 -0800 Subject: [PATCH 070/457] # Add 2015 to copyright years --- lisp/net/sasl-scram-rfc.el | 2 +- test/automated/sasl-scram-rfc-tests.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/net/sasl-scram-rfc.el b/lisp/net/sasl-scram-rfc.el index 3d86da43f35..6c8c00959b1 100644 --- a/lisp/net/sasl-scram-rfc.el +++ b/lisp/net/sasl-scram-rfc.el @@ -1,6 +1,6 @@ ;;; sasl-scram-rfc.el --- SCRAM-SHA-1 module for the SASL client framework -*- lexical-binding: t; -*- -;; Copyright (C) 2014 Free Software Foundation, Inc. +;; Copyright (C) 2014-2015 Free Software Foundation, Inc. ;; Author: Magnus Henoch diff --git a/test/automated/sasl-scram-rfc-tests.el b/test/automated/sasl-scram-rfc-tests.el index c747e5f65c3..46b139b21a7 100644 --- a/test/automated/sasl-scram-rfc-tests.el +++ b/test/automated/sasl-scram-rfc-tests.el @@ -1,6 +1,6 @@ ;;; sasl-scram-rfc-tests.el --- tests for SCRAM-SHA-1 -*- lexical-binding: t; -*- -;; Copyright (C) 2014 Free Software Foundation, Inc. +;; Copyright (C) 2014-2015 Free Software Foundation, Inc. ;; Author: Magnus Henoch From 0d54f2f51c799cc372d9521233a8009adc4c3691 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 13 Feb 2015 22:45:18 -0500 Subject: [PATCH 071/457] * lisp/textmodes/flyspell.el (flyspell-word): Defvar. Fixes: debbugs:19844 (flyspell-generic-check-word-p): Mark as obsolete. * lisp/erc/erc-spelling.el (erc-spelling-init): Use flyspell-generic-check-word-predicate. --- lisp/ChangeLog | 13 +++++++++---- lisp/erc/ChangeLog | 5 +++++ lisp/erc/erc-spelling.el | 3 ++- lisp/textmodes/flyspell.el | 8 +++++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 030d572d90f..257b11bd51c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-14 Stefan Monnier + + * textmodes/flyspell.el (flyspell-word): Defvar (bug#19844). + (flyspell-generic-check-word-p): Mark as obsolete. + 2015-02-13 Artur Malabarba * emacs-lisp/package.el (package--compatibility-table): New var. @@ -14,8 +19,8 @@ * net/sasl-scram-rfc.el: New file. - * net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5. Add - SCRAM-SHA-1 first. + * net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5. + Add SCRAM-SHA-1 first. (sasl-mechanism-alist): Remove SCRAM-MD5 entry. Add SCRAM-SHA-1 entry (bug#17636). @@ -34,8 +39,8 @@ python.el: Allow killing shell buffer if process is dead. (Bug#19823) - * progmodes/python.el (python-shell-font-lock-kill-buffer): Don't - require a running process. + * progmodes/python.el (python-shell-font-lock-kill-buffer): + Don't require a running process. (python-shell-font-lock-post-command-hook): Fontify only if the shell process is running. diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 44971cc16fc..4c1c8432733 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2015-02-14 Stefan Monnier + + * erc-spelling.el (erc-spelling-init): + Use flyspell-generic-check-word-predicate. + 2015-01-28 Dima Kogan * erc-backend.el (define-erc-response-handler): Give hook-name diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el index e2ddb04538a..0cba956c429 100644 --- a/lisp/erc/erc-spelling.el +++ b/lisp/erc/erc-spelling.el @@ -71,7 +71,7 @@ The current buffer is given by BUFFER." (if dicts (cadr (car dicts)) (erc-with-server-buffer ispell-local-dictionary))))) - (setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify) + (setq flyspell-generic-check-word-predicate #'erc-spelling-flyspell-verify) (flyspell-mode 1))) (defun erc-spelling-unhighlight-word (word) @@ -85,6 +85,7 @@ The cadr is the beginning and the caddr is the end." (defun erc-spelling-flyspell-verify () "Flyspell only the input line, nothing else." + ;; FIXME: Don't use `flyspell-word'! (let ((word-data (and (boundp 'flyspell-word) flyspell-word))) (when word-data diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 91a43f0b9f7..ffaf7e753f4 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -304,8 +304,8 @@ Returns t to continue checking, nil otherwise. Flyspell mode sets this variable to whatever is the `flyspell-mode-predicate' property of the major mode name.") (make-variable-buffer-local 'flyspell-generic-check-word-predicate) -(defvaralias 'flyspell-generic-check-word-p - 'flyspell-generic-check-word-predicate) +(define-obsolete-variable-alias 'flyspell-generic-check-word-p + 'flyspell-generic-check-word-predicate "25.1") ;;*--- mail mode -------------------------------------------------------*/ (put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify) @@ -398,7 +398,7 @@ like \"Some." "Turn on `flyspell-mode' for comments and strings." (interactive) (setq flyspell-generic-check-word-predicate - 'flyspell-generic-progmode-verify) + #'flyspell-generic-progmode-verify) (flyspell-mode 1) (run-hooks 'flyspell-prog-mode-hook)) @@ -1040,6 +1040,8 @@ Mostly we check word delimiters." (goto-char (1+ p))))) r))) +(defvar flyspell-word) ;Backward compatibility; some predicates made use of it! + ;;*---------------------------------------------------------------------*/ ;;* flyspell-word ... */ ;;*---------------------------------------------------------------------*/ From 61b4c22c6eba96718327a0d208a8492d8bad76e0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 14 Feb 2015 00:46:29 -0500 Subject: [PATCH 072/457] * lisp/emacs-lisp/cl*.el: Use define-inline and move some code * lisp/emacs-lisp/cl-lib.el: Move autoloaded code to cl-preload. * lisp/emacs-lisp/cl-preloaded.el (cl-struct-define): Register as children of the parent. (cl--assertion-failed): New function. (cl-assertion-failed): Move in from cl-lib.el. * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't generate code to register as children of its parents. (cl--make-type-test, cl--compiler-macro-typep): Remove functions. (cl-typep): Reimplement using define-inline. (cl-assert): Use cl--assertion-failed. (cl-struct-slot-value): Use define-inline. --- lisp/ChangeLog | 14 +++ lisp/emacs-lisp/cl-lib.el | 16 ---- lisp/emacs-lisp/cl-macs.el | 156 ++++++++++++++++---------------- lisp/emacs-lisp/cl-preloaded.el | 26 ++++++ 4 files changed, 119 insertions(+), 93 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 257b11bd51c..24cf80a4093 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,19 @@ 2015-02-14 Stefan Monnier + * emacs-lisp/cl-preloaded.el (cl-struct-define): Register as children + of the parent. + (cl--assertion-failed): New function. + (cl-assertion-failed): Move in from cl-lib.el. + + * emacs-lisp/cl-macs.el (cl-defstruct): Don't generate code to register + as children of its parents. + (cl--make-type-test, cl--compiler-macro-typep): Remove functions. + (cl-typep): Reimplement using define-inline. + (cl-assert): Use cl--assertion-failed. + (cl-struct-slot-value): Use define-inline. + + * emacs-lisp/cl-lib.el: Move autoloaded code to cl-preload. + * textmodes/flyspell.el (flyspell-word): Defvar (bug#19844). (flyspell-generic-check-word-p): Mark as obsolete. diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 0f534181b22..4b124951446 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -731,22 +731,6 @@ If ALIST is non-nil, the new pairs are prepended to it." ;;; Miscellaneous. -;;;###autoload -(progn - ;; The `assert' macro from the cl package signals - ;; `cl-assertion-failed' at runtime so always define it. - (define-error 'cl-assertion-failed (purecopy "Assertion failed")) - ;; Make sure functions defined with cl-defsubst can be inlined even in - ;; packages which do not require CL. We don't put an autoload cookie - ;; directly on that function, since those cookies only go to cl-loaddefs. - (autoload 'cl--defsubst-expand "cl-macs") - ;; Autoload, so autoload.el and font-lock can use it even when CL - ;; is not loaded. - (put 'cl-defun 'doc-string-elt 3) - (put 'cl-defmacro 'doc-string-elt 3) - (put 'cl-defsubst 'doc-string-elt 3) - (put 'cl-defstruct 'doc-string-elt 2)) - (provide 'cl-lib) (or (load "cl-loaddefs" 'noerror 'quiet) ;; When bootstrapping, cl-loaddefs hasn't been built yet! diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index eaec2c5263c..2861d669697 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2488,13 +2488,7 @@ non-nil value, that slot cannot be set via `setf'. (setq descs (append old-descs (delq (assq 'cl-tag-slot descs) descs)) type (car inc-type) named (assq 'cl-tag-slot descs)) - (if (cadr inc-type) (setq tag name named t)) - (let ((incl include)) - (while incl - (push `(cl-pushnew ',tag - ,(intern (format "cl-struct-%s-tags" incl))) - forms) - (setq incl (get incl 'cl-struct-include))))) + (if (cadr inc-type) (setq tag name named t))) (if type (progn (or (memq type '(vector list)) @@ -2661,64 +2655,70 @@ Of course, we really can't know that for sure, so it's just a heuristic." (or (cdr (assq sym byte-compile-function-environment)) (cdr (assq sym byte-compile-macro-environment)))))) -(defun cl--make-type-test (val type) - (pcase type - ((and `(,name . ,args) (guard (get name 'cl-deftype-handler))) - (cl--make-type-test val (apply (get name 'cl-deftype-handler) - args))) - (`(,(and name (or 'integer 'float 'real 'number)) - . ,(or `(,min ,max) pcase--dontcare)) - `(and ,(cl--make-type-test val name) - ,(if (memq min '(* nil)) t - (if (consp min) `(> ,val ,(car min)) - `(>= ,val ,min))) - ,(if (memq max '(* nil)) t - (if (consp max) - `(< ,val ,(car max)) - `(<= ,val ,max))))) - (`(,(and name (or 'and 'or 'not)) . ,args) - (cons name (mapcar (lambda (x) (cl--make-type-test val x)) args))) - (`(member . ,args) - `(and (cl-member ,val ',args) t)) - (`(satisfies ,pred) `(funcall #',pred ,val)) - ((and (pred symbolp) (guard (get type 'cl-deftype-handler))) - (cl--make-type-test val (funcall (get type 'cl-deftype-handler)))) - ((and (pred symbolp) (guard (get type 'cl-deftype-satisfies))) - `(funcall #',(get type 'cl-deftype-satisfies) ,val)) - ((or 'nil 't) type) - ('null `(null ,val)) - ('atom `(atom ,val)) - ('float `(floatp ,val)) - ('real `(numberp ,val)) - ('fixnum `(integerp ,val)) - ;; FIXME: Implement `base-char' and `extended-char'. - ('character `(characterp ,val)) - ((pred symbolp) - (let* ((name (symbol-name type)) - (namep (intern (concat name "p")))) - (cond - ((cl--macroexp-fboundp namep) (list namep val)) - ((cl--macroexp-fboundp - (setq namep (intern (concat name "-p")))) - (list namep val)) - ((cl--macroexp-fboundp type) (list type val)) - (t (error "Unknown type %S" type))))) - (_ (error "Bad type spec: %s" type)))) +(put 'null 'cl-deftype-satisfies #'null) +(put 'atom 'cl-deftype-satisfies #'atom) +(put 'real 'cl-deftype-satisfies #'numberp) +(put 'fixnum 'cl-deftype-satisfies #'integerp) +(put 'base-char 'cl-deftype-satisfies #'characterp) +(put 'character 'cl-deftype-satisfies #'integerp) + -(defvar cl--object) ;;;###autoload -(defun cl-typep (object type) ; See compiler macro below. - "Check that OBJECT is of type TYPE. -TYPE is a Common Lisp-style type specifier." - (declare (compiler-macro cl--compiler-macro-typep)) - (let ((cl--object object)) ;; Yuck!! - (eval (cl--make-type-test 'cl--object type)))) +(define-inline cl-typep (val type) + (inline-letevals (val) + (pcase (inline-const-val type) + ((and `(,name . ,args) (guard (get name 'cl-deftype-handler))) + (inline-quote + (cl-typep ,val ',(apply (get name 'cl-deftype-handler) args)))) + (`(,(and name (or 'integer 'float 'real 'number)) + . ,(or `(,min ,max) pcase--dontcare)) + (inline-quote + (and (cl-typep ,val ',name) + ,(if (memq min '(* nil)) t + (if (consp min) + (inline-quote (> ,val ',(car min))) + (inline-quote (>= ,val ',min)))) + ,(if (memq max '(* nil)) t + (if (consp max) + (inline-quote (< ,val ',(car max))) + (inline-quote (<= ,val ',max))))))) + (`(not ,type) (inline-quote (not (cl-typep ,val ',type)))) + (`(,(and name (or 'and 'or)) . ,types) + (cond + ((null types) (inline-quote ',(eq name 'and))) + ((null (cdr types)) + (inline-quote (cl-typep ,val ',(car types)))) + (t + (let ((head (car types)) + (rest `(,name . ,(cdr types)))) + (cond + ((eq name 'and) + (inline-quote (and (cl-typep ,val ',head) + (cl-typep ,val ',rest)))) + (t + (inline-quote (or (cl-typep ,val ',head) + (cl-typep ,val ',rest))))))))) + (`(member . ,args) + (inline-quote (and (memql ,val ',args) t))) + (`(satisfies ,pred) (inline-quote (funcall #',pred ,val))) + ((and (pred symbolp) type (guard (get type 'cl-deftype-handler))) + (inline-quote + (cl-typep ,val ',(funcall (get type 'cl-deftype-handler))))) + ((and (pred symbolp) type (guard (get type 'cl-deftype-satisfies))) + (inline-quote (funcall #',(get type 'cl-deftype-satisfies) ,val))) + ((and (or 'nil 't) type) (inline-quote ',type)) + ((and (pred symbolp) type) + (let* ((name (symbol-name type)) + (namep (intern (concat name "p")))) + (cond + ((cl--macroexp-fboundp namep) (inline-quote (funcall #',namep ,val))) + ((cl--macroexp-fboundp + (setq namep (intern (concat name "-p")))) + (inline-quote (funcall #',namep ,val))) + ((cl--macroexp-fboundp type) (inline-quote (funcall #',type ,val))) + (t (error "Unknown type %S" type))))) + (type (error "Bad type spec: %s" type))))) -(defun cl--compiler-macro-typep (form val type) - (if (macroexp-const-p type) - (macroexp-let2 macroexp-copyable-p temp val - (cl--make-type-test temp (cl--const-expr-val type))) - form)) ;;;###autoload (defmacro cl-check-type (form type &optional string) @@ -2751,10 +2751,9 @@ omitted, a default message listing FORM itself is used." (cdr form)))))) `(progn (or ,form - ,(if string - `(error ,string ,@sargs ,@args) - `(signal 'cl-assertion-failed - (list ',form ,@sargs)))) + (cl--assertion-failed + ',form ,@(if (or string sargs args) + `(,string (list ,@sargs) (list ,@args))))) nil)))) ;;; Compiler macros. @@ -2962,23 +2961,26 @@ The type name can then be used in `cl-typecase', `cl-check-type', etc." (put ',name 'cl-deftype-handler (cl-function (lambda (&cl-defs '('*) ,@arglist) ,@body))))) +(cl-deftype extended-char () `(and character (not base-char))) + ;;; Additional functions that we can now define because we've defined ;;; `cl-defsubst' and `cl-typep'. -(cl-defsubst cl-struct-slot-value (struct-type slot-name inst) - ;; The use of `cl-defsubst' here gives us both a compiler-macro - ;; and a gv-expander "for free". +(define-inline cl-struct-slot-value (struct-type slot-name inst) "Return the value of slot SLOT-NAME in INST of STRUCT-TYPE. STRUCT and SLOT-NAME are symbols. INST is a structure instance." (declare (side-effect-free t)) - (unless (cl-typep inst struct-type) - (signal 'wrong-type-argument (list struct-type inst))) - ;; We could use `elt', but since the byte compiler will resolve the - ;; branch below at compile time, it's more efficient to use the - ;; type-specific accessor. - (if (eq (cl-struct-sequence-type struct-type) 'vector) - (aref inst (cl-struct-slot-offset struct-type slot-name)) - (nth (cl-struct-slot-offset struct-type slot-name) inst))) + (inline-letevals (struct-type slot-name inst) + (inline-quote + (progn + (unless (cl-typep ,inst ,struct-type) + (signal 'wrong-type-argument (list ,struct-type ,inst))) + ;; We could use `elt', but since the byte compiler will resolve the + ;; branch below at compile time, it's more efficient to use the + ;; type-specific accessor. + (if (eq (cl-struct-sequence-type ,struct-type) 'vector) + (aref ,inst (cl-struct-slot-offset ,struct-type ,slot-name)) + (nth (cl-struct-slot-offset ,struct-type ,slot-name) ,inst)))))) (run-hooks 'cl-macs-load-hook) diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index c9867b412a1..03045de509a 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -33,6 +33,10 @@ (if (boundp children-sym) (add-to-list children-sym tag) (set children-sym (list tag))) + (let* ((parent-class parent)) + (while parent-class + (add-to-list (intern (format "cl-struct-%s-tags" parent-class)) tag) + (setq parent-class (get parent-class 'cl-struct-include)))) ;; If the cl-generic support, we need to be able to check ;; if a vector is a cl-struct object, without knowing its particular type. ;; So we use the (otherwise) unused function slots of the tag symbol @@ -44,5 +48,27 @@ (if print-auto (put name 'cl-struct-print print-auto)) (if docstring (put name 'structure-documentation docstring))) +;; The `assert' macro from the cl package signals +;; `cl-assertion-failed' at runtime so always define it. +(define-error 'cl-assertion-failed (purecopy "Assertion failed")) + +(defun cl--assertion-failed (form &optional string sargs args) + (if debug-on-error + (debug `(cl-assertion-failed ,form ,string ,@sargs)) + (if string + (apply #'error string (append sargs args)) + (signal 'cl-assertion-failed `(,form ,@sargs))))) + +;; Make sure functions defined with cl-defsubst can be inlined even in +;; packages which do not require CL. We don't put an autoload cookie +;; directly on that function, since those cookies only go to cl-loaddefs. +(autoload 'cl--defsubst-expand "cl-macs") +;; Autoload, so autoload.el and font-lock can use it even when CL +;; is not loaded. +(put 'cl-defun 'doc-string-elt 3) +(put 'cl-defmacro 'doc-string-elt 3) +(put 'cl-defsubst 'doc-string-elt 3) +(put 'cl-defstruct 'doc-string-elt 2) + (provide 'cl-preloaded) ;;; cl-preloaded.el ends here From 432b00e6597f2a1eec192d807ad554a430f96f93 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 14 Feb 2015 15:03:20 +0200 Subject: [PATCH 073/457] Fix assertions in popping up menus on TTY (Bug#19862) Do not merge this commit to trunk! src/menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call mouse_position_for_popup only for X frames. --- src/ChangeLog | 5 +++++ src/menu.c | 54 +++++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 20d3fb34034..52be915ecb9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-14 Eli Zaretskii + + * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call + mouse_position_for_popup only for X frames. (Bug#19862) + 2015-02-13 Eli Zaretskii * buffer.c (syms_of_buffer): Doc fix. (Bug#19841) diff --git a/src/menu.c b/src/menu.c index e318da059a3..3e0a89dc076 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1238,35 +1238,39 @@ no quit occurs and `x-popup-menu' returns nil. */) /* Use the mouse's current position. */ struct frame *new_f = SELECTED_FRAME (); #ifdef HAVE_X_WINDOWS - /* Can't use mouse_position_hook for X since it returns - coordinates relative to the window the mouse is in, - we need coordinates relative to the edit widget always. */ - if (new_f != 0) + if (FRAME_X_P (new_f)) { - int cur_x, cur_y; + /* Can't use mouse_position_hook for X since it returns + coordinates relative to the window the mouse is in, + we need coordinates relative to the edit widget always. */ + if (new_f != 0) + { + int cur_x, cur_y; - mouse_position_for_popup (new_f, &cur_x, &cur_y); - /* cur_x/y may be negative, so use make_number. */ - x = make_number (cur_x); - y = make_number (cur_y); + mouse_position_for_popup (new_f, &cur_x, &cur_y); + /* cur_x/y may be negative, so use make_number. */ + x = make_number (cur_x); + y = make_number (cur_y); + } } + else +#endif /* HAVE_X_WINDOWS */ + { + Lisp_Object bar_window; + enum scroll_bar_part part; + Time time; + void (*mouse_position_hook) (struct frame **, int, + Lisp_Object *, + enum scroll_bar_part *, + Lisp_Object *, + Lisp_Object *, + Time *) = + FRAME_TERMINAL (new_f)->mouse_position_hook; -#else /* not HAVE_X_WINDOWS */ - Lisp_Object bar_window; - enum scroll_bar_part part; - Time time; - void (*mouse_position_hook) (struct frame **, int, - Lisp_Object *, - enum scroll_bar_part *, - Lisp_Object *, - Lisp_Object *, - Time *) = - FRAME_TERMINAL (new_f)->mouse_position_hook; - - if (mouse_position_hook) - (*mouse_position_hook) (&new_f, 1, &bar_window, - &part, &x, &y, &time); -#endif /* not HAVE_X_WINDOWS */ + if (mouse_position_hook) + (*mouse_position_hook) (&new_f, 1, &bar_window, + &part, &x, &y, &time); + } if (new_f != 0) XSETFRAME (window, new_f); From 34c75359126e78367e4542a39b4b687c8955e1c6 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Sat, 14 Feb 2015 11:13:29 -0200 Subject: [PATCH 074/457] emacs-lisp/package.el: Move the compatibility-table building logic. --- lisp/ChangeLog | 8 ++++++++ lisp/emacs-lisp/package.el | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 24cf80a4093..42b386f3f22 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-02-14 Artur Malabarba + + * emacs-lisp/package.el (package-read-all-archive-contents): Don't + build the compatibility table. + (package-refresh-contents, package-initialize): Do build the + compatibility table. + (package--build-compatibility-table): New function. + 2015-02-14 Stefan Monnier * emacs-lisp/cl-preloaded.el (cl-struct-define): Register as children diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index d8b4595b6e6..64a646a9896 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1144,10 +1144,7 @@ Will throw an error if the archive version is too new." If successful, set `package-archive-contents'." (setq package-archive-contents nil) (dolist (archive package-archives) - (package-read-archive-contents (car archive))) - ;; Build compat table. - (setq package--compatibility-table (make-hash-table :test 'eq)) - (package--mapc #'package--add-to-compatibility-table)) + (package-read-archive-contents (car archive)))) (defun package-read-archive-contents (archive) "Re-read archive contents for ARCHIVE. @@ -1691,6 +1688,12 @@ similar to an entry in `package-alist'. Save the cached copy to (epg-import-keys-from-file context file) (message "Importing %s...done" (file-name-nondirectory file)))) +(defun package--build-compatibility-table () + "Build `package--compatibility-table' with `package--mapc'." + ;; Build compat table. + (setq package--compatibility-table (make-hash-table :test 'eq)) + (package--mapc #'package--add-to-compatibility-table)) + ;;;###autoload (defun package-refresh-contents () "Download the ELPA archive description if needed. @@ -1713,7 +1716,8 @@ makes them available for download." (package--download-one-archive archive "archive-contents") (error (message "Failed to download `%s' archive." (car archive))))) - (package-read-all-archive-contents)) + (package-read-all-archive-contents) + (package--build-compatibility-table)) (defun package--find-non-dependencies () "Return a list of installed packages which are not dependencies. @@ -1742,7 +1746,10 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." (unless no-activate (dolist (elt package-alist) (package-activate (car elt)))) - (setq package--initialized t)) + (setq package--initialized t) + ;; This uses `package--mapc' so it must be called after + ;; `package--initialized' is t. + (package--build-compatibility-table)) (defun package--add-to-compatibility-table (pkg) "If PKG is compatible (without dependencies), add to the compatibility table. From 93888585deba41f7f67a83cda2c69927ffb130c8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 14 Feb 2015 15:11:30 +0200 Subject: [PATCH 075/457] Fix assertion violations when popping menus on TTY (Bug#19862) src/menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call x_relative_mouse_position only for X frames. --- src/ChangeLog | 5 +++++ src/menu.c | 54 +++++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6d246fb52c6..5144738a708 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-14 Eli Zaretskii + + * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call + x_relative_mouse_position only for X frames. (Bug#19862) + 2015-02-13 Paul Eggert Better support for future plugins diff --git a/src/menu.c b/src/menu.c index 5a8ea34242f..e925f29ac5f 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1243,35 +1243,39 @@ no quit occurs and `x-popup-menu' returns nil. */) /* Use the mouse's current position. */ struct frame *new_f = SELECTED_FRAME (); #ifdef HAVE_X_WINDOWS - /* Can't use mouse_position_hook for X since it returns - coordinates relative to the window the mouse is in, - we need coordinates relative to the edit widget always. */ - if (new_f != 0) + if (FRAME_X_P (new_f)) { - int cur_x, cur_y; + /* Can't use mouse_position_hook for X since it returns + coordinates relative to the window the mouse is in, + we need coordinates relative to the edit widget always. */ + if (new_f != 0) + { + int cur_x, cur_y; - x_relative_mouse_position (new_f, &cur_x, &cur_y); - /* cur_x/y may be negative, so use make_number. */ - x = make_number (cur_x); - y = make_number (cur_y); + x_relative_mouse_position (new_f, &cur_x, &cur_y); + /* cur_x/y may be negative, so use make_number. */ + x = make_number (cur_x); + y = make_number (cur_y); + } } + else +#endif /* HAVE_X_WINDOWS */ + { + Lisp_Object bar_window; + enum scroll_bar_part part; + Time time; + void (*mouse_position_hook) (struct frame **, int, + Lisp_Object *, + enum scroll_bar_part *, + Lisp_Object *, + Lisp_Object *, + Time *) = + FRAME_TERMINAL (new_f)->mouse_position_hook; -#else /* not HAVE_X_WINDOWS */ - Lisp_Object bar_window; - enum scroll_bar_part part; - Time time; - void (*mouse_position_hook) (struct frame **, int, - Lisp_Object *, - enum scroll_bar_part *, - Lisp_Object *, - Lisp_Object *, - Time *) = - FRAME_TERMINAL (new_f)->mouse_position_hook; - - if (mouse_position_hook) - (*mouse_position_hook) (&new_f, 1, &bar_window, - &part, &x, &y, &time); -#endif /* not HAVE_X_WINDOWS */ + if (mouse_position_hook) + (*mouse_position_hook) (&new_f, 1, &bar_window, + &part, &x, &y, &time); + } if (new_f != 0) XSETFRAME (window, new_f); From f4f4f93e42a0ae572a62c9f64b90e4401232d9f4 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Sat, 14 Feb 2015 15:06:27 -0200 Subject: [PATCH 076/457] emacs-lisp/package.el (describe-package-1): Describe incompatibility. --- lisp/ChangeLog | 1 + lisp/emacs-lisp/package.el | 36 +++++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42b386f3f22..3cc42a5964b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,6 +5,7 @@ (package-refresh-contents, package-initialize): Do build the compatibility table. (package--build-compatibility-table): New function. + (describe-package-1): Describe why a package is incompatible. 2015-02-14 Stefan Monnier diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 64a646a9896..d8a4fc9c846 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1817,8 +1817,9 @@ the table." (built-in (eq pkg-dir 'builtin)) (installable (and archive (not built-in))) (status (if desc (package-desc-status desc) "orphan")) + (incompatible-reason (package--incompatible-p desc)) (signed (if desc (package-desc-signed desc)))) - (when (string= status "incompat") + (when incompatible-reason (setq status "incompatible")) (prin1 name) (princ " is ") @@ -1850,6 +1851,12 @@ the table." (if signed (insert ".") (insert " (unsigned)."))) + (incompatible-reason + (insert (propertize "Incompatible" 'face font-lock-warning-face) + " because it depends on ") + (if (stringp incompatible-reason) + (insert "Emacs " incompatible-reason ".") + (insert "uninstallable packages."))) (installable (insert (capitalize status)) (insert " from " (format "%s" archive)) @@ -1870,19 +1877,22 @@ the table." (setq reqs (if desc (package-desc-reqs desc))) (when reqs (insert " " (propertize "Requires" 'font-lock-face 'bold) ": ") - (let ((first t) - name vers text) + (let ((first t)) (dolist (req reqs) - (setq name (car req) - vers (cadr req) - text (format "%s-%s" (symbol-name name) - (package-version-join vers))) - (cond (first (setq first nil)) - ((>= (+ 2 (current-column) (length text)) - (window-width)) - (insert ",\n ")) - (t (insert ", "))) - (help-insert-xref-button text 'help-package name)) + (let* ((name (car req)) + (vers (cadr req)) + (text (format "%s-%s" (symbol-name name) + (package-version-join vers))) + (reason (if (and (listp incompatible-reason) + (assq name incompatible-reason)) + " (not available)" ""))) + (cond (first (setq first nil)) + ((>= (+ 2 (current-column) (length text) (length reason)) + (window-width)) + (insert ",\n ")) + (t (insert ", "))) + (help-insert-xref-button text 'help-package name) + (insert reason))) (insert "\n"))) (insert " " (propertize "Summary" 'font-lock-face 'bold) ": " (if desc (package-desc-summary desc)) "\n") From ffec11d9b47d71978fbfc26fe37d936037f2dfac Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 14 Feb 2015 18:50:37 +0100 Subject: [PATCH 077/457] Fix doc-string of x_frame_normalize_before_maximize. * xterm.c (x_frame_normalize_before_maximize): Fix doc-string. Suggested by Alan Mackenzie . --- src/ChangeLog | 5 +++++ src/xterm.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5144738a708..c89fa60a5b5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-14 Martin Rudalics + + * xterm.c (x_frame_normalize_before_maximize): Fix doc-string. + Suggested by Alan Mackenzie . + 2015-02-14 Eli Zaretskii * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call diff --git a/src/xterm.c b/src/xterm.c index 0b3efe7b4b6..03c081179a6 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11729,9 +11729,11 @@ default is nil, which is the same as `super'. */); DEFVAR_BOOL ("x-frame-normalize-before-maximize", x_frame_normalize_before_maximize, doc: /* Non-nil means normalize frame before maximizing. -If this variable is t, Emacs asks the window manager to give the frame -intermediately its normal size whenever changing from a full-height or -full-width state to the fully maximized one and vice versa. +If this variable is t, Emacs first asks the window manager to give the +frame its normal size, and only then the final state, whenever changing +from a full-height, full-width or full-both state to the maximized one +or when changing from the maximized to the full-height or full-width +state. Set this variable only if your window manager cannot handle the transition between the various maximization states. */); From ba5bc0ee7c81f2122072bee162fcf1dbd8b2a8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Compostella?= Date: Sun, 15 Feb 2015 10:57:33 +0100 Subject: [PATCH 078/457] Tramp: Disable paging with PAGER=cat. Fixes: debbugs:19870 * net/tramp-sh.el (tramp-remote-process-environment): Disable paging with PAGER=cat. --- lisp/ChangeLog | 65 ++++---------------------------------------- lisp/net/tramp-sh.el | 2 +- 2 files changed, 6 insertions(+), 61 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3cc42a5964b..f91313b5655 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,69 +1,14 @@ -2015-02-14 Artur Malabarba +2015-02-15 Jérémy Compostella - * emacs-lisp/package.el (package-read-all-archive-contents): Don't - build the compatibility table. - (package-refresh-contents, package-initialize): Do build the - compatibility table. - (package--build-compatibility-table): New function. - (describe-package-1): Describe why a package is incompatible. - -2015-02-14 Stefan Monnier - - * emacs-lisp/cl-preloaded.el (cl-struct-define): Register as children - of the parent. - (cl--assertion-failed): New function. - (cl-assertion-failed): Move in from cl-lib.el. - - * emacs-lisp/cl-macs.el (cl-defstruct): Don't generate code to register - as children of its parents. - (cl--make-type-test, cl--compiler-macro-typep): Remove functions. - (cl-typep): Reimplement using define-inline. - (cl-assert): Use cl--assertion-failed. - (cl-struct-slot-value): Use define-inline. - - * emacs-lisp/cl-lib.el: Move autoloaded code to cl-preload. - - * textmodes/flyspell.el (flyspell-word): Defvar (bug#19844). - (flyspell-generic-check-word-p): Mark as obsolete. - -2015-02-13 Artur Malabarba - - * emacs-lisp/package.el (package--compatibility-table): New var. - (package--add-to-compatibility-table): New function. - (package-read-all-archive-contents): Populate compatibility table. - (package--incompatible-p): Also look in dependencies. - (describe-package-1): Fix "incompat" handling. - -2015-02-13 Lars Ingebrigtsen - - * net/rfc2104.el: Moved here from lisp/gnus. - -2015-02-13 Magnus Henoch - - * net/sasl-scram-rfc.el: New file. - - * net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5. - Add SCRAM-SHA-1 first. - (sasl-mechanism-alist): Remove SCRAM-MD5 entry. Add SCRAM-SHA-1 - entry (bug#17636). - -2015-02-13 Lars Ingebrigtsen - - * net/shr.el (shr-tag-li): Speed up rendering pages with lots of -
        . - -2015-02-12 Oleh Krehel - - * progmodes/gdb-mi.el (gdb-display-io-nopopup): New defcustom. - (gdb-inferior-filter): Don't pop up the buried output buffer when - `gdb-display-io-nopopup' is non-nil. + * net/tramp-sh.el (tramp-remote-process-environment): Disable paging + with PAGER=cat. (Bug#19870) 2015-02-12 Fabián Ezequiel Gallina python.el: Allow killing shell buffer if process is dead. (Bug#19823) - * progmodes/python.el (python-shell-font-lock-kill-buffer): - Don't require a running process. + * progmodes/python.el (python-shell-font-lock-kill-buffer): Don't + require a running process. (python-shell-font-lock-post-command-hook): Fontify only if the shell process is running. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 45050cdd77a..f3fdb63bb9e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -475,7 +475,7 @@ as given in your `~/.profile'." ,(format "TERM=%s" tramp-terminal-type) "EMACS=t" ;; Deprecated. ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version) - "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\"" + "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=cat" "autocorrect=" "correct=") "List of environment variables to be set on the remote host. From 9366f0547e6d5c1b3fe6c5d7c890e70ce232e6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Compostella?= Date: Sun, 15 Feb 2015 16:11:33 +0100 Subject: [PATCH 079/457] Tramp: Disable paging with PAGER=cat Fixes: debbugs:19870 * net/tramp-sh.el (tramp-remote-process-environment): Disable paging with PAGER=cat. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp-sh.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef145390a24..6373df64e91 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-15 Jérémy Compostella + + * net/tramp-sh.el (tramp-remote-process-environment): Disable paging + with PAGER=cat. (Bug#19870) + 2015-02-13 Glenn Morris * textmodes/flyspell.el (flyspell-duplicate-distance): diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 8e65686e353..bd7aec98f79 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -457,7 +457,7 @@ as given in your `~/.profile'." ,(format "TERM=%s" tramp-terminal-type) "EMACS=t" ;; Deprecated. ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version) - "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\"" + "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=cat" "autocorrect=" "correct=") "List of environment variables to be set on the remote host. From 45c5ccd48cee9c703e64fc67139a2e3bb8e9b3a5 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 15 Feb 2015 23:05:46 +0000 Subject: [PATCH 080/457] Fix inserting parts with `E' in Gnus * lisp/gnus/mm-decode.el (mm-head-p): New function. (mm-display-part): Go to a blank line when inserting parts internally. Fix inserting parts with `E' in Gnus * lisp/gnus/mm-decode.el (mm-head-p): New function. (mm-display-part): Go to a blank line when inserting parts internally. --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/gnus-art.el | 3 ++- lisp/gnus/mm-decode.el | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 67929a30186..b9ae796782d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-02-14 Lars Ingebrigtsen + + * mm-decode.el (mm-head-p): New function. + (mm-display-part): Go to a blank line when inserting parts internally. + 2015-02-13 Lars Ingebrigtsen * gnus-msg.el (gnus-msg-mail): Don't let-bind `gnus-newsgroup-name' so diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index b3121bf7518..85030959f79 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -5505,7 +5505,8 @@ If no internal viewer is available, use an external viewer." (gnus-mime-view-part-as-type nil (lambda (type) (mm-inlinable-p handle type))) (when handle - (gnus-bind-safe-url-regexp (mm-display-part handle)))))) + (gnus-bind-safe-url-regexp + (mm-display-part handle nil t)))))) (defun gnus-mime-action-on-part (&optional action) "Do something with the MIME attachment at \(point\)." diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 3fdcdba45c0..459c7935f9b 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -791,6 +791,14 @@ MIME-Version header before proceeding." (autoload 'mailcap-parse-mailcaps "mailcap") (autoload 'mailcap-mime-info "mailcap") +(defun mm-head-p (&optional point) + "Return non-nil if point is in the article header." + (let ((point (or point (point)))) + (save-excursion + (goto-char point) + (and (not (re-search-backward "^$" nil t)) + (re-search-forward "^$" nil t))))) + (defun mm-display-part (handle &optional no-default force) "Display the MIME part represented by HANDLE. Returns nil if the part is removed; inline if displayed inline; @@ -824,6 +832,10 @@ external if displayed external." 'inline) ((and (mm-inlinable-p ehandle) (mm-inlined-p ehandle)) + (when force + (if (mm-head-p) + (re-search-forward "^$" nil t) + (forward-line 1))) (mm-display-inline handle) 'inline) ((or method From 4aafd19a0e800607e36779f423052df8b7a84f5f Mon Sep 17 00:00:00 2001 From: Ivan Shmakov Date: Sun, 15 Feb 2015 23:08:03 +0000 Subject: [PATCH 081/457] Make `url-retrieve-synchronously' work again with news: * lisp/gnus/nntp.el (nntp-open-server): Set variables in the correct buffer (bug#19583). --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nntp.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b9ae796782d..df331984865 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-02-14 Ivan Shmakov + + * nntp.el (nntp-open-server): Set variables in the correct buffer + (bug#19583). + 2015-02-14 Lars Ingebrigtsen * mm-decode.el (mm-head-p): New function. diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 0891dba0387..a86f45e8bf3 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1066,7 +1066,8 @@ command whose response triggered the error." (setq defs (cons (list 'nntp-port-number (car defs)) (cdr defs)))) (unless (assq 'nntp-address defs) (setq defs (append defs (list (list 'nntp-address server))))) - (nnoo-change-server 'nntp server defs) + (with-current-buffer nntp-server-buffer + (nnoo-change-server 'nntp server defs)) (if connectionless t (or (nntp-find-connection nntp-server-buffer) From 6090b8f68dfc37bfe8bee539fc43149f9dd5d6bb Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 15 Feb 2015 23:10:06 +0000 Subject: [PATCH 082/457] Revert previous patch (let ((url-news-server "news.gmane.org")) (url-retrieve-synchronously "news:87y4p9y2cq.fsf@violet.siamics.net")) works fine for me --- lisp/gnus/ChangeLog | 5 ----- lisp/gnus/nntp.el | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index df331984865..b9ae796782d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,8 +1,3 @@ -2015-02-14 Ivan Shmakov - - * nntp.el (nntp-open-server): Set variables in the correct buffer - (bug#19583). - 2015-02-14 Lars Ingebrigtsen * mm-decode.el (mm-head-p): New function. diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index a86f45e8bf3..0891dba0387 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1066,8 +1066,7 @@ command whose response triggered the error." (setq defs (cons (list 'nntp-port-number (car defs)) (cdr defs)))) (unless (assq 'nntp-address defs) (setq defs (append defs (list (list 'nntp-address server))))) - (with-current-buffer nntp-server-buffer - (nnoo-change-server 'nntp server defs)) + (nnoo-change-server 'nntp server defs) (if connectionless t (or (nntp-find-connection nntp-server-buffer) From 0d38b2f403fa873159138b194c0d45bc4c7e61cc Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 15 Feb 2015 23:11:41 +0000 Subject: [PATCH 083/457] Don't mark nnimap articles as read on a server hangup * lisp/gnus/nnimap.el (nnimap-retrieve-headers): If the server closes connection during header retrieval, error out instead of interpreting the data in the buffer as the only messages there. This way, we don't mark articles as read on a server hangup (bug#19035). --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnimap.el | 2 ++ 2 files changed, 7 insertions(+) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b9ae796782d..7910d74fb15 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,10 @@ 2015-02-14 Lars Ingebrigtsen + * nnimap.el (nnimap-retrieve-headers): If the server closes connection + during header retrieval, error out instead of interpreting the data in + the buffer as the only messages there. This way, we don't mark + articles as read on a server hangup (bug#19035). + * mm-decode.el (mm-head-p): New function. (mm-display-part): Go to a blank line when inserting parts internally. diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index e7f91b7cc33..4a9ca744b9f 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -196,6 +196,8 @@ textual parts.") (nnimap-article-ranges (gnus-compress-sequence articles)) (nnimap-header-parameters)) t) + (unless (process-live-p (get-buffer-process (current-buffer))) + (error "Server closed connection")) (nnimap-transform-headers) (nnheader-remove-cr-followed-by-lf)) (insert-buffer-substring From e59feb3c15ca1dfb7a2a7edef21cbdb07d6ea183 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Mon, 16 Feb 2015 03:42:00 +0000 Subject: [PATCH 084/457] lisp/ChangeLog: Restore entries accidentally deleted --- lisp/ChangeLog | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f91313b5655..ca180ff6327 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,12 +3,72 @@ * net/tramp-sh.el (tramp-remote-process-environment): Disable paging with PAGER=cat. (Bug#19870) +2015-02-14 Artur Malabarba + + * emacs-lisp/package.el (package-read-all-archive-contents): Don't + build the compatibility table. + (package-refresh-contents, package-initialize): Do build the + compatibility table. + (package--build-compatibility-table): New function. + (describe-package-1): Describe why a package is incompatible. + +2015-02-14 Stefan Monnier + + * emacs-lisp/cl-preloaded.el (cl-struct-define): Register as children + of the parent. + (cl--assertion-failed): New function. + (cl-assertion-failed): Move in from cl-lib.el. + + * emacs-lisp/cl-macs.el (cl-defstruct): Don't generate code to register + as children of its parents. + (cl--make-type-test, cl--compiler-macro-typep): Remove functions. + (cl-typep): Reimplement using define-inline. + (cl-assert): Use cl--assertion-failed. + (cl-struct-slot-value): Use define-inline. + + * emacs-lisp/cl-lib.el: Move autoloaded code to cl-preload. + + * textmodes/flyspell.el (flyspell-word): Defvar (bug#19844). + (flyspell-generic-check-word-p): Mark as obsolete. + +2015-02-13 Artur Malabarba + + * emacs-lisp/package.el (package--compatibility-table): New var. + (package--add-to-compatibility-table): New function. + (package-read-all-archive-contents): Populate compatibility table. + (package--incompatible-p): Also look in dependencies. + (describe-package-1): Fix "incompat" handling. + +2015-02-13 Lars Ingebrigtsen + + * net/rfc2104.el: Moved here from lisp/gnus. + +2015-02-13 Magnus Henoch + + * net/sasl-scram-rfc.el: New file. + + * net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5. + Add SCRAM-SHA-1 first. + (sasl-mechanism-alist): Remove SCRAM-MD5 entry. Add SCRAM-SHA-1 + entry (bug#17636). + +2015-02-13 Lars Ingebrigtsen + + * net/shr.el (shr-tag-li): Speed up rendering pages with lots of +
          . + +2015-02-12 Oleh Krehel + + * progmodes/gdb-mi.el (gdb-display-io-nopopup): New defcustom. + (gdb-inferior-filter): Don't pop up the buried output buffer when + `gdb-display-io-nopopup' is non-nil. + 2015-02-12 Fabián Ezequiel Gallina python.el: Allow killing shell buffer if process is dead. (Bug#19823) - * progmodes/python.el (python-shell-font-lock-kill-buffer): Don't - require a running process. + * progmodes/python.el (python-shell-font-lock-kill-buffer): + Don't require a running process. (python-shell-font-lock-post-command-hook): Fontify only if the shell process is running. From 6bf61df8ab359f1371ab2e3e278bc8642d65a985 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 16 Feb 2015 01:37:57 -0500 Subject: [PATCH 085/457] * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Keep type=nil by default. * lisp/emacs-lisp/cl-preloaded.el (cl-struct-define): Add sanity checks about relationship between `type', `named', and `slots'. * lisp/emacs-lisp/cl-generic.el (cl--generic-struct-tagcode): Adjust to new value of `cl-struct-type' property. --- lisp/ChangeLog | 12 ++++++++++-- lisp/emacs-lisp/bytecomp.el | 14 +++++++------- lisp/emacs-lisp/cl-generic.el | 4 ++-- lisp/emacs-lisp/cl-macs.el | 8 ++++---- lisp/emacs-lisp/cl-preloaded.el | 4 ++++ 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ca180ff6327..bb8c97badf7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-02-16 Stefan Monnier + + * emacs-lisp/cl-macs.el (cl-defstruct): Keep type=nil by default. + * emacs-lisp/cl-preloaded.el (cl-struct-define): Add sanity checks + about relationship between `type', `named', and `slots'. + * emacs-lisp/cl-generic.el (cl--generic-struct-tagcode): Adjust to new + value of `cl-struct-type' property. + 2015-02-15 Jérémy Compostella * net/tramp-sh.el (tramp-remote-process-environment): Disable paging @@ -5,8 +13,8 @@ 2015-02-14 Artur Malabarba - * emacs-lisp/package.el (package-read-all-archive-contents): Don't - build the compatibility table. + * emacs-lisp/package.el (package-read-all-archive-contents): + Don't build the compatibility table. (package-refresh-contents, package-initialize): Do build the compatibility table. (package--build-compatibility-table): New function. diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 548aaa9626b..e929c02eefb 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1353,13 +1353,13 @@ extra args." (let ((keyword-args (cdr (cdr (cdr (cdr form))))) (name (cadr form))) (or (not (eq (car-safe name) 'quote)) - (and (eq (car form) 'custom-declare-group) - (equal name ''emacs)) - (plist-get keyword-args :group) - (not (and (consp name) (eq (car name) 'quote))) - (byte-compile-warn - "%s for `%s' fails to specify containing group" - (cdr (assq (car form) + (and (eq (car form) 'custom-declare-group) + (equal name ''emacs)) + (plist-get keyword-args :group) + (not (and (consp name) (eq (car name) 'quote))) + (byte-compile-warn + "%s for `%s' fails to specify containing group" + (cdr (assq (car form) '((custom-declare-group . defgroup) (custom-declare-face . defface) (custom-declare-variable . defcustom)))) diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index c4232863cfc..ccd5bec5685 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -731,7 +731,7 @@ Can only be used from within the lexical body of a primary or around method." (defun cl--generic-struct-tagcode (type name) (and (symbolp type) (get type 'cl-struct-type) - (or (eq 'vector (car (get type 'cl-struct-type))) + (or (null (car (get type 'cl-struct-type))) (error "Can't dispatch on cl-struct %S: type is %S" type (car (get type 'cl-struct-type)))) (or (equal '(cl-tag-slot) (car (get type 'cl-struct-slots))) @@ -761,7 +761,7 @@ Can only be used from within the lexical body of a primary or around method." (let ((types (list (intern (substring (symbol-name tag) 10))))) (while (get (car types) 'cl-struct-include) (push (get (car types) 'cl-struct-include) types)) - (push 'cl-struct types) ;The "parent type" of all cl-structs. + (push 'cl-structure-object types) ;The "parent type" of all cl-structs. (nreverse types)))) ;;; Dispatch on "system types". diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 2861d669697..caaf7687dc8 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2494,7 +2494,7 @@ non-nil value, that slot cannot be set via `setf'. (or (memq type '(vector list)) (error "Invalid :type specifier: %s" type)) (if named (setq tag name))) - (setq type 'vector named 'true))) + (setq named 'true))) (or named (setq descs (delq (assq 'cl-tag-slot descs) descs))) (when (and (null predicate) named) (setq predicate (intern (format "cl--struct-%s-p" name)))) @@ -2503,7 +2503,7 @@ non-nil value, that slot cannot be set via `setf'. (length (memq (assq 'cl-tag-slot descs) descs))))) (cond - ((eq type 'vector) + ((memq type '(nil vector)) `(and (vectorp cl-x) (>= (length cl-x) ,(length descs)) (memq (aref cl-x ,pos) ,tag-symbol))) @@ -2535,7 +2535,7 @@ non-nil value, that slot cannot be set via `setf'. (list `(or ,pred-check (error "%s accessing a non-%s" ',accessor ',name)))) - ,(if (eq type 'vector) `(aref cl-x ,pos) + ,(if (memq type '(nil vector)) `(aref cl-x ,pos) (if (= pos 0) '(car cl-x) `(nth ,pos cl-x)))) forms) @@ -2593,7 +2593,7 @@ non-nil value, that slot cannot be set via `setf'. (&cl-defs '(nil ,@descs) ,@args) ,@(if (cl--safe-expr-p `(progn ,@(mapcar #'cl-second descs))) '((declare (side-effect-free t)))) - (,type ,@make)) + (,(or type #'vector) ,@make)) forms))) (if print-auto (nconc print-func (list '(princ ")" cl-s) t))) ;; Don't bother adding to cl-custom-print-functions since it's not used diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index 03045de509a..401d34b449e 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -28,8 +28,12 @@ ;;; Code: +(eval-when-compile (require 'cl-lib)) + (defun cl-struct-define (name docstring parent type named slots children-sym tag print-auto) + (cl-assert (or type (equal '(cl-tag-slot) (car slots)))) + (cl-assert (or type (not named))) (if (boundp children-sym) (add-to-list children-sym tag) (set children-sym (list tag))) From c4e2be4587ec6d0f1367b1bfe220a71360e25bea Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 16 Feb 2015 02:22:46 -0500 Subject: [PATCH 086/457] * lisp/emacs-lisp/eieio*.el: Align a bit better with CLOS * lisp/cedet/semantic/db-el.el (semanticdb-elisp-sym->tag): Fix copy&paste error (semanticdb-project-database => sym). Avoid eieio--class-public-a when possible. * lisp/emacs-lisp/eieio-base.el (make-instance): Add a method here rather than on eieio-constructor. * lisp/emacs-lisp/eieio-core.el (eieio--class-print-name): New function. (eieio-class-name): Make it do what the docstring claims. (eieio-defclass-internal): Simplify since `prots' isn't used any more. (eieio--slot-name-index): Simplify accordingly. (eieio-barf-if-slot-unbound): Pass the class object rather than its name to `slot-unbound'. * lisp/emacs-lisp/eieio.el (defclass): Use make-instance rather than eieio-constructor. (set-slot-value): Mark as obsolete. (eieio-object-class-name): Improve call to eieio-class-name. (eieio-slot-descriptor-name, eieio-class-slots): New functions. (object-slots): Use it. Declare obsolete. (eieio-constructor): Merge it with `make-instance'. (initialize-instance): Use `dolist'. (eieio-override-prin1, eieio-edebug-prin1-to-string): Use eieio--class-print-name. * test/automated/eieio-test-methodinvoke.el (make-instance): Add methods here rather than on eieio-constructor. --- lisp/ChangeLog | 23 ++++++ lisp/cedet/ChangeLog | 6 ++ lisp/cedet/semantic/db-el.el | 8 +- lisp/emacs-lisp/eieio-base.el | 2 +- lisp/emacs-lisp/eieio-core.el | 33 ++++---- lisp/emacs-lisp/eieio.el | 91 ++++++++++++----------- test/ChangeLog | 5 ++ test/automated/eieio-test-methodinvoke.el | 4 +- 8 files changed, 101 insertions(+), 71 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bb8c97badf7..e4383437c6d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,26 @@ +2015-02-16 Stefan Monnier + + * emacs-lisp/eieio.el (defclass): Use make-instance rather than + eieio-constructor. + (set-slot-value): Mark as obsolete. + (eieio-object-class-name): Improve call to eieio-class-name. + (eieio-slot-descriptor-name, eieio-class-slots): New functions. + (object-slots): Use it. Declare obsolete. + (eieio-constructor): Merge it with `make-instance'. + (initialize-instance): Use `dolist'. + (eieio-override-prin1, eieio-edebug-prin1-to-string): + Use eieio--class-print-name. + + * emacs-lisp/eieio-core.el (eieio--class-print-name): New function. + (eieio-class-name): Make it do what the docstring claims. + (eieio-defclass-internal): Simplify since `prots' isn't used any more. + (eieio--slot-name-index): Simplify accordingly. + (eieio-barf-if-slot-unbound): Pass the class object rather than its + name to `slot-unbound'. + + * emacs-lisp/eieio-base.el (make-instance): Add a method here rather + than on eieio-constructor. + 2015-02-16 Stefan Monnier * emacs-lisp/cl-macs.el (cl-defstruct): Keep type=nil by default. diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 6bbae7e08a8..838a2693491 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,9 @@ +2015-02-16 Stefan Monnier + + * semantic/db-el.el (semanticdb-elisp-sym->tag): Fix copy&paste error + (semanticdb-project-database => sym). Avoid eieio--class-public-a + when possible. + 2015-02-04 Stefan Monnier Use cl-generic instead of EIEIO's defgeneric/defmethod. diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el index e37b65a461e..b20a756f6b7 100644 --- a/lisp/cedet/semantic/db-el.el +++ b/lisp/cedet/semantic/db-el.el @@ -223,9 +223,11 @@ TOKTYPE is a hint to the type of tag desired." (symbol-name sym) "class" (semantic-elisp-desymbolify - ;; FIXME: This only gives the instance slots and ignores the - ;; class-allocated slots. - (eieio--class-public-a (find-class 'semanticdb-project-database))) ;; slots ;FIXME: eieio-- + (let ((class (find-class sym))) + (if (fboundp 'eieio-slot-descriptor-name) + (mapcar #'eieio-slot-descriptor-name + (eieio-class-slots class)) + (eieio--class-public-a class)))) (semantic-elisp-desymbolify (eieio-class-parents sym)) ;; parents )) ((not toktype) diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index fcf02b92736..1cc9f895f8a 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -140,7 +140,7 @@ Multiple calls to `make-instance' will return this object.")) A singleton is a class which will only ever have one instance." :abstract t) -(cl-defmethod eieio-constructor ((class (subclass eieio-singleton)) &rest _slots) +(cl-defmethod make-instance ((class (subclass eieio-singleton)) &rest _slots) "Constructor for singleton CLASS. NAME and SLOTS initialize the new object. This constructor guarantees that no matter how many you request, diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index e71c54d4123..408922a2daa 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -181,15 +181,15 @@ Currently under control of this var: CLASS is a symbol." ;FIXME: Is it a vector or a symbol? (and (symbolp class) (eieio--class-p (eieio--class-v class)))) +(defun eieio--class-print-name (class) + "Return a printed representation of CLASS." + (format "#" (eieio-class-name class))) + (defun eieio-class-name (class) "Return a Lisp like symbol name for CLASS." - ;; FIXME: What's a "Lisp like symbol name"? - ;; FIXME: CLOS returns a symbol, but the code returns a string. - (if (eieio--class-p class) (setq class (eieio--class-symbol class))) - (cl-check-type class class) - ;; I think this is supposed to return a symbol, but to me CLASS is a symbol, - ;; and I wanted a string. Arg! - (format "#" (symbol-name class))) + (setq class (eieio--class-object class)) + (cl-check-type class eieio--class) + (eieio--class-symbol class)) (define-obsolete-function-alias 'class-name #'eieio-class-name "24.4") (defalias 'eieio--class-constructor #'identity @@ -317,7 +317,7 @@ See `defclass' for more information." (newc (if (and oldc (not (eieio--class-default-object-cache oldc))) ;; The oldc class is a stub setup by eieio-defclass-autoload. ;; Reuse it instead of creating a new one, so that existing - ;; references are still valid. + ;; references stay valid. oldc (eieio--class-make cname))) (groups nil) ;; list of groups id'd from slots @@ -488,16 +488,10 @@ See `defclass' for more information." ;; Attach slot symbols into a hashtable, and store the index of ;; this slot as the value this table. (let* ((cnt 0) - (pubsyms (eieio--class-public-a newc)) - (prots (eieio--class-protection newc)) (oa (make-hash-table :test #'eq))) - (while pubsyms - (let ((newsym (list cnt))) - (setf (gethash (car pubsyms) oa) newsym) - (setq cnt (1+ cnt)) - (if (car prots) (setcdr newsym (car prots)))) - (setq pubsyms (cdr pubsyms) - prots (cdr prots))) + (dolist (pubsym (eieio--class-public-a newc)) + (setf (gethash pubsym oa) cnt) + (setq cnt (1+ cnt))) (setf (eieio--class-symbol-hashtable newc) oa)) ;; Set up a specialized doc string. @@ -895,7 +889,7 @@ INSTANCE is the object being referenced. SLOTNAME is the offending slot. If the slot is ok, return VALUE. Argument FN is the function calling this verifier." (if (and (eq value eieio-unbound) (not eieio-skip-typecheck)) - (slot-unbound instance (eieio--object-class-name instance) slotname fn) + (slot-unbound instance (eieio--object-class-object instance) slotname fn) value)) @@ -1029,8 +1023,7 @@ The slot is a symbol which is installed in CLASS by the `defclass' call. If SLOT is the value created with :initarg instead, reverse-lookup that name, and recurse with the associated slot value." ;; Removed checks to outside this call - (let* ((fsym (gethash slot (eieio--class-symbol-hashtable class))) - (fsi (car fsym))) + (let* ((fsi (gethash slot (eieio--class-symbol-hashtable class)))) (if (integerp fsi) (+ (eval-when-compile eieio--object-num-slots) fsi) (let ((fn (eieio--initarg-to-attribute class slot))) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 526090954a9..4f6b6d73183 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -272,34 +272,9 @@ This method is obsolete." ;; but hide it so we don't trigger indefinitely. `(,(car whole) (identity ,(car slots)) ,@(cdr slots))))))) - (apply #'eieio-constructor ',name slots)))))) + (apply #'make-instance ',name slots)))))) -;;; CLOS style implementation of object creators. -;; -(defun make-instance (class &rest initargs) - "Make a new instance of CLASS based on INITARGS. -CLASS is a class symbol. For example: - - (make-instance 'foo) - - INITARGS is a property list with keywords based on the :initarg -for each slot. For example: - - (make-instance 'foo :slot1 value1 :slotN valueN) - -Compatibility note: - -If the first element of INITARGS is a string, it is used as the -name of the class. - -In EIEIO, the class' constructor requires a name for use when printing. -`make-instance' in CLOS doesn't use names the way Emacs does, so the -class is used as the name slot instead when INITARGS doesn't start with -a string." - (apply (eieio--class-constructor class) initargs)) - - ;;; Get/Set slots in an object. ;; (defmacro oref (obj slot) @@ -311,6 +286,7 @@ created by the :initarg tag." (defalias 'slot-value 'eieio-oref) (defalias 'set-slot-value 'eieio-oset) +(make-obsolete 'set-slot-value "use (setf (slot-value ..) ..) instead" "25.1") (defmacro oref-default (obj slot) "Get the default value of OBJ (maybe a class) for SLOT. @@ -363,7 +339,7 @@ variable name of the same name as the slot." (declare (obsolete eieio-named "25.1"))) (defun eieio-object-name (obj &optional extra) - "Return a Lisp like symbol string for object OBJ. + "Return a printed representation for object OBJ. If EXTRA, include that in the string returned to represent the symbol." (cl-check-type obj eieio-object) (format "#<%s %s%s>" (eieio--object-class-name obj) @@ -402,7 +378,7 @@ If EXTRA, include that in the string returned to represent the symbol." (defun eieio-object-class-name (obj) "Return a Lisp like symbol name for OBJ's class." (cl-check-type obj eieio-object) - (eieio-class-name (eieio--object-class-name obj))) + (eieio-class-name (eieio--object-class-object obj))) (define-obsolete-function-alias 'object-class-name 'eieio-object-class-name "24.4") @@ -463,10 +439,23 @@ The CLOS function `class-direct-subclasses' is aliased to this function." child (pop p))) (if child t)))) +(defun eieio-slot-descriptor-name (slot) slot) + +(defun eieio-class-slots (class) + "Return list of slots available in instances of CLASS." + ;; FIXME: This only gives the instance slots and ignores the + ;; class-allocated slots. + ;; FIXME: It only gives the slot's *names* rather than actual + ;; slot descriptors. + (setq class (eieio--class-object class)) + (cl-check-type class eieio--class) + (eieio--class-public-a class)) + (defun object-slots (obj) "Return list of slots available in OBJ." + (declare (obsolete eieio-class-slots "25.1")) (cl-check-type obj eieio-object) - (eieio--class-public-a (eieio--object-class-object obj))) + (eieio-class-slots (eieio--object-class-object obj))) (defun eieio--class-slot-initarg (class slot) "Fetch from CLASS, SLOT's :initarg." (cl-check-type class eieio--class) @@ -613,6 +602,9 @@ If SLOT is unbound, do nothing." ;;; Here are some CLOS items that need the CL package ;; +;; FIXME: Shouldn't this be a more complex gv-expander which extracts the +;; common code between oref and oset, so as to reduce the redundant work done +;; in (push foo (oref bar baz)), like we do for the `nth' expander? (gv-define-simple-setter eieio-oref eieio-oset) @@ -636,20 +628,28 @@ This class is not stored in the `parent' slot of a class vector." (defalias 'standard-class 'eieio-default-superclass) -(cl-defgeneric eieio-constructor (class &rest slots) - "Default constructor for CLASS `eieio-default-superclass'.") +(cl-defgeneric make-instance (class &rest initargs) + "Make a new instance of CLASS based on INITARGS. +For example: -(define-obsolete-function-alias 'constructor #'eieio-constructor "25.1") + (make-instance 'foo) -(cl-defmethod eieio-constructor - ((class (subclass eieio-default-superclass)) &rest slots) +INITARGS is a property list with keywords based on the `:initarg' +for each slot. For example: + + (make-instance 'foo :slot1 value1 :slotN valueN)") + +(define-obsolete-function-alias 'constructor #'make-instance "25.1") + +(cl-defmethod make-instance + ((class (subclass eieio-default-superclass)) &rest slots) "Default constructor for CLASS `eieio-default-superclass'. -SLOTS are the initialization slots used by `shared-initialize'. +SLOTS are the initialization slots used by `initialize-instance'. This static method is called when an object is constructed. It allocates the vector used to represent an EIEIO object, and then -calls `shared-initialize' on that object." +calls `initialize-instance' on that object." (let* ((new-object (copy-sequence (eieio--class-default-object-cache - (eieio--class-v class))))) + (eieio--class-object class))))) (if (and slots (let ((x (car slots))) (or (stringp x) (null x)))) @@ -662,6 +662,7 @@ calls `shared-initialize' on that object." ;; Return the created object. new-object)) +;; FIXME: CLOS uses "&rest INITARGS" instead. (cl-defgeneric shared-initialize (obj slots) "Set slots of OBJ with SLOTS which is a list of name/value pairs. Called from the constructor routine.") @@ -677,6 +678,7 @@ Called from the constructor routine." (eieio-oset obj rn (car (cdr slots))))) (setq slots (cdr (cdr slots))))) +;; FIXME: CLOS uses "&rest INITARGS" instead. (cl-defgeneric initialize-instance (this &optional slots) "Construct the new object THIS based on SLOTS.") @@ -693,9 +695,8 @@ dynamically set from SLOTS." ;; First, see if any of our defaults are `lambda', and ;; re-evaluate them and apply the value to our slots. (let* ((this-class (eieio--object-class-object this)) - (slot (eieio--class-public-a this-class)) (defaults (eieio--class-public-d this-class))) - (while slot + (dolist (slot (eieio--class-public-a this-class)) ;; For each slot, see if we need to evaluate it. ;; ;; Paul Landes said in an email: @@ -705,10 +706,9 @@ dynamically set from SLOTS." ;; > web. (let ((dflt (eieio-default-eval-maybe (car defaults)))) (when (not (eq dflt (car defaults))) - (eieio-oset this (car slot) dflt) )) + (eieio-oset this slot dflt) )) ;; Next. - (setq slot (cdr slot) - defaults (cdr defaults)))) + (setq defaults (cdr defaults)))) ;; Shared initialize will parse our slots for us. (shared-initialize this slots)) @@ -742,7 +742,8 @@ Use `slot-boundp' to determine if a slot is bound or not. In CLOS, the argument list is (CLASS OBJECT SLOT-NAME), but EIEIO can only dispatch on the first argument, so the first two are swapped." - (signal 'unbound-slot (list (eieio-class-name class) (eieio-object-name object) + (signal 'unbound-slot (list (eieio-class-name class) + (eieio-object-name object) slot-name fn))) (cl-defgeneric clone (obj &rest params) @@ -861,7 +862,7 @@ this object." ((consp thing) (eieio-list-prin1 thing)) ((eieio--class-p thing) - (princ (eieio-class-name thing))) + (princ (eieio--class-print-name thing))) (t (prin1 thing)))) (defun eieio-list-prin1 (list) @@ -902,7 +903,7 @@ of `eq'." Used as advice around `edebug-prin1-to-string', held in the variable PRINT-FUNCTION. Optional argument NOESCAPE is passed to `prin1-to-string' when appropriate." - (cond ((eieio--class-p object) (eieio-class-name object)) + (cond ((eieio--class-p object) (eieio--class-print-name object)) ((eieio-object-p object) (object-print object)) ((and (listp object) (or (eieio--class-p (car object)) (eieio-object-p (car object)))) diff --git a/test/ChangeLog b/test/ChangeLog index 29b7c7d59ea..87425a69148 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-02-16 Stefan Monnier + + * automated/eieio-test-methodinvoke.el (make-instance): Add methods + here rather than on eieio-constructor. + 2015-02-13 Magnus Henoch * automated/sasl-scram-rfc-tests.el: New file. diff --git a/test/automated/eieio-test-methodinvoke.el b/test/automated/eieio-test-methodinvoke.el index da5f59a4654..62f5603d3b6 100644 --- a/test/automated/eieio-test-methodinvoke.el +++ b/test/automated/eieio-test-methodinvoke.el @@ -179,12 +179,12 @@ (if (next-method-p) (call-next-method)) ) -(defmethod eieio-constructor :STATIC ((p C-base2) &rest args) +(defmethod make-instance :STATIC ((p C-base2) &rest args) (eieio-test-method-store :STATIC 'C-base2) (if (next-method-p) (call-next-method)) ) -(defmethod eieio-constructor :STATIC ((p C) &rest args) +(defmethod make-instance :STATIC ((p C) &rest args) (eieio-test-method-store :STATIC 'C) (call-next-method) ) From 2ea5364ca8d1a8dc3f8ac4c9a5ba5c7f03666258 Mon Sep 17 00:00:00 2001 From: Ivan Shmakov Date: Mon, 16 Feb 2015 18:55:02 +0000 Subject: [PATCH 087/457] Fix eww.el desktop support. * lisp/net/eww.el (eww-mode): Add autoload cookie. (eww-restore-desktop): Use inhibit-read-only. Fixes: debbugs:19226 --- lisp/ChangeLog | 6 ++++++ lisp/net/eww.el | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e4383437c6d..42628ff2c53 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-16 Ivan Shmakov + + * net/eww.el: Fix desktop support. (Bug#19226) + (eww-mode): Add autoload cookie. + (eww-restore-desktop): Use inhibit-read-only. + 2015-02-16 Stefan Monnier * emacs-lisp/eieio.el (defclass): Use make-instance rather than diff --git a/lisp/net/eww.el b/lisp/net/eww.el index c401701f255..c2da4c96173 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -686,6 +686,8 @@ the like." map) "Tool bar for `eww-mode'.") +;; Autoload cookie needed by desktop.el. +;;;###autoload (define-derived-mode eww-mode special-mode "eww" "Mode for browsing the web." (setq-local eww-data (list :title "")) @@ -1877,8 +1879,9 @@ Otherwise, the restored buffer will contain a prompt to do so by using (case eww-restore-desktop ((t auto) (eww (plist-get eww-data :url))) ((zerop (buffer-size)) - (insert (substitute-command-keys - eww-restore-reload-prompt)))))) + (let ((inhibit-read-only t)) + (insert (substitute-command-keys + eww-restore-reload-prompt))))))) ;; . (current-buffer))) From 8b36bfafeecf5f0578c64129be1d2017483b00f7 Mon Sep 17 00:00:00 2001 From: Ivan Shmakov Date: Mon, 16 Feb 2015 19:01:50 +0000 Subject: [PATCH 088/457] Add autoload cookie for the eww-suggest-uris variable. * lisp/net/eww.el (eww-suggest-uris): Add autoload cookie, so that add-hook works correctly even if the file is not yet loaded. --- lisp/ChangeLog | 3 +++ lisp/net/eww.el | 1 + 2 files changed, 4 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42628ff2c53..71ecb407d32 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,6 +4,9 @@ (eww-mode): Add autoload cookie. (eww-restore-desktop): Use inhibit-read-only. + * net/eww.el (eww-suggest-uris): Add autoload cookie, so that + add-hook works correctly even if the file is not yet loaded. + 2015-02-16 Stefan Monnier * emacs-lisp/eieio.el (defclass): Use make-instance rather than diff --git a/lisp/net/eww.el b/lisp/net/eww.el index c2da4c96173..b7ee0650d70 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -60,6 +60,7 @@ :group 'eww :type 'string) +;;;###autoload (defcustom eww-suggest-uris '(eww-links-at-point url-get-url-at-point From 16d91bce1d054c45ccd60efd5bd3ff88c12e39bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Mon, 16 Feb 2015 19:53:59 -0300 Subject: [PATCH 089/457] python.el: Do not deactivate mark on shell fontification. Fixes: debbugs:19871 * lisp/progmodes/python.el (python-shell-font-lock-post-command-hook): Do not deactivate mark on fontification. --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/python.el | 1 + 2 files changed, 8 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 71ecb407d32..43cffffcb36 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-16 Fabián Ezequiel Gallina + + python.el: Do not deactivate mark on shell fontification. (Bug#19871) + + * progmodes/python.el (python-shell-font-lock-post-command-hook): + Do not deactivate mark on fontification. + 2015-02-16 Ivan Shmakov * net/eww.el: Fix desktop support. (Bug#19226) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 20266097fed..4420faf3dfc 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2360,6 +2360,7 @@ goes wrong and syntax highlighting in the shell gets messed up." (process-live-p (get-buffer-process (current-buffer)))) (let* ((input (buffer-substring-no-properties prompt-end (point-max))) + (deactivate-mark nil) (start-pos prompt-end) (buffer-undo-list t) (font-lock-buffer-pos nil) From 4fa778b62c936d5d3a3cc348043c072d7011f13f Mon Sep 17 00:00:00 2001 From: kwhite Date: Tue, 17 Feb 2015 13:41:02 -0500 Subject: [PATCH 090/457] erc.el: Add old version header for package.el compatibilty --- lisp/erc/ChangeLog | 5 +++++ lisp/erc/erc.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index b8357d1de6b..d37906721a8 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2015-02-17 Kelvin White + + * erc.el: Add old version string back to file header for + package.el compatibility + 2015-02-13 Glenn Morris * erc.el (erc-rename-buffers): Doc fix. Add :version. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index e2366a1b58f..a84f9f07523 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -12,7 +12,7 @@ ;; Kelvin White (kwhite@gnu.org) ;; Maintainer: emacs-devel@gnu.org ;; Keywords: IRC, chat, client, Internet - +;; Version: 5.3 ;; This file is part of GNU Emacs. From cec04fb220601bdc653a44b007316a7e53663921 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:15:21 +0000 Subject: [PATCH 091/457] * src/keyboard.c (timer_check_2): Fix incorrect comment --- src/ChangeLog | 4 ++++ src/keyboard.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c89fa60a5b5..76e195605fd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Kelly Dean + + * src/keyboard.c (timer_check_2): Fix incorrect comment. + 2015-02-14 Martin Rudalics * xterm.c (x_frame_normalize_before_maximize): Fix doc-string. diff --git a/src/keyboard.c b/src/keyboard.c index bcb51cfa1f2..ac70062a79b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4441,7 +4441,7 @@ timer_check_2 (Lisp_Object timers, Lisp_Object idle_timers) /* Set TIMER and TIMER_DIFFERENCE based on the next ordinary timer. TIMER_DIFFERENCE is the distance in time from NOW to when - this timer becomes ripe (negative if it's already ripe). + this timer becomes ripe. Skip past invalid timers and timers already handled. */ if (CONSP (timers)) { From 77052f4baa974802021197536f7f5004f471fc48 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:17:09 +0000 Subject: [PATCH 092/457] * help-mode.el: Prevent duplicated display of Info buffer. (Bug#13190) --- lisp/ChangeLog | 5 +++++ lisp/help-mode.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 43cffffcb36..4200a7b7dda 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-16 Kelly Dean + + * help-mode.el (help-do-xref): Prevent duplicated display of Info + buffer, and prevent interference with existing buffer. (Bug#13190) + 2015-02-16 Fabián Ezequiel Gallina python.el: Do not deactivate mark on shell fontification. (Bug#19871) diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 564362a0c43..b8b129dbc4a 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -739,7 +739,8 @@ Things are set up properly so that the resulting help-buffer has a proper [back] button." ;; There is a reference at point. Follow it. (let ((help-xref-following t)) - (apply function args))) + (apply function (if (eq function 'info) + (append args (list (generate-new-buffer-name "*info*"))) args)))) ;; The doc string is meant to explain what buttons do. (defun help-follow-mouse () From 1e00ee2497be60040a20fccb79633c936ccbe2c7 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:18:25 +0000 Subject: [PATCH 093/457] desktop.el: Conditionally re-enable desktop autosave * desktop.el (desktop-read): Conditionally re-enable desktop autosave. (Bug#19059) --- lisp/ChangeLog | 5 +++++ lisp/desktop.el | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4200a7b7dda..b3da9dcaadf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-16 Kelly Dean + + * desktop.el (desktop-read): Conditionally re-enable desktop autosave. + (Bug#19059) + 2015-02-16 Kelly Dean * help-mode.el (help-do-xref): Prevent duplicated display of Info diff --git a/lisp/desktop.el b/lisp/desktop.el index c2724904b58..b85d8b257a5 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1136,7 +1136,8 @@ It returns t if a desktop file was loaded, nil otherwise." (desktop-buffer-fail-count 0) (owner (desktop-owner)) ;; Avoid desktop saving during evaluation of desktop buffer. - (desktop-save nil)) + (desktop-save nil) + (desktop-autosave-was-enabled)) (if (and owner (memq desktop-load-locked-desktop '(nil ask)) (or (null desktop-load-locked-desktop) @@ -1152,6 +1153,8 @@ Using it may cause conflicts. Use it anyway? " owner))))) ;; Temporarily disable the autosave that will leave it ;; disabled when loading the desktop fails with errors, ;; thus not overwriting the desktop with broken contents. + (setq desktop-autosave-was-enabled + (memq 'desktop-auto-save-set-timer window-configuration-change-hook)) (desktop-auto-save-disable) ;; Evaluate desktop buffer and remember when it was modified. (load (desktop-full-file-name) t t t) @@ -1205,7 +1208,7 @@ Using it may cause conflicts. Use it anyway? " owner))))) (set-window-prev-buffers window nil) (set-window-next-buffers window nil)))) (setq desktop-saved-frameset nil) - (desktop-auto-save-enable) + (if desktop-autosave-was-enabled (desktop-auto-save-enable)) t)) ;; No desktop file found. (let ((default-directory desktop-dirname)) From 1f2c4f817ee37c7c7767e22eda1c427456885b6b Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:19:41 +0000 Subject: [PATCH 094/457] emacs-lisp/package-x.el: Create valid tar files * emacs-lisp/package-x.el (package-upload-buffer-internal): Create valid tar files. (Bug#19536) --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/package-x.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3da9dcaadf..d5080d92fd5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-16 Kelly Dean + + * emacs-lisp/package-x.el (package-upload-buffer-internal): + Create valid tar files. (Bug#19536) + 2015-02-16 Kelly Dean * desktop.el (desktop-read): Conditionally re-enable desktop autosave. diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el index e0945d47a45..6955ce8f5a6 100644 --- a/lisp/emacs-lisp/package-x.el +++ b/lisp/emacs-lisp/package-x.el @@ -247,7 +247,7 @@ if it exists." (concat (symbol-name pkg-name) "-readme.txt") package-archive-upload-base))) - (set-buffer pkg-buffer) + (set-buffer (if (eq file-type 'tar) tar-data-buffer pkg-buffer)) (write-region (point-min) (point-max) (expand-file-name (format "%s-%s.%s" pkg-name pkg-version extension) From 3194809d247efdc7ea65644ea7b298885e47a392 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:21:06 +0000 Subject: [PATCH 095/457] emacs-lisp/easy-mmode.el: Process macro arguments correctly * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro arguments correctly. (Bug#19685) --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/easy-mmode.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d5080d92fd5..9741baa64bd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-16 Kelly Dean + + * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro + arguments correctly. (Bug#19685) + 2015-02-16 Kelly Dean * emacs-lisp/package-x.el (package-upload-buffer-internal): diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index f7e8619948a..cd5720d144f 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -159,7 +159,8 @@ For example, you could write ;; Allow skipping the first three args. (cond ((keywordp init-value) - (setq body `(,init-value ,lighter ,keymap ,@body) + (setq body (if keymap `(,init-value ,lighter ,keymap ,@body) + `(,init-value ,lighter)) init-value nil lighter nil keymap nil)) ((keywordp lighter) (setq body `(,lighter ,keymap ,@body) lighter nil keymap nil)) From cc273d1c033e669c642115550d2f132c7a9618b8 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:22:16 +0000 Subject: [PATCH 096/457] emacs-lisp/easy-mmode.el (define-minor-mode): Clarify docs --- lisp/ChangeLog | 1 + lisp/emacs-lisp/easy-mmode.el | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9741baa64bd..b7ca890091b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,7 @@ * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro arguments correctly. (Bug#19685) + (define-minor-mode): Clarify docstring. 2015-02-16 Kelly Dean diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index cd5720d144f..cc30042002b 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -114,9 +114,12 @@ Optional KEYMAP is the default keymap bound to the mode keymap. BODY contains code to execute each time the mode is enabled or disabled. It is executed after toggling the mode, and before running MODE-hook. Before the actual body code, you can write keyword arguments, i.e. - alternating keywords and values. These following special keywords - are supported (other keywords are passed to `defcustom' if the minor - mode is global): + alternating keywords and values. If you provide BODY, then you must + provide (even if just nil) INIT-VALUE, LIGHTER, and KEYMAP, or provide + at least one keyword argument, or both; otherwise, BODY would be + misinterpreted as the first omitted argument. The following special + keywords are supported (other keywords are 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\". From 04096849d54e09553d25897591993d5e0221a8d8 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:24:13 +0000 Subject: [PATCH 097/457] emacs-lisp/easy-mmode.el: Clarify mode switch messages * emacs-lisp/easy-mmode.el (define-minor-mode): Clarify mode switch messages for minor modes. (Bug#19690) --- lisp/ChangeLog | 1 + lisp/emacs-lisp/easy-mmode.el | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b7ca890091b..3df34d6577c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,7 @@ * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro arguments correctly. (Bug#19685) (define-minor-mode): Clarify docstring. + Clarify mode switch messages for minor modes. (Bug#19690) 2015-02-16 Kelly Dean diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index cc30042002b..bd95a6018ff 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -284,14 +284,23 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. (if (called-interactively-p 'any) (progn ,(if (and globalp (symbolp mode)) + ;; Unnecessary but harmless if mode set buffer-locally `(customize-mark-as-set ',mode)) ;; Avoid overwriting a message shown by the body, ;; but do overwrite previous messages. (unless (and (current-message) (not (equal ,last-message (current-message)))) - (message ,(format "%s %%sabled" pretty-name) - (if ,mode "en" "dis"))))) + (let ((local + ,(if globalp + (if (symbolp mode) + `(if (local-variable-p ',mode) + " in current buffer" + "") + "") + " in current buffer"))) + (message ,(format "%s %%sabled%%s" pretty-name) + (if ,mode "en" "dis") local))))) ,@(when after-hook `(,after-hook))) (force-mode-line-update) ;; Return the new setting. From 8338e4420d4a0fd375f36698b5be54a65fe9cbb7 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:26:36 +0000 Subject: [PATCH 098/457] lisp/files.el (insert-file-contents-literally): Fix typo --- lisp/ChangeLog | 4 ++++ lisp/files.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3df34d6577c..704ec34606c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Kelly Dean + + * lisp/files.el (insert-file-contents-literally): Fix docstring typo. + 2015-02-16 Kelly Dean * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro diff --git a/lisp/files.el b/lisp/files.el index 5e80cb76599..83369792fe7 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2110,7 +2110,7 @@ Do you want to revisit the file normally now? ") (defun insert-file-contents-literally (filename &optional visit beg end replace) "Like `insert-file-contents', but only reads in the file literally. A buffer may be modified in several ways after reading into the buffer, -to Emacs features such as format decoding, character code +due to Emacs features such as format decoding, character code conversion, `find-file-hook', automatic uncompression, etc. This function ensures that none of these modifications will take place." From 81d89d88aef5de720e7fbeecbfb295d6eaf6fd37 Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Wed, 18 Feb 2015 05:09:12 +0100 Subject: [PATCH 099/457] Fixes display of prefix argument when input-method-function * keyboard.c (read_char): When there is an input method function, do not restore the echo area if a prefix argument is being introduced. (Bug#19875) --- src/ChangeLog | 6 ++++++ src/keyboard.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 76e195605fd..8a3b534e7ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-18 Oscar Fuentes + + * keyboard.c (read_char): When there is an input method function, + do not restore the echo area if a prefix argument is being + introduced. (Bug#19875) + 2015-02-16 Kelly Dean * src/keyboard.c (timer_check_2): Fix incorrect comment. diff --git a/src/keyboard.c b/src/keyboard.c index ac70062a79b..4f6a4414a04 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3095,7 +3095,14 @@ read_char (int commandflag, Lisp_Object map, cancel_echoing (); ok_to_echo_at_next_pause = saved_ok_to_echo; - kset_echo_string (current_kboard, saved_echo_string); + /* Do not restore the echo area string when the user is + introducing a prefix argument. Otherwise we end with + repetitions of the partially introduced prefix + argument. (bug#19875) */ + if (NILP (intern ("prefix-arg"))) + { + kset_echo_string (current_kboard, saved_echo_string); + } current_kboard->echo_after_prompt = saved_echo_after_prompt; if (saved_immediate_echo) echo_now (); From ad6c1be9230ac8ed517a51778b586055edb952c3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 18 Feb 2015 11:04:15 -0500 Subject: [PATCH 100/457] * lisp/emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus assumptions about window ordering. --- etc/NEWS | 1 + lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/checkdoc.el | 17 +++++++++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 0295245d120..f359f9168b2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -235,6 +235,7 @@ If you need your objects to be named, do it by inheriting from `eieio-named'. *** The variables are declared obsolete. *** The variables are declared obsolete. *** defgeneric and defmethod are declared obsolete. +*** `constructor' is now an obsolete alias for `make-instance'. ** ido *** New command `ido-bury-buffer-at-head' bound to C-S-b diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 704ec34606c..f6831508471 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-18 Stefan Monnier + + * emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus + assumptions about window ordering. + 2015-02-16 Kelly Dean * lisp/files.el (insert-file-contents-literally): Fix docstring typo. diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 47b6e5f81de..288e25e6060 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -2619,14 +2619,15 @@ function called to create the messages." (defun checkdoc-show-diagnostics () "Display the checkdoc diagnostic buffer in a temporary window." (if checkdoc-pending-errors - (let ((b (get-buffer checkdoc-diagnostic-buffer))) - (if b (progn (pop-to-buffer b) - (goto-char (point-max)) - (re-search-backward "\C-l" nil t) - (beginning-of-line) - (forward-line 1) - (recenter 0))) - (other-window -1) + (let* ((b (get-buffer checkdoc-diagnostic-buffer)) + (win (if b (display-buffer b)))) + (when win + (with-selected-window win + (goto-char (point-max)) + (re-search-backward "\C-l" nil t) + (beginning-of-line) + (forward-line 1) + (recenter 0))) (setq checkdoc-pending-errors nil) nil))) From 86fe750260ddcf2e10f445f06a3d07c701f15698 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 18 Feb 2015 09:09:50 -0800 Subject: [PATCH 101/457] # Remove NEWS temporary markup --- etc/NEWS | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index cec45fa8339..0b26d7abb18 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -14,60 +14,43 @@ and NEWS.1-17 for changes in older Emacs versions. You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. -Temporary note: -+++ indicates that all necessary documentation updates are complete. - (This means all relevant manuals in doc/ AND lisp doc-strings.) ---- means no change in the manuals is needed. -When you add a new item, use the appropriate mark if you are sure it applies, -otherwise leave it unmarked. - * Changes in Emacs 24.5 ---- +** This is mainly a bug-fix release, but there are some other changes. + ** The default value of `history-length' has increased to 100. -+++ ** The variable `redisplay-dont-pause' is obsolete. * Changes in Specialized Modes and Packages in Emacs 24.5 -+++ -** `call-process-shell-command' and `process-file-shell-command' -don't take "&rest args" any more. +** `call-process-shell-command' and `process-file-shell-command' no longer +take "&rest args". ** ERC -+++ *** New option `erc-rename-buffers'. ---- *** New faces `erc-my-nick-prefix-face' and `erc-nick-prefix-face'. -+++ *** `erc-format-@nick' displays all user modes instead of only op and voice. ---- *** The display of irc commands in the current buffer has been disabled. ---- *** `erc-version' now follows the Emacs version. ** Obsolete packages ---- *** cc-compat.el ---- -*** crisp.el - moved to elpa.gnu.org. +*** crisp.el (moved to elpa.gnu.org) ---- *** tpu-edt.el, ws-mode.el These emulations of old editors are believed to be no longer relevant - contact emacs-devel@gnu.org if you disagree. ---- *** vi.el, vip.el (try M-x viper instead) From 72f7eded979c672662112304cc8615c0dbcf9803 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Wed, 18 Feb 2015 07:35:49 +0000 Subject: [PATCH 102/457] Use user-error where error is inappropriate * help-mode.el (help-go-back, help-go-forward, help-follow): * simple.el (yank-pop, pop-to-mark-command, exchange-point-and-mark): * winner.el (winner-redo): * windmove.el (windmove-do-window-select): * register.el (jump-to-register, increment-register, insert-register) (append-to-register, prepend-to-register): * files.el (find-alternate-file, abort-if-file-too-large, write-file) (set-visited-file-name): * emacs-lisp/lisp.el (kill-backward-up-list): Use user-error instead of error. (Bug#14480) --- lisp/ChangeLog | 15 ++++++++++++++- lisp/emacs-lisp/lisp.el | 2 +- lisp/files.el | 10 +++++----- lisp/help-mode.el | 6 +++--- lisp/register.el | 14 +++++++------- lisp/simple.el | 6 +++--- lisp/windmove.el | 4 ++-- lisp/winner.el | 2 +- 8 files changed, 36 insertions(+), 23 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f6831508471..73e139657bb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2015-02-18 Kelly Dean + + * help-mode.el (help-go-back, help-go-forward, help-follow): + * simple.el (yank-pop, pop-to-mark-command, exchange-point-and-mark): + * winner.el (winner-redo): + * windmove.el (windmove-do-window-select): + * register.el (jump-to-register, increment-register, insert-register) + (append-to-register, prepend-to-register): + * files.el (find-alternate-file, abort-if-file-too-large, write-file) + (set-visited-file-name): + * emacs-lisp/lisp.el (kill-backward-up-list): + Use user-error instead of error. (Bug#14480) + 2015-02-18 Stefan Monnier * emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus @@ -5,7 +18,7 @@ 2015-02-16 Kelly Dean - * lisp/files.el (insert-file-contents-literally): Fix docstring typo. + * files.el (insert-file-contents-literally): Fix docstring typo. 2015-02-16 Kelly Dean diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 214bed7622d..fb631a73da1 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -263,7 +263,7 @@ This command assumes point is not in a string or comment." (backward-up-list arg) (kill-sexp) (insert current-sexp)) - (error "Not at a sexp")))) + (user-error "Not at a sexp")))) (defvar beginning-of-defun-function nil "If non-nil, function for `beginning-of-defun-raw' to call. diff --git a/lisp/files.el b/lisp/files.el index 83369792fe7..1914ad8814c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1628,10 +1628,10 @@ killed." (confirm-nonexistent-file-or-buffer) file-name) t))) (unless (run-hook-with-args-until-failure 'kill-buffer-query-functions) - (error "Aborted")) + (user-error "Aborted")) (and (buffer-modified-p) buffer-file-name (not (yes-or-no-p "Kill and replace the buffer without saving it? ")) - (error "Aborted")) + (user-error "Aborted")) (let ((obuf (current-buffer)) (ofile buffer-file-name) (onum buffer-file-number) @@ -1844,7 +1844,7 @@ OP-TYPE specifies the file operation being performed (for message to user)." (not (y-or-n-p (format "File %s is large (%s), really %s? " (file-name-nondirectory filename) (file-size-human-readable size) op-type)))) - (error "Aborted"))) + (user-error "Aborted"))) (defun warn-maybe-out-of-memory (size) "Warn if an attempt to open file of SIZE bytes may run out of memory." @@ -3883,7 +3883,7 @@ the old visited file has been renamed to the new name FILENAME." (not no-query) (not (y-or-n-p (format "A buffer is visiting %s; proceed? " filename))) - (error "Aborted"))) + (user-error "Aborted"))) (or (equal filename buffer-file-name) (progn (and filename (lock-buffer filename)) @@ -4007,7 +4007,7 @@ Interactively, confirmation is required unless you supply a prefix argument." (listp last-nonmenu-event) use-dialog-box)) (or (y-or-n-p (format "File `%s' exists; overwrite? " filename)) - (error "Canceled"))) + (user-error "Canceled"))) (set-visited-file-name filename (not confirm)))) (set-buffer-modified-p t) ;; Make buffer writable if file is writable. diff --git a/lisp/help-mode.el b/lisp/help-mode.el index b8b129dbc4a..d6679e9e4de 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -724,14 +724,14 @@ BUFFER or FRAME." (interactive) (if help-xref-stack (help-xref-go-back (current-buffer)) - (error "No previous help buffer"))) + (user-error "No previous help buffer"))) (defun help-go-forward () "Go back to next topic in this help buffer." (interactive) (if help-xref-forward-stack (help-xref-go-forward (current-buffer)) - (error "No next help buffer"))) + (user-error "No next help buffer"))) (defun help-do-xref (_pos function args) "Call the help cross-reference function FUNCTION with args ARGS. @@ -754,7 +754,7 @@ a proper [back] button." For the cross-reference format, see `help-make-xrefs'." (interactive) - (error "No cross-reference here")) + (user-error "No cross-reference here")) (defun help-follow-symbol (&optional pos) "In help buffer, show docs for symbol at POS, defaulting to point. diff --git a/lisp/register.el b/lisp/register.el index a60181e43c6..053657bd8cb 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -252,7 +252,7 @@ Interactively, reads the register using `register-read-with-preview'." (goto-char (cadr val))) ((markerp val) (or (marker-buffer val) - (error "That register's buffer no longer exists")) + (user-error "That register's buffer no longer exists")) (switch-to-buffer (marker-buffer val)) (goto-char val)) ((and (consp val) (eq (car val) 'file)) @@ -260,11 +260,11 @@ Interactively, reads the register using `register-read-with-preview'." ((and (consp val) (eq (car val) 'file-query)) (or (find-buffer-visiting (nth 1 val)) (y-or-n-p (format "Visit file %s again? " (nth 1 val))) - (error "Register access aborted")) + (user-error "Register access aborted")) (find-file (nth 1 val)) (goto-char (nth 2 val))) (t - (error "Register doesn't contain a buffer position or configuration"))))) + (user-error "Register doesn't contain a buffer position or configuration"))))) (defun register-swap-out () "Turn markers into file-query references when a buffer is killed." @@ -316,7 +316,7 @@ Interactively, reads the register using `register-read-with-preview'." (set-register register (+ number register-val)))) ((or (not register-val) (stringp register-val)) (append-to-register register (region-beginning) (region-end) prefix)) - (t (error "Register does not contain a number or text"))))) + (t (user-error "Register does not contain a number or text"))))) (defun view-register (register) "Display what is contained in register named REGISTER. @@ -449,7 +449,7 @@ Interactively, reads the register using `register-read-with-preview'." ((and (markerp val) (marker-position val)) (princ (marker-position val) (current-buffer))) (t - (error "Register does not contain text")))) + (user-error "Register does not contain text")))) (if (not arg) (exchange-point-and-mark))) (defun copy-to-register (register start end &optional delete-flag region) @@ -492,7 +492,7 @@ Interactively, reads the register using `register-read-with-preview'." (set-register register (cond ((not reg) text) ((stringp reg) (concat reg separator text)) - (t (error "Register does not contain text"))))) + (t (user-error "Register does not contain text"))))) (setq deactivate-mark t) (cond (delete-flag (delete-region start end)) @@ -516,7 +516,7 @@ Interactively, reads the register using `register-read-with-preview'." (set-register register (cond ((not reg) text) ((stringp reg) (concat text separator reg)) - (t (error "Register does not contain text"))))) + (t (user-error "Register does not contain text"))))) (setq deactivate-mark t) (cond (delete-flag (delete-region start end)) diff --git a/lisp/simple.el b/lisp/simple.el index 967fbc69cbc..b78286dc83b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4326,7 +4326,7 @@ When this command inserts killed text into the buffer, it honors doc string for `insert-for-yank-1', which see." (interactive "*p") (if (not (eq last-command 'yank)) - (error "Previous command was not a yank")) + (user-error "Previous command was not a yank")) (setq this-command 'yank) (unless arg (setq arg 1)) (let ((inhibit-read-only t) @@ -4958,7 +4958,7 @@ Start discarding off end if gets this big." \(Does not affect global mark ring)." (interactive) (if (null (mark t)) - (error "No mark set in this buffer") + (user-error "No mark set in this buffer") (if (= (point) (mark t)) (message "Mark popped")) (goto-char (mark t)) @@ -5107,7 +5107,7 @@ mode temporarily." (let ((omark (mark t)) (temp-highlight (eq (car-safe transient-mark-mode) 'only))) (if (null omark) - (error "No mark set in this buffer")) + (user-error "No mark set in this buffer")) (set-mark (point)) (goto-char omark) (cond (temp-highlight diff --git a/lisp/windmove.el b/lisp/windmove.el index d857dfc98dd..c461a00740a 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -479,10 +479,10 @@ DIR, ARG, and WINDOW are handled as by `windmove-other-window-loc'. If no window is at direction DIR, an error is signaled." (let ((other-window (windmove-find-other-window dir arg window))) (cond ((null other-window) - (error "No window %s from selected window" dir)) + (user-error "No window %s from selected window" dir)) ((and (window-minibuffer-p other-window) (not (minibuffer-window-active-p other-window))) - (error "Minibuffer is inactive")) + (user-error "Minibuffer is inactive")) (t (select-window other-window))))) diff --git a/lisp/winner.el b/lisp/winner.el index f244003b066..fdf62137514 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -415,7 +415,7 @@ In other words, \"undo\" changes in window configuration." (ring-ref winner-pending-undo-ring 0))) (unless (eq (selected-window) (minibuffer-window)) (message "Winner undid undo"))) - (t (error "Previous command was not a `winner-undo'")))) + (t (user-error "Previous command was not a `winner-undo'")))) (provide 'winner) ;;; winner.el ends here From 56f5ea17f19bfb07e263dd2d59a3c61b652fcc3d Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Wed, 18 Feb 2015 07:38:13 +0000 Subject: [PATCH 103/457] rect.el: Suppress superfluous "Mark set" message from push-mark. --- lisp/ChangeLog | 5 +++++ lisp/rect.el | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 73e139657bb..a15295f4b4e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-18 Kelly Dean + + * rect.el (rectangle-mark-mode): + Suppress superfluous "Mark set" message from push-mark. + 2015-02-18 Kelly Dean * help-mode.el (help-go-back, help-go-forward, help-follow): diff --git a/lisp/rect.el b/lisp/rect.el index c5a548647f3..75585d2f080 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -586,8 +586,7 @@ Activates the region if needed. Only lasts until the region is deactivated." (add-hook 'deactivate-mark-hook (lambda () (rectangle-mark-mode -1))) (unless (region-active-p) - (push-mark) - (activate-mark) + (push-mark (point) t t) (message "Mark set (rectangle mode)")))) (defun rectangle-exchange-point-and-mark (&optional arg) From b1d6ddd44614c84746f5ee494e1f29cd9be8a2d8 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Wed, 18 Feb 2015 07:41:10 +0000 Subject: [PATCH 104/457] Push mark before goto-char in jump-to-register and check-parens * register.el (jump-to-register): * emacs-lisp/lisp.el (check-parens): Push mark before goto-char so user doesn't lose his previous place. --- lisp/ChangeLog | 6 ++++++ lisp/emacs-lisp/lisp.el | 3 ++- lisp/register.el | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a15295f4b4e..b71b55d8477 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-18 Kelly Dean + + * register.el (jump-to-register): + * emacs-lisp/lisp.el (check-parens): + Push mark before goto-char so user doesn't lose his previous place. + 2015-02-18 Kelly Dean * rect.el (rectangle-mark-mode): diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index fb631a73da1..67d14872b3a 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -714,7 +714,8 @@ character." (condition-case data ;; Buffer can't have more than (point-max) sexps. (scan-sexps (point-min) (point-max)) - (scan-error (goto-char (nth 2 data)) + (scan-error (push-mark) + (goto-char (nth 2 data)) ;; Could print (nth 1 data), which is either ;; "Containing expression ends prematurely" or ;; "Unbalanced parentheses", but those may not be so diff --git a/lisp/register.el b/lisp/register.el index 053657bd8cb..7afbc06c7fc 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -254,6 +254,9 @@ Interactively, reads the register using `register-read-with-preview'." (or (marker-buffer val) (user-error "That register's buffer no longer exists")) (switch-to-buffer (marker-buffer val)) + (unless (or (= (point) (marker-position val)) + (eq last-command 'jump-to-register)) + (push-mark)) (goto-char val)) ((and (consp val) (eq (car val) 'file)) (find-file (cdr val))) From 7932d062cf85c2c37bd15b22be30a65c034001fc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 18 Feb 2015 23:14:31 +0200 Subject: [PATCH 105/457] Fix exit code when stdin is at EOF (Bug#19897) src/emacs.c (Fkill_emacs): Exit with specified exit code even if stdin is at EOF. --- src/ChangeLog | 5 +++++ src/emacs.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8a3b534e7ae..1c4758f969b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-18 Eli Zaretskii + + * emacs.c (Fkill_emacs): Exit with specified exit code even if + stdin is at EOF. (Bug#19897) + 2015-02-18 Oscar Fuentes * keyboard.c (read_char): When there is an input method function, diff --git a/src/emacs.c b/src/emacs.c index fdd17d1e062..f933eb1443d 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1896,9 +1896,6 @@ all of which are called before Emacs is actually killed. */ GCPRO1 (arg); - if (feof (stdin)) - arg = Qt; - /* Fsignal calls emacs_abort () if it sees that waiting_for_input is set. */ waiting_for_input = 0; @@ -1910,7 +1907,7 @@ all of which are called before Emacs is actually killed. */ x_clipboard_manager_save_all (); #endif - shut_down_emacs (0, STRINGP (arg) ? arg : Qnil); + shut_down_emacs (0, (STRINGP (arg) && !feof (stdin)) ? arg : Qnil); #ifdef HAVE_NS ns_release_autorelease_pool (ns_pool); From 0a1c83457d209fcf08c741a5e50bd60b72fd8713 Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Wed, 18 Feb 2015 22:25:22 +0000 Subject: [PATCH 106/457] Handle unquoted IMAP group names * lisp/gnus/nnimap.el (nnimap-get-groups): Correctly read unquoted group names from the server LIST response. --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnimap.el | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7910d74fb15..7895f378b82 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-02-18 Eric Abrahamsen + + * nnimap.el (nnimap-get-groups): Correctly read unquoted group names + from the server LIST response. + 2015-02-14 Lars Ingebrigtsen * nnimap.el (nnimap-retrieve-headers): If the server closes connection diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 4a9ca744b9f..6904e0a7259 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -1262,7 +1262,12 @@ If LIMIT, first try to limit the search to the N last articles." (while (search-forward "* LIST " nil t) (let ((flags (read (current-buffer))) (separator (read (current-buffer))) - (group (read (current-buffer)))) + (group (buffer-substring-no-properties + (progn (skip-chars-forward " \"") + (point)) + (progn (move-end-of-line 1) + (skip-chars-backward " \"") + (point))))) (unless (member '%NoSelect flags) (push (utf7-decode (if (stringp group) group From 746d2923d685ff9067ca0a999ac8321dd45d1c43 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Wed, 18 Feb 2015 23:06:12 +0000 Subject: [PATCH 107/457] lisp/gnus/nnimap.el (nnimap-get-groups): Fix XEmacs compilation --- lisp/gnus/nnimap.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 6904e0a7259..369d9d36418 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -1265,7 +1265,7 @@ If LIMIT, first try to limit the search to the N last articles." (group (buffer-substring-no-properties (progn (skip-chars-forward " \"") (point)) - (progn (move-end-of-line 1) + (progn (end-of-line) (skip-chars-backward " \"") (point))))) (unless (member '%NoSelect flags) From 99db66a01fd998942c4e75733863903247345d90 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 18 Feb 2015 20:31:17 -0500 Subject: [PATCH 108/457] * lisp/emacs-lisp/smie.el (smie-prec2->grammar): Fix corner case problem. --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/smie.el | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b71b55d8477..933e5bbb515 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-19 Stefan Monnier + + * emacs-lisp/smie.el (smie-prec2->grammar): Fix corner case problem. + 2015-02-18 Kelly Dean * register.el (jump-to-register): diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 5b9dc6422a2..48bded4e3a6 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -612,8 +612,11 @@ PREC2 is a table as returned by `smie-precs->prec2' or (cons (pcase (cdr x) (`closer (cddr (assoc token table))) (`opener (cdr (assoc token table)))))) - (cl-assert (numberp (car cons))) - (setf (car cons) (list (car cons))))) + ;; `cons' can be nil for openers/closers which only contain + ;; "atomic" elements. + (when cons + (cl-assert (numberp (car cons))) + (setf (car cons) (list (car cons)))))) (let ((ca (gethash :smie-closer-alist prec2))) (when ca (push (cons :smie-closer-alist ca) table))) ;; (smie-check-grammar table prec2 'step3) From 37e3549055fc153657f0a04b28cf29b7e15a97d8 Mon Sep 17 00:00:00 2001 From: Fujii Hironori Date: Thu, 19 Feb 2015 13:40:48 +0200 Subject: [PATCH 109/457] Fix display of IME window on MS-Windows (Bug#11732) src/w32fns.c (w32_wnd_proc) : Pass the message to DefWindowProc, after positioning the IME window, to trigger its display. Copyright-paperwork-exempt: yes --- src/ChangeLog | 6 ++++++ src/w32fns.c | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1c4758f969b..87133535e97 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-19 Fujii Hironori (tiny change) + + * w32fns.c (w32_wnd_proc) : Pass the + message to DefWindowProc, after positioning the IME window, to + trigger its display. (Bug#11732) + 2015-02-18 Eli Zaretskii * emacs.c (Fkill_emacs): Exit with specified exit code even if diff --git a/src/w32fns.c b/src/w32fns.c index 08000d87d38..1e685ad6d98 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -3295,12 +3295,12 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) field being reset to nil. */ f = x_window_to_frame (dpyinfo, hwnd); if (!(f && FRAME_LIVE_P (f))) - break; + goto dflt; w = XWINDOW (FRAME_SELECTED_WINDOW (f)); /* Punt if someone changed the frame's selected window behind our back. */ if (w != w32_system_caret_window) - break; + goto dflt; form.dwStyle = CFS_RECT; form.ptCurrentPos.x = w32_system_caret_x; @@ -3318,17 +3318,19 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) /* Punt if the window was deleted behind our back. */ if (!BUFFERP (w->contents)) - break; + goto dflt; context = get_ime_context_fn (hwnd); if (!context) - break; + goto dflt; set_ime_composition_window_fn (context, &form); release_ime_context_fn (hwnd, context); } - break; + /* Pass WM_IME_STARTCOMPOSITION to DefWindowProc, so that the + composition window will actually be displayed. */ + goto dflt; case WM_IME_ENDCOMPOSITION: ignore_ime_char = 0; From 65d8ac7c3729e9416696f77a7add8944e069da92 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 19 Feb 2015 17:40:41 +0200 Subject: [PATCH 110/457] Mention in admin/notes/repo how to mark commits that are not to be merged. --- admin/notes/repo | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/notes/repo b/admin/notes/repo index 46a9e08c698..65bdd2c2c98 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -82,7 +82,9 @@ The exception is, if you know that the change will be difficult to merge to the trunk (eg because the trunk code has changed a lot). In that case, it's helpful if you can apply the change to both trunk and branch yourself (when committing the branch change, indicate -in the commit log that it should not be merged to the trunk; see below). +in the commit log that it should not be merged to the trunk, by +including the phrase "Not to be merged to master", or any other phrase +that matches "merge"). * Installing changes from your personal branches. From d10c3edaf21ebbc424d452f3f0ca5c1e51487201 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 19 Feb 2015 18:13:31 +0200 Subject: [PATCH 111/457] Fix generation of TAGS from compressed files (Bug#19735) lib-src/etags.c (process_file_name) [!DOS_NT]: Use "r", not "rb" in the call to 'popen'. --- lib-src/ChangeLog | 5 +++++ lib-src/etags.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 534d253cabb..05511164706 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-19 Eli Zaretskii + + * etags.c (process_file_name) [!DOS_NT]: Use "r", not "rb" in the + call to 'popen'. (Bug#19735) + 2015-02-13 Paul Eggert Better support for future plugins diff --git a/lib-src/etags.c b/lib-src/etags.c index dc2ced50933..cdac9289230 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -1532,7 +1532,14 @@ process_file_name (char *file, language *lang) if (real_name == compressed_name) { char *cmd = concat (compr->command, " ", real_name); + + /* Unix implementations of 'popen' generally don't support "rb", whereas + DOS_NT needs it. */ +#ifdef DOS_NT inf = popen (cmd, "rb"); +#else + inf = popen (cmd, "r"); +#endif free (cmd); } else From a2f904981d10d68bd84b6c7233a79094f052fa8a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 19 Feb 2015 18:48:39 +0200 Subject: [PATCH 112/457] Avoid aborts when input-method-function changes this-command-keys (Bug#19774) src/keyboard.c (read_char): Make sure this_single_command_key_start is in sync with this_command_key_count, around the call to input-method-function. --- src/ChangeLog | 6 ++++++ src/keyboard.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 87133535e97..38af1d83a6d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-19 Eli Zaretskii + + * keyboard.c (read_char): Make sure this_single_command_key_start + is in sync with this_command_key_count, around the call to + input-method-function. (Bug#19774) + 2015-02-19 Fujii Hironori (tiny change) * w32fns.c (w32_wnd_proc) : Pass the diff --git a/src/keyboard.c b/src/keyboard.c index 4f6a4414a04..ab57553e7d3 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3034,6 +3034,7 @@ read_char (int commandflag, Lisp_Object map, Lisp_Object keys; ptrdiff_t key_count; bool key_count_reset; + ptrdiff_t command_key_start; struct gcpro gcpro1; ptrdiff_t count = SPECPDL_INDEX (); @@ -3057,6 +3058,7 @@ read_char (int commandflag, Lisp_Object map, /* Save the this_command_keys status. */ key_count = this_command_key_count; key_count_reset = this_command_key_count_reset; + command_key_start = this_single_command_key_start; if (key_count > 0) keys = Fcopy_sequence (this_command_keys); @@ -3067,6 +3069,7 @@ read_char (int commandflag, Lisp_Object map, /* Clear out this_command_keys. */ this_command_key_count = 0; this_command_key_count_reset = 0; + this_single_command_key_start = 0; /* Now wipe the echo area. */ if (!NILP (echo_area_buffer[0])) @@ -3090,6 +3093,7 @@ read_char (int commandflag, Lisp_Object map, and this_command_keys state. */ this_command_key_count = key_count; this_command_key_count_reset = key_count_reset; + this_single_command_key_start = command_key_start; if (key_count > 0) this_command_keys = keys; From 235c3cb105c3bac49e44296c8066cf7f1c585472 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 19 Feb 2015 13:14:51 -0500 Subject: [PATCH 113/457] * lisp/emacs-lisp/cl-macs.el (cl-struct-slot-value): Handle a nil type. --- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/cl-macs.el | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 933e5bbb515..bf6ea90510c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2015-02-19 Stefan Monnier + * emacs-lisp/cl-macs.el (cl-struct-slot-value): Handle a nil type. + * emacs-lisp/smie.el (smie-prec2->grammar): Fix corner case problem. 2015-02-18 Kelly Dean diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index caaf7687dc8..c5f49b0ed91 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2978,9 +2978,9 @@ STRUCT and SLOT-NAME are symbols. INST is a structure instance." ;; We could use `elt', but since the byte compiler will resolve the ;; branch below at compile time, it's more efficient to use the ;; type-specific accessor. - (if (eq (cl-struct-sequence-type ,struct-type) 'vector) - (aref ,inst (cl-struct-slot-offset ,struct-type ,slot-name)) - (nth (cl-struct-slot-offset ,struct-type ,slot-name) ,inst)))))) + (if (eq (cl-struct-sequence-type ,struct-type) 'list) + (nth (cl-struct-slot-offset ,struct-type ,slot-name) ,inst) + (aref ,inst (cl-struct-slot-offset ,struct-type ,slot-name))))))) (run-hooks 'cl-macs-load-hook) From d4ed798d2598a914b1313e58acaff5b66c487318 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 19 Feb 2015 13:22:21 -0500 Subject: [PATCH 114/457] * lisp/emacs-lisp/eieio-opt.el (eieio-help-class): Fix bug#19891 Fixes: debbugs:19891 * lisp/emacs-lisp/eieio-opt.el (eieio-help-class): `eieio-class-parents' returns classes, not class names. --- lisp/ChangeLog | 3 +++ lisp/emacs-lisp/eieio-opt.el | 1 + 2 files changed, 4 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf6ea90510c..cdcb340614a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2015-02-19 Stefan Monnier + * emacs-lisp/eieio-opt.el (eieio-help-class): `eieio-class-parents' + returns classes, not class names (bug#19891). + * emacs-lisp/cl-macs.el (cl-struct-slot-value): Handle a nil type. * emacs-lisp/smie.el (smie-prec2->grammar): Fix corner case problem. diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index 304ee364dc8..a769ca7b536 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -99,6 +99,7 @@ If CLASS is actually an object, then also display current values of that object. (when pl (insert " Inherits from ") (while (setq cur (pop pl)) + (setq cur (eieio--class-symbol cur)) (insert "`") (help-insert-xref-button (symbol-name cur) 'help-function cur) From 6f2971ab761e62e649892bd3fe5c08983420c5ae Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 19 Feb 2015 21:28:41 +0200 Subject: [PATCH 115/457] * lisp/comint.el (comint-line-beginning-position): Revert searching for the prompt when comint-use-prompt-regexp is non-nil because it doesn't distinguish input from output. Check the field property `output' for the case when comint-use-prompt-regexp is nil. Fixes: debbugs:19710 --- lisp/ChangeLog | 8 ++++++++ lisp/comint.el | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6373df64e91..22e952a91e6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-02-19 Juri Linkov + + * comint.el (comint-line-beginning-position): Revert searching for + the prompt when comint-use-prompt-regexp is non-nil because it + doesn't distinguish input from output. Check the field property + `output' for the case when comint-use-prompt-regexp is nil. + (Bug#19710) + 2015-02-15 Jérémy Compostella * net/tramp-sh.el (tramp-remote-process-environment): Disable paging diff --git a/lisp/comint.el b/lisp/comint.el index c81551acd5f..68b8edbb8ca 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2267,8 +2267,6 @@ a buffer local variable." ;; Use comint-prompt-regexp (save-excursion (beginning-of-line) - (unless (looking-at comint-prompt-regexp) - (re-search-backward comint-prompt-regexp nil t)) (comint-skip-prompt) (point)) ;; Use input fields. Note that, unlike the behavior of @@ -2278,7 +2276,10 @@ a buffer local variable." ;; if there are two fields on a line, then the first one is the ;; prompt, and the second one is an input field, and is front-sticky ;; (as input fields should be). - (constrain-to-field (field-beginning) (line-end-position)))) + (constrain-to-field (if (eq (field-at-pos (point)) 'output) + (line-beginning-position) + (field-beginning)) + (line-end-position)))) (defun comint-bol (&optional arg) "Go to the beginning of line, then skip past the prompt, if any. From 12ab9571935d79c69ffab0fb1ea3f6e20f475860 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Thu, 19 Feb 2015 21:36:03 +0100 Subject: [PATCH 116/457] auto-revert-mode can now revert immediately in response to a change event Fixes: debbugs:18958 * autorevert.el (auto-revert-buffers-counter) (auto-revert-buffers-counter-lockedout): New variables. (auto-revert-buffers): Increase `auto-revert-buffers-counter'. (auto-revert-notify-handler): Apply `auto-revert-handler' if not suppressed by lockout. --- lisp/ChangeLog | 16 ++++++++++++---- lisp/autorevert.el | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cdcb340614a..3d15b4095bf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-02-19 Dima Kogan + + * autorevert.el (auto-revert-buffers-counter) + (auto-revert-buffers-counter-lockedout): New variables. + (auto-revert-buffers): Increase `auto-revert-buffers-counter'. + (auto-revert-notify-handler): Apply `auto-revert-handler' if not + suppressed by lockout. (Bug#18958) + 2015-02-19 Stefan Monnier * emacs-lisp/eieio-opt.el (eieio-help-class): `eieio-class-parents' @@ -29,7 +37,7 @@ * files.el (find-alternate-file, abort-if-file-too-large, write-file) (set-visited-file-name): * emacs-lisp/lisp.el (kill-backward-up-list): - Use user-error instead of error. (Bug#14480) + Use user-error instead of error. (Bug#14480) 2015-02-18 Stefan Monnier @@ -45,12 +53,12 @@ * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro arguments correctly. (Bug#19685) (define-minor-mode): Clarify docstring. - Clarify mode switch messages for minor modes. (Bug#19690) + Clarify mode switch messages for minor modes. (Bug#19690) 2015-02-16 Kelly Dean * emacs-lisp/package-x.el (package-upload-buffer-internal): - Create valid tar files. (Bug#19536) + Create valid tar files. (Bug#19536) 2015-02-16 Kelly Dean @@ -60,7 +68,7 @@ 2015-02-16 Kelly Dean * help-mode.el (help-do-xref): Prevent duplicated display of Info - buffer, and prevent interference with existing buffer. (Bug#13190) + buffer, and prevent interference with existing buffer. (Bug#13190) 2015-02-16 Fabián Ezequiel Gallina diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 8c8c6174c47..02cef24f2aa 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -531,6 +531,30 @@ will use an up-to-date value of `auto-revert-interval'" ;; Fallback to file checks. (set (make-local-variable 'auto-revert-use-notify) nil)))) +;; If we have file notifications, we want to update the auto-revert buffers +;; immediately when a notification occurs. Since file updates can happen very +;; often, we want to skip some revert operations so that we don't spend all our +;; time reverting the buffer. +;; +;; We do this by reverting immediately in response to the first in a flurry of +;; notifications. We suppress subsequent notifications until the next time +;; `auto-revert-buffers' is called (this happens on a timer with a period set by +;; `auto-revert-interval'). +(defvar auto-revert-buffers-counter 1 + "Incremented each time `auto-revert-buffers' is called") +(defvar-local auto-revert-buffers-counter-lockedout 0 + "Buffer-local value to indicate whether we should immediately +update the buffer on a notification event or not. If + + (= auto-revert-buffers-counter-lockedout + auto-revert-buffers-counter) + +then the updates are locked out, and we wait until the next call +of `auto-revert-buffers' to revert the buffer. If no lockout is +present, then we revert immediately and set the lockout, so that +no more reverts are possible until the next call of +`auto-revert-buffers'") + (defun auto-revert-notify-handler (event) "Handle an EVENT returned from file notification." (with-demoted-errors @@ -566,6 +590,14 @@ will use an up-to-date value of `auto-revert-interval'" (file-name-nondirectory buffer-file-name))))) ;; Mark buffer modified. (setq auto-revert-notify-modified-p t) + + ;; Revert the buffer now if we're not locked out + (when (/= auto-revert-buffers-counter-lockedout + auto-revert-buffers-counter) + (auto-revert-handler) + (setq auto-revert-buffers-counter-lockedout + auto-revert-buffers-counter)) + ;; No need to check other buffers. (cl-return))))))))) @@ -686,6 +718,10 @@ are checked first the next time this function is called. This function is also responsible for removing buffers no longer in Auto-Revert mode from `auto-revert-buffer-list', and for canceling the timer when no buffers need to be checked." + + (setq auto-revert-buffers-counter + (1+ auto-revert-buffers-counter)) + (save-match-data (let ((bufs (if global-auto-revert-mode (buffer-list) From 3bbf5170722d9e555307259763623c74240a2555 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 19 Feb 2015 19:20:35 -0800 Subject: [PATCH 117/457] Simplify binary I/O configuration * lib-src/etags.c: Include rather than . (process_file_name, analyze_regex): Use FOPEN_BINARY rather than hard-coded "b". * src/lread.c (Fload): Prefer FOPEN_TEXT and FOPEN_BINARY to #ifdef DOS_NT. * src/sysstdio.h: Add copyright notice. Include . (FOPEN_BINARY, FOPEN_TEXT): New macros. * src/xfaces.c (Fx_load_color_file): Use FOPEN_TEXT, since POSIX doesn't guarantee that "t" will work. --- lib-src/ChangeLog | 7 +++++++ lib-src/etags.c | 15 ++++----------- src/ChangeLog | 9 +++++++++ src/lread.c | 11 ++--------- src/sysstdio.h | 29 +++++++++++++++++++++++++++++ src/xfaces.c | 2 +- 6 files changed, 52 insertions(+), 21 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 05511164706..4ac9638102f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,10 @@ +2015-02-20 Paul Eggert + + Simplify binary I/O configuration + * etags.c: Include rather than . + (process_file_name, analyze_regex): Use FOPEN_BINARY rather than + hard-coded "b". + 2015-02-19 Eli Zaretskii * etags.c (process_file_name) [!DOS_NT]: Use "r", not "rb" in the diff --git a/lib-src/etags.c b/lib-src/etags.c index cdac9289230..7f1875547cf 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -122,7 +122,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4"; #include #include #include -#include +#include #include #include #include @@ -1532,18 +1532,11 @@ process_file_name (char *file, language *lang) if (real_name == compressed_name) { char *cmd = concat (compr->command, " ", real_name); - - /* Unix implementations of 'popen' generally don't support "rb", whereas - DOS_NT needs it. */ -#ifdef DOS_NT - inf = popen (cmd, "rb"); -#else - inf = popen (cmd, "r"); -#endif + inf = popen (cmd, "r" FOPEN_BINARY); free (cmd); } else - inf = fopen (real_name, "rb"); + inf = fopen (real_name, "r" FOPEN_BINARY); if (inf == NULL) { perror (real_name); @@ -5607,7 +5600,7 @@ analyze_regex (char *regex_arg) char *regexfile = regex_arg + 1; /* regexfile is a file containing regexps, one per line. */ - regexfp = fopen (regexfile, "rb"); + regexfp = fopen (regexfile, "r" FOPEN_BINARY); if (regexfp == NULL) pfatal (regexfile); linebuffer_init (®exbuf); diff --git a/src/ChangeLog b/src/ChangeLog index 38af1d83a6d..1126dde7450 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2015-02-20 Paul Eggert + + Simplify binary I/O configuration + * lread.c (Fload): Prefer FOPEN_TEXT and FOPEN_BINARY to #ifdef DOS_NT. + * sysstdio.h: Add copyright notice. Include . + (FOPEN_BINARY, FOPEN_TEXT): New macros. + * xfaces.c (Fx_load_color_file): Use FOPEN_TEXT, since POSIX + doesn't guarantee that "t" will work. + 2015-02-19 Eli Zaretskii * keyboard.c (read_char): Make sure this_single_command_key_start diff --git a/src/lread.c b/src/lread.c index b42849fc414..ae175296ddb 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1033,13 +1033,9 @@ Return t if the file exists and loads successfully. */) bool compiled = 0; Lisp_Object handler; bool safe_p = 1; - const char *fmode = "r"; + const char *fmode = "r" FOPEN_TEXT; int version; -#ifdef DOS_NT - fmode = "rt"; -#endif /* DOS_NT */ - CHECK_STRING (file); /* If file name is magic, call the handler. */ @@ -1223,10 +1219,7 @@ Return t if the file exists and loads successfully. */) compiled = 1; efound = ENCODE_FILE (found); - -#ifdef DOS_NT - fmode = "rb"; -#endif /* DOS_NT */ + fmode = "r" FOPEN_BINARY; /* openp already checked for newness, no point doing it again. FIXME would be nice to get a message when openp diff --git a/src/sysstdio.h b/src/sysstdio.h index e9dfb696059..c97c4f883fc 100644 --- a/src/sysstdio.h +++ b/src/sysstdio.h @@ -1,2 +1,31 @@ +/* Standard I/O for Emacs. + +Copyright 2013-2015 Free Software Foundation, Inc. + +This file is part of GNU Emacs. + +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 +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 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . */ + +#include #include + extern FILE *emacs_fopen (char const *, char const *); + +#if O_BINARY +# define FOPEN_BINARY "b" +# define FOPEN_TEXT "t" +#else +# define FOPEN_BINARY "" +# define FOPEN_TEXT "" +#endif diff --git a/src/xfaces.c b/src/xfaces.c index d0fe8726cbb..fcfdbc0ee4f 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6187,7 +6187,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) abspath = Fexpand_file_name (filename, Qnil); block_input (); - fp = emacs_fopen (SSDATA (abspath), "rt"); + fp = emacs_fopen (SSDATA (abspath), "r" FOPEN_TEXT); if (fp) { char buf[512]; From 4fa6da01eb7883976313de119cd3c268ca639778 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 19 Feb 2015 21:28:12 -0800 Subject: [PATCH 118/457] f90.el: Add some F2008 keywords * lisp/progmodes/f90.el (f90-keywords-re, f90-procedures-re) (f90-font-lock-keywords-2): Some F2008 additions. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/f90.el | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d15b4095bf..b04319891fd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-20 Glenn Morris + + * progmodes/f90.el (f90-keywords-re, f90-procedures-re) + (f90-font-lock-keywords-2): Some F2008 additions. + 2015-02-19 Dima Kogan * autorevert.el (auto-revert-buffers-counter) diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index aeb4ddee9ef..b923819ebb3 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -342,8 +342,10 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil." "final" "generic" "import" "non_intrinsic" "non_overridable" "nopass" "pass" "protected" "same_type_as" "value" "volatile" ;; F2008. + ;; FIXME f90-change-keywords does not work right if + ;; there are spaces. "contiguous" "submodule" "concurrent" "codimension" - "sync all" "sync memory" "critical" "image_index" + "sync all" "sync memory" "critical" "image_index" "error stop" )) "\\_>") "Regexp used by the function `f90-change-keywords'.") @@ -417,6 +419,8 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil." "norm2" "parity" "findloc" "is_contiguous" "sync images" "lock" "unlock" "image_index" "lcobound" "ucobound" "num_images" "this_image" + "acosh" "asinh" "atanh" + "atomic_define" "atomic_ref" "execute_command_line" ;; F2008 iso_fortran_env module. "compiler_options" "compiler_version" ;; F2008 iso_c_binding module. @@ -649,7 +653,8 @@ logical\\|double[ \t]*precision\\|type[ \t]*(\\(?:\\sw\\|\\s_\\)+)\\|none\\)[ \t (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)) "\\_" '("\\(&\\)[ \t]*\\(!\\|$\\)" (1 font-lock-keyword-face)) - "\\_<\\(then\\|continue\\|format\\|include\\|stop\\|return\\)\\_>" + "\\_<\\(then\\|continue\\|format\\|include\\|\\(?:error[ \t]+\\)?stop\\|\ +return\\)\\_>" '("\\_<\\(exit\\|cycle\\)[ \t]*\\(\\(?:\\sw\\|\\s_\\)+\\)?\\_>" (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)) '("\\_<\\(case\\)[ \t]*\\(default\\|(\\)" . 1) @@ -2338,6 +2343,8 @@ CHANGE-WORD should be one of 'upcase-word, 'downcase-word, 'capitalize-word." (skip-chars-forward " \t0-9") (looking-at "#")))) (setq ref-point (point) + ;; FIXME this does not work for constructs with + ;; embedded space, eg "sync all". back-point (save-excursion (backward-word 1) (point)) saveword (buffer-substring back-point ref-point)) (funcall change-word -1) From 35f047c06603ce2e549e43ba38de0e61083b0311 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 19 Feb 2015 21:42:22 -0800 Subject: [PATCH 119/457] * src/fileio.c (Fmake_temp_name): Doc tweaks. Fixes: debbugs:19858 --- src/ChangeLog | 4 ++++ src/fileio.c | 18 +++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 52be915ecb9..8bffdadf66c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-02-20 Glenn Morris + + * fileio.c (Fmake_temp_name): Doc tweaks. (Bug#19858) + 2015-02-14 Eli Zaretskii * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call diff --git a/src/fileio.c b/src/fileio.c index fb1fe28aca2..c87a87ca7c6 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -828,20 +828,16 @@ make_temp_name (Lisp_Object prefix, bool base64_p) DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0, doc: /* Generate temporary file name (string) starting with PREFIX (a string). -The Emacs process number forms part of the result, -so there is no danger of generating a name being used by another process. +The Emacs process number forms part of the result, so there is no +danger of generating a name being used by another Emacs process +\(so long as only a single host can access the containing directory...). -In addition, this function makes an attempt to choose a name -which has no existing file. To make this work, -PREFIX should be an absolute file name. +This function tries to choose a name that has no existing file. +For this to work, PREFIX should be an absolute file name. There is a race condition between calling `make-temp-name' and creating the -file which opens all kinds of security holes. For that reason, you should -probably use `make-temp-file' instead, except in three circumstances: - -* If you are creating the file in the user's home directory. -* If you are creating a directory rather than an ordinary file. -* If you are taking special precautions as `make-temp-file' does. */) +file, which opens all kinds of security holes. For that reason, you should +normally use `make-temp-file' instead. */) (Lisp_Object prefix) { return make_temp_name (prefix, 0); From 98cb7d9e4d7ff3e9cb8aad229e30dbd0a7963a8f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 19 Feb 2015 22:24:34 -0800 Subject: [PATCH 120/457] solar.el: Tweak sunrise-sunset output * lisp/calendar/solar.el (solar-sunrise-sunset-string): Shorten message a bit. (sunrise-sunset): Use message rather than a window. Fixes: debbugs:19859 --- lisp/ChangeLog | 4 ++++ lisp/calendar/solar.el | 22 +++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b04319891fd..dc62555a471 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2015-02-20 Glenn Morris + * calendar/solar.el (solar-sunrise-sunset-string): + Shorten message a little. + (sunrise-sunset): Use message rather than a window. (Bug#19859) + * progmodes/f90.el (f90-keywords-re, f90-procedures-re) (f90-font-lock-keywords-2): Some F2008 additions. diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 46cd8d3eb6d..25a24eeffeb 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -657,7 +657,7 @@ Corresponding value is nil if there is no sunrise/sunset." Optional NOLOCATION non-nil means do not print the location." (let ((l (solar-sunrise-sunset date))) (format - "%s, %s%s (%s hours daylight)" + "%s, %s%s (%s hrs daylight)" (if (car l) (concat "Sunrise " (apply 'solar-time-string (car l))) "No sunrise") @@ -847,20 +847,12 @@ This function is suitable for execution in an init file." (date (if (< arg 4) (calendar-current-date) (calendar-read-date))) (date-string (calendar-date-string date t)) (time-string (solar-sunrise-sunset-string date)) - (msg (format "%s: %s" date-string time-string)) - (one-window (one-window-p t))) - (if (<= (length msg) (frame-width)) - (message "%s" msg) - (with-output-to-temp-buffer "*temp*" - (princ (concat date-string "\n" time-string))) - (message "%s" - (substitute-command-keys - (if one-window - (if pop-up-windows - "Type \\[delete-other-windows] to remove temp window." - "Type \\[switch-to-buffer] RET to remove temp window.") - "Type \\[switch-to-buffer-other-window] RET to restore old \ -contents of temp window.")))))) + (msg (format "%s%s" + (if (< arg 4) "" ; don't print date if it's today's + (format "%s: " date-string)) + time-string))) + (message "%s" msg) + msg)) ;;;###cal-autoload (defun calendar-sunrise-sunset (&optional event) From 51d475a8d8a07e0edec92addd4bf96eb1be23b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Fri, 20 Feb 2015 08:46:38 +0100 Subject: [PATCH 121/457] Avoid endless loop when handling fatal signal. * src/emacs.c (terminate_due_to_signal): Move totally_unblock_input after setting fatal_error_in_progress, so gobble_input and *read_socket are not read if there are pending_signals. --- src/ChangeLog | 6 ++++++ src/emacs.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1126dde7450..dc33e417ef4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-20 Jan Djärv + + * emacs.c (terminate_due_to_signal): Move totally_unblock_input after + setting fatal_error_in_progress, so gobble_input and *read_socket are + not read if there are pending_signals. + 2015-02-20 Paul Eggert Simplify binary I/O configuration diff --git a/src/emacs.c b/src/emacs.c index f933eb1443d..590579907ff 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -345,13 +345,13 @@ _Noreturn void terminate_due_to_signal (int sig, int backtrace_limit) { signal (sig, SIG_DFL); - totally_unblock_input (); /* If fatal error occurs in code below, avoid infinite recursion. */ if (! fatal_error_in_progress) { fatal_error_in_progress = 1; + totally_unblock_input (); if (sig == SIGTERM || sig == SIGHUP || sig == SIGINT) Fkill_emacs (make_number (sig)); From 226c1224b5805e5dfc8dd0939b93de2a2bf1e103 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Feb 2015 06:18:36 -0500 Subject: [PATCH 122/457] # Auto-commit of loaddefs files. --- lisp/emacs-lisp/eieio.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 4f6b6d73183..cdf1992f9a5 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -930,7 +930,7 @@ Optional argument GROUP is the sub-group of slots to display. ;;;*** -;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "ff1097f185bc2c253276a7d19fe2f54a") +;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "d1910eb455f102989fc33bb3f5a9b614") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ From 80e67e434cce67417453b0d8ac66e061b279e4e7 Mon Sep 17 00:00:00 2001 From: Reto Zimmermann Date: Fri, 20 Feb 2015 19:35:25 -0500 Subject: [PATCH 123/457] Sync with upstream vhdl mode v3.37.1. Add VHDL'08 support. * lisp/progmodes/vhdl-mode.el (vhdl-version, vhdl-time-stamp) (vhdl-doc-release-notes): Update. (vhdl-standard): Add VHDL'08 option. (vhdl-sensitivity-list-all): New option. (vhdl-directive-keywords): Add psl. (vhdl-offsets-alist-default, vhdl-mode-abbrev-table-init) (vhdl-template-construct-alist-init, vhdl-create-mode-menu): (vhdl-imenu-generic-expression): Add context, directive. (vhdl-offsets-alist, vhdl-mode, vhdl-doc-keywords): Doc fixes. (vhdl-template-map-init): Add vhdl-template-context. (vhdl-mode-syntax-table): Support VHDL'08 block comments. (vhdl-create-mode-menu): Add some entries. (vhdl-08-keywords, vhdl-08-types, vhdl-08-attributes) (vhdl-08-functions, vhdl-08-packages, vhdl-08-directives): New constants. (vhdl-directives): New variable. (vhdl-words-init, vhdl-template-process) (vhdl-template-replace-header-keywords): Support VHDL'08. (vhdl-abbrev-list-init): Add vhdl-directives. (vhdl-in-comment-p, vhdl-in-literal, vhdl-win-il) (vhdl-forward-syntactic-ws, vhdl-get-syntactic-context) (vhdl-lineup-comment): Handle block comments and directives. (vhdl-beginning-of-directive, vhdl-template-context) (vhdl-template-context-hook): New functions. (vhdl-libunit-re, vhdl-defun-re, vhdl-begin-p) (vhdl-corresponding-begin, vhdl-get-library-unit, vhdl-regress-line) (vhdl-align-declarations, vhdl-beginning-of-block, vhdl-end-of-block) (vhdl-font-lock-keywords-2, vhdl-get-end-of-unit) (vhdl-scan-context-clause): Add context. * etc/NEWS: Mention this. --- etc/NEWS | 2 + lisp/ChangeLog | 33 +++++ lisp/progmodes/vhdl-mode.el | 273 ++++++++++++++++++++++++++++++------ 3 files changed, 262 insertions(+), 46 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index f359f9168b2..ed25538da32 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -467,6 +467,8 @@ allows to customize this. *** Two new faces `compare-windows-removed' and `compare-windows-added' replace the obsolete face `compare-windows'. +** VHDL mode supports VHDL'08. + ** Calculator: decimal display mode uses "," groups, so it's more fitting for use in money calculations; factorial works with non-integer inputs. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dc62555a471..ce1a8c2c0f9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,36 @@ +2015-02-21 Reto Zimmermann + + Sync with upstream vhdl mode v3.37.1. Add VHDL'08 support. + * progmodes/vhdl-mode.el (vhdl-version, vhdl-time-stamp) + (vhdl-doc-release-notes): Update. + (vhdl-standard): Add VHDL'08 option. + (vhdl-sensitivity-list-all): New option. + (vhdl-directive-keywords): Add psl. + (vhdl-offsets-alist-default, vhdl-mode-abbrev-table-init) + (vhdl-template-construct-alist-init, vhdl-create-mode-menu): + (vhdl-imenu-generic-expression): Add context, directive. + (vhdl-offsets-alist, vhdl-mode, vhdl-doc-keywords): Doc fixes. + (vhdl-template-map-init): Add vhdl-template-context. + (vhdl-mode-syntax-table): Support VHDL'08 block comments. + (vhdl-create-mode-menu): Add some entries. + (vhdl-08-keywords, vhdl-08-types, vhdl-08-attributes) + (vhdl-08-functions, vhdl-08-packages, vhdl-08-directives): + New constants. + (vhdl-directives): New variable. + (vhdl-words-init, vhdl-template-process) + (vhdl-template-replace-header-keywords): Support VHDL'08. + (vhdl-abbrev-list-init): Add vhdl-directives. + (vhdl-in-comment-p, vhdl-in-literal, vhdl-win-il) + (vhdl-forward-syntactic-ws, vhdl-get-syntactic-context) + (vhdl-lineup-comment): Handle block comments and directives. + (vhdl-beginning-of-directive, vhdl-template-context) + (vhdl-template-context-hook): New functions. + (vhdl-libunit-re, vhdl-defun-re, vhdl-begin-p) + (vhdl-corresponding-begin, vhdl-get-library-unit, vhdl-regress-line) + (vhdl-align-declarations, vhdl-beginning-of-block, vhdl-end-of-block) + (vhdl-font-lock-keywords-2, vhdl-get-end-of-unit) + (vhdl-scan-context-clause): Add context. + 2015-02-20 Glenn Morris * calendar/solar.el (solar-sunrise-sunset-string): diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 875de3b865c..8d6d2a29293 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -13,10 +13,10 @@ ;; filed in the Emacs bug reporting system against this file, a copy ;; of the bug report be sent to the maintainer's email address. -(defconst vhdl-version "3.36.1" +(defconst vhdl-version "3.37.1" "VHDL Mode version number.") -(defconst vhdl-time-stamp "2014-11-27" +(defconst vhdl-time-stamp "2015-01-15" "VHDL Mode time stamp for last update.") ;; This file is part of GNU Emacs. @@ -59,7 +59,7 @@ ;; - Block commenting ;; - Code fixing/alignment/beautification ;; - PostScript printing -;; - VHDL'87/'93 and VHDL-AMS supported +;; - VHDL'87/'93/'02/'08 and VHDL-AMS supported ;; - Comprehensive menu ;; - Fully customizable ;; - Works under GNU Emacs (recommended) and XEmacs @@ -716,6 +716,7 @@ A project setup file can be obtained by exporting a project (see menu). Basic standard: VHDL'87 : IEEE Std 1076-1987 VHDL'93/02 : IEEE Std 1076-1993/2002 + VHDL'08 : IEEE Std 1076-2008 Additional standards: VHDL-AMS : IEEE Std 1076.1 (analog-mixed-signal) Math packages: IEEE Std 1076.2 (`math_real', `math_complex') @@ -724,7 +725,8 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry \"Activate Options\"." :type '(list (choice :tag "Basic standard" (const :tag "VHDL'87" 87) - (const :tag "VHDL'93/02" 93)) + (const :tag "VHDL'93/02" 93) + (const :tag "VHDL'08" 08)) (set :tag "Additional standards" :indent 2 (const :tag "VHDL-AMS" ams) (const :tag "Math packages" math))) @@ -942,6 +944,12 @@ If nil, only a list of actual parameters is entered." :type 'boolean :group 'vhdl-template) +(defcustom vhdl-sensitivity-list-all t + "Non-nil means use 'all' keyword in sensitivity list." + :version "25.1" + :type 'boolean + :group 'vhdl-template) + (defcustom vhdl-zero-string "'0'" "String to use for a logic zero." :type 'string @@ -1728,7 +1736,7 @@ NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu 'vhdl-words-init 'vhdl-font-lock-init)) :group 'vhdl-highlight) -(defcustom vhdl-directive-keywords '("pragma" "synopsys") +(defcustom vhdl-directive-keywords '("psl" "pragma" "synopsys") "List of compiler directive keywords recognized for highlighting. NOTE: Activate the new setting in a VHDL buffer by re-fontifying it (menu @@ -2001,6 +2009,8 @@ reported and the syntactic symbol is ignored.") (package . 0) (architecture . 0) (package-body . 0) + (context . 0) + (directive . 0) ) "Default settings for offsets of syntactic elements. Do not change this constant! See the variable `vhdl-offsets-alist' for @@ -2065,7 +2075,8 @@ Here is the current list of valid syntactic element symbols: configuration -- inside a configuration declaration package -- inside a package declaration architecture -- inside an architecture body - package-body -- inside a package body") + package-body -- inside a package body + context -- inside a context declaration") (defvar vhdl-comment-only-line-offset 0 "Extra offset for line which contains only the start of a comment. @@ -2684,6 +2695,7 @@ elements > `vhdl-menu-max-size'." (define-key vhdl-template-map "Cd" 'vhdl-template-configuration-decl) (define-key vhdl-template-map "Cs" 'vhdl-template-configuration-spec) (define-key vhdl-template-map "co" 'vhdl-template-constant) + (define-key vhdl-template-map "ct" 'vhdl-template-context) (define-key vhdl-template-map "di" 'vhdl-template-disconnect) (define-key vhdl-template-map "el" 'vhdl-template-else) (define-key vhdl-template-map "ei" 'vhdl-template-elsif) @@ -2963,7 +2975,7 @@ STRING are replaced by `-' and substrings are converted to lower case." (modify-syntax-entry ?\* "." st) (modify-syntax-entry ?\+ "." st) (modify-syntax-entry ?\. "." st) - (modify-syntax-entry ?\/ "." st) +;;; (modify-syntax-entry ?\/ "." st) (modify-syntax-entry ?\: "." st) (modify-syntax-entry ?\; "." st) (modify-syntax-entry ?\< "." st) @@ -2975,11 +2987,13 @@ STRING are replaced by `-' and substrings are converted to lower case." (modify-syntax-entry ?\" "\"" st) ;; define underscore (modify-syntax-entry ?\_ (if vhdl-underscore-is-part-of-word "w" "_") st) - ;; a single hyphen is punctuation, but a double hyphen starts a comment - (modify-syntax-entry ?\- ". 12" st) - ;; and \n and \^M end a comment - (modify-syntax-entry ?\n ">" st) - (modify-syntax-entry ?\^M ">" st) + ;; single-line comments + (modify-syntax-entry ?\- ". 12b" st) + ;; multi-line comments + (modify-syntax-entry ?\/ ". 14b" st) + (modify-syntax-entry ?* ". 23" st) + (modify-syntax-entry ?\n "> b" st) + (modify-syntax-entry ?\^M "> b" st) ;; define parentheses to match (modify-syntax-entry ?\( "()" st) (modify-syntax-entry ?\) ")(" st) @@ -3044,6 +3058,7 @@ STRING are replaced by `-' and substrings are converted to lower case." ("configuration" . vhdl-template-configuration-hook) ("cons" . vhdl-template-constant-hook) ("constant" . vhdl-template-constant-hook) + ("context" . vhdl-template-context-hook) ("disconnect" . vhdl-template-disconnect-hook) ("downto" . vhdl-template-default-hook) ("else" . vhdl-template-else-hook) @@ -3191,6 +3206,7 @@ STRING are replaced by `-' and substrings are converted to lower case." ("configuration declaration" vhdl-template-configuration-decl) ("configuration specification" vhdl-template-configuration-spec) ("constant declaration" vhdl-template-constant) + ("context declaration" vhdl-template-context) ("disconnection specification" vhdl-template-disconnect) ("entity declaration" vhdl-template-entity) ("exit statement" vhdl-template-exit) @@ -3367,6 +3383,7 @@ STRING are replaced by `-' and substrings are converted to lower case." ["Configuration (Decl)" vhdl-template-configuration-decl t] ["Configuration (Spec)" vhdl-template-configuration-spec t] ["Constant" vhdl-template-constant t] + ["Context" vhdl-template-context t] ["Disconnect" vhdl-template-disconnect t] ["Else" vhdl-template-else t] ["Elsif" vhdl-template-elsif t] @@ -3708,6 +3725,11 @@ STRING are replaced by `-' and substrings are converted to lower case." (list '93 (cadr vhdl-standard))) (vhdl-activate-customizations)) :style radio :selected (eq '93 (car vhdl-standard))] + ["VHDL'08" + (progn (customize-set-variable 'vhdl-standard + (list '08 (cadr vhdl-standard))) + (vhdl-activate-customizations)) + :style radio :selected (eq '08 (car vhdl-standard))] "--" ["VHDL-AMS" (progn (customize-set-variable @@ -3830,6 +3852,10 @@ STRING are replaced by `-' and substrings are converted to lower case." (customize-set-variable 'vhdl-conditions-in-parenthesis (not vhdl-conditions-in-parenthesis)) :style toggle :selected vhdl-conditions-in-parenthesis] + ["Sensitivity List uses 'all'" + (customize-set-variable 'vhdl-sensitivity-list-all + (not vhdl-sensitivity-list-all)) + :style toggle :selected vhdl-sensitivity-list-all] ["Zero String..." (customize-option 'vhdl-zero-string) t] ["One String..." (customize-option 'vhdl-one-string) t] ("File Header" @@ -4224,6 +4250,9 @@ STRING are replaced by `-' and substrings are converted to lower case." ("Entity" "^\\s-*\\(entity\\)\\s-+\\(\\(\\w\\|\\s_\\)+\\)" 2) + ("Context" + "^\\s-*\\(context\\)\\s-+\\(\\(\\w\\|\\s_\\)+\\)" + 2) ) "Imenu generic expression for VHDL Mode. See `imenu-generic-expression'.") @@ -4677,7 +4706,7 @@ Usage: VHDL STANDARDS: The VHDL standards to be used are specified in option `vhdl-standard'. - Available standards are: VHDL'87/'93(02), VHDL-AMS, and Math Packages. + Available standards are: VHDL'87/'93(02)/'08, VHDL-AMS, and Math Packages. KEYWORD CASE: @@ -4987,6 +5016,12 @@ Key bindings: ) "List of VHDL'02 keywords.") +(defconst vhdl-08-keywords + '( + "context" "force" "property" "release" "sequence" + ) + "List of VHDL'08 keywords.") + (defconst vhdl-ams-keywords '( "across" "break" "limit" "nature" "noise" "procedural" "quantity" @@ -5028,6 +5063,12 @@ Key bindings: ) "List of VHDL'02 standardized types.") +(defconst vhdl-08-types + '( + "boolean_vector" "integer_vector" "real_vector" "time_vector" + ) + "List of VHDL'08 standardized types.") + (defconst vhdl-ams-types ;; standards: IEEE Std 1076.1-2007, IEEE Std 1076.1.1-2004 '( @@ -5103,6 +5144,12 @@ Key bindings: ) "List of VHDL'02 standardized attributes.") +(defconst vhdl-08-attributes + '( + "instance_name" "path_name" + ) + "List of VHDL'08 standardized attributes.") + (defconst vhdl-ams-attributes '( "across" "through" @@ -5174,6 +5221,15 @@ Key bindings: ) "List of VHDL'02 standardized functions.") +(defconst vhdl-08-functions + '( + "finish" "flush" "justify" "maximum" "minimum" + "resolution_limit" "rising_edge" "stop" "swrite" + "tee" "to_binarystring" "to_bstring" "to_hexstring" "to_hstring" + "to_octalstring" "to_ostring" "to_string" + ) + "List of VHDL'08 standardized functions.") + (defconst vhdl-ams-functions '( ;; package `standard' @@ -5202,6 +5258,13 @@ Key bindings: ) "List of VHDL'02 standardized packages and libraries.") +(defconst vhdl-08-packages + '( + "env" "numeric_std_signed" "numeric_std_unsigned" + "ieee_bit_context" "ieee_std_context" ;; contexts + ) + "List of VHDL'08 standardized packages and libraries.") + (defconst vhdl-ams-packages '( "fundamental_constants" "material_constants" "energy_systems" @@ -5216,6 +5279,18 @@ Key bindings: ) "List of Math Packages standardized packages and libraries.") +(defconst vhdl-08-directives + '( + "author" "author_info" "begin" "begin_protected" "comment" + "data_block" "data_keyname" "data_keyowner" "data_method" + "decrypt_license" "digest_block" "digest_key_method" "digest_keyname" + "digest_keyowner" "digest_method" + "encoding" "encrypt_agent" "encrypt_agent_info" "end" "end_protected" + "key_block" "key_keyname" "key_keyowner" "key_method" + "runtime_license" "viewport" + ) + "List of VHDL'08 standardized tool directives.") + (defvar vhdl-keywords nil "List of VHDL keywords.") @@ -5237,6 +5312,9 @@ Key bindings: (defvar vhdl-packages nil "List of VHDL standardized packages and libraries.") +(defvar vhdl-directives nil + "List of VHDL standardized packages and libraries.") + (defvar vhdl-reserved-words nil "List of additional reserved words.") @@ -5282,17 +5360,20 @@ Key bindings: (vhdl-upcase-list (and vhdl-highlight-case-sensitive vhdl-upper-case-keywords) (append vhdl-02-keywords + (when (vhdl-standard-p '08) vhdl-08-keywords) (when (vhdl-standard-p 'ams) vhdl-ams-keywords)))) (setq vhdl-types (vhdl-upcase-list (and vhdl-highlight-case-sensitive vhdl-upper-case-types) (append vhdl-02-types + (when (vhdl-standard-p '08) vhdl-08-types) (when (vhdl-standard-p 'ams) vhdl-ams-types) (when (vhdl-standard-p 'math) vhdl-math-types)))) (setq vhdl-attributes (vhdl-upcase-list (and vhdl-highlight-case-sensitive vhdl-upper-case-attributes) (append vhdl-02-attributes + (when (vhdl-standard-p '08) vhdl-08-attributes) (when (vhdl-standard-p 'ams) vhdl-ams-attributes)))) (setq vhdl-enum-values (vhdl-upcase-list @@ -5307,12 +5388,16 @@ Key bindings: '("")))) (setq vhdl-functions (append vhdl-02-functions + (when (vhdl-standard-p '08) vhdl-08-functions) (when (vhdl-standard-p 'ams) vhdl-ams-functions) (when (vhdl-standard-p 'math) vhdl-math-functions))) (setq vhdl-packages (append vhdl-02-packages + (when (vhdl-standard-p '08) vhdl-08-packages) (when (vhdl-standard-p 'ams) vhdl-ams-packages) (when (vhdl-standard-p 'math) vhdl-math-packages))) + (setq vhdl-directives + (append (when (vhdl-standard-p '08) vhdl-08-directives))) (setq vhdl-reserved-words (append (when vhdl-highlight-forbidden-words vhdl-forbidden-words) (when vhdl-highlight-verilog-keywords vhdl-verilog-keywords) @@ -5357,7 +5442,8 @@ Key bindings: (list vhdl-upper-case-enum-values) vhdl-enum-values (list vhdl-upper-case-constants) vhdl-constants (list nil) vhdl-functions - (list nil) vhdl-packages))) + (list nil) vhdl-packages + (list nil) vhdl-directives))) ;; initialize reserved words for VHDL Mode (vhdl-words-init) @@ -5598,9 +5684,24 @@ the offset is simply returned." ;; Syntactic support functions: -(defun vhdl-in-comment-p () - "Check if point is in a comment." - (eq (vhdl-in-literal) 'comment)) +(defun vhdl-in-comment-p (&optional pos) + "Check if point is in a comment (include multi-line comments)." + (let ((parse (lambda (p) + (let ((c (char-after p))) + (or (and c (eq (char-syntax c) ?<)) + (nth 4 (parse-partial-sexp + (save-excursion + (beginning-of-defun) + (point)) p))))))) + (save-excursion + (goto-char (or pos (point))) + (or (funcall parse (point)) + ;; `parse-partial-sexp's notion of comments doesn't span lines + (progn + (back-to-indentation) + (unless (eolp) + (forward-char) + (funcall parse (point)))))))) (defun vhdl-in-string-p () "Check if point is in a string." @@ -5625,6 +5726,9 @@ the offset is simply returned." ((nth 3 state) 'string) ((nth 4 state) 'comment) ((vhdl-beginning-of-macro) 'pound) + ((vhdl-beginning-of-directive) 'directive) + ;; for multi-line comments + ((and (vhdl-standard-p '08) (vhdl-in-comment-p)) 'comment) (t nil))))) (defun vhdl-in-extended-identifier-p () @@ -5675,7 +5779,7 @@ negative, skip forward otherwise." (goto-char lim ) (while (< (point) here) (setq match - (and (re-search-forward "--\\|[\"']" + (and (re-search-forward "--\\|[\"']\\|`" here 'move) (buffer-substring (match-beginning 0) (match-end 0)))) (setq state @@ -5685,6 +5789,9 @@ negative, skip forward otherwise." ;; looking at the opening of a VHDL style comment ((string= "--" match) (if (<= here (progn (end-of-line) (point))) 'comment)) + ;; looking at a directive + ((string= "`" match) + (if (<= here (progn (end-of-line) (point))) 'directive)) ;; looking at the opening of a double quote string ((string= "\"" match) (if (not (save-restriction @@ -5729,7 +5836,7 @@ negative, skip forward otherwise." (setq here (point)) (vhdl-forward-comment hugenum) ;; skip preprocessor directives - (when (and (eq (char-after) ?#) + (when (and (or (eq (char-after) ?#) (eq (char-after) ?`)) (= (vhdl-point 'boi) (point))) (while (and (eq (char-before (vhdl-point 'eol)) ?\\) (= (forward-line 1) 0))) @@ -5766,6 +5873,19 @@ negative, skip forward otherwise." (goto-char here) nil))) +(defun vhdl-beginning-of-directive (&optional lim) + "Go to the beginning of a directive (nicked from `cc-engine')." + (let ((here (point))) + (beginning-of-line) + (while (eq (char-before (1- (point))) ?\\) + (forward-line -1)) + (back-to-indentation) + (if (and (<= (point) here) + (eq (char-after) ?`)) + t + (goto-char here) + nil))) + (defun vhdl-backward-syntactic-ws (&optional lim) "Backward skip over syntactic whitespace." (let* ((here (point-min)) @@ -5822,7 +5942,7 @@ that point, else nil." ;; Core syntactic evaluation functions: (defconst vhdl-libunit-re - "\\b\\(architecture\\|configuration\\|entity\\|package\\)\\b[^_]") + "\\b\\(architecture\\|configuration\\|context\\|entity\\|package\\)\\b[^_]") (defun vhdl-libunit-p () (and @@ -5840,7 +5960,7 @@ that point, else nil." )) (defconst vhdl-defun-re - "\\b\\(architecture\\|block\\|configuration\\|entity\\|package\\|process\\|procedural\\|procedure\\|function\\)\\b[^_]") + "\\b\\(architecture\\|block\\|configuration\\|context\\|entity\\|package\\|process\\|procedural\\|procedure\\|function\\)\\b[^_]") (defun vhdl-defun-p () (save-excursion @@ -5849,7 +5969,7 @@ that point, else nil." (save-excursion (backward-sexp) (not (looking-at "end\\s-+\\w"))) - ;; "architecture", "configuration", "entity", + ;; "architecture", "configuration", "context", "entity", ;; "package", "procedure", "function": t))) @@ -5863,7 +5983,7 @@ corresponding \"begin\" keyword, else return nil." (if (looking-at "block\\|process\\|procedural") ;; "block", "process". "procedural: (buffer-substring (match-beginning 0) (match-end 0)) - ;; "architecture", "configuration", "entity", "package", + ;; "architecture", "configuration", "context", "entity", "package", ;; "procedure", "function": "is")))) @@ -5884,7 +6004,7 @@ vhdl-begin-fwd-re, and are not inside a literal, and that we are not in the middle of an identifier that just happens to contain a \"begin\" keyword." (cond - ;; "[architecture|case|configuration|entity|package| + ;; "[architecture|case|configuration|context|entity|package| ;; procedure|function] ... is": ((and (looking-at "i") (save-excursion @@ -5897,7 +6017,7 @@ keyword." (let (foundp) (while (and (not foundp) (re-search-backward - ";\\|\\b\\(architecture\\|case\\|configuration\\|entity\\|package\\|procedure\\|return\\|is\\|begin\\|process\\|procedural\\|block\\)\\b[^_]" + ";\\|\\b\\(architecture\\|case\\|configuration\\|context\\|entity\\|package\\|procedure\\|return\\|is\\|begin\\|process\\|procedural\\|block\\)\\b[^_]" lim 'move)) (if (or (= (preceding-char) ?_) (vhdl-in-literal)) @@ -6092,7 +6212,7 @@ of an identifier that just happens to contain an \"end\" keyword." (vector "for" (vhdl-first-word pos) nil nil)) ;; "end [id]": (t - (vector "begin\\|architecture\\|configuration\\|entity\\|package\\|procedure\\|function" + (vector "begin\\|architecture\\|configuration\\|context\\|entity\\|package\\|procedure\\|function" (vhdl-first-word pos) ;; return an alist of (statement . keyword) mappings '( @@ -6102,6 +6222,8 @@ of an identifier that just happens to contain an \"end\" keyword." ("architecture" . "is") ;; "configuration ... is ... end [id]": ("configuration" . "is") + ;; "context ... is ... end [id]": + ("context" . "is") ;; "entity ... is ... end [id]": ("entity" . "is") ;; "package ... is ... end [id]": @@ -6716,7 +6838,8 @@ keyword at PLACEHOLDER, then return the library unit type." (cond ((looking-at "e") 'entity) ((looking-at "a") 'architecture) - ((looking-at "c") 'configuration) + ((looking-at "conf") 'configuration) + ((looking-at "cont") 'context) ((looking-at "p") (save-excursion (goto-char bod) @@ -6992,7 +7115,7 @@ is not moved." (goto-char (1+ containing-sexp)) (skip-chars-forward " \t") (not (eolp)) - (not (looking-at "--"))) + (not (looking-at "--\\|`"))) (save-excursion (vhdl-beginning-of-statement-1 containing-sexp) (skip-chars-backward " \t(") @@ -7141,8 +7264,10 @@ is not moved." ;; now we need to look at any modifiers (goto-char indent-point) (skip-chars-forward " \t") - (if (looking-at "--") + (if (or (looking-at "--") (looking-at "/\\*")) (vhdl-add-syntax 'comment)) + (if (looking-at "`") + (vhdl-add-syntax 'directive)) (if (eq literal 'pound) (vhdl-add-syntax 'cpp-macro)) ;; return the syntax @@ -7216,8 +7341,12 @@ only-lines." (vhdl-comment-indent) ;; otherwise, indent as specified by vhdl-comment-only-line-offset (if (not (bolp)) + ;; inside multi-line comment + (if (looking-at "\\*") + 1 + ;; otherwise (or (car-safe vhdl-comment-only-line-offset) - vhdl-comment-only-line-offset) + vhdl-comment-only-line-offset)) (or (cdr-safe vhdl-comment-only-line-offset) (car-safe vhdl-comment-only-line-offset) -1000 ;jam it against the left side @@ -7457,7 +7586,7 @@ ENDPOS is encountered." (mapc (function (lambda (elt) - (if (memq (car elt) '(entity configuration package + (if (memq (car elt) '(entity configuration context package package-body architecture)) nil (setq expurgated (append expurgated (list elt)))))) @@ -7787,7 +7916,7 @@ the token in MATCH." (vhdl-prepare-search-2 (save-excursion ;; search for declarative part - (when (and (re-search-backward "^\\(architecture\\|begin\\|configuration\\|end\\|entity\\|package\\)\\>" nil t) + (when (and (re-search-backward "^\\(architecture\\|begin\\|configuration\\|context\\|end\\|entity\\|package\\)\\>" nil t) (not (member (upcase (match-string 1)) '("BEGIN" "END")))) (setq beg (point)) (re-search-forward "^\\(begin\\|end\\)\\>" nil t) @@ -9137,6 +9266,27 @@ a configuration declaration if not within a design unit." (insert ";") (vhdl-comment-insert-inline)))))) +(defun vhdl-template-context () + "Insert a context declaration." + (interactive) + (let ((margin (current-indentation)) + (start (point)) + entity-exists string name position) + (vhdl-insert-keyword "CONTEXT ") + (when (setq name (vhdl-template-field "name" nil t start (point))) + (vhdl-insert-keyword " IS\n") + (when (memq vhdl-insert-empty-lines '(unit all)) (insert "\n")) + (indent-to (+ margin vhdl-basic-offset)) + (setq position (point)) + (insert "\n") + (when (memq vhdl-insert-empty-lines '(unit all)) (insert "\n")) + (indent-to margin) + (vhdl-insert-keyword "END ") + (unless (vhdl-standard-p '87) + (vhdl-insert-keyword "CONTEXT ")) + (insert name ";") + (goto-char position)))) + (defun vhdl-template-default () "Insert nothing." (interactive) @@ -9798,8 +9948,10 @@ otherwise." (forward-char 1)) (insert "(") (if (not seq) - (unless (setq input-signals - (vhdl-template-field "[sensitivity list]" ")" t)) + (unless (or (and (vhdl-standard-p '08) vhdl-sensitivity-list-all + (progn (insert "all)") (setq input-signals "all"))) + (setq input-signals + (vhdl-template-field "[sensitivity list]" ")" t))) (setq input-signals "") (delete-char -2)) (setq clock (or (and (not (equal "" vhdl-clock-name)) @@ -10533,7 +10685,8 @@ specification, if not already there." (while (search-forward "" end t) (replace-match (concat "VHDL" (cond ((vhdl-standard-p '87) "'87") - ((vhdl-standard-p '93) "'93/02")) + ((vhdl-standard-p '93) "'93/02") + ((vhdl-standard-p '08) "'08")) (when (vhdl-standard-p 'ams) ", VHDL-AMS") (when (vhdl-standard-p 'math) ", Math Packages")) t t)) (goto-char beg) @@ -11071,7 +11224,7 @@ else insert tab (used for word completion in VHDL minibuffer)." (save-excursion (beginning-of-line) ;; search backward for block beginning or end - (while (or (while (and (setq pos (re-search-backward "^\\s-*\\(\\(end\\)\\|\\(\\(impure\\|pure\\)[ \t\n\r\f]+\\)?\\(function\\|procedure\\)\\|\\(for\\)\\|\\(architecture\\|component\\|configuration\\|entity\\|package\\(\\s-+body\\)?\\|type[ \t\n\r\f]+\\w+[ \t\n\r\f]+is[ \t\n\r\f]+\\(record\\|protected\\(\\s-+body\\)?\\)\\|units\\)\\|\\(\\w+[ \t\n\r\f]*:[ \t\n\r\f]*\\)?\\(postponed[ \t\n\r\f]+\\)?\\(block\\|case\\|for\\|if\\|procedural\\|process\\|while\\|loop\\)\\)\\>" nil t)) + (while (or (while (and (setq pos (re-search-backward "^\\s-*\\(\\(end\\)\\|\\(\\(impure\\|pure\\)[ \t\n\r\f]+\\)?\\(function\\|procedure\\)\\|\\(for\\)\\|\\(architecture\\|component\\|configuration\\|context\\|entity\\|package\\(\\s-+body\\)?\\|type[ \t\n\r\f]+\\w+[ \t\n\r\f]+is[ \t\n\r\f]+\\(record\\|protected\\(\\s-+body\\)?\\)\\|units\\)\\|\\(\\w+[ \t\n\r\f]*:[ \t\n\r\f]*\\)?\\(postponed[ \t\n\r\f]+\\)?\\(block\\|case\\|for\\|if\\|procedural\\|process\\|while\\|loop\\)\\)\\>" nil t)) ;; not consider subprogram declarations (or (and (match-string 5) (save-match-data @@ -11102,7 +11255,7 @@ else insert tab (used for word completion in VHDL minibuffer)." (save-excursion (end-of-line) ;; search forward for block beginning or end - (while (or (while (and (setq pos (re-search-forward "^\\s-*\\(\\(end\\)\\|\\(\\(impure\\|pure\\)[ \t\n\r\f]+\\)?\\(function\\|procedure\\)\\|\\(for\\)\\|\\(architecture\\|component\\|configuration\\|entity\\|package\\(\\s-+body\\)?\\|type[ \t\n\r\f]+\\w+[ \t\n\r\f]+is[ \t\n\r\f]+\\(record\\|protected\\(\\s-+body\\)?\\)\\|units\\)\\|\\(\\w+[ \t\n\r\f]*:[ \t\n\r\f]*\\)?\\(postponed[ \t\n\r\f]+\\)?\\(block\\|case\\|for\\|if\\|procedural\\|process\\|while\\|loop\\)\\)\\>" nil t)) + (while (or (while (and (setq pos (re-search-forward "^\\s-*\\(\\(end\\)\\|\\(\\(impure\\|pure\\)[ \t\n\r\f]+\\)?\\(function\\|procedure\\)\\|\\(for\\)\\|\\(architecture\\|component\\|configuration\\|context\\|entity\\|package\\(\\s-+body\\)?\\|type[ \t\n\r\f]+\\w+[ \t\n\r\f]+is[ \t\n\r\f]+\\(record\\|protected\\(\\s-+body\\)?\\)\\|units\\)\\|\\(\\w+[ \t\n\r\f]*:[ \t\n\r\f]*\\)?\\(postponed[ \t\n\r\f]+\\)?\\(block\\|case\\|for\\|if\\|procedural\\|process\\|while\\|loop\\)\\)\\>" nil t)) ;; not consider subprogram declarations (or (and (match-string 5) (save-match-data @@ -11203,6 +11356,8 @@ but not if inside a comment or quote." (vhdl-hooked-abbrev 'vhdl-template-configuration)) (defun vhdl-template-constant-hook () (vhdl-hooked-abbrev 'vhdl-template-constant)) +(defun vhdl-template-context-hook () + (vhdl-hooked-abbrev 'vhdl-template-context)) (defun vhdl-template-disconnect-hook () (vhdl-hooked-abbrev 'vhdl-template-disconnect)) (defun vhdl-template-display-comment-hook () @@ -13190,7 +13345,8 @@ This does highlighting of keywords and standard identifiers.") (list (concat "^\\s-*\\(" - "architecture\\|configuration\\|entity\\|package\\(\\s-+body\\)?\\|" + "architecture\\|configuration\\|context\\|entity\\|package" + "\\(\\s-+body\\)?\\|" "\\(\\(impure\\|pure\\)\\s-+\\)?function\\|procedure\\|component" "\\)\\s-+\\(\\w+\\)") 5 'font-lock-function-name-face) @@ -13232,9 +13388,9 @@ This does highlighting of keywords and standard identifiers.") (list (concat "^\\s-*end\\s-+\\(\\(" - "architecture\\|block\\|case\\|component\\|configuration\\|entity\\|" - "for\\|function\\|generate\\|if\\|loop\\|package\\(\\s-+body\\)?\\|" - "procedure\\|\\(postponed\\s-+\\)?process\\|" + "architecture\\|block\\|case\\|component\\|configuration\\|context\\|" + "entity\\|for\\|function\\|generate\\|if\\|loop\\|package" + "\\(\\s-+body\\)?\\|procedure\\|\\(postponed\\s-+\\)?process\\|" (when (vhdl-standard-p 'ams) "procedural\\|") "units" "\\)\\s-+\\)?\\(\\w*\\)") @@ -13266,10 +13422,10 @@ This does highlighting of keywords and standard identifiers.") ;; highlight names in use clauses (list (concat - "\\" nil 1) + (while (and (re-search-forward "^[ \t]*\\(architecture\\|configuration\\|context\\|entity\\|package\\)\\>" nil 1) (save-excursion (goto-char (match-beginning 0)) (vhdl-backward-syntactic-ws) @@ -13682,7 +13844,7 @@ hierarchy otherwise.") "Scan the context clause that precedes a design unit." (let (lib-alist) (save-excursion - (when (re-search-backward "^[ \t]*\\(architecture\\|configuration\\|entity\\|package\\)\\>" nil t) + (when (re-search-backward "^[ \t]*\\(architecture\\|configuration\\|context\\|entity\\|package\\)\\>" nil t) (while (and (re-search-backward "^[ \t]*\\(end\\|use\\)\\>" nil t) (equal "USE" (upcase (match-string 1)))) (when (looking-at "^[ \t]*use[ \t\n\r\f]*\\(\\w+\\)\\.\\(\\w+\\)\\.\\w+") @@ -17502,6 +17664,7 @@ specified by a target." 'vhdl-argument-list-indent 'vhdl-association-list-with-formals 'vhdl-conditions-in-parenthesis + 'vhdl-sensitivity-list-all 'vhdl-zero-string 'vhdl-one-string 'vhdl-file-header @@ -17606,6 +17769,17 @@ specified by a target." (defconst vhdl-doc-release-notes nil "\ +Release Notes for VHDL Mode 3.37 +================================ + +- Added support for VHDL'08: + - New keywords, types, functions, attributes, operators, packages + - Context declaration + - Block comments + - Directives + - 'all' keyword in sensitivity list + + Release Notes for VHDL Mode 3.34 ================================ @@ -17667,6 +17841,13 @@ User Options Reserved words in VHDL ---------------------- +VHDL'08 (IEEE Std 1076-2008): + `vhdl-08-keywords' : keywords + `vhdl-08-types' : standardized types + `vhdl-08-attributes' : standardized attributes + `vhdl-08-functions' : standardized functions + `vhdl-08-packages' : standardized packages and libraries + VHDL'93/02 (IEEE Std 1076-1993/2002): `vhdl-02-keywords' : keywords `vhdl-02-types' : standardized types From 1ee99b6fbde4a58e7be24c46e19ff8faadbe704f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Feb 2015 19:36:54 -0500 Subject: [PATCH 124/457] # ChangeLog fix --- lisp/ChangeLog | 3 --- lisp/url/ChangeLog | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce1a8c2c0f9..925f51b6557 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1384,9 +1384,6 @@ 2015-01-17 Ivan Shmakov - * url/url-cookie.el (url-cookie-write-file): Let-bind print-length - and print-level to nil to avoid writing a garbled list. (Bug#16805) - * files.el (find-file-other-window, find-file-other-frame): Use mapc instead of mapcar. (Bug#18175) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 920d692d319..0f464135840 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -4,6 +4,11 @@ * url-dav.el (url-dav-delete-directory, url-dav-delete-file) (url-dav-directory-files): Keep diagnostics consistent with system's. +2015-01-17 Ivan Shmakov + + * url-cookie.el (url-cookie-write-file): Let-bind print-length + and print-level to nil to avoid writing a garbled list. (Bug#16805) + 2014-12-12 Lars Magne Ingebrigtsen * url-http.el (url-http-parse-headers): `gnutls-available-p' is From 852947baf0d71751843da82ec4593ea154fda9af Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Fri, 20 Feb 2015 19:50:46 -0500 Subject: [PATCH 125/457] Sync with upstream verilog-mode revision 0d6420b * lisp/progmodes/verilog-mode.el (verilog-mode-version): Update. (vector-skip-list): Remove. (verilog-auto-inst-port, verilog-auto-inst-port-list) (verilog-auto-inst, verilog-auto-inst-param): Use arguments rather than vector-skip. (verilog-auto-inst-port): Fix AUTOINST interfaces to not show modport if signal attachment is itself a modport. Reported by Matthew Lovell. --- lisp/ChangeLog | 12 +++++++++++ lisp/progmodes/verilog-mode.el | 37 +++++++++++++++++----------------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 925f51b6557..4e59654e0c2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2015-02-21 Wilson Snyder + + Sync with upstream verilog-mode revision 0d6420b. + * progmodes/verilog-mode.el (verilog-mode-version): Update. + (vector-skip-list): Remove. + (verilog-auto-inst-port, verilog-auto-inst-port-list) + (verilog-auto-inst, verilog-auto-inst-param): + Use arguments rather than vector-skip. + (verilog-auto-inst-port): Fix AUTOINST interfaces to not show + modport if signal attachment is itself a modport. Reported by + Matthew Lovell. + 2015-02-21 Reto Zimmermann Sync with upstream vhdl mode v3.37.1. Add VHDL'08 support. diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 7b6f2d3a819..57206544b9b 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -123,7 +123,7 @@ ;;; Code: ;; This variable will always hold the version number of the mode -(defconst verilog-mode-version "2014-11-12-aa4b777-vpo" +(defconst verilog-mode-version "2015-02-20-0d6420b-vpo" "Version of this Verilog mode.") (defconst verilog-mode-release-emacs t "If non-nil, this version of Verilog mode was released with Emacs itself.") @@ -8419,7 +8419,6 @@ Return an array of [outputs inouts inputs wire reg assign const]." (defvar sigs-temp) ;; These are known to be from other packages and may not be defined (defvar diff-command nil) - (defvar vector-skip-list) ;; There are known to be from newer versions of Emacs (defvar create-lockfiles)) @@ -10884,7 +10883,7 @@ See the example in `verilog-auto-inout-modport'." (defvar vl-bits nil "See `verilog-auto-inst'.") ; Prevent compile warning (defvar vl-mbits nil "See `verilog-auto-inst'.") ; Prevent compile warning -(defun verilog-auto-inst-port (port-st indent-pt tpl-list tpl-num for-star par-values) +(defun verilog-auto-inst-port (port-st indent-pt moddecls tpl-list tpl-num for-star par-values) "Print out an instantiation connection for this PORT-ST. Insert to INDENT-PT, use template TPL-LIST. @ are instantiation numbers, replaced with TPL-NUM. @@ -10901,9 +10900,10 @@ If PAR-VALUES replace final strings with these parameter values." (vl-mbits (if (verilog-sig-multidim port-st) (verilog-sig-multidim-string port-st) "")) (vl-bits (if (or verilog-auto-inst-vector - (not (assoc port vector-skip-list)) + (not (assoc port (verilog-decls-get-signals moddecls))) (not (equal (verilog-sig-bits port-st) - (verilog-sig-bits (assoc port vector-skip-list))))) + (verilog-sig-bits + (assoc port (verilog-decls-get-signals moddecls)))))) (or (verilog-sig-bits port-st) "") "")) (case-fold-search nil) @@ -10932,7 +10932,12 @@ If PAR-VALUES replace final strings with these parameter values." (concat "/*" vl-mbits vl-bits "*/") (concat vl-bits)) tpl-net (concat port - (if vl-modport (concat "." vl-modport) "") + (if (and vl-modport + ;; .modport cannot be added if attachment is + ;; already declared as modport, VCS croaks + (let ((sig (assoc port (verilog-decls-get-interfaces moddecls)))) + (not (and sig (verilog-sig-modport sig))))) + (concat "." vl-modport) "") dflt-bits)) ;; Find template (cond (tpl-ass ; Template of exact port name @@ -11002,12 +11007,12 @@ If PAR-VALUES replace final strings with these parameter values." ;;(x "incom[@\"(+ (* 8 @) 7)\":@\"(* 8 @)\"]") ;;(x ".out (outgo[@\"(concat (+ (* 8 @) 7) \\\":\\\" ( * 8 @))\"]));") -(defun verilog-auto-inst-port-list (sig-list indent-pt tpl-list tpl-num for-star par-values) +(defun verilog-auto-inst-port-list (sig-list indent-pt moddecls tpl-list tpl-num for-star par-values) "For `verilog-auto-inst' print a list of ports using `verilog-auto-inst-port'." (when verilog-auto-inst-sort (setq sig-list (sort (copy-alist sig-list) `verilog-signals-sort-compare))) (mapc (lambda (port) - (verilog-auto-inst-port port indent-pt + (verilog-auto-inst-port port indent-pt moddecls tpl-list tpl-num for-star par-values)) sig-list)) @@ -11366,8 +11371,6 @@ For more information see the \\[verilog-faq] and forums at URL (+ 16 (* 8 (/ (+ indent-pt 7) 8))))) (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) - (vector-skip-list (unless verilog-auto-inst-vector - (verilog-decls-get-signals moddecls))) submod submodi submoddecls inst skip-pins tpl-list tpl-num did-first par-values) @@ -11409,7 +11412,7 @@ For more information see the \\[verilog-faq] and forums at URL (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) ;; Note these are searched for in verilog-read-sub-decls. (verilog-insert-indent "// Interfaced\n") - (verilog-auto-inst-port-list sig-list indent-pt + (verilog-auto-inst-port-list sig-list indent-pt moddecls tpl-list tpl-num for-star par-values))) (let ((sig-list (verilog-signals-not-in (verilog-decls-get-interfaces submoddecls) @@ -11419,7 +11422,7 @@ For more information see the \\[verilog-faq] and forums at URL (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) ;; Note these are searched for in verilog-read-sub-decls. (verilog-insert-indent "// Interfaces\n") - (verilog-auto-inst-port-list sig-list indent-pt + (verilog-auto-inst-port-list sig-list indent-pt moddecls tpl-list tpl-num for-star par-values))) (let ((sig-list (verilog-signals-not-in (verilog-decls-get-outputs submoddecls) @@ -11428,7 +11431,7 @@ For more information see the \\[verilog-faq] and forums at URL (when sig-list (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) (verilog-insert-indent "// Outputs\n") - (verilog-auto-inst-port-list sig-list indent-pt + (verilog-auto-inst-port-list sig-list indent-pt moddecls tpl-list tpl-num for-star par-values))) (let ((sig-list (verilog-signals-not-in (verilog-decls-get-inouts submoddecls) @@ -11437,7 +11440,7 @@ For more information see the \\[verilog-faq] and forums at URL (when sig-list (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) (verilog-insert-indent "// Inouts\n") - (verilog-auto-inst-port-list sig-list indent-pt + (verilog-auto-inst-port-list sig-list indent-pt moddecls tpl-list tpl-num for-star par-values))) (let ((sig-list (verilog-signals-not-in (verilog-decls-get-inputs submoddecls) @@ -11446,7 +11449,7 @@ For more information see the \\[verilog-faq] and forums at URL (when sig-list (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) (verilog-insert-indent "// Inputs\n") - (verilog-auto-inst-port-list sig-list indent-pt + (verilog-auto-inst-port-list sig-list indent-pt moddecls tpl-list tpl-num for-star par-values))) ;; Kill extra semi (save-excursion @@ -11509,8 +11512,6 @@ Templates: (+ 16 (* 8 (/ (+ indent-pt 7) 8))))) (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) - (vector-skip-list (unless verilog-auto-inst-vector - (verilog-decls-get-signals moddecls))) submod submodi submoddecls inst skip-pins tpl-list tpl-num did-first) ;; Find module name that is instantiated @@ -11550,7 +11551,7 @@ Templates: (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) ;; Note these are searched for in verilog-read-sub-decls. (verilog-insert-indent "// Parameters\n") - (verilog-auto-inst-port-list sig-list indent-pt + (verilog-auto-inst-port-list sig-list indent-pt moddecls tpl-list tpl-num nil nil))) ;; Kill extra semi (save-excursion From 5169b7118190145e392b21da621a536853257d32 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Feb 2015 19:54:02 -0500 Subject: [PATCH 126/457] # etc/TODO: Add idlwave --- etc/TODO | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/TODO b/etc/TODO index 68a3792993f..13153c4168b 100644 --- a/etc/TODO +++ b/etc/TODO @@ -102,6 +102,11 @@ make it. "FOO-tab -> ?\FOO-\t", "uppercase -> lowercase", "[fringe KEY...] -> [KEY]", "H-FOO -> M-FOO", "C-x C-y FOO -> H-FOO", ... +* Things related to elpa.gnu.org. + +** Move idlwave to elpa.gnu.org. +Need to sync up the Emacs and external versions. +See * Simple tasks. These don't require much Emacs knowledge, they are suitable for anyone from beginners to experts. From 43fb42da8bd6851b5b22d2bbb5d2cd8ceede9c09 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Feb 2015 20:38:43 -0500 Subject: [PATCH 127/457] # etc/TODO: More elpa additions --- etc/TODO | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/etc/TODO b/etc/TODO index 13153c4168b..79996e28d3f 100644 --- a/etc/TODO +++ b/etc/TODO @@ -108,6 +108,16 @@ make it. Need to sync up the Emacs and external versions. See +** Move Org mode to elpa.gnu.org. +See + + +** Move verilog-mode to elpa.gnu.org. +See + +** Move vhdl-mode to elpa.gnu.org. +See + * Simple tasks. These don't require much Emacs knowledge, they are suitable for anyone from beginners to experts. From 066b17df681fabb40108d719086669957aebbc51 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 20 Feb 2015 23:31:17 -0800 Subject: [PATCH 128/457] Merge from gnulib * doc/misc/texinfo.tex: Update from gnulib. * lib/getdtablesize.c, lib/getopt.c, lib/signal.in.h, lib/tempname.c: * lib/tempname.h, m4/dup2.m4, m4/fcntl.m4, m4/getdtablesize.m4: Update from gnulib, incorporating: 2015-02-20 getdtablesize: port better for Android 2015-02-19 fcntl: Fix cross compiling 2015-02-18 dup2, fcntl: cross-compile better for Android 2015-02-18 getopt: don't crash on memory exhaustion 2015-02-17 tempname: allow compilation with C++ (trivial) 2015-02-17 dup2, fcntl: port to AIX 2015-02-16 getdtablesize, dup2, fcntl: port to Android 2015-02-11 getdtablesize, signal_h: Fix Android build 2015-02-11 maint: various whitespace cleanups in tempname --- ChangeLog | 16 ++++++ doc/misc/ChangeLog | 4 ++ doc/misc/texinfo.tex | 55 ++++++++++++++++---- lib/getdtablesize.c | 37 +++++++------- lib/getopt.c | 52 +++++++++++++++---- lib/signal.in.h | 8 +-- lib/tempname.c | 118 +++++++++++++++++++++++++------------------ lib/tempname.h | 15 ++++++ m4/dup2.m4 | 76 ++++++++++++++-------------- m4/fcntl.m4 | 52 ++++++++++--------- m4/getdtablesize.m4 | 6 ++- 11 files changed, 282 insertions(+), 157 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43656680f9c..41bff0ef30a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2015-02-21 Paul Eggert + + Merge from gnulib + * lib/getdtablesize.c, lib/getopt.c, lib/signal.in.h, lib/tempname.c: + * lib/tempname.h, m4/dup2.m4, m4/fcntl.m4, m4/getdtablesize.m4: + Update from gnulib, incorporating: + 2015-02-20 getdtablesize: port better for Android + 2015-02-19 fcntl: Fix cross compiling + 2015-02-18 dup2, fcntl: cross-compile better for Android + 2015-02-18 getopt: don't crash on memory exhaustion + 2015-02-17 tempname: allow compilation with C++ (trivial) + 2015-02-17 dup2, fcntl: port to AIX + 2015-02-16 getdtablesize, dup2, fcntl: port to Android + 2015-02-11 getdtablesize, signal_h: Fix Android build + 2015-02-11 maint: various whitespace cleanups in tempname + 2015-02-13 Jan Djärv * configure.ac: Set locallisppath to empty for NS self contained, diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c796b751f05..d04a8bbb083 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2015-02-21 Paul Eggert + + * texinfo.tex: Update from gnulib. + 2015-02-10 Lars Ingebrigtsen * eww.texi (Basics): Mention eww-toggle-fonts. diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 96b212d2ad1..8236d7d2f82 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2015-01-31.10} +\def\texinfoversion{2015-02-05.16} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -4489,7 +4489,6 @@ % Called from \indexdummies and \atdummies. % \def\commondummies{% - % % \definedummyword defines \#1 as \string\#1\space, thus effectively % preventing its expansion. This is used only for control words, % not control letters, because the \space would be incorrect for @@ -4566,6 +4565,7 @@ \definedummyword\guilsinglright \definedummyword\lbracechar \definedummyword\leq + \definedummyword\mathopsup \definedummyword\minus \definedummyword\ogonek \definedummyword\pounds @@ -4579,6 +4579,8 @@ \definedummyword\quotesinglbase \definedummyword\rbracechar \definedummyword\result + \definedummyword\sub + \definedummyword\sup \definedummyword\textdegree % % We want to disable all macros so that they are not expanded by \write. @@ -4653,6 +4655,7 @@ \definedummyword\samp \definedummyword\strong \definedummyword\tie + \definedummyword\U \definedummyword\uref \definedummyword\url \definedummyword\var @@ -8335,14 +8338,7 @@ \catcode`\\=\other % % Make the characters 128-255 be printing characters. - {% - \count1=128 - \def\loop{% - \catcode\count1=\other - \advance\count1 by 1 - \ifnum \count1<256 \loop \fi - }% - }% + {\setnonasciicharscatcodenonglobal\other}% % % @ is our escape character in .aux files, and we need braces. \catcode`\{=1 @@ -9831,15 +9827,51 @@ \DeclareUnicodeCharacter{2261}{\equiv} }% end of \utfeightchardefs - % US-ASCII character definitions. \def\asciichardefs{% nothing need be done \relax } +% Latin1 (ISO-8859-1) character definitions. +\def\nonasciistringdefs{% + \setnonasciicharscatcode\active + \def\defstringchar##1{\def##1{\string##1}}% + \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3% + \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7% + \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab% + \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af% + % + \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3% + \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7% + \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb% + \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf% + % + \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3% + \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7% + \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb% + \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf% + % + \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3% + \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7% + \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db% + \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df% + % + \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3% + \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7% + \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb% + \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef% + % + \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3% + \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7% + \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb% + \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff% +} + + % define all the unicode characters we know about, for the sake of @U. \utfeightchardefs + % Make non-ASCII characters printable again for compatibility with % existing Texinfo documents that may use them, even without declaring a % document encoding. @@ -10193,6 +10225,7 @@ % {@catcode`- = @active @gdef@normalturnoffactive{% + @nonasciistringdefs @let-=@normaldash @let"=@normaldoublequote @let$=@normaldollar %$ font-lock fix diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index 59b97360bc5..bad45f7e32f 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -84,32 +84,31 @@ getdtablesize (void) return dtablesize; } -#elif HAVE_GETDTABLESIZE +#else +# include # include -# undef getdtablesize -int -rpl_getdtablesize(void) -{ - /* To date, this replacement is only compiled for Cygwin 1.7.25, - which auto-increased the RLIMIT_NOFILE soft limit until it - hits the compile-time constant hard limit of 3200. Although - that version of cygwin supported a child process inheriting - a smaller soft limit, the smaller limit is not enforced, so - we might as well just report the hard limit. */ - struct rlimit lim; - if (!getrlimit (RLIMIT_NOFILE, &lim) && lim.rlim_max != RLIM_INFINITY) - return lim.rlim_max; - return getdtablesize (); -} - -#elif defined _SC_OPEN_MAX +# ifdef __CYGWIN__ + /* Cygwin 1.7.25 auto-increases the RLIMIT_NOFILE soft limit until it + hits the compile-time constant hard limit of 3200. We might as + well just report the hard limit. */ +# define rlim_cur rlim_max +# endif int getdtablesize (void) { - return sysconf (_SC_OPEN_MAX); + struct rlimit lim; + + if (getrlimit (RLIMIT_NOFILE, &lim) == 0 + && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX + && lim.rlim_cur != RLIM_INFINITY + && lim.rlim_cur != RLIM_SAVED_CUR + && lim.rlim_cur != RLIM_SAVED_MAX) + return lim.rlim_cur; + + return INT_MAX; } #endif diff --git a/lib/getopt.c b/lib/getopt.c index 3b9c585a28c..212cbf73410 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -487,7 +487,20 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, const struct option *p; struct option_list *next; } *ambig_list = NULL; +#ifdef _LIBC +/* malloc() not used for _LIBC to simplify failure messages. */ +# define free_option_list(l) +#else +# define free_option_list(l) \ + while (l != NULL) \ + { \ + struct option_list *pn = l->next; \ + free (l); \ + l = pn; \ + } +#endif int exact = 0; + int ambig = 0; int indfound = -1; int option_index; @@ -514,22 +527,37 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, pfound = p; indfound = option_index; } + else if (ambig) + ; /* Taking simpler path to handling ambiguities. */ else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val) { /* Second or later nonexact match found. */ +#ifdef _LIBC + struct option_list *newp = alloca (sizeof (*newp)); +#else struct option_list *newp = malloc (sizeof (*newp)); - newp->p = p; - newp->next = ambig_list; - ambig_list = newp; + if (newp == NULL) + { + free_option_list (ambig_list); + ambig_list = NULL; + ambig = 1; /* Use simpler fallback message. */ + } + else +#endif + { + newp->p = p; + newp->next = ambig_list; + ambig_list = newp; + } } } - if (ambig_list != NULL && !exact) + if ((ambig || ambig_list) && !exact) { - if (print_errors) + if (print_errors && ambig_list) { struct option_list first; first.p = pfound; @@ -585,18 +613,20 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, fputc ('\n', stderr); #endif } + else if (print_errors && ambig) + { + fprintf (stderr, + _("%s: option '%s' is ambiguous\n"), + argv[0], argv[d->optind]); + } d->__nextchar += strlen (d->__nextchar); d->optind++; d->optopt = 0; + free_option_list (ambig_list); return '?'; } - while (ambig_list != NULL) - { - struct option_list *pn = ambig_list->next; - free (ambig_list); - ambig_list = pn; - } + free_option_list (ambig_list); if (pfound != NULL) { diff --git a/lib/signal.in.h b/lib/signal.in.h index 0f2ff5af843..265b72ab0ec 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -55,11 +55,13 @@ #ifndef _@GUARD_PREFIX@_SIGNAL_H #define _@GUARD_PREFIX@_SIGNAL_H -/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare - pthread_sigmask in , not in . +/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6, Android + declare pthread_sigmask in , not in . But avoid namespace pollution on glibc systems.*/ #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ - && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \ + && ((defined __APPLE__ && defined __MACH__) \ + || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ \ + || defined __sun || defined __ANDROID__) \ && ! defined __GLIBC__ # include #endif diff --git a/lib/tempname.c b/lib/tempname.c index 088b224ab96..8e6d26cc485 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -62,6 +62,7 @@ # define struct_stat64 struct stat64 #else # define struct_stat64 struct stat +# define __try_tempname try_tempname # define __gen_tempname gen_tempname # define __getpid getpid # define __gettimeofday gettimeofday @@ -176,21 +177,9 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; -/* Generate a temporary file name based on TMPL. TMPL must match the - rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). - The name constructed does not exist at the time of the call to - __gen_tempname. TMPL is overwritten with the result. - - KIND may be one of: - __GT_NOCREATE: simply verify that the name does not exist - at the time of the call. - __GT_FILE: create the file using open(O_CREAT|O_EXCL) - and return a read-write fd. The file is mode 0600. - __GT_DIR: create a directory, which will be mode 0700. - - We use a clever algorithm to get hard-to-predict names. */ int -__gen_tempname (char *tmpl, int suffixlen, int flags, int kind) +__try_tempname (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *)) { int len; char *XXXXXX; @@ -199,7 +188,6 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) unsigned int count; int fd = -1; int save_errno = errno; - struct_stat64 st; /* A lower bound on the number of temporary files to attempt to generate. The maximum total number of temporary file names that @@ -256,41 +244,7 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) v /= 62; XXXXXX[5] = letters[v % 62]; - switch (kind) - { - case __GT_FILE: - fd = __open (tmpl, - (flags & ~O_ACCMODE) - | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); - break; - - case __GT_DIR: - fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); - break; - - case __GT_NOCREATE: - /* This case is backward from the other three. __gen_tempname - succeeds if __xstat fails because the name does not exist. - Note the continue to bypass the common logic at the bottom - of the loop. */ - if (__lxstat64 (_STAT_VER, tmpl, &st) < 0) - { - if (errno == ENOENT) - { - __set_errno (save_errno); - return 0; - } - else - /* Give up now. */ - return -1; - } - continue; - - default: - assert (! "invalid KIND in __gen_tempname"); - abort (); - } - + fd = tryfunc (tmpl, args); if (fd >= 0) { __set_errno (save_errno); @@ -304,3 +258,67 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) __set_errno (EEXIST); return -1; } + +static int +try_file (char *tmpl, void *flags) +{ + int *openflags = flags; + return __open (tmpl, + (*openflags & ~O_ACCMODE) + | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); +} + +static int +try_dir (char *tmpl, void *flags) +{ + return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); +} + +static int +try_nocreate (char *tmpl, void *flags) +{ + struct_stat64 st; + + if (__lxstat64 (_STAT_VER, tmpl, &st) == 0) + __set_errno (EEXIST); + return errno == ENOENT ? 0 : -1; +} + +/* Generate a temporary file name based on TMPL. TMPL must match the + rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). + The name constructed does not exist at the time of the call to + __gen_tempname. TMPL is overwritten with the result. + + KIND may be one of: + __GT_NOCREATE: simply verify that the name does not exist + at the time of the call. + __GT_FILE: create the file using open(O_CREAT|O_EXCL) + and return a read-write fd. The file is mode 0600. + __GT_DIR: create a directory, which will be mode 0700. + + We use a clever algorithm to get hard-to-predict names. */ +int +__gen_tempname (char *tmpl, int suffixlen, int flags, int kind) +{ + int (*tryfunc) (char *, void *); + + switch (kind) + { + case __GT_FILE: + tryfunc = try_file; + break; + + case __GT_DIR: + tryfunc = try_dir; + break; + + case __GT_NOCREATE: + tryfunc = try_nocreate; + break; + + default: + assert (! "invalid KIND in __gen_tempname"); + abort (); + } + return __try_tempname (tmpl, suffixlen, &flags, tryfunc); +} diff --git a/lib/tempname.h b/lib/tempname.h index b560ee5cb14..e6093607463 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -32,6 +32,10 @@ # define GT_NOCREATE 2 # endif +#ifdef __cplusplus +extern "C" { +#endif + /* Generate a temporary file name based on TMPL. TMPL must match the rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). The name constructed does not exist at the time of the call to @@ -47,4 +51,15 @@ We use a clever algorithm to get hard-to-predict names. */ extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); +/* Similar to gen_tempname, but TRYFUNC is called for each temporary + name to try. If TRYFUNC returns a non-negative number, TRY_GEN_TEMPNAME + returns with this value. Otherwise, if errno is set to EEXIST, another + name is tried, or else TRY_GEN_TEMPNAME returns -1. */ +extern int try_tempname (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *)); + +#ifdef __cplusplus +} +#endif + #endif /* GL_TEMPNAME_H */ diff --git a/m4/dup2.m4 b/m4/dup2.m4 index 0354c6ad478..9aa2ea85ebd 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,4 +1,4 @@ -#serial 20 +#serial 22 dnl Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,6 @@ AC_DEFUN([gl_FUNC_DUP2], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_FUNCS_ONCE([getdtablesize]) m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [ AC_CHECK_FUNCS_ONCE([dup2]) if test $ac_cv_func_dup2 = no; then @@ -20,38 +19,44 @@ AC_DEFUN([gl_FUNC_DUP2], if test $HAVE_DUP2 = 1; then AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works], [AC_RUN_IFELSE([ - AC_LANG_PROGRAM([[#include -#include -#include ]], - [int result = 0; -#ifdef HAVE_GETDTABLESIZE - int bad_fd = getdtablesize (); -#else - int bad_fd = 1000000; -#endif -#ifdef FD_CLOEXEC - if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) - result |= 1; -#endif - if (dup2 (1, 1) == 0) - result |= 2; -#ifdef FD_CLOEXEC - if (fcntl (1, F_GETFD) != FD_CLOEXEC) - result |= 4; -#endif - close (0); - if (dup2 (0, 0) != -1) - result |= 8; - /* Many gnulib modules require POSIX conformance of EBADF. */ - if (dup2 (2, bad_fd) == -1 && errno != EBADF) - result |= 16; - /* Flush out some cygwin core dumps. */ - if (dup2 (2, -1) != -1 || errno != EBADF) - result |= 32; - dup2 (2, 255); - dup2 (2, 256); - return result; - ]) + AC_LANG_PROGRAM( + [[#include + #include + #include + #include + #include + ]], + [[int result = 0; + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + #ifdef FD_CLOEXEC + if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) + result |= 1; + #endif + if (dup2 (1, 1) == 0) + result |= 2; + #ifdef FD_CLOEXEC + if (fcntl (1, F_GETFD) != FD_CLOEXEC) + result |= 4; + #endif + close (0); + if (dup2 (0, 0) != -1) + result |= 8; + /* Many gnulib modules require POSIX conformance of EBADF. */ + if (dup2 (2, bad_fd) == -1 && errno != EBADF) + result |= 16; + /* Flush out some cygwin core dumps. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; + dup2 (2, 255); + dup2 (2, 256); + return result;]]) ], [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no], [case "$host_os" in @@ -59,9 +64,6 @@ AC_DEFUN([gl_FUNC_DUP2], gl_cv_func_dup2_works="guessing no" ;; cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 gl_cv_func_dup2_works="guessing no" ;; - linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a - # closed fd may yield -EBADF instead of -1 / errno=EBADF. - gl_cv_func_dup2_works="guessing no" ;; aix* | freebsd*) # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, # not EBADF. diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index 733cd2d701b..218e78628ba 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,4 +1,4 @@ -# fcntl.m4 serial 5 +# fcntl.m4 serial 7 dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_FCNTL], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_FUNCS_ONCE([fcntl getdtablesize]) + AC_CHECK_FUNCS_ONCE([fcntl]) if test $ac_cv_func_fcntl = no; then gl_REPLACE_FCNTL else @@ -27,30 +27,34 @@ AC_DEFUN([gl_FUNC_FCNTL], dnl haiku alpha 2 F_DUPFD has wrong errno AC_CACHE_CHECK([whether fcntl handles F_DUPFD correctly], [gl_cv_func_fcntl_f_dupfd_works], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#ifdef HAVE_GETDTABLESIZE -# include -#endif -#include -#include -]], [[int result = 0; -#ifdef HAVE_GETDTABLESIZE - int bad_fd = getdtablesize (); -#else - int bad_fd = 1000000; -#endif - if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; - if (errno != EINVAL) result |= 2; - if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4; - if (errno != EINVAL) result |= 8; - return result; - ]])], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + #include + #include + ]], + [[int result = 0; + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; + if (errno != EINVAL) result |= 2; + if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4; + if (errno != EINVAL) result |= 8; + return result;]])], [gl_cv_func_fcntl_f_dupfd_works=yes], [gl_cv_func_fcntl_f_dupfd_works=no], - [# Guess that it works on glibc systems - case $host_os in #(( - *-gnu*) gl_cv_func_fcntl_f_dupfd_works="guessing yes";; - *) gl_cv_func_fcntl_f_dupfd_works="guessing no";; + [case $host_os in + aix* | cygwin* | haiku*) + gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; + *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; esac])]) case $gl_cv_func_fcntl_f_dupfd_works in *yes) ;; diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index a6b6c1b6c52..25e9968947d 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,4 +1,4 @@ -# getdtablesize.m4 serial 5 +# getdtablesize.m4 serial 6 dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,9 @@ AC_DEFUN([gl_FUNC_GETDTABLESIZE], AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) AC_CHECK_FUNCS_ONCE([getdtablesize]) - if test $ac_cv_func_getdtablesize = yes; then + AC_CHECK_DECLS_ONCE([getdtablesize]) + if test $ac_cv_func_getdtablesize = yes && + test $ac_cv_have_decl_getdtablesize = yes; then # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit # up to an unchangeable hard limit; all other platforms correctly # require setrlimit before getdtablesize() can report a larger value. From 3ebf06300b8186feac5e9b436ca263dc908ed886 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 21 Feb 2015 00:26:13 -0800 Subject: [PATCH 129/457] Prefer 'Qfoo' to 'intern ("foo")' * buffer.c (syms_of_buffer): * bytecode.c (exec_byte_code): * callint.c (Fcall_interactively): * callproc.c (create_temp_file): * charset.c (define_charset_internal): * coding.c (syms_of_coding): * editfns.c (syms_of_editfns): * emacs.c (main): * fns.c (syms_of_fns): * frame.c (delete_frame, Fframe_parameters): * keyboard.c (syms_of_keyboard): * keymap.c (syms_of_keymap): * minibuf.c (read_minibuf, syms_of_minibuf): * nsfns.m (ns_cursor_type_to_lisp): * textprop.c (syms_of_textprop): * xdisp.c (Fformat_mode_line, syms_of_xdisp): * xfns.c (x_create_tip_frame, Fx_select_font): * xml.c (parse_region): Prefer constants like 'Qfoo' to calls like 'intern ("foo")'. * buffer.c (syms_of_buffer): OK to do (put 'erase-buffer 'disabled t) here now ... (keys_of_buffer): ... instead of here. * ftfont.c (syms_of_ftfont): Move DEFSYM of Qmono from here ... * xfns.c (syms_of_xfns): ... to here, since ftfont.c is more optional than xfns.c. --- src/ChangeLog | 29 +++++++++++++++++++++++++++++ src/buffer.c | 8 +++----- src/bytecode.c | 8 ++++---- src/callint.c | 8 ++++---- src/callproc.c | 2 +- src/charset.c | 4 ++-- src/coding.c | 8 ++++---- src/editfns.c | 3 +-- src/emacs.c | 6 ++---- src/fns.c | 2 +- src/frame.c | 4 ++-- src/ftfont.c | 1 - src/keyboard.c | 2 +- src/keymap.c | 4 ++-- src/minibuf.c | 6 ++---- src/nsfns.m | 6 +++--- src/textprop.c | 3 +-- src/xdisp.c | 5 ++--- src/xfns.c | 5 +++-- src/xml.c | 3 +-- 20 files changed, 68 insertions(+), 49 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index dc33e417ef4..1692c3f6f70 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,32 @@ +2015-02-21 Paul Eggert + + Prefer 'Qfoo' to 'intern ("foo")' + * buffer.c (syms_of_buffer): + * bytecode.c (exec_byte_code): + * callint.c (Fcall_interactively): + * callproc.c (create_temp_file): + * charset.c (define_charset_internal): + * coding.c (syms_of_coding): + * editfns.c (syms_of_editfns): + * emacs.c (main): + * fns.c (syms_of_fns): + * frame.c (delete_frame, Fframe_parameters): + * keyboard.c (syms_of_keyboard): + * keymap.c (syms_of_keymap): + * minibuf.c (read_minibuf, syms_of_minibuf): + * nsfns.m (ns_cursor_type_to_lisp): + * textprop.c (syms_of_textprop): + * xdisp.c (Fformat_mode_line, syms_of_xdisp): + * xfns.c (x_create_tip_frame, Fx_select_font): + * xml.c (parse_region): + Prefer constants like 'Qfoo' to calls like 'intern ("foo")'. + * buffer.c (syms_of_buffer): OK to do (put 'erase-buffer 'disabled + t) here now ... + (keys_of_buffer): ... instead of here. + * ftfont.c (syms_of_ftfont): Move DEFSYM of Qmono from here ... + * xfns.c (syms_of_xfns): ... to here, since ftfont.c is more + optional than xfns.c. + 2015-02-20 Jan Djärv * emacs.c (terminate_due_to_signal): Move totally_unblock_input after diff --git a/src/buffer.c b/src/buffer.c index 67eda3ee89e..371588b3093 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5408,7 +5408,7 @@ syms_of_buffer (void) DEFSYM (Qoverwrite_mode, "overwrite-mode"); Fput (Qoverwrite_mode, Qchoice, list3 (Qnil, intern ("overwrite-mode-textual"), - intern ("overwrite-mode-binary"))); + Qoverwrite_mode_binary)); Fput (Qprotected_field, Qerror_conditions, listn (CONSTYPE_PURE, 2, Qprotected_field, Qerror)); @@ -6326,6 +6326,8 @@ Functions running this hook are, `get-buffer-create', defsubr (&Soverlay_get); defsubr (&Soverlay_put); defsubr (&Srestore_buffer_modified_p); + + Fput (intern_c_string ("erase-buffer"), Qdisabled, Qt); } void @@ -6333,8 +6335,4 @@ keys_of_buffer (void) { initial_define_key (control_x_map, 'b', "switch-to-buffer"); initial_define_key (control_x_map, 'k', "kill-buffer"); - - /* This must not be in syms_of_buffer, because Qdisabled is not - initialized when that function gets called. */ - Fput (intern_c_string ("erase-buffer"), Qdisabled, Qt); } diff --git a/src/bytecode.c b/src/bytecode.c index b4583676835..55789b41ad9 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1945,10 +1945,10 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, /* Actually this is Bstack_ref with offset 0, but we use Bdup for that instead. */ /* CASE (Bstack_ref): */ - call3 (intern ("error"), - build_string ("Invalid byte opcode: op=%s, ptr=%d"), - make_number (op), - make_number ((stack.pc - 1) - stack.byte_string_start)); + call3 (Qerror, + build_string ("Invalid byte opcode: op=%s, ptr=%d"), + make_number (op), + make_number ((stack.pc - 1) - stack.byte_string_start)); /* Handy byte-codes for lexical binding. */ CASE (Bstack_ref1): diff --git a/src/callint.c b/src/callint.c index 60021fdfc82..0c6c03036c8 100644 --- a/src/callint.c +++ b/src/callint.c @@ -615,9 +615,9 @@ invoke it. If KEYS is omitted or nil, the return value of { Lisp_Object tem2; - teml = Fget (teml, intern ("event-symbol-elements")); + teml = Fget (teml, Qevent_symbol_elements); /* Ignore first element, which is the base key. */ - tem2 = Fmemq (intern ("down"), Fcdr (teml)); + tem2 = Fmemq (Qdown, Fcdr (teml)); if (! NILP (tem2)) up_event = Fread_event (Qnil, Qnil, Qnil); } @@ -647,9 +647,9 @@ invoke it. If KEYS is omitted or nil, the return value of { Lisp_Object tem2; - teml = Fget (teml, intern ("event-symbol-elements")); + teml = Fget (teml, Qevent_symbol_elements); /* Ignore first element, which is the base key. */ - tem2 = Fmemq (intern ("down"), Fcdr (teml)); + tem2 = Fmemq (Qdown, Fcdr (teml)); if (! NILP (tem2)) up_event = Fread_event (Qnil, Qnil, Qnil); } diff --git a/src/callproc.c b/src/callproc.c index 63ab9bf70db..e1fe8ed95df 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1020,7 +1020,7 @@ create_temp_file (ptrdiff_t nargs, Lisp_Object *args, specbind (intern ("coding-system-for-write"), val); /* POSIX lets mk[s]temp use "."; don't invoke jka-compr if we happen to get a ".Z" suffix. */ - specbind (intern ("file-name-handler-alist"), Qnil); + specbind (Qfile_name_handler_alist, Qnil); write_region (start, end, filename_string, Qnil, Qlambda, Qnil, Qnil, fd); unbind_to (count1, Qnil); diff --git a/src/charset.c b/src/charset.c index 908084074fd..f1aa07471c5 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1268,7 +1268,7 @@ define_charset_internal (Lisp_Object name, args[charset_arg_plist] = listn (CONSTYPE_HEAP, 14, - intern_c_string (":name"), + QCname, args[charset_arg_name], intern_c_string (":dimension"), args[charset_arg_dimension], @@ -1278,7 +1278,7 @@ define_charset_internal (Lisp_Object name, args[charset_arg_iso_final], intern_c_string (":emacs-mule-id"), args[charset_arg_emacs_mule_id], - intern_c_string (":ascii-compatible-p"), + QCascii_compatible_p, args[charset_arg_ascii_compatible_p], intern_c_string (":code-offset"), args[charset_arg_code_offset]); diff --git a/src/coding.c b/src/coding.c index 1a0e1279648..4b41355595c 100644 --- a/src/coding.c +++ b/src/coding.c @@ -11281,15 +11281,15 @@ internal character representation. */); Lisp_Object plist[] = { - intern_c_string (":name"), + QCname, args[coding_arg_name] = Qno_conversion, - intern_c_string (":mnemonic"), + QCmnemonic, args[coding_arg_mnemonic] = make_number ('='), intern_c_string (":coding-type"), args[coding_arg_coding_type] = Qraw_text, - intern_c_string (":ascii-compatible-p"), + QCascii_compatible_p, args[coding_arg_ascii_compatible_p] = Qt, - intern_c_string (":default-char"), + QCdefault_char, args[coding_arg_default_char] = make_number (0), intern_c_string (":for-unibyte"), args[coding_arg_for_unibyte] = Qt, diff --git a/src/editfns.c b/src/editfns.c index c205ca3688f..dbcb3160b27 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -4973,8 +4973,7 @@ of the buffer being accessed. */); /* Do this here, because init_buffer_once is too early--it won't work. */ Fset_buffer (Vprin1_to_string_buffer); /* Make sure buffer-access-fontify-functions is nil in this buffer. */ - Fset (Fmake_local_variable (intern_c_string ("buffer-access-fontify-functions")), - Qnil); + Fset (Fmake_local_variable (Qbuffer_access_fontify_functions), Qnil); Fset_buffer (obuf); } diff --git a/src/emacs.c b/src/emacs.c index 590579907ff..4a6d6badf28 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1570,13 +1570,11 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem if (filename_from_ansi (file, file_utf8) == 0) file = file_utf8; #endif - Vtop_level = list2 (intern_c_string ("load"), - build_unibyte_string (file)); + Vtop_level = list2 (Qload, build_unibyte_string (file)); } /* Unless next switch is -nl, load "loadup.el" first thing. */ if (! no_loadup) - Vtop_level = list2 (intern_c_string ("load"), - build_string ("loadup.el")); + Vtop_level = list2 (Qload, build_string ("loadup.el")); } /* Set up for profiling. This is known to work on FreeBSD, diff --git a/src/fns.c b/src/fns.c index 4c7095133eb..51f61d23881 100644 --- a/src/fns.c +++ b/src/fns.c @@ -5093,7 +5093,7 @@ syms_of_fns (void) DEFVAR_LISP ("features", Vfeatures, doc: /* A list of symbols which are the features of the executing Emacs. Used by `featurep' and `require', and altered by `provide'. */); - Vfeatures = list1 (intern_c_string ("emacs")); + Vfeatures = list1 (Qemacs); DEFSYM (Qsubfeatures, "subfeatures"); DEFSYM (Qfuncall, "funcall"); diff --git a/src/frame.c b/src/frame.c index 92b6b7c73ba..d82df0912b4 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1544,7 +1544,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) } } - is_tooltip_frame = !NILP (Fframe_parameter (frame, intern ("tooltip"))); + is_tooltip_frame = !NILP (Fframe_parameter (frame, Qtooltip)); /* Run `delete-frame-functions' unless FORCE is `noelisp' or frame is a tooltip. FORCE is set to `noelisp' when handling @@ -2533,7 +2533,7 @@ If FRAME is omitted or nil, return information on the currently selected frame. else store_in_alist (&alist, Qbackground_color, tty_color_name (f, FRAME_BACKGROUND_PIXEL (f))); - store_in_alist (&alist, intern ("font"), + store_in_alist (&alist, Qfont, build_string (FRAME_MSDOS_P (f) ? "ms-dos" : FRAME_W32_P (f) ? "w32term" diff --git a/src/ftfont.c b/src/ftfont.c index adf188815de..26740c263ce 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -2659,7 +2659,6 @@ syms_of_ftfont (void) DEFSYM (Qmonospace, "monospace"); DEFSYM (Qsans_serif, "sans-serif"); DEFSYM (Qserif, "serif"); - DEFSYM (Qmono, "mono"); DEFSYM (Qsans, "sans"); DEFSYM (Qsans__serif, "sans serif"); diff --git a/src/keyboard.c b/src/keyboard.c index ab57553e7d3..c2174539ea7 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11598,7 +11598,7 @@ and the minor mode maps regardless of `overriding-local-map'. */); DEFVAR_LISP ("special-event-map", Vspecial_event_map, doc: /* Keymap defining bindings for special events to execute at low level. */); - Vspecial_event_map = list1 (intern_c_string ("keymap")); + Vspecial_event_map = list1 (Qkeymap); DEFVAR_LISP ("track-mouse", do_mouse_tracking, doc: /* Non-nil means generate motion events for mouse motion. */); diff --git a/src/keymap.c b/src/keymap.c index 34fe1cb7a95..d10c00489d1 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -3730,8 +3730,8 @@ be preferred. */); staticpro (&Vmouse_events); Vmouse_events = listn (CONSTYPE_PURE, 9, Qmenu_bar, - intern_c_string ("tool-bar"), - intern_c_string ("header-line"), + Qtool_bar, + Qheader_line, Qmode_line, intern_c_string ("mouse-1"), intern_c_string ("mouse-2"), diff --git a/src/minibuf.c b/src/minibuf.c index 3408bb995c6..2dc5c544457 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -395,7 +395,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, Lisp_Object dummy, frame; specbind (Qminibuffer_default, defalt); - specbind (intern ("inhibit-read-only"), Qnil); + specbind (Qinhibit_read_only, Qnil); /* If Vminibuffer_completing_file_name is `lambda' on entry, it was t in previous recursive minibuffer, but was not set explicitly @@ -2070,9 +2070,7 @@ with completion; they always discard text properties. */); doc: /* Text properties that are added to minibuffer prompts. These are in addition to the basic `field' property, and stickiness properties. */); - /* We use `intern' here instead of Qread_only to avoid - initialization-order problems. */ - Vminibuffer_prompt_properties = list2 (intern_c_string ("read-only"), Qt); + Vminibuffer_prompt_properties = list2 (Qread_only, Qt); DEFVAR_LISP ("read-hide-char", Vread_hide_char, doc: /* Whether to hide input characters in noninteractive mode. diff --git a/src/nsfns.m b/src/nsfns.m index cc2e49641e8..9e379e28429 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -849,9 +849,9 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side switch (arg) { case FILLED_BOX_CURSOR: return Qbox; - case HOLLOW_BOX_CURSOR: return intern ("hollow"); - case HBAR_CURSOR: return intern ("hbar"); - case BAR_CURSOR: return intern ("bar"); + case HOLLOW_BOX_CURSOR: return Qhollow; + case HBAR_CURSOR: return Qhbar; + case BAR_CURSOR: return Qbar; case NO_CURSOR: default: return intern ("no"); } diff --git a/src/textprop.c b/src/textprop.c index 35f22bf454e..740b96227cf 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -2356,8 +2356,7 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and /* Text properties `syntax-table'and `display' should be nonsticky by default. */ Vtext_property_default_nonsticky - = list2 (Fcons (intern_c_string ("syntax-table"), Qt), - Fcons (intern_c_string ("display"), Qt)); + = list2 (Fcons (Qsyntax_table, Qt), Fcons (Qdisplay, Qt)); staticpro (&interval_insert_behind_hooks); staticpro (&interval_insert_in_front_hooks); diff --git a/src/xdisp.c b/src/xdisp.c index 57a5631c0e3..3f57841ac13 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -22656,7 +22656,7 @@ are the selected window and the WINDOW's buffer). */) else { mode_line_string_list = Fnreverse (mode_line_string_list); - str = Fmapconcat (intern ("identity"), mode_line_string_list, + str = Fmapconcat (Qidentity, mode_line_string_list, empty_unibyte_string); } @@ -30491,8 +30491,7 @@ syms_of_xdisp (void) DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces"); - list_of_error = list1 (list2 (intern_c_string ("error"), - intern_c_string ("void-variable"))); + list_of_error = list1 (list2 (Qerror, Qvoid_variable)); staticpro (&list_of_error); /* Values of those variables at last redisplay are stored as diff --git a/src/xfns.c b/src/xfns.c index 629ac4b26ff..80be6ac257c 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5185,7 +5185,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object disptype; if (FRAME_DISPLAY_INFO (f)->n_planes == 1) - disptype = intern ("mono"); + disptype = Qmono; else if (FRAME_DISPLAY_INFO (f)->visual->class == GrayScale || FRAME_DISPLAY_INFO (f)->visual->class == StaticGray) disptype = intern ("grayscale"); @@ -6007,7 +6007,7 @@ nil, it defaults to the selected frame. */) GCPRO2 (font_param, font); XSETFONT (font, FRAME_FONT (f)); - font_param = Ffont_get (font, intern (":name")); + font_param = Ffont_get (font, QCname); if (STRINGP (font_param)) default_name = xlispstrdup (font_param); else @@ -6194,6 +6194,7 @@ syms_of_xfns (void) DEFSYM (Qcompound_text, "compound-text"); DEFSYM (Qcancel_timer, "cancel-timer"); DEFSYM (Qfont_param, "font-parameter"); + DEFSYM (Qmono, "mono"); Fput (Qundefined_color, Qerror_conditions, listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror)); diff --git a/src/xml.c b/src/xml.c index e32417724ce..a3f92395792 100644 --- a/src/xml.c +++ b/src/xml.c @@ -237,8 +237,7 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, if (node != NULL) result = make_dom (node); } else - result = Fcons (intern ("top"), - Fcons (Qnil, Fnreverse (Fcons (r, result)))); + result = Fcons (Qtop, Fcons (Qnil, Fnreverse (Fcons (r, result)))); xmlFreeDoc (doc); } From 6982acc4e1561e681ea18a91ee87c32cd3b47f57 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Sat, 21 Feb 2015 10:47:22 +0100 Subject: [PATCH 130/457] Install notification handlers when enabling the auto-revert modes. * autorevert.el (auto-revert-mode, auto-revert-tail-mode) (global-auto-revert-mode): Remove (let (auto-revert-use-notify) ... ) wrappers. Call (auto-revert-buffers) consequently in order to install handlers. --- lisp/ChangeLog | 7 +++++++ lisp/autorevert.el | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4e59654e0c2..7f5fb7ddf0d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-21 Dima Kogan + + * autorevert.el (auto-revert-mode, auto-revert-tail-mode) + (global-auto-revert-mode): Remove (let (auto-revert-use-notify) ... ) + wrappers. Call (auto-revert-buffers) consequently in order to + install handlers. + 2015-02-21 Wilson Snyder Sync with upstream verilog-mode revision 0d6420b. diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 02cef24f2aa..4dd021e4c76 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -361,9 +361,8 @@ without being changed in the part that is already in the buffer." (delq (current-buffer) auto-revert-buffer-list))) (auto-revert-set-timer) (when auto-revert-mode - (let (auto-revert-use-notify) - (auto-revert-buffers) - (setq auto-revert-tail-mode nil)))) + (auto-revert-buffers) + (setq auto-revert-tail-mode nil))) ;;;###autoload @@ -417,8 +416,7 @@ Use `auto-revert-mode' for changes other than appends!" (y-or-n-p "File changed on disk, content may be missing. \ Perform a full revert? ") ;; Use this (not just revert-buffer) for point-preservation. - (let (auto-revert-use-notify) - (auto-revert-handler))) + (auto-revert-buffers)) ;; else we might reappend our own end when we save (add-hook 'before-save-hook (lambda () (auto-revert-tail-mode 0)) nil t) (or (local-variable-p 'auto-revert-tail-pos) ; don't lose prior position @@ -463,8 +461,7 @@ specifies in the mode line." :global t :group 'auto-revert :lighter global-auto-revert-mode-text (auto-revert-set-timer) (if global-auto-revert-mode - (let (auto-revert-use-notify) - (auto-revert-buffers)) + (auto-revert-buffers) (dolist (buf (buffer-list)) (with-current-buffer buf (when auto-revert-use-notify From 629ed7714a0387cfb9fa5d928159a52f1b088def Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 21 Feb 2015 13:11:55 +0100 Subject: [PATCH 131/457] Support file notifications for dired auto-revert * autorevert.el (auto-revert-notify-add-watch) (auto-revert-notify-handler, auto-revert-buffers): Handle also buffers without an associated file, like dired buffers. --- lisp/ChangeLog | 6 ++++ lisp/autorevert.el | 80 +++++++++++++++++++++++++--------------------- 2 files changed, 49 insertions(+), 37 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7f5fb7ddf0d..0211458daab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-21 Michael Albinus + + * autorevert.el (auto-revert-notify-add-watch) + (auto-revert-notify-handler, auto-revert-buffers): Handle also + buffers without an associated file, like dired buffers. + 2015-02-21 Dima Kogan * autorevert.el (auto-revert-mode, auto-revert-tail-mode) diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 4dd021e4c76..6489a3e04c2 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -505,16 +505,22 @@ will use an up-to-date value of `auto-revert-interval'" ;; `auto-revert-use-notify' are non-nil. (when (or (string-match auto-revert-notify-exclude-dir-regexp (expand-file-name default-directory)) - (file-symlink-p buffer-file-name)) + (file-symlink-p (or buffer-file-name default-directory))) ;; Fallback to file checks. (set (make-local-variable 'auto-revert-use-notify) nil)) (when (not auto-revert-notify-watch-descriptor) (setq auto-revert-notify-watch-descriptor (ignore-errors - (file-notify-add-watch - (expand-file-name buffer-file-name default-directory) - '(change attribute-change) 'auto-revert-notify-handler))) + (if buffer-file-name + (file-notify-add-watch + (expand-file-name buffer-file-name default-directory) + '(change attribute-change) + 'auto-revert-notify-handler) + (file-notify-add-watch + (expand-file-name default-directory) + '(change) + 'auto-revert-notify-handler)))) (if auto-revert-notify-watch-descriptor (progn (puthash @@ -563,40 +569,40 @@ no more reverts are possible until the next call of auto-revert-notify-watch-descriptor-hash-list))) ;; Check, that event is meant for us. (cl-assert descriptor) - ;; We do not handle `deleted', because nothing has to be refreshed. - (unless (eq action 'deleted) - (cl-assert (memq action '(attribute-changed changed created renamed)) - t) - ;; Since we watch a directory, a file name must be returned. - (cl-assert (stringp file)) - (when (eq action 'renamed) (cl-assert (stringp file1))) - ;; Loop over all buffers, in order to find the intended one. - (cl-dolist (buffer buffers) - (when (buffer-live-p buffer) - (with-current-buffer buffer - (when (and (stringp buffer-file-name) - (or - (and (memq action '(attribute-changed changed - created)) - (string-equal - (file-name-nondirectory file) - (file-name-nondirectory buffer-file-name))) - (and (eq action 'renamed) - (string-equal - (file-name-nondirectory file1) - (file-name-nondirectory buffer-file-name))))) - ;; Mark buffer modified. - (setq auto-revert-notify-modified-p t) + ;; Since we watch a directory, a file name must be returned. + (cl-assert (stringp file)) + (when (eq action 'renamed) (cl-assert (stringp file1))) + ;; Loop over all buffers, in order to find the intended one. + (cl-dolist (buffer buffers) + (when (buffer-live-p buffer) + (with-current-buffer buffer + (when (or + ;; A buffer associated with a file. + (and (stringp buffer-file-name) + (or + (and (memq action '(attribute-changed changed created)) + (string-equal + (file-name-nondirectory file) + (file-name-nondirectory buffer-file-name))) + (and (eq action 'renamed) + (string-equal + (file-name-nondirectory file1) + (file-name-nondirectory buffer-file-name))))) + ;; A buffer w/o a file, like dired. + (and (null buffer-file-name) + (memq action '(created renamed deleted)))) + ;; Mark buffer modified. + (setq auto-revert-notify-modified-p t) - ;; Revert the buffer now if we're not locked out - (when (/= auto-revert-buffers-counter-lockedout - auto-revert-buffers-counter) - (auto-revert-handler) - (setq auto-revert-buffers-counter-lockedout - auto-revert-buffers-counter)) + ;; Revert the buffer now if we're not locked out. + (when (/= auto-revert-buffers-counter-lockedout + auto-revert-buffers-counter) + (auto-revert-handler) + (setq auto-revert-buffers-counter-lockedout + auto-revert-buffers-counter)) - ;; No need to check other buffers. - (cl-return))))))))) + ;; No need to check other buffers. + (cl-return)))))))) (defun auto-revert-active-p () "Check if auto-revert is active (in current buffer or globally)." @@ -750,7 +756,7 @@ the timer when no buffers need to be checked." (delq buf auto-revert-buffer-list))) (when (auto-revert-active-p) ;; Enable file notification. - (when (and auto-revert-use-notify buffer-file-name + (when (and auto-revert-use-notify (not auto-revert-notify-watch-descriptor)) (auto-revert-notify-add-watch)) (auto-revert-handler))) From a2e6668dee271ef76bede2c9556439df67999fda Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 21 Feb 2015 13:21:24 +0100 Subject: [PATCH 132/457] Mention file notification support for dired buffers and autorevert. --- etc/NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index ed25538da32..3f88d3d297a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -558,6 +558,9 @@ command line's password prompt. ** tar-mode: new `tar-new-entry' command, allowing for new members to be added to the archive. +** Autorevert: dired buffers are also auto-reverted via file +notifications, if Emacs is compiled with file notification support. + ** Obsolete packages --- From 9074a684990600abd9dfad0477c7cd1d2f339ed3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 21 Feb 2015 14:54:08 +0200 Subject: [PATCH 133/457] Prefer 'Qfoo' to 'intern ("foo")' in w32 source files src/w32term.c (queue_notifications): src/w32inevt.c (handle_file_notifications): src/w32font.c (w32_enumfont_pattern_entity): Prefer 'Qfoo' to 'intern ("foo")'. --- src/ChangeLog | 7 +++++++ src/w32font.c | 8 ++++---- src/w32inevt.c | 2 +- src/w32term.c | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1692c3f6f70..8604cfcb29f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-02-21 Eli Zaretskii + + * w32term.c (queue_notifications): + * w32inevt.c (handle_file_notifications): + * w32font.c (w32_enumfont_pattern_entity): Prefer 'Qfoo' to + 'intern ("foo")'. + 2015-02-21 Paul Eggert Prefer 'Qfoo' to 'intern ("foo")' diff --git a/src/w32font.c b/src/w32font.c index 360ad3f1c48..422f082e72b 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1072,11 +1072,11 @@ w32_enumfont_pattern_entity (Lisp_Object frame, truetype so that this information is not any worse than we could have obtained later. */ if (EQ (backend, Quniscribe) && (full_type & NTMFLAGS_OPENTYPE)) - tem = intern ("opentype"); + tem = Qopentype; else if (font_type & TRUETYPE_FONTTYPE) tem = intern ("truetype"); else if (full_type & NTM_PS_OPENTYPE) - tem = intern ("postscript"); + tem = Qpostscript; else if (full_type & NTM_TYPE1) tem = intern ("type1"); else if (font_type & RASTER_FONTTYPE) @@ -1875,10 +1875,10 @@ static Lisp_Object w32_to_fc_weight (int n) { if (n >= FW_EXTRABOLD) return intern ("black"); - if (n >= FW_BOLD) return intern ("bold"); + if (n >= FW_BOLD) return Qbold; if (n >= FW_SEMIBOLD) return intern ("demibold"); if (n >= FW_NORMAL) return intern ("medium"); - return intern ("light"); + return Qlight; } /* Fill in all the available details of LOGFONT from FONT_SPEC. */ diff --git a/src/w32inevt.c b/src/w32inevt.c index e09903f99be..ea2db26a60e 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -631,7 +631,7 @@ handle_file_notifications (struct input_event *hold_quit) if (notification_buffer_in_use) { DWORD info_size = notifications_size; - Lisp_Object cs = intern ("utf-16le"); + Lisp_Object cs = Qutf_16le; Lisp_Object obj = w32_get_watch_object (notifications_desc); /* notifications_size could be zero when the buffer of diff --git a/src/w32term.c b/src/w32term.c index a9ed2a852da..d415b13f715 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3223,7 +3223,7 @@ queue_notifications (struct input_event *event, W32Msg *msg, struct frame *f, if (notification_buffer_in_use) { DWORD info_size = notifications_size; - Lisp_Object cs = intern ("utf-16le"); + Lisp_Object cs = Qutf_16le; Lisp_Object obj = w32_get_watch_object (notifications_desc); /* notifications_size could be zero when the buffer of From 48415204e8ea143300f3f10d33b9617d91ed1c54 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Sat, 21 Feb 2015 18:06:07 -0200 Subject: [PATCH 134/457] bindings.el (ctl-x-map): Fix `comment-line' binding. --- lisp/ChangeLog | 4 ++++ lisp/bindings.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0211458daab..1d95f1008d1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-21 Artur Malabarba + + * bindings.el (ctl-x-map): Fix `comment-line' binding. + 2015-02-21 Michael Albinus * autorevert.el (auto-revert-notify-add-watch) diff --git a/lisp/bindings.el b/lisp/bindings.el index 4cc9f6ad368..44a6570117a 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1130,7 +1130,7 @@ if `inhibit-field-text-motion' is non-nil." (define-key esc-map "j" 'indent-new-comment-line) (define-key esc-map "\C-j" 'indent-new-comment-line) (define-key ctl-x-map ";" 'comment-set-column) -(define-key ctl-x-map "C-;" 'comment-line) +(define-key ctl-x-map "\C-;" 'comment-line) (define-key ctl-x-map "f" 'set-fill-column) (define-key ctl-x-map "$" 'set-selective-display) From e38be5c483ee4b629a4a3ecb27de068a1cb6402c Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Sat, 21 Feb 2015 18:07:22 -0200 Subject: [PATCH 135/457] lisp/ChangeLog: Fix entry to mention (Bug#19826) --- lisp/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d95f1008d1..64aa3de3539 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2015-02-21 Artur Malabarba * bindings.el (ctl-x-map): Fix `comment-line' binding. + (Bug#19826) 2015-02-21 Michael Albinus From b0adfc721f505b5d6e581b18739d8aa1c619d1eb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 21 Feb 2015 12:34:19 -0800 Subject: [PATCH 136/457] Spelling fixes --- lisp/org/ChangeLog | 2 +- nt/cmdproxy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index b75f2baa1f3..335818d7023 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -13060,7 +13060,7 @@ 2012-01-03 Nicolas Goaziou * org.el (org-fontify-meta-lines-and-blocks-1): - Recognize "name" as a valid keyword that can preceed a block. + Recognize "name" as a valid keyword that can precede a block. 2012-01-03 Eric Schulte diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 16956288fef..9598f1d0a56 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -220,7 +220,7 @@ get_next_token (char * buf, const char ** pSrc) { /* Output literal backslashes. Note that we don't treat a backslash as an escape character here, - since it doesn't preceed a quote. */ + since it doesn't precede a quote. */ for ( ; escape_char_run > 0; escape_char_run--) *o++ = escape_char; } From 1cb34285463d2b9050a031a7f9a53d376de5b489 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 21 Feb 2015 12:54:21 -0800 Subject: [PATCH 137/457] * bindings.el (ctl-x-map): There is no 'C-;'. For now, make do with 'M-;'; this allows 'make bootstrap' to work. Perhaps some other binding should be chosen. Fixes: bug#19826 --- lisp/ChangeLog | 7 +++++++ lisp/bindings.el | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 64aa3de3539..b78dd7920ae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-21 Paul Eggert + + * bindings.el (ctl-x-map): There is no 'C-;'. + For now, make do with 'M-;'; this allows 'make bootstrap' to work. + Perhaps some other binding should be chosen. + Fixes: bug#19826 + 2015-02-21 Artur Malabarba * bindings.el (ctl-x-map): Fix `comment-line' binding. diff --git a/lisp/bindings.el b/lisp/bindings.el index 44a6570117a..a1f0d987f5c 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1130,7 +1130,7 @@ if `inhibit-field-text-motion' is non-nil." (define-key esc-map "j" 'indent-new-comment-line) (define-key esc-map "\C-j" 'indent-new-comment-line) (define-key ctl-x-map ";" 'comment-set-column) -(define-key ctl-x-map "\C-;" 'comment-line) +(define-key ctl-x-map "\M-;" 'comment-line) (define-key ctl-x-map "f" 'set-fill-column) (define-key ctl-x-map "$" 'set-selective-display) From 02609324ce7341c05f4c5c141942c45d730291b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Sat, 21 Feb 2015 18:43:33 -0300 Subject: [PATCH 138/457] Bump python.el version --- lisp/progmodes/python.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index dea316ec32d..de2d2d1b590 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -4,7 +4,7 @@ ;; Author: Fabián E. Gallina ;; URL: https://github.com/fgallina/python.el -;; Version: 0.24.4 +;; Version: 0.24.5 ;; Maintainer: emacs-devel@gnu.org ;; Created: Jul 2010 ;; Keywords: languages From 14b4e657e2fd647153b336c61a220acedda8454c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 21 Feb 2015 20:00:16 -0800 Subject: [PATCH 139/457] Spelling fixes * lisp/cedet/semantic/doc.el (semantic-documentation-comment-preceding-tag): Rename from semantic-documentation-comment-preceeding-tag. All uses changed. Leave an obsolete alias behind. * src/lisp.h (DEFINE_NON_NIL_Q_SYMBOL_MACROS): Rename from DEFINE_NONNIL_Q_SYMBOL_MACROS. All uses changed. --- doc/misc/auth.texi | 4 ++-- lib-src/make-docfile.c | 2 +- lisp/ChangeLog | 2 +- lisp/cedet/ChangeLog | 7 +++++++ lisp/cedet/semantic/doc.el | 9 ++++++--- lisp/cedet/srecode/document.el | 2 +- lisp/emacs-lisp/package.el | 13 ++++++------- lisp/gnus/ChangeLog | 4 ++-- lisp/org/ChangeLog | 2 +- src/ChangeLog | 6 ++++++ src/lisp.h | 6 +++--- test/automated/vc-tests.el | 4 ++-- test/cedet/srecode-tests.el | 2 +- 13 files changed, 39 insertions(+), 24 deletions(-) diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 7c0254a9a3a..8dbde4d5ea0 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -247,8 +247,8 @@ names: Your netrc entries will then be: @example -machine gmail login account@@gmail.com password "accountpassword" port imap -machine gmail2 login account2@@gmail.com password "account2password" port imap +machine gmail login account@@gmail.com password "account password" port imap +machine gmail2 login account2@@gmail.com password "account2 password" port imap @end example @node Secret Service API diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index a7943e3118c..bada8df9f72 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -743,7 +743,7 @@ write_globals (void) puts ("#endif"); puts ("#define Qnil builtin_lisp_symbol (0)"); - puts ("#if DEFINE_NONNIL_Q_SYMBOL_MACROS"); + puts ("#if DEFINE_NON_NIL_Q_SYMBOL_MACROS"); num_symbols = 0; for (int i = 0; i < num_globals; i++) if (globals[i].type == SYMBOL && num_symbols++ != 0) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b78dd7920ae..a583d7c58e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -534,7 +534,7 @@ (package--sort-deps-in-alist): New function. (package-menu-mark-install): Can mark dependencies. (package--newest-p): New function. - (package-delete): Don't delesect when deleting an older version of + (package-delete): Don't deselect when deleting an older version of an upgraded package. * emacs-lisp/package.el: Add missing (require 'subr-x) diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 838a2693491..c9ddc382d50 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,10 @@ +2015-02-22 Paul Eggert + + Spelling fixes + * semantic/doc.el (semantic-documentation-comment-preceding-tag): + Rename from semantic-documentation-comment-preceeding-tag. All + uses changed. Leave an obsolete alias behind. + 2015-02-16 Stefan Monnier * semantic/db-el.el (semanticdb-elisp-sym->tag): Fix copy&paste error diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el index 874763f0a7f..3ceb3510ad2 100644 --- a/lisp/cedet/semantic/doc.el +++ b/lisp/cedet/semantic/doc.el @@ -56,13 +56,12 @@ If nosnarf if 'lex, then only return the lex token." doctmp ;; Check just before the definition. (when (semantic-tag-with-position-p tag) - (semantic-documentation-comment-preceeding-tag tag nosnarf)) + (semantic-documentation-comment-preceding-tag tag nosnarf)) ;; Let's look for comments either after the definition, but before code: ;; Not sure yet. Fill in something clever later.... nil)))))) -;; FIXME this is not how you spell "preceding". -(defun semantic-documentation-comment-preceeding-tag (&optional tag nosnarf) +(defun semantic-documentation-comment-preceding-tag (&optional tag nosnarf) "Find a comment preceding TAG. If TAG is nil. use the tag under point. Searches the space between TAG and the preceding tag for a comment, @@ -84,6 +83,10 @@ just the lexical token and not the string." ;; of a function. (semantic-doc-snarf-comment-for-tag nosnarf))) )) +(define-obsolete-function-alias + 'semantic-documentation-comment-preceeding-tag + 'semantic-documentation-comment-preceding-tag + "25.1") (defun semantic-doc-snarf-comment-for-tag (nosnarf) "Snarf up the comment at POINT for `semantic-documentation-for-tag'. diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index 9f106a40660..47577844c74 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -395,7 +395,7 @@ It is assumed that the comment occurs just in front of FCN-IN." (beginning-of-line) (forward-char -1) - (let ((lextok (semantic-documentation-comment-preceeding-tag fcn-in 'lex)) + (let ((lextok (semantic-documentation-comment-preceding-tag fcn-in 'lex)) (doctext (srecode-document-function-name-comment fcn-in)) ) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index d8a4fc9c846..de1158d96a7 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -335,11 +335,10 @@ contents of the archive." :version "24.4") (defcustom package-selected-packages nil - "Store here packages installed explicitely by user. -This variable will be feeded automatically by emacs, -when installing a new package. -This variable will be used by `package-autoremove' to decide -which packages are no more needed. + "Store here packages installed explicitly by user. +This variable is fed automatically by Emacs when installing a new package. +This variable is used by `package-autoremove' to decide +which packages are no longer needed. You can use it to (re)install packages on other machines by running `package-user-selected-packages-install'. @@ -1280,7 +1279,7 @@ to install it but still mark it as selected." ;;;###autoload (defun package-reinstall (pkg) "Reinstall package PKG. -PKG shoul be either a symbol, the package name, or a package-desc +PKG should be either a symbol, the package name, or a package-desc object." (interactive (list (intern (completing-read "Reinstall package: " @@ -1547,7 +1546,7 @@ If NOSAVE is non-nil, the package is not removed from ;; `package-selected-packages' even if it can't be deleted. (when (and (null nosave) (package--user-selected-p name) - ;; Don't delesect if this is an older version of an + ;; Don't deselect if this is an older version of an ;; upgraded package. (package--newest-p pkg-desc)) (customize-save-variable diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7895f378b82..07d1d471b9f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -827,7 +827,7 @@ 2014-01-30 Lars Ingebrigtsen * nnmail.el (nnmail-split-it): Instead of redoing the search to restore - the match data, just save and restore it explictly (bug#12375). + the match data, just save and restore it explicitly (bug#12375). * gnus-sum.el (gnus-summary-read-group-1): Initialize the spam code if that's needed. @@ -24084,7 +24084,7 @@ (spam-ham-copy-or-move-routine): Return the number of processed ham messages. (spam-summary-prepare-exit): Use the above values to decide - whether status messages shouled be displayed. + whether status messages should be displayed. 2004-05-20 Katsumi Yamaoka diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 081da5db73b..ce39bb7d568 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -852,7 +852,7 @@ in a table.el table last. * org.el (org-delete-property): Don't suggest to delete the - CATEGORY property when the category is not explicitely set in the + CATEGORY property when the category is not explicitly set in the property drawer. Also enforce matching when completing. (org-insert-heading): Fix regression: with two universal prefixes, insert heading at the end of the subtree. diff --git a/src/ChangeLog b/src/ChangeLog index 8604cfcb29f..5e4dbb7ae1c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-22 Paul Eggert + + Spelling fixes + * lisp.h (DEFINE_NON_NIL_Q_SYMBOL_MACROS): + Rename from DEFINE_NONNIL_Q_SYMBOL_MACROS. All uses changed. + 2015-02-21 Eli Zaretskii * w32term.c (queue_notifications): diff --git a/src/lisp.h b/src/lisp.h index 7795c90e5cc..9764b096ef0 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -746,10 +746,10 @@ struct Lisp_Symbol /* By default, define macros for Qt, etc., as this leads to a bit better performance in the core Emacs interpreter. A plugin can - define DEFINE_NONNIL_Q_SYMBOL_MACROS to be false, to be portable to + define DEFINE_NON_NIL_Q_SYMBOL_MACROS to be false, to be portable to other Emacs instances that assign different values to Qt, etc. */ -#ifndef DEFINE_NONNIL_Q_SYMBOL_MACROS -# define DEFINE_NONNIL_Q_SYMBOL_MACROS true +#ifndef DEFINE_NON_NIL_Q_SYMBOL_MACROS +# define DEFINE_NON_NIL_Q_SYMBOL_MACROS true #endif #include "globals.h" diff --git a/test/automated/vc-tests.el b/test/automated/vc-tests.el index e83eb85c0fe..4d9aefad7fb 100644 --- a/test/automated/vc-tests.el +++ b/test/automated/vc-tests.el @@ -331,8 +331,8 @@ For backends which dont support it, `vc-not-supported' is signalled." (let ((tmp-name (expand-file-name "foo" default-directory))) ;; Check for initial state, should be nil until it's registered. - ;; Don't pass the backend explictly, otherwise some implementations - ;; return non-nil. + ;; Don't pass the backend explicitly, otherwise some + ;; implementations return non-nil. (should (null (vc-working-revision tmp-name))) ;; Write a new file. Check state. diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el index 423df72d5ac..f7529ecb5e3 100644 --- a/test/cedet/srecode-tests.el +++ b/test/cedet/srecode-tests.el @@ -272,7 +272,7 @@ Dump out the extracted dictionary." (not (semantic-tag-of-class-p fcn-in 'function))) (error "No tag of class 'function to insert comment for")) - (let ((lextok (semantic-documentation-comment-preceeding-tag fcn-in 'lex)) + (let ((lextok (semantic-documentation-comment-preceding-tag fcn-in 'lex)) ) (when (not lextok) From 4a5190ff48f0ec376b014f00bf3171e08ed55a25 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 22 Feb 2015 11:07:17 +0100 Subject: [PATCH 140/457] Fix ChangeLog. --- lisp/ChangeLog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a583d7c58e8..04aaed6a202 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,14 +7,13 @@ 2015-02-21 Artur Malabarba - * bindings.el (ctl-x-map): Fix `comment-line' binding. - (Bug#19826) + * bindings.el (ctl-x-map): Fix `comment-line' binding. (Bug#19826) 2015-02-21 Michael Albinus * autorevert.el (auto-revert-notify-add-watch) (auto-revert-notify-handler, auto-revert-buffers): Handle also - buffers without an associated file, like dired buffers. + buffers without an associated file, like dired buffers. (Bug#16112) 2015-02-21 Dima Kogan From f113707a071b5b35224861ddba3db881d74a164e Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 22 Feb 2015 13:09:30 +0100 Subject: [PATCH 141/457] * lisp/dom.el (dom-previous-sibling): New function. --- lisp/dom.el | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lisp/dom.el b/lisp/dom.el index 11357e88804..42131073a04 100644 --- a/lisp/dom.el +++ b/lisp/dom.el @@ -149,6 +149,16 @@ ATTRIBUTE would typically be `class', `id' or the like." (setq result (dom-parent elem node)))) result))) +(defun dom-previous-sibling (dom node) + (when-let (parent (dom-parent dom node)) + (let ((siblings (dom-children parent)) + (previous nil)) + (while siblings + (when (eq (cadr siblings) node) + (setq previous (car siblings))) + (pop siblings)) + previous))) + (defun dom-node (tag &optional attributes &rest children) "Return a DOM node with TAG and ATTRIBUTES." (if children From 32af8a39c46c01a1fe113a676a31e8f8123b1c2f Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 22 Feb 2015 13:09:47 +0100 Subject: [PATCH 142/457] * lisp/dom.el (dom-previous-sibling): New function. --- lisp/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 04aaed6a202..b4c6d0be8ef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-22 Lars Magne Ingebrigtsen + + * dom.el (dom-previous-sibling): New function. + 2015-02-21 Paul Eggert * bindings.el (ctl-x-map): There is no 'C-;'. From 9f5a24a6fda0653cc1f60dc674bc06ec9aad1907 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sun, 22 Feb 2015 17:24:32 +0100 Subject: [PATCH 143/457] Implement x-frame-geometry for NS. * src/nsfns.m (Fx_frame_geometry): New function. (syms_of_nsfns): Defsubr Sx_frame_geometry. --- src/ChangeLog | 5 ++++ src/nsfns.m | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 5e4dbb7ae1c..6ef5746daa2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-22 Jan Djärv + + * nsfns.m (Fx_frame_geometry): New function. + (syms_of_nsfns): Defsubr Sx_frame_geometry. + 2015-02-22 Paul Eggert Spelling fixes diff --git a/src/nsfns.m b/src/nsfns.m index 9e379e28429..f8863e6d400 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -2806,6 +2806,87 @@ DY added (default is -10). return Qt; } +DEFUN ("x-frame-geometry", Fx_frame_geometry, Sx_frame_geometry, 0, 1, 0, + doc: /* Return geometric attributes of frame FRAME. + +FRAME must be a live frame and defaults to the selected one. + +The return value is an association list containing the following +elements (all size values are in pixels). + +- `frame-outer-size' is a cons of the outer width and height of FRAME. + The outer size include the title bar and the external borders as well + as any menu and/or tool bar of frame. + +- `border' is a cons of the horizontal and vertical width of FRAME's + external borders. + +- `title-bar-height' is the height of the title bar of FRAME. + +- `menu-bar-external' if `t' means the menu bar is external (not + included in the inner edges of FRAME). + +- `menu-bar-size' is a cons of the width and height of the menu bar of + FRAME. + +- `tool-bar-external' if `t' means the tool bar is external (not + included in the inner edges of FRAME). + +- `tool-bar-side' tells tells on which side the tool bar on FRAME is and + can be one of `left', `top', `right' or `bottom'. + +- `tool-bar-size' is a cons of the width and height of the tool bar of + FRAME. + +- `frame-inner-size' is a cons of the inner width and height of FRAME. + This excludes FRAME's title bar and external border as well as any + external menu and/or tool bar. */) + (Lisp_Object frame) +{ + struct frame *f = decode_live_frame (frame); + int inner_width = FRAME_PIXEL_WIDTH (f); + int inner_height = FRAME_PIXEL_HEIGHT (f); + Lisp_Object fullscreen = Fframe_parameter (frame, Qfullscreen); + int border = f->border_width; + int title = FRAME_NS_TITLEBAR_HEIGHT (f); + int outer_width = FRAME_PIXEL_WIDTH (f) + 2 * border; + int outer_height = FRAME_PIXEL_HEIGHT (f) + 2 * border; + int tool_bar_height = FRAME_TOOLBAR_HEIGHT (f); + int tool_bar_width = tool_bar_height > 0 + ? outer_width - 2 * FRAME_INTERNAL_BORDER_WIDTH (f) + : 0; + // Always 0 on NS. + int menu_bar_height = 0; + int menu_bar_width = 0; + + return + listn (CONSTYPE_HEAP, 10, + Fcons (Qframe_position, + Fcons (make_number (f->left_pos), make_number (f->top_pos))), + Fcons (Qframe_outer_size, + Fcons (make_number (outer_width), make_number (outer_height))), + Fcons (Qexternal_border_size, + ((EQ (fullscreen, Qfullboth) || EQ (fullscreen, Qfullscreen)) + ? Fcons (make_number (0), make_number (0)) + : Fcons (make_number (border), make_number (border)))), + Fcons (Qtitle_height, + ((EQ (fullscreen, Qfullboth) || EQ (fullscreen, Qfullscreen)) + ? make_number (0) + : make_number (title))), + Fcons (Qmenu_bar_external, FRAME_EXTERNAL_MENU_BAR (f) ? Qt : Qnil), + Fcons (Qmenu_bar_size, + Fcons (make_number (menu_bar_width), + make_number (menu_bar_height))), + Fcons (Qtool_bar_external, FRAME_EXTERNAL_TOOL_BAR (f) ? Qt : Qnil), + Fcons (Qtool_bar_position, FRAME_TOOL_BAR_POSITION (f)), + Fcons (Qtool_bar_size, + Fcons (make_number (tool_bar_width), + make_number (tool_bar_height))), + Fcons (Qframe_inner_size, + Fcons (make_number (inner_width), + make_number (inner_height)))); +} + /* ========================================================================== @@ -2989,6 +3070,7 @@ - (NSString *)panel: (id)sender userEnteredFilename: (NSString *)filename defsubr (&Sx_display_pixel_width); defsubr (&Sx_display_pixel_height); defsubr (&Sns_display_monitor_attributes_list); + defsubr (&Sx_frame_geometry); defsubr (&Sx_display_mm_width); defsubr (&Sx_display_mm_height); defsubr (&Sx_display_screens); From c7cdc8ed5bd80a80e0660e953da1497996ba284d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 22 Feb 2015 19:58:05 +0100 Subject: [PATCH 144/457] Suppress localized settings in Tramp test. * automated/tramp-tests.el (tramp-test17-insert-directory): Suppress localized settings in order to have a proper check for the summary line. --- test/ChangeLog | 6 ++++++ test/automated/tramp-tests.el | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/test/ChangeLog b/test/ChangeLog index 87425a69148..abc582c20fa 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-02-22 Michael Albinus + + * automated/tramp-tests.el (tramp-test17-insert-directory): + Suppress localized settings in order to have a proper check for + the summary line. + 2015-02-16 Stefan Monnier * automated/eieio-test-methodinvoke.el (make-instance): Add methods diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 2c4610c8113..3b72da8955a 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -927,7 +927,10 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." (skip-unless (tramp--test-enabled)) (let* ((tmp-name1 (tramp--test-make-temp-name)) - (tmp-name2 (expand-file-name "foo" tmp-name1))) + (tmp-name2 (expand-file-name "foo" tmp-name1)) + ;; We test for the summary line. Keyword "total" could be localized. + (process-environment + (append '("LANG=C" "LANGUAGE=C" "LC_ALL=C") process-environment))) (unwind-protect (progn (make-directory tmp-name1) From f6bb2ccb9b4b3c50049512d2d0664b44fc7bcc70 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 23 Feb 2015 04:00:01 +0200 Subject: [PATCH 145/457] Introduce `xref-etags-mode' Fixes: debbugs:19466 * lisp/progmodes/xref.el (xref-etags-mode--saved): New variable. (xref-etags-mode): New minor mode. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/xref.el | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4c6d0be8ef..ced342baeb9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-23 Dmitry Gutov + + Introduce `xref-etags-mode'. + * progmodes/xref.el (xref-etags-mode--saved): New variable. + (xref-etags-mode): New minor mode. (Bug#19466) + 2015-02-22 Lars Magne Ingebrigtsen * dom.el (dom-previous-sibling): New function. diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 55405b63fe0..fe72b3f778c 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -627,6 +627,29 @@ The argument has the same meaning as in `apropos'." ;;;###autoload (define-key ctl-x-4-map "." #'xref-find-definitions-other-window) ;;;###autoload (define-key ctl-x-5-map "." #'xref-find-definitions-other-frame) + +;;; Helper functions + +(defvar xref-etags-mode--saved nil) + +(define-minor-mode xref-etags-mode + "Minor mode to make xref use etags again. + +Certain major modes install their own mechanisms for listing +identifiers and navigation. Turn this on to undo those settings +and just use etags." + :lighter "" + (if xref-etags-mode + (progn + (setq xref-etags-mode--saved + (cons xref-find-function + xref-identifier-completion-table-function)) + (kill-local-variable 'xref-find-function) + (kill-local-variable 'xref-identifier-completion-table-function)) + (setq-local xref-find-function (car xref-etags-mode--saved)) + (setq-local xref-identifier-completion-table-function + (cdr xref-etags-mode--saved)))) + (provide 'xref) From 3f006e1d47c25a8282fd41fb0df01fd80f486b9e Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Mon, 23 Feb 2015 02:40:12 +0000 Subject: [PATCH 146/457] lisp/gnus/gnus-art.el (gnus-mime-display-single): Avoid "End of buffer" error --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/gnus-art.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 07d1d471b9f..5f8b092c62a 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2015-02-23 Katsumi Yamaoka + + * gnus-art.el (gnus-mime-display-single): Avoid "End of buffer" error. + 2015-02-18 Eric Abrahamsen * nnimap.el (nnimap-get-groups): Correctly read unquoted group names diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 85030959f79..83a2f941e9c 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -6101,7 +6101,7 @@ If nil, don't show those extra buttons." (gnus-article-insert-newline) (if (prog1 (= (skip-chars-backward "\n") -1) - (forward-char 1)) + (unless (eobp) (forward-char 1))) (gnus-article-insert-newline) (put-text-property (point) (point-max) 'gnus-undeletable t)) (goto-char (point-max))) From e846bbf360d1bcee3a35dd05a57bc76cbb22a6f0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 22 Feb 2015 23:50:03 -0500 Subject: [PATCH 147/457] * lisp/emacs-lisp/macroexp.el (macroexp-parse-body): Handle cl-declare and :documentation. Change return value format accordingly. * lisp/emacs-lisp/cl-generic.el (cl--generic-lambda): * lisp/emacs-lisp/pcase.el (pcase-lambda): Adjust accordingly. * lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): Use macroexp-parse-body. --- lisp/ChangeLog | 8 ++++++++ lisp/emacs-lisp/cl-generic.el | 2 +- lisp/emacs-lisp/cl-macs.el | 35 ++++++++++++++++------------------- lisp/emacs-lisp/macroexp.el | 19 ++++++++++--------- lisp/emacs-lisp/pcase.el | 2 +- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ced342baeb9..6352d77ca3a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-02-23 Stefan Monnier + + * emacs-lisp/macroexp.el (macroexp-parse-body): Handle cl-declare + and :documentation. Change return value format accordingly. + * emacs-lisp/cl-generic.el (cl--generic-lambda): + * emacs-lisp/pcase.el (pcase-lambda): Adjust accordingly. + * emacs-lisp/cl-macs.el (cl--transform-lambda): Use macroexp-parse-body. + 2015-02-23 Dmitry Gutov Introduce `xref-etags-mode'. diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index ccd5bec5685..99924ba288f 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -278,7 +278,7 @@ This macro can only be used within the lexical scope of a cl-generic method." (uses-cnm (cl--generic-fgrep (list cnm nmp) nbody))) (cons (not (not uses-cnm)) `#'(lambda (,@(if uses-cnm (list cnm)) ,@args) - ,@(delq nil (car parsed-body)) + ,@(car parsed-body) ,(if (not (memq nmp uses-cnm)) nbody `(let ((,nmp (lambda () diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index c5f49b0ed91..c3da091fb00 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -234,10 +234,9 @@ FORM is of the form (ARGS . BODY)." (let* ((args (car form)) (body (cdr form)) (orig-args args) (cl--bind-block bind-block) (cl--bind-defs nil) (cl--bind-enquote nil) (cl--bind-lets nil) (cl--bind-forms nil) - (header nil) (simple-args nil)) - (while (or (stringp (car body)) - (memq (car-safe (car body)) '(interactive declare cl-declare))) - (push (pop body) header)) + (parsed-body (macroexp-parse-body body)) + (header (car parsed-body)) (simple-args nil)) + (setq body (cdr parsed-body)) (setq args (if (listp args) (cl-copy-list args) (list '&rest args))) (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p))))) (if (setq cl--bind-defs (cadr (memq '&cl-defs args))) @@ -258,7 +257,7 @@ FORM is of the form (ARGS . BODY)." (or (eq cl--bind-block 'cl-none) (setq body (list `(cl-block ,cl--bind-block ,@body)))) (if (null args) - (cl-list* nil (nreverse simple-args) (nconc (nreverse header) body)) + (cl-list* nil (nreverse simple-args) (nconc header body)) (if (memq '&optional simple-args) (push '&optional args)) (cl--do-arglist args nil (- (length simple-args) (if (memq '&optional simple-args) 1 0))) @@ -266,20 +265,18 @@ FORM is of the form (ARGS . BODY)." (cl-list* nil (nconc (nreverse simple-args) (list '&rest (car (pop cl--bind-lets)))) - (nconc (let ((hdr (nreverse header))) - ;; Macro expansion can take place in the middle of - ;; apparently harmless computation, so it should not - ;; touch the match-data. - (save-match-data - (require 'help-fns) - (cons (help-add-fundoc-usage - (if (stringp (car hdr)) (pop hdr)) - ;; Be careful with make-symbol and (back)quote, - ;; see bug#12884. - (let ((print-gensym nil) (print-quoted t)) - (format "%S" (cons 'fn (cl--make-usage-args - orig-args))))) - hdr))) + (nconc (save-match-data ;; Macro expansion can take place in the + ;; middle of apparently harmless computation, so it + ;; should not touch the match-data. + (require 'help-fns) + (cons (help-add-fundoc-usage + (if (stringp (car header)) (pop header)) + ;; Be careful with make-symbol and (back)quote, + ;; see bug#12884. + (let ((print-gensym nil) (print-quoted t)) + (format "%S" (cons 'fn (cl--make-usage-args + orig-args))))) + header)) (list `(let* ,cl--bind-lets ,@(nreverse cl--bind-forms) ,@body))))))) diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index b75c8cc50a7..68bf4f62c34 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -297,15 +297,16 @@ definitions to shadow the loaded ones for use in file byte-compilation." ;;; Handy functions to use in macros. -(defun macroexp-parse-body (exps) - "Parse EXPS into ((DOC DECLARE-FORM INTERACTIVE-FORM) . BODY)." - `((,(and (stringp (car exps)) - (pop exps)) - ,(and (eq (car-safe (car exps)) 'declare) - (pop exps)) - ,(and (eq (car-safe (car exps)) 'interactive) - (pop exps))) - ,@exps)) +(defun macroexp-parse-body (body) + "Parse a function BODY into (DECLARATIONS . EXPS)." + (let ((decls ())) + (while (and (cdr body) + (let ((e (car body))) + (or (stringp e) + (memq (car-safe e) + '(:documentation declare interactive cl-declare))))) + (push (pop body) decls)) + (cons (nreverse decls) body))) (defun macroexp-progn (exps) "Return an expression equivalent to `(progn ,@EXPS)." diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index 057b12894f9..4706be5e57c 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -180,7 +180,7 @@ like `(,a . ,(pred (< a))) or, with more checks: (when (eq nil (car (last pats 2))) (setq pats (append (butlast pats 2) (car (last pats))))) `(lambda (&rest ,args) - ,@(remq nil (car body)) + ,@(car body) (pcase ,args (,(list '\` pats) . ,(cdr body)))))) From 34871865de0452cd251e92d76ab12c2ac237e783 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 22 Feb 2015 22:00:01 -0800 Subject: [PATCH 148/457] Fix the desired binding for comment-line * bindings.el (ctl-x-map): Use [?\C-\;] to get the desired binding. Fixes: bug#19826 --- lisp/ChangeLog | 6 ++++++ lisp/bindings.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6352d77ca3a..c1fb8697707 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-23 Paul Eggert + + Fix the desired binding for comment-line + * bindings.el (ctl-x-map): Use [?\C-\;] to get the desired binding. + Fixes: bug#19826 + 2015-02-23 Stefan Monnier * emacs-lisp/macroexp.el (macroexp-parse-body): Handle cl-declare diff --git a/lisp/bindings.el b/lisp/bindings.el index a1f0d987f5c..b658914c454 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1130,7 +1130,7 @@ if `inhibit-field-text-motion' is non-nil." (define-key esc-map "j" 'indent-new-comment-line) (define-key esc-map "\C-j" 'indent-new-comment-line) (define-key ctl-x-map ";" 'comment-set-column) -(define-key ctl-x-map "\M-;" 'comment-line) +(define-key ctl-x-map [?\C-\;] 'comment-line) (define-key ctl-x-map "f" 'set-fill-column) (define-key ctl-x-map "$" 'set-selective-display) From 80e50144d82e271dccd7716703c2f4390463a753 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Mon, 23 Feb 2015 09:09:46 +0000 Subject: [PATCH 149/457] Fix SCRAM-SHA-1 SASL mechanism The symbol used in sasl-mechanism-alist needs to match the name that can be required. Move sasl-make-mechanism call to end of file, to ensure that it can refer to the specified step functions. * net/sasl.el (sasl-mechanism-alist): Refer to sasl-scram-rfc instead of sasl-scram-sha-1, as the former is the name that can be required. * net/sasl-scram-rfc.el (sasl-scram-sha-1-steps) (sasl-scram-sha-1-client-final-message) (sasl-scram-sha-1-authenticate-server): Move to end of file. --- lisp/ChangeLog | 10 ++++++++ lisp/net/sasl-scram-rfc.el | 47 ++++++++++++++++++++------------------ lisp/net/sasl.el | 2 +- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1fb8697707..af8845bfb45 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2015-02-23 Magnus Henoch + + * net/sasl.el (sasl-mechanism-alist): Refer to sasl-scram-rfc + instead of sasl-scram-sha-1, as the former is the name that can be + required. + + * net/sasl-scram-rfc.el (sasl-scram-sha-1-steps) + (sasl-scram-sha-1-client-final-message) + (sasl-scram-sha-1-authenticate-server): Move to end of file. + 2015-02-23 Paul Eggert Fix the desired binding for comment-line diff --git a/lisp/net/sasl-scram-rfc.el b/lisp/net/sasl-scram-rfc.el index 6c8c00959b1..18d7a6bfa18 100644 --- a/lisp/net/sasl-scram-rfc.el +++ b/lisp/net/sasl-scram-rfc.el @@ -39,31 +39,9 @@ (require 'cl-lib) (require 'sasl) - -;;; SCRAM-SHA-1 - (require 'hex-util) (require 'rfc2104) -(defconst sasl-scram-sha-1-steps - '(sasl-scram-client-first-message - sasl-scram-sha-1-client-final-message - sasl-scram-sha-1-authenticate-server)) - -(defun sasl-scram-sha-1-client-final-message (client step) - (sasl-scram--client-final-message - ;; HMAC-SHA1 uses block length 64 and hash length 20; see RFC 2104. - 'sha1 64 20 client step)) - -(defun sasl-scram-sha-1-authenticate-server (client step) - (sasl-scram--authenticate-server - 'sha1 64 20 client step)) - -(put 'sasl-scram-sha-1 'sasl-mechanism - (sasl-make-mechanism "SCRAM-SHA-1" sasl-scram-sha-1-steps)) - -(provide 'sasl-scram-sha-1) - ;;; Generic for SCRAM-* (defun sasl-scram-client-first-message (client _step) @@ -156,5 +134,30 @@ (t (sasl-error "Invalid response from server")))) +;;; SCRAM-SHA-1 + +(defconst sasl-scram-sha-1-steps + '(sasl-scram-client-first-message + sasl-scram-sha-1-client-final-message + sasl-scram-sha-1-authenticate-server)) + +(defun sasl-scram-sha-1-client-final-message (client step) + (sasl-scram--client-final-message + ;; HMAC-SHA1 uses block length 64 and hash length 20; see RFC 2104. + 'sha1 64 20 client step)) + +(defun sasl-scram-sha-1-authenticate-server (client step) + (sasl-scram--authenticate-server + 'sha1 64 20 client step)) + +;; This needs to be at the end, because of how `sasl-make-mechanism' +;; handles step function names. +(put 'sasl-scram-sha-1 'sasl-mechanism + (sasl-make-mechanism "SCRAM-SHA-1" sasl-scram-sha-1-steps)) + +(put 'sasl-scram-rfc 'sasl-mechanism (get 'sasl-scram-sha-1 'sasl-mechanism)) + +(provide 'sasl-scram-sha-1) + (provide 'sasl-scram-rfc) ;;; sasl-scram-rfc.el ends here diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el index e59ed5d43aa..9321efdfda8 100644 --- a/lisp/net/sasl.el +++ b/lisp/net/sasl.el @@ -45,7 +45,7 @@ ("LOGIN" sasl-login) ("ANONYMOUS" sasl-anonymous) ("NTLM" sasl-ntlm) - ("SCRAM-SHA-1" sasl-scram-sha-1))) + ("SCRAM-SHA-1" sasl-scram-rfc))) (defvar sasl-unique-id-function #'sasl-unique-id-function) From 931e7babcb81d74709825580192f9ad58d595b63 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Mon, 23 Feb 2015 09:36:06 +0000 Subject: [PATCH 150/457] lisp/gnus/mailcap.el: Support PDF Tools for PDF viewing of attachments * mailcap.el (mailcap-mime-data): Support `pdf-view-mode' (from PDF Tools: https://github.com/politza/pdf-tools) for viewing PDF attachments in emacs. --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/mailcap.el | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5f8b092c62a..7a4c463208a 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2015-02-23 Tassilo Horn + + * mailcap.el (mailcap-mime-data): Support `pdf-view-mode' (from PDF + Tools: https://github.com/politza/pdf-tools) for viewing PDF + attachments in emacs. + 2015-02-23 Katsumi Yamaoka * gnus-art.el (gnus-mime-display-single): Avoid "End of buffer" error. diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el index 01d8587f06a..9f844139960 100644 --- a/lisp/gnus/mailcap.el +++ b/lisp/gnus/mailcap.el @@ -152,6 +152,11 @@ This is a compatibility function for different Emacsen." (non-viewer . t) (type . "application/zip") ("copiousoutput")) + ("pdf" + (viewer . pdf-view-mode) + (type . "application/pdf") + (test . (and (fboundp 'pdf-view-mode) + (eq window-system 'x)))) ("pdf" (viewer . doc-view-mode) (type . "application/pdf") From a0edb0160b482bdb9ea48b82e440a3ec5763dd11 Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Mon, 23 Feb 2015 09:13:31 -0500 Subject: [PATCH 151/457] `auto-save-list-file-prefix' can be a directory name * lisp/files.el (recover-session): Handle `auto-save-list-file-prefix' being a directory (empty non-directory part). --- lisp/ChangeLog | 5 +++++ lisp/files.el | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index af8845bfb45..2c22ed24bb6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-23 Sam Steingold + + * files.el (recover-session): Handle `auto-save-list-file-prefix' + being a directory (empty non-directory part). + 2015-02-23 Magnus Henoch * net/sasl.el (sasl-mechanism-alist): Refer to sasl-scram-rfc diff --git a/lisp/files.el b/lisp/files.el index 1914ad8814c..42b00accbd8 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5664,13 +5664,14 @@ Then you'll be asked about a number of files to recover." (interactive) (if (null auto-save-list-file-prefix) (error "You set `auto-save-list-file-prefix' to disable making session files")) - (let ((dir (file-name-directory auto-save-list-file-prefix))) + (let ((dir (file-name-directory auto-save-list-file-prefix)) + (nd (file-name-nondirectory auto-save-list-file-prefix))) (unless (file-directory-p dir) (make-directory dir t)) (unless (directory-files dir nil - (concat "\\`" (regexp-quote - (file-name-nondirectory - auto-save-list-file-prefix))) + (if (string= "" nd) + directory-files-no-dot-files-regexp + (concat "\\`" (regexp-quote nd))) t) (error "No previous sessions to recover"))) (let ((ls-lisp-support-shell-wildcards t)) From 18178922a8074627fe4e4e2fd0c9d21839f172c4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Feb 2015 19:46:44 +0200 Subject: [PATCH 152/457] Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925) src/w32fns.c (Fw32__menu_bar_in_use): New internal function. lisp/frame.el (blink-cursor-timer-function): Don't increment blink-cursor-blinks-done counter when a menu is active on a w32 frame. --- lisp/ChangeLog | 6 ++++++ lisp/frame.el | 6 +++++- src/ChangeLog | 5 +++++ src/w32fns.c | 10 ++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22e952a91e6..14a12b53a35 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-23 Eli Zaretskii + + * frame.el (blink-cursor-timer-function): Don't increment + blink-cursor-blinks-done counter when a menu is active on a w32 + frame. (Bug#19925) + 2015-02-19 Juri Linkov * comint.el (comint-line-beginning-position): Revert searching for diff --git a/lisp/frame.el b/lisp/frame.el index 1a584fa0e2c..e1dfa483c97 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1798,8 +1798,12 @@ command starts, by installing a pre-command hook." (defun blink-cursor-timer-function () "Timer function of timer `blink-cursor-timer'." (internal-show-cursor nil (not (internal-show-cursor-p))) + ;; Suspend counting blinks when the w32 menu-bar menu is displayed, + ;; since otherwise menu tooltips will behave erratically. + (or (and (fboundp 'w32--menu-bar-in-use) + (w32--menu-bar-in-use)) + (setq blink-cursor-blinks-done (1+ blink-cursor-blinks-done))) ;; Each blink is two calls to this function. - (setq blink-cursor-blinks-done (1+ blink-cursor-blinks-done)) (when (and (> blink-cursor-blinks 0) (<= (* 2 blink-cursor-blinks) blink-cursor-blinks-done)) (blink-cursor-suspend) diff --git a/src/ChangeLog b/src/ChangeLog index 8bffdadf66c..a2ac5389f20 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-23 Eli Zaretskii + + * w32fns.c (Fw32__menu_bar_in_use): New internal function. + (Bug#19925) + 2015-02-20 Glenn Morris * fileio.c (Fmake_temp_name): Doc tweaks. (Bug#19858) diff --git a/src/w32fns.c b/src/w32fns.c index 5af36b9a0c8..ed110317d17 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -8063,6 +8063,15 @@ w32_sys_ring_bell (struct frame *f) MessageBeep (sound_type); } +DEFUN ("w32--menu-bar-in-use", Fw32__menu_bar_in_use, Sw32__menu_bar_in_use, + 0, 0, 0, + doc: /* Return non-nil when a menu-bar menu is being used. +Internal use only. */) + (void) +{ + return menubar_in_use ? Qt : Qnil; +} + /*********************************************************************** Initialization @@ -8439,6 +8448,7 @@ only be necessary if the default setting causes problems. */); defsubr (&Sw32_window_exists_p); defsubr (&Sw32_frame_rect); defsubr (&Sw32_battery_status); + defsubr (&Sw32__menu_bar_in_use); #ifdef WINDOWSNT defsubr (&Sfile_system_info); From 6b62d265891cf28e263ff4c99054e30ffb1fb2b3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 23 Feb 2015 10:09:51 -0800 Subject: [PATCH 153/457] Use ${EXEEXT} more uniformly in makefiles When porting Emacs to run on NaCl, we need to make sure that we always call it with the proper extension (.nexe in this case) during the build. * leim/Makefile.in, lib-src/Makefile.in, lisp/Makefile.in (EMACS): Append ${EXEEXT}. (tiny change) --- leim/ChangeLog | 7 +++++++ leim/Makefile.in | 2 +- lib-src/ChangeLog | 5 +++++ lib-src/Makefile.in | 2 +- lisp/ChangeLog | 5 +++++ lisp/Makefile.in | 2 +- 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/leim/ChangeLog b/leim/ChangeLog index 4bda9a64335..a8dbca29526 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,10 @@ +2015-02-23 Pete Williamson (tiny change) + + Use ${EXEEXT} more uniformly in makefiles + When porting Emacs to run on NaCl, we need to make sure that we always + call it with the proper extension (.nexe in this case) during the build. + * Makefile.in (EMACS): Append ${EXEEXT}. + 2015-01-04 Paul Eggert Less 'make' chatter for leim diff --git a/leim/Makefile.in b/leim/Makefile.in index 573acf7678c..2ec03db49b7 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH # Which Emacs to use to convert TIT files to Emacs Lisp files, # and generate the file leim-list.el. -EMACS = ../src/emacs +EMACS = ../src/emacs${EXEEXT} # How to run Emacs. # Prevent any setting of EMACSLOADPATH in user environment causing problems. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 4ac9638102f..f161dbc038f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-23 Paul Eggert + + Use ${EXEEXT} more uniformly in makefiles + * Makefile.in (EMACS): Append ${EXEEXT}. + 2015-02-20 Paul Eggert Simplify binary I/O configuration diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index d2705e7b5dc..6b5d379e38b 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -21,7 +21,7 @@ SHELL = @SHELL@ # Following ../lisp/Makefile.in. -EMACS = ../src/emacs +EMACS = ../src/emacs${EXEEXT} EMACSOPT = -batch --no-site-file --no-site-lisp # ==================== Things `configure' will edit ==================== diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2c22ed24bb6..7b6b48b1018 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-23 Paul Eggert + + Use ${EXEEXT} more uniformly in makefiles + * Makefile.in (EMACS): Append ${EXEEXT}. + 2015-02-23 Sam Steingold * files.el (recover-session): Handle `auto-save-list-file-prefix' diff --git a/lisp/Makefile.in b/lisp/Makefile.in index e5cfc6326e1..22d5ddcf12f 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -47,7 +47,7 @@ am__v_GEN_1 = # We never change directory before running Emacs, so a relative file # name is fine, and makes life easier. If we need to change # directory, we can use emacs --chdir. -EMACS = ../src/emacs +EMACS = ../src/emacs${EXEEXT} # Command line flags for Emacs. From ed7005c0e974a43c9b63d6f5d8ef6bd4099ba449 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 23 Feb 2015 10:17:21 -0800 Subject: [PATCH 154/457] Fix previous change's attribution --- lib-src/ChangeLog | 2 +- lisp/ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f161dbc038f..5c55bcea506 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,4 +1,4 @@ -2015-02-23 Paul Eggert +2015-02-23 Pete Williamson (tiny change) Use ${EXEEXT} more uniformly in makefiles * Makefile.in (EMACS): Append ${EXEEXT}. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7b6b48b1018..d401852eeeb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,4 @@ -2015-02-23 Paul Eggert +2015-02-23 Pete Williamson (tiny change) Use ${EXEEXT} more uniformly in makefiles * Makefile.in (EMACS): Append ${EXEEXT}. From eaf9499a7fe485a57ab54c665f0548d4eb1a2e88 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Sun, 22 Feb 2015 08:01:08 +0200 Subject: [PATCH 155/457] Add new interactive command comint-clear-buffer The command clears the entire comint buffer. It's bound to C-c M-o. --- lisp/ChangeLog | 5 +++++ lisp/comint.el | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d401852eeeb..7e7bbb7486a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-24 Bozhidar Batsov + + * comint.el (comint-clear-buffer): New command. + (comint-mode-map): Bind `comint-clear-buffer' to 'C-c M-o'. + 2015-02-23 Pete Williamson (tiny change) Use ${EXEEXT} more uniformly in makefiles diff --git a/lisp/comint.el b/lisp/comint.el index 30c4dda5c0f..30aece14332 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -472,6 +472,7 @@ executed once when the buffer is created." (define-key map "\C-c\C-\\" 'comint-quit-subjob) (define-key map "\C-c\C-m" 'comint-copy-old-input) (define-key map "\C-c\C-o" 'comint-delete-output) + (defile-key map "\C-c\M-o" 'comint-clear-buffer) (define-key map "\C-c\C-r" 'comint-show-output) (define-key map "\C-c\C-e" 'comint-show-maximum-output) (define-key map "\C-c\C-l" 'comint-dynamic-list-input-ring) @@ -2428,6 +2429,11 @@ Sets mark to the value of point when this command is run." (goto-char (field-beginning pos)) (set-window-start (selected-window) (point)))))) +(defun comint-clear-buffer () + "Clear the comint buffer." + (interactive) + (let ((comint-buffer-maximum-size 0)) + (comint-truncate-buffer))) (defun comint-interrupt-subjob () "Interrupt the current subjob. From e8a11db943dfc7a469a761f98d606a4072a6ca43 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 23 Feb 2015 23:13:49 -0800 Subject: [PATCH 156/457] f90.el: add some support for continued strings without leading '&' * lisp/progmodes/f90.el (f90-beginning-of-subprogram) (f90-end-of-subprogram, f90-match-end): Handle continued strings where the continuation does not start with "&" and happens to match our regexp. * test/automated/f90.el (f90-test-bug-19809): New test. Fixes: debbugs:19809 --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/f90.el | 14 +++++++++++--- test/ChangeLog | 4 ++++ test/automated/f90.el | 16 ++++++++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7e7bbb7486a..165c1ce96de 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-24 Glenn Morris + + * progmodes/f90.el (f90-beginning-of-subprogram) + (f90-end-of-subprogram, f90-match-end): + Handle continued strings where the continuation does not start + with "&" and happens to match our regexp. (Bug#19809) + 2015-02-24 Bozhidar Batsov * comint.el (comint-clear-buffer): New command. diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index b923819ebb3..6264d3b7b82 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1634,7 +1634,10 @@ Return (TYPE NAME), or nil if not found." (re-search-backward f90-program-block-re nil 'move)) (beginning-of-line) (skip-chars-forward " \t0-9") - (cond ((setq matching-beg (f90-looking-at-program-block-start)) + ;; Check if in string in case using non-standard feature where + ;; continued strings do not need "&" at start of continuations. + (cond ((f90-in-string)) + ((setq matching-beg (f90-looking-at-program-block-start)) (setq count (1- count))) ((f90-looking-at-program-block-end) (setq count (1+ count))))) @@ -1659,7 +1662,8 @@ Return (TYPE NAME), or nil if not found." (re-search-forward f90-program-block-re nil 'move)) (beginning-of-line) (skip-chars-forward " \t0-9") - (cond ((f90-looking-at-program-block-start) + (cond ((f90-in-string)) + ((f90-looking-at-program-block-start) (setq count (1+ count))) ((setq matching-end (f90-looking-at-program-block-end)) (setq count (1- count)))) @@ -2199,8 +2203,12 @@ Leave point at the end of line." (end-point (point)) (case-fold-search t) matching-beg beg-name end-name beg-block end-block end-struct) + ;; Check if in string in case using non-standard feature where + ;; continued strings do not need "&" at start of continuations. (when (save-excursion (beginning-of-line) (skip-chars-forward " \t0-9") - (setq end-struct (f90-looking-at-program-block-end))) + (unless (f90-in-string) + (setq end-struct + (f90-looking-at-program-block-end)))) (setq end-block (car end-struct) end-name (cadr end-struct)) (save-excursion diff --git a/test/ChangeLog b/test/ChangeLog index abc582c20fa..7ba14964c0a 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2015-02-24 Glenn Morris + + * automated/f90.el (f90-test-bug-19809): New test. + 2015-02-22 Michael Albinus * automated/tramp-tests.el (tramp-test17-insert-directory): diff --git a/test/automated/f90.el b/test/automated/f90.el index c6bc41f799a..1cb2f035a6b 100644 --- a/test/automated/f90.el +++ b/test/automated/f90.el @@ -173,4 +173,20 @@ end program prog") (f90-indent-subprogram) (should (= 0 (current-indentation))))) +(ert-deftest f90-test-bug-19809 () + "Test for http://debbugs.gnu.org/19809 ." + (with-temp-buffer + (f90-mode) + ;; The Fortran standard says that continued strings should have + ;; '&' at the start of continuation lines, but it seems gfortran + ;; allows them to be absent (albeit with a warning). + (insert "program prog + write (*,*), '& +end program prog' +end program prog") + (goto-char (point-min)) + (f90-end-of-subprogram) + (should (= (point) (point-max))))) + + ;;; f90.el ends here From f418e991c052a1f9c4ad5b877a47de524c24a892 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 23 Feb 2015 23:43:58 -0800 Subject: [PATCH 157/457] rmailsum.el minor optional argument fix * lisp/mail/rmailsum.el (rmail-summary-next-all) (rmail-summary-previous-all, rmail-summary-next-msg): Fix handling of optional argument. Fixes: debbugs:19916 --- lisp/ChangeLog | 4 ++++ lisp/mail/rmailsum.el | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 165c1ce96de..25b32666754 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2015-02-24 Glenn Morris + * mail/rmailsum.el (rmail-summary-next-all) + (rmail-summary-previous-all, rmail-summary-next-msg): + Fix handling of optional argument. (Bug#19916) + * progmodes/f90.el (f90-beginning-of-subprogram) (f90-end-of-subprogram, f90-match-end): Handle continued strings where the continuation does not start diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 7ac147b87d7..bfcd81cedb8 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -791,7 +791,7 @@ the message being processed." (forward-line 1) (setq str (buffer-substring pos (1- (point)))) (while (looking-at "[ \t]") - (setq str (concat str " " + (setq str (concat str " " (buffer-substring (match-end 0) (line-end-position)))) (forward-line 1)) @@ -804,7 +804,8 @@ the message being processed." (defun rmail-summary-next-all (&optional number) (interactive "p") - (forward-line (if number number 1)) + (or number (setq number 1)) + (forward-line number) ;; It doesn't look nice to move forward past the last message line. (and (eobp) (> number 0) (forward-line -1)) @@ -812,7 +813,8 @@ the message being processed." (defun rmail-summary-previous-all (&optional number) (interactive "p") - (forward-line (- (if number number 1))) + (or number (setq number 1)) + (forward-line (- number)) ;; It doesn't look nice to move forward past the last message line. (and (eobp) (< number 0) (forward-line -1)) @@ -823,6 +825,7 @@ the message being processed." With optional prefix argument NUMBER, moves forward this number of non-deleted messages, or backward if NUMBER is negative." (interactive "p") + (or number (setq number 1)) (forward-line 0) (and (> number 0) (end-of-line)) (let ((count (if (< number 0) (- number) number)) From 7a77ed9147703d9fcaa70868282b9c09d00bfad3 Mon Sep 17 00:00:00 2001 From: Johan Claesson Date: Mon, 23 Feb 2015 23:50:44 -0800 Subject: [PATCH 158/457] * filecache.el (file-cache-filter-regexps): Add lock files (tiny change) Fixes: debbugs:19516 --- lisp/ChangeLog | 5 +++++ lisp/filecache.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25b32666754..b0a07df8064 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-24 Johan Claesson (tiny change) + + * filecache.el (file-cache-filter-regexps): + Add lock files. (Bug#19516) + 2015-02-24 Glenn Morris * mail/rmailsum.el (rmail-summary-next-all) diff --git a/lisp/filecache.el b/lisp/filecache.el index d036107d6fb..fd99ee0fb93 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -154,11 +154,12 @@ ;; These are also used in buffers containing lines of file names, ;; so the end-of-name is matched with $ rather than \\'. (list "~$" "\\.o$" "\\.exe$" "\\.a$" "\\.elc$" ",v$" "\\.output$" - "\\.$" "#$" "\\.class$") + "\\.$" "#$" "\\.class$" "/\\.#") "List of regular expressions used as filters by the file cache. File names which match these expressions will not be added to the cache. Note that the functions `file-cache-add-file' and `file-cache-add-file-list' do not use this variable." + :version "25.1" ; added "/\\.#" :type '(repeat regexp) :group 'file-cache) From feb49cb7a481f988350899c748ba5582ffac5bf7 Mon Sep 17 00:00:00 2001 From: Karl Fogel Date: Tue, 24 Feb 2015 09:30:56 -0600 Subject: [PATCH 159/457] * comint.el (comint-mode-map): Fix obvious typo. --- lisp/ChangeLog | 4 ++++ lisp/comint.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0a07df8064..4c50f25e376 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-24 Karl Fogel (tiny change) + + * comint.el (comint-mode-map): Fix obvious typo. + 2015-02-24 Johan Claesson (tiny change) * filecache.el (file-cache-filter-regexps): diff --git a/lisp/comint.el b/lisp/comint.el index 30aece14332..2c4168474ab 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -472,7 +472,7 @@ executed once when the buffer is created." (define-key map "\C-c\C-\\" 'comint-quit-subjob) (define-key map "\C-c\C-m" 'comint-copy-old-input) (define-key map "\C-c\C-o" 'comint-delete-output) - (defile-key map "\C-c\M-o" 'comint-clear-buffer) + (define-key map "\C-c\M-o" 'comint-clear-buffer) (define-key map "\C-c\C-r" 'comint-show-output) (define-key map "\C-c\C-e" 'comint-show-maximum-output) (define-key map "\C-c\C-l" 'comint-dynamic-list-input-ring) From 450bebaec94611f0958e13e35faf494e17931f8e Mon Sep 17 00:00:00 2001 From: Samer Masterson Date: Tue, 24 Feb 2015 14:03:54 -0500 Subject: [PATCH 160/457] * lisp/eshell: Fix history substitution error Fixes: debbugs:18960 * lisp/eshell/em-hist.el (eshell-hist-parse-word-designator): Return args joined with " ". * lisp/eshell/em-pred.el (eshell-parse-modifiers): Correct docstring. (eshell-hist-parse-modifier): Pass mod a list instead of a string. --- lisp/ChangeLog | 16 ++++++++++++---- lisp/eshell/em-hist.el | 4 ++-- lisp/eshell/em-pred.el | 14 +++++++------- lisp/hi-lock.el | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4c50f25e376..b152a752115 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-02-24 Samer Masterson + + * eshell/em-hist.el (eshell-hist-parse-word-designator): + Return args joined with " ". + * eshell/em-pred.el (eshell-parse-modifiers): Correct docstring. + (eshell-hist-parse-modifier): Pass mod a list instead of a string + (bug#18960). + 2015-02-24 Karl Fogel (tiny change) * comint.el (comint-mode-map): Fix obvious typo. @@ -100,8 +108,8 @@ (verilog-auto-inst, verilog-auto-inst-param): Use arguments rather than vector-skip. (verilog-auto-inst-port): Fix AUTOINST interfaces to not show - modport if signal attachment is itself a modport. Reported by - Matthew Lovell. + modport if signal attachment is itself a modport. + Reported by Matthew Lovell. 2015-02-21 Reto Zimmermann @@ -341,7 +349,7 @@ 2015-02-11 Stefan Monnier * hi-lock.el (hi-lock-unface-buffer): Don't call - font-lock-remove-keywords if not needed (bug#19737). + font-lock-remove-keywords if not needed (bug#19796). 2015-02-11 Artur Malabarba @@ -1622,7 +1630,7 @@ * vc/vc-svn.el (vc-svn-dir-status-files): Pass t as vc-svn-after-dir-status's second argument. (Bug#19429) -2015-01-16 Samer Masterson (tiny change) +2015-01-16 Samer Masterson * pcomplete.el (pcomplete-parse-arguments): Parse arguments regardless of pcomplete-cycle-completions's value. (Bug#18950) diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 55c83e45226..1cdf6d69714 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -724,7 +724,7 @@ matched." (setq nth (eshell-hist-word-reference nth))) (unless (numberp mth) (setq mth (eshell-hist-word-reference mth))) - (cons (mapconcat 'identity (eshell-sublist textargs nth mth) "") + (cons (mapconcat 'identity (eshell-sublist textargs nth mth) " ") end)))) (defun eshell-hist-parse-modifier (hist reference) @@ -737,7 +737,7 @@ matched." (goto-char (point-min)) (let ((modifiers (cdr (eshell-parse-modifiers)))) (dolist (mod modifiers) - (setq hist (funcall mod hist))) + (setq hist (car (funcall mod (list hist))))) hist)) (delete-region here (point))))) diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index abaa99eff23..289d37dd580 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -119,7 +119,8 @@ The format of each entry is (function (lambda (str) (eshell-stringify - (car (eshell-parse-argument str))))) lst))) + (car (eshell-parse-argument str))))) + lst))) (?L . #'(lambda (lst) (mapcar 'downcase lst))) (?U . #'(lambda (lst) (mapcar 'upcase lst))) (?C . #'(lambda (lst) (mapcar 'capitalize lst))) @@ -296,16 +297,15 @@ This function is specially for adding onto `eshell-parse-argument-hook'." (defun eshell-parse-modifiers () "Parse value modifiers and predicates at point. -If ALLOW-PREDS is non-nil, predicates will be parsed as well. Return a cons cell of the form (PRED-FUNC-LIST . MOD-FUNC-LIST) -NEW-STRING is STRING minus any modifiers. PRED-FUNC-LIST is a list of -predicate functions. MOD-FUNC-LIST is a list of result modifier -functions. PRED-FUNCS take a filename and return t if the test -succeeds; MOD-FUNCS take any string and preform a modification, -returning the resultant string." +PRED-FUNC-LIST is a list of predicate functions. MOD-FUNC-LIST +is a list of result modifier functions. PRED-FUNCS take a +filename and return t if the test succeeds; MOD-FUNCS take any +list of strings and perform a modification, returning the +resultant list of strings." (let (negate follow preds mods) (condition-case nil (while (not (eobp)) diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index d74664a845f..0255585f532 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -600,7 +600,7 @@ then remove all hi-lock highlighting." ;; `font-lock-specified-p' to go from nil to non-nil (because it ;; calls font-lock-set-defaults). This is yet-another bug in ;; font-lock-add/remove-keywords, which we circumvent here by - ;; testing `font-lock-fontified' (bug#19737). + ;; testing `font-lock-fontified' (bug#19796). (if font-lock-fontified (font-lock-remove-keywords nil (list keyword))) (setq hi-lock-interactive-patterns (delq keyword hi-lock-interactive-patterns)) From 1b0ebbdb566a8dfa5f45ce121b2c835e9760091f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 24 Feb 2015 18:02:11 -0500 Subject: [PATCH 161/457] browse-url-firefox: update for firefox 36's removal of -remote Ref: https://bugzilla.mozilla.org/show_bug.cgi?id=1080319 * lisp/net/browse-url.el (browse-url-firefox-startup-arguments): Make obsolete. (browse-url-firefox): Doc fix. Remove -remote. (browse-url-firefox-sentinel): Remove function. * etc/NEWS: Mention this. Fixes: debbugs:19921 --- etc/NEWS | 2 ++ lisp/ChangeLog | 8 +++++ lisp/net/browse-url.el | 80 ++++++++++++++---------------------------- 3 files changed, 37 insertions(+), 53 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 0b26d7abb18..7d9e1f0d83f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -29,6 +29,8 @@ with a prefix argument or by typing C-u C-h C-n. ** `call-process-shell-command' and `process-file-shell-command' no longer take "&rest args". +** The option `browse-url-firefox-startup-arguments' no longer has an effect. + ** ERC *** New option `erc-rename-buffers'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 14a12b53a35..a5603941ad1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-02-24 Glenn Morris + + * net/browse-url.el (browse-url-firefox-startup-arguments): + Make obsolete. + (browse-url-firefox): Doc fix. Remove -remote, which no longer + exists in Firefox 36. (Bug#19921) + (browse-url-firefox-sentinel): Remove function. + 2015-02-23 Eli Zaretskii * frame.el (blink-cursor-timer-function): Don't increment diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index e6ae0d7df06..4819cdc20f6 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -337,6 +337,9 @@ Defaults to the value of `browse-url-firefox-arguments' at the time :type '(repeat (string :tag "Argument")) :group 'browse-url) +(make-obsolete-variable 'browse-url-firefox-startup-arguments + "it no longer has any effect." "24.5") + (defcustom browse-url-chromium-program (let ((candidates '("chromium" "chromium-browser"))) (while (and candidates (not (executable-find (car candidates)))) @@ -1102,68 +1105,39 @@ used instead of `browse-url-new-window-flag'." ;;;###autoload (defun browse-url-firefox (url &optional new-window) "Ask the Firefox WWW browser to load URL. -Default to the URL around or before point. The strings in -variable `browse-url-firefox-arguments' are also passed to -Firefox. +Defaults to the URL around or before point. Passes the strings +in the variable `browse-url-firefox-arguments' to Firefox. -When called interactively, if variable -`browse-url-new-window-flag' is non-nil, load the document in a -new Firefox window, otherwise use a random existing one. A -non-nil interactive prefix argument reverses the effect of -`browse-url-new-window-flag'. +Interactively, if the variable `browse-url-new-window-flag' is non-nil, +loads the document in a new Firefox window. A non-nil prefix argument +reverses the effect of `browse-url-new-window-flag'. If `browse-url-firefox-new-window-is-tab' is non-nil, then whenever a document would otherwise be loaded in a new window, it is loaded in a new tab in an existing window instead. -When called non-interactively, optional second argument -NEW-WINDOW is used instead of `browse-url-new-window-flag'. +Non-interactively, this uses the optional second argument NEW-WINDOW +instead of `browse-url-new-window-flag'. -On MS-Windows systems the optional `new-window' parameter is -ignored. Firefox for Windows does not support the \"-remote\" -command line parameter. Therefore, the -`browse-url-new-window-flag' and `browse-url-firefox-new-window-is-tab' -are ignored as well. Firefox on Windows will always open the requested -URL in a new window." +On MS Windows, this ignores `browse-url-new-window-flag' and +`browse-url-firefox-new-window-is-tab', as well as the NEW-WINDOW argument. +It always uses a new window." (interactive (browse-url-interactive-arg "URL: ")) (setq url (browse-url-encode-url url)) - (let* ((process-environment (browse-url-process-environment)) - (use-remote - (not (memq system-type '(windows-nt ms-dos)))) - (process - (apply 'start-process - (concat "firefox " url) nil - browse-url-firefox-program - (append - browse-url-firefox-arguments - (if use-remote - (list "-remote" - (concat - "openURL(" - url - (if (browse-url-maybe-new-window new-window) - (if browse-url-firefox-new-window-is-tab - ",new-tab" - ",new-window")) - ")")) - (list url)))))) - ;; If we use -remote, the process exits with status code 2 if - ;; Firefox is not already running. The sentinel runs firefox - ;; directly if that happens. - (when use-remote - (set-process-sentinel process - `(lambda (process change) - (browse-url-firefox-sentinel process ,url)))))) - -(defun browse-url-firefox-sentinel (process url) - "Handle a change to the process communicating with Firefox." - (or (eq (process-exit-status process) 0) - (let* ((process-environment (browse-url-process-environment))) - ;; Firefox is not running - start it - (message "Starting Firefox...") - (apply 'start-process (concat "firefox " url) nil - browse-url-firefox-program - (append browse-url-firefox-startup-arguments (list url)))))) + (let* ((process-environment (browse-url-process-environment))) + (apply 'start-process + (concat "firefox " url) nil + browse-url-firefox-program + (append + browse-url-firefox-arguments + ;; FIXME someone should check if this limitation + ;; still applies. + (unless (memq system-type '(windows-nt ms-dos)) + (if (browse-url-maybe-new-window new-window) + (if browse-url-firefox-new-window-is-tab + '("-new-tab") + '("-new-window")))) + (list url))))) ;;;###autoload (defun browse-url-chromium (url &optional _new-window) From 341e5f3c867f25c33a18dfe3e2ed369e6fb58c66 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Tue, 24 Feb 2015 22:50:44 -0300 Subject: [PATCH 162/457] simple.el (region-active-p): Fix doc to say non-nil. --- lisp/ChangeLog | 4 ++++ lisp/simple.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b152a752115..76f9eb40194 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-25 Artur Malabarba + + * simple.el (region-active-p): Fix doc to say non-nil. + 2015-02-24 Samer Masterson * eshell/em-hist.el (eshell-hist-parse-word-designator): diff --git a/lisp/simple.el b/lisp/simple.el index b78286dc83b..2f09042d817 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4865,7 +4865,7 @@ For some commands, it may be appropriate to ignore the value of (or use-empty-active-region (> (region-end) (region-beginning))))) (defun region-active-p () - "Return t if Transient Mark mode is enabled and the mark is active. + "Return non-nil if Transient Mark mode is enabled and the mark is active. Some commands act specially on the region when Transient Mark mode is enabled. Usually, such commands should use From 0c4f73a09d9069824911420f0205da0dd90c1504 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 24 Feb 2015 18:10:36 -0500 Subject: [PATCH 163/457] rmailsum.el tiny simplification * lisp/mail/rmailsum.el (rmail-summary-previous-all) (rmail-summary-previous-msg): Simplify. --- lisp/ChangeLog | 5 +++++ lisp/mail/rmailsum.el | 12 +++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 76f9eb40194..5fa7ef757b3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-24 Glenn Morris + + * mail/rmailsum.el (rmail-summary-previous-all) + (rmail-summary-previous-msg): Simplify. + 2015-02-25 Artur Malabarba * simple.el (region-active-p): Fix doc to say non-nil. diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index bfcd81cedb8..7144e43d301 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -1,7 +1,6 @@ ;;; rmailsum.el --- make summary buffers for the mail reader -;; Copyright (C) 1985, 1993-1996, 2000-2015 Free Software Foundation, -;; Inc. +;; Copyright (C) 1985, 1993-1996, 2000-2015 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: mail @@ -813,12 +812,7 @@ the message being processed." (defun rmail-summary-previous-all (&optional number) (interactive "p") - (or number (setq number 1)) - (forward-line (- number)) - ;; It doesn't look nice to move forward past the last message line. - (and (eobp) (< number 0) - (forward-line -1)) - (display-buffer rmail-buffer)) + (rmail-summary-next-all (- (or number 1)))) (defun rmail-summary-next-msg (&optional number) "Display next non-deleted msg from rmail file. @@ -843,7 +837,7 @@ messages, or backward if NUMBER is negative." With optional prefix argument NUMBER, moves backward this number of non-deleted messages." (interactive "p") - (rmail-summary-next-msg (- (if number number 1)))) + (rmail-summary-next-msg (- (or number 1)))) (defun rmail-summary-next-labeled-message (n labels) "Show next message with LABELS. Defaults to last labels used. From b74db6347cf5cac1ebd4c604fd5691c588fd8e32 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 24 Feb 2015 16:34:13 -0800 Subject: [PATCH 164/457] Backtrace after malloc arena is corrupted Without this change, if the malloc arena is corrupted and then 'backtrace' is called, the backtrace can crash because 'backtrace' calls 'malloc'. For more, please see: https://sourceware.org/ml/libc-alpha/2015-02/msg00678.html * emacs.c (main): Initialize tables used by 'backtrace'. * sysdep.c (emacs_backtrace): Document the newly used part of the API. --- src/ChangeLog | 10 ++++++++++ src/emacs.c | 2 ++ src/sysdep.c | 12 +++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6ef5746daa2..1f0781fef10 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2015-02-25 Paul Eggert + + Backtrace after malloc arena is corrupted + Without this change, if the malloc arena is corrupted and then + 'backtrace' is called, the backtrace can crash because 'backtrace' + calls 'malloc'. For more, please see: + https://sourceware.org/ml/libc-alpha/2015-02/msg00678.html + * emacs.c (main): Initialize tables used by 'backtrace'. + * sysdep.c (emacs_backtrace): Document the newly used part of the API. + 2015-02-22 Jan Djärv * nsfns.m (Fx_frame_geometry): New function. diff --git a/src/emacs.c b/src/emacs.c index 4a6d6badf28..c2b698ba50b 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -884,6 +884,8 @@ main (int argc, char **argv) clearerr (stdin); + emacs_backtrace (-1); + #if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC /* Arrange to get warning messages as memory fills up. */ memory_warnings (0, malloc_warning); diff --git a/src/sysdep.c b/src/sysdep.c index a2bda96192f..cb361ec2dc5 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2147,7 +2147,17 @@ snprintf (char *buf, size_t bufsize, char const *format, ...) /* If a backtrace is available, output the top lines of it to stderr. Do not output more than BACKTRACE_LIMIT or BACKTRACE_LIMIT_MAX lines. This function may be called from a signal handler, so it should - not invoke async-unsafe functions like malloc. */ + not invoke async-unsafe functions like malloc. + + If BACKTRACE_LIMIT is -1, initialize tables that 'backtrace' uses + but do not output anything. This avoids some problems that can + otherwise occur if the malloc arena is corrupted before 'backtrace' + is called, since 'backtrace' may call malloc if the tables are not + initialized. + + If the static variable THREAD_BACKTRACE_NPOINTERS is nonzero, a + fatal error has occurred in some other thread; generate a thread + backtrace instead, ignoring BACKTRACE_LIMIT. */ void emacs_backtrace (int backtrace_limit) { From 27bd6dadf4a841c16e7f8fcdbd6068512c02bc3b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 24 Feb 2015 16:38:16 -0800 Subject: [PATCH 165/457] Merge from gnulib * lib/getdtablesize.c, m4/dup2.m4, m4/fcntl.m4: Update from gnulib, incorporating: 2015-02-23 dup2: doc and test for Android bug 2015-02-23 Replace dup2() on Android 2015-02-22 Android doesn't define RLIM_SAVED_* --- ChangeLog | 9 +++++++++ lib/getdtablesize.c | 7 +++++++ m4/dup2.m4 | 12 ++++++++++-- m4/fcntl.m4 | 8 +++++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41bff0ef30a..47ef578fb7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-02-25 Paul Eggert + + Merge from gnulib + * lib/getdtablesize.c, m4/dup2.m4, m4/fcntl.m4: + Update from gnulib, incorporating: + 2015-02-23 dup2: doc and test for Android bug + 2015-02-23 Replace dup2() on Android + 2015-02-22 Android doesn't define RLIM_SAVED_* + 2015-02-21 Paul Eggert Merge from gnulib diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index bad45f7e32f..03eb7ef1bff 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -89,6 +89,13 @@ getdtablesize (void) # include # include +# ifndef RLIM_SAVED_CUR +# define RLIM_SAVED_CUR RLIM_INFINITY +# endif +# ifndef RLIM_SAVED_MAX +# define RLIM_SAVED_MAX RLIM_INFINITY +# endif + # ifdef __CYGWIN__ /* Cygwin 1.7.25 auto-increases the RLIMIT_NOFILE soft limit until it hits the compile-time constant hard limit of 3200. We might as diff --git a/m4/dup2.m4 b/m4/dup2.m4 index 9aa2ea85ebd..59028e0982c 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,4 +1,4 @@ -#serial 22 +#serial 24 dnl Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -25,6 +25,12 @@ AC_DEFUN([gl_FUNC_DUP2], #include #include #include + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif ]], [[int result = 0; int bad_fd = INT_MAX; @@ -39,7 +45,7 @@ AC_DEFUN([gl_FUNC_DUP2], if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) result |= 1; #endif - if (dup2 (1, 1) == 0) + if (dup2 (1, 1) != 1) result |= 2; #ifdef FD_CLOEXEC if (fcntl (1, F_GETFD) != FD_CLOEXEC) @@ -70,6 +76,8 @@ AC_DEFUN([gl_FUNC_DUP2], gl_cv_func_dup2_works="guessing no" ;; haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. gl_cv_func_dup2_works="guessing no" ;; + *-android*) # implemented using dup3(), which fails if oldfd == newfd + gl_cv_func_dup2_works="guessing no" ;; *) gl_cv_func_dup2_works="guessing yes" ;; esac]) ]) diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index 218e78628ba..76dd86711b2 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,4 +1,4 @@ -# fcntl.m4 serial 7 +# fcntl.m4 serial 8 dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -34,6 +34,12 @@ AC_DEFUN([gl_FUNC_FCNTL], #include #include #include + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif ]], [[int result = 0; int bad_fd = INT_MAX; From b86ba30d17abcc85c73ad47ed95f15147508538c Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Wed, 25 Feb 2015 02:39:47 +0000 Subject: [PATCH 166/457] Gnus: Revert my bogus changes (2014-06-05) * mm-decode.el (mm-shr) * mm-view.el (mm-inline-text-html-render-with-w3m): Revert my bogus change that made the start marker of a part the "moves after insertion" type. --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/mm-decode.el | 2 +- lisp/gnus/mm-view.el | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7a4c463208a..671e171e93e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2015-02-25 Katsumi Yamaoka + + * mm-decode.el (mm-shr) + * mm-view.el (mm-inline-text-html-render-with-w3m): + Revert my bogus change that made the start marker of a part + the "moves after insertion" type. + 2015-02-23 Tassilo Horn * mailcap.el (mailcap-mime-data): Support `pdf-view-mode' (from PDF diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 459c7935f9b..ae6bb71dfc7 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1895,7 +1895,7 @@ If RECURSIVE, search recursively." handle `(lambda () (let ((inhibit-read-only t)) - (delete-region ,(copy-marker (point-min) t) + (delete-region ,(point-min-marker) ,(point-max-marker)))))))) (defvar shr-map) diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 4b520edf1e2..a3d6e74fbcb 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -217,7 +217,7 @@ handle `(lambda () (let ((inhibit-read-only t)) - (delete-region ,(copy-marker (point-min) t) + (delete-region ,(point-min-marker) ,(point-max-marker))))))))) (defvar mm-w3m-standalone-supports-m17n-p (if (featurep 'mule) 'undecided) From 8bb64d2722632fcc2b7c816e5f85d64ff10161f9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 25 Feb 2015 01:03:14 -0500 Subject: [PATCH 167/457] * lisp/emacs-lisp/edebug.el (edebug--display): Save-excursion. Fixes: debbugs:19611 * lisp/emacs-lisp/debug.el (debugger-env-macro): Remove redundant save-excursion. --- lisp/ChangeLog | 6 ++++++ lisp/emacs-lisp/debug.el | 6 +----- lisp/emacs-lisp/edebug.el | 9 +++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5fa7ef757b3..fc2893e1c1d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-25 Stefan Monnier + + * emacs-lisp/edebug.el (edebug--display): Save-excursion (bug#19611). + * emacs-lisp/debug.el (debugger-env-macro): Remove redundant + save-excursion. + 2015-02-24 Glenn Morris * mail/rmailsum.el (rmail-summary-previous-all) diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index dc0e666836e..8c1440d02f3 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -535,11 +535,7 @@ Applies to the frame whose line point is on in the backtrace." (defmacro debugger-env-macro (&rest body) "Run BODY in original environment." (declare (indent 0)) - `(save-excursion - (if (null (buffer-live-p debugger-old-buffer)) - ;; old buffer deleted - (setq debugger-old-buffer (current-buffer))) - (set-buffer debugger-old-buffer) + `(progn (set-match-data debugger-outer-match-data) (prog1 (progn ,@body) diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 7faa101299e..10918775f49 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -2358,6 +2358,12 @@ MSG is printed after `::::} '." (defalias 'edebug-mark-marker 'mark-marker) (defun edebug--display (value offset-index arg-mode) + ;; edebug--display-1 is too big, we should split it. This function + ;; here was just introduced to avoid making edebug--display-1 + ;; yet a bit deeper. + (save-excursion (edebug--display-1 value offset-index arg-mode))) + +(defun edebug--display-1 (value offset-index arg-mode) (unless (marker-position edebug-def-mark) ;; The buffer holding the source has been killed. ;; Let's at least show a backtrace so the user can figure out @@ -3317,6 +3323,9 @@ Return the result of the last expression." ;; Restore outside context. (setq-default cursor-in-non-selected-windows edebug-outside-d-c-i-n-s-w) (unwind-protect + ;; FIXME: This restoring of edebug-outside-buffer and + ;; edebug-outside-point is redundant now that backtrace-eval does it + ;; for us. (with-current-buffer edebug-outside-buffer ; of edebug-buffer (goto-char edebug-outside-point) (if (marker-buffer (edebug-mark-marker)) From dcd4830cb9b716c0d055df84f5106b14585eb879 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Wed, 25 Feb 2015 11:45:20 +0100 Subject: [PATCH 168/457] Handle customizations of reftex-include-file-commands * reftex.texi (Multifile Documents): Document reftex-include-file-commands. (Options): Mention that non-customize changes might require calling reftex-compile-variables. * textmodes/reftex-vars.el (reftex-include-file-commands): Call reftex-set-dirty on changes. --- doc/misc/ChangeLog | 7 +++++++ doc/misc/reftex.texi | 10 ++++++++++ lisp/ChangeLog | 5 +++++ lisp/textmodes/reftex-vars.el | 1 + 4 files changed, 23 insertions(+) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d04a8bbb083..448c7f26c1a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,10 @@ +2015-02-25 Tassilo Horn + + * reftex.texi (Multifile Documents): Document + reftex-include-file-commands. + (Options): Mention that non-customize changes might require + calling reftex-compile-variables. + 2015-02-21 Paul Eggert * texinfo.tex: Update from gnulib. diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index 567063f2c3b..facfb4376db 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -2961,6 +2961,12 @@ label itself in order to be processed correctly by @RefTeX{}. The only exception is that section labels referring to a section statement outside the current file can still use that section title as context. + +@item +@vindex reftex-include-file-commands +@RefTeX{} knows about the @code{\include} and @code{\input} macros. +In case you use different commands to include files in a multifile +document, customize the variable @code{reftex-include-file-commands}. @end itemize @node Language Support @@ -3893,6 +3899,10 @@ Lisp (and even if you are) you might find it more comfortable to use @code{customize} to look at and change these variables. @kbd{M-x reftex-customize} will get you there. +In case you don't use the @code{customize} interface, here's a caveat: +Changing (mostly parsing-related) options might require a call to +@code{reftex-compile-variables} in order to become effective. + @menu * Options - Table of Contents:: * Options - Defining Label Environments:: diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fc2893e1c1d..fb8b1f7fc94 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-25 Tassilo Horn + + * textmodes/reftex-vars.el (reftex-include-file-commands): Call + reftex-set-dirty on changes. + 2015-02-25 Stefan Monnier * emacs-lisp/edebug.el (edebug--display): Save-excursion (bug#19611). diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 115c1e0cde4..7fe6882d3ca 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -263,6 +263,7 @@ distribution. Mixed-case symbols are convenience aliases.") The file name is expected after the command, either in braces or separated by whitespace." :group 'reftex-table-of-contents-browser + :set 'reftex-set-dirty :type '(repeat string)) (defcustom reftex-max-section-depth 12 From 26b2e9aa4d022fbd13e7878dab6a1df51eddebc5 Mon Sep 17 00:00:00 2001 From: Oleh Krehel Date: Fri, 13 Feb 2015 14:34:17 +0100 Subject: [PATCH 169/457] check-declare.el (check-declare-ext-errors): New defcustom. * emacs-lisp/check-declare.el (check-declare): New defgroup. (check-declare-verify): When `check-declare-ext-errors' is non-nil, warn about an unfound function, instead of saying "skipping external file". --- lisp/ChangeLog | 9 +++++++++ lisp/emacs-lisp/check-declare.el | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fb8b1f7fc94..078fc3e3a6b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-02-25 Oleh Krehel + + * emacs-lisp/check-declare.el (check-declare-ext-errors): New + defcustom. + (check-declare): New defgroup. + (check-declare-verify): When `check-declare-ext-errors' is + non-nil, warn about an unfound function, instead of saying + "skipping external file". + 2015-02-25 Tassilo Horn * textmodes/reftex-vars.el (reftex-include-file-commands): Call diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el index 13de61c4935..40ab03d8351 100644 --- a/lisp/emacs-lisp/check-declare.el +++ b/lisp/emacs-lisp/check-declare.el @@ -125,6 +125,14 @@ With optional argument FULL, sums the number of elements in each element." (autoload 'byte-compile-arglist-signature "bytecomp") +(defgroup check-declare nil + "Check declare-function statements." + :group 'tools) + +(defcustom check-declare-ext-errors nil + "When non-nil, warn abount functions not found in :ext." + :type 'boolean) + (defun check-declare-verify (fnfile fnlist) "Check that FNFILE contains function definitions matching FNLIST. Each element of FNLIST has the form (FILE FN ARGLIST FILEONLY), where @@ -226,7 +234,8 @@ method\\|class\\)\\|fset\\)\\>" type) (when type (setq errlist (cons (list (car e) (cadr e) type) errlist)))) (message "%s%s" m - (if (or re (not ext)) + (if (or re (or check-declare-ext-errors + (not ext))) (check-declare-errmsg errlist) (progn (setq errlist nil) From 383722dee79aee1dd0b9def6a2af6649b26f5687 Mon Sep 17 00:00:00 2001 From: Oleh Krehel Date: Fri, 13 Feb 2015 14:59:31 +0100 Subject: [PATCH 170/457] check-declare.el: Use compilation-style warnings * lisp/emacs-lisp/check-declare.el (check-declare-warn): Add file-line-column info to the warning. (check-declare-files): Make sure that `check-declare-warning-buffer' is in `compilation-mode'. Make the order of the errors that same as in the file. Add code to ensure that `first-error' will work properly. --- lisp/ChangeLog | 7 ++++++ lisp/emacs-lisp/check-declare.el | 40 +++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 078fc3e3a6b..f1dd8db5298 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-25 Oleh Krehel + + * emacs-lisp/check-declare.el (check-declare-warn): Use + compilation-style warnings. + (check-declare-files): Make sure that + `check-declare-warning-buffer' is in `compilation-mode'. + 2015-02-25 Oleh Krehel * emacs-lisp/check-declare.el (check-declare-ext-errors): New diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el index 40ab03d8351..c2639729fa9 100644 --- a/lisp/emacs-lisp/check-declare.el +++ b/lisp/emacs-lisp/check-declare.el @@ -260,12 +260,29 @@ Returned list has elements FNFILE (FILE ...)." "Warn that FILE made a false claim about FN in FNFILE. TYPE is a string giving the nature of the error. Warning is displayed in `check-declare-warning-buffer'." - (display-warning 'check-declare - (format "%s said `%s' was defined in %s: %s" - (file-name-nondirectory file) fn - (file-name-nondirectory fnfile) - type) - nil check-declare-warning-buffer)) + (let ((warning-prefix-function + (lambda (level entry) + (let ((line 0) + (col 0)) + (insert + (with-current-buffer (find-file-noselect file) + (goto-char (point-min)) + (when (re-search-forward + (format "(declare-function[ \t\n]+%s" fn) nil t) + (goto-char (match-beginning 0)) + (setq line (line-number-at-pos)) + (setq col (1+ (current-column)))) + (format "%s:%d:%d:" + (file-name-nondirectory file) + line col)))) + entry)) + (warning-fill-prefix " ")) + (display-warning 'check-declare + (format "%s said `%s' was defined in %s: %s" + (file-name-nondirectory file) fn + (file-name-nondirectory fnfile) + type) + nil check-declare-warning-buffer))) (defun check-declare-files (&rest files) "Check veracity of all `declare-function' statements in FILES. @@ -278,13 +295,20 @@ Return a list of any errors found." (dolist (e (check-declare-sort alist)) (if (setq err (check-declare-verify (car e) (cdr e))) (setq errlist (cons (cons (car e) err) errlist)))) + (setq errlist (nreverse errlist)) (if (get-buffer check-declare-warning-buffer) (kill-buffer check-declare-warning-buffer)) + (with-current-buffer (get-buffer-create check-declare-warning-buffer) + (unless (derived-mode-p 'compilation-mode) + (compilation-mode)) + (let ((inhibit-read-only t)) + (insert "\f\n")) + (compilation-forget-errors)) ;; Sort back again so that errors are ordered by the files ;; containing the declare-function statements. (dolist (e (check-declare-sort errlist)) - (dolist (f (cdr e)) - (check-declare-warn (car e) (cadr f) (car f) (nth 2 f)))) + (dolist (f (cdr e)) + (check-declare-warn (car e) (cadr f) (car f) (nth 2 f)))) errlist)) ;;;###autoload From ca5790eb50db4511ecd987559b91f0509ffe61e5 Mon Sep 17 00:00:00 2001 From: Nicolas Richard Date: Wed, 25 Feb 2015 13:07:43 +0100 Subject: [PATCH 171/457] lisp/progmodes/elisp-mode.el (elisp--eval-last-sexp): Document argument. Fixes: 19932 --- lisp/ChangeLog | 4 ++++ lisp/progmodes/elisp-mode.el | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f1dd8db5298..7f7eac64b6e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-02-25 Nicolas Richard + + * progmodes/elisp-mode.el (elisp--eval-last-sexp): Document argument. + 2015-02-25 Oleh Krehel * emacs-lisp/check-declare.el (check-declare-warn): Use diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index b2c5fbfe60e..29f1ee9a98c 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -883,10 +883,11 @@ If CHAR is not a character, return nil." (defun elisp--eval-last-sexp (eval-last-sexp-arg-internal) "Evaluate sexp before point; print value in the echo area. -With argument, print output into current buffer. -With a zero prefix arg, print output with no limit on the length -and level of lists, and include additional formats for integers -\(octal, hexadecimal, and character)." +If EVAL-LAST-SEXP-ARG-INTERNAL is non-nil, print output into +current buffer. If EVAL-LAST-SEXP-ARG-INTERNAL is `0', print +output with no limit on the length and level of lists, and +include additional formats for integers \(octal, hexadecimal, and +character)." (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t))) ;; Setup the lexical environment if lexical-binding is enabled. (elisp--eval-last-sexp-print-value From 0731a2e857f6d328a06a12d9d7540f41f3a8ae04 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 25 Feb 2015 12:28:28 -0500 Subject: [PATCH 172/457] # Auto-commit of loaddefs files. --- lisp/mail/rmail.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 855a4c2d0ff..1b8dd063db4 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4810,7 +4810,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. ;;;*** -;;;### (autoloads nil "rmailsum" "rmailsum.el" "e3943ef45946f10b9b5cab8097d7f271") +;;;### (autoloads nil "rmailsum" "rmailsum.el" "3203e61425330fc20f3154b559f8b539") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ From 719fd9334634dfc91e145d0a7320387a8bb4b75f Mon Sep 17 00:00:00 2001 From: Jan D Date: Wed, 25 Feb 2015 20:16:44 +0100 Subject: [PATCH 173/457] Redo the whole window offsets and coordinate translation for X. * frame.h (struct frame): Remove x_pixels_diff, y_pixels_diff. * w32fns.c (x_real_positions): Remove setting of x_pixels_diff, y_pixels_diff. * xfns.c (x_real_pos_and_offsets): New function, basically the code from x_real_positions. (x_real_positions): Call x_real_pos_and_offsets. (x_relative_mouse_position): Use XTranslateCoordinates instead of OUTER_TO_INNER_DIFF macros. (Fx_frame_geometry): Get offsets with x_real_pos_and_offsets, border from window attributes. Adjust tool bar and menu widths. * xmenu.c (create_and_show_popup_menu): Use XTranslateCoordinates instead of OUTER_TO_INNER_DIFF macros. * xterm.h (struct x_output): Remove x_pixels_outer_diff, y_pixels_outer_diff, FRAME_OUTER_TO_INNER_DIFF_X, FRAME_OUTER_TO_INNER_DIFF_Y. Declare x_real_pos_and_offsets. --- src/ChangeLog | 22 +++++++++++ src/frame.h | 4 -- src/w32fns.c | 4 -- src/xfns.c | 106 ++++++++++++++++++++++++++++++++++++-------------- src/xmenu.c | 16 +++++++- src/xterm.h | 28 +++++-------- 6 files changed, 121 insertions(+), 59 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1f0781fef10..e4506968baa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,25 @@ +2015-02-25 Jan Djärv + + * xterm.h (struct x_output): Remove x_pixels_outer_diff, + y_pixels_outer_diff, FRAME_OUTER_TO_INNER_DIFF_X, + FRAME_OUTER_TO_INNER_DIFF_Y. Declare x_real_pos_and_offsets. + + * xmenu.c (create_and_show_popup_menu): Use XTranslateCoordinates + instead of OUTER_TO_INNER_DIFF macros. + + * xfns.c (x_real_pos_and_offsets): New function, basically the code + from x_real_positions. + (x_real_positions): Call x_real_pos_and_offsets. + (x_relative_mouse_position): Use XTranslateCoordinates instead of + OUTER_TO_INNER_DIFF macros. + (Fx_frame_geometry): Get offsets with x_real_pos_and_offsets, + border from window attributes. Adjust tool bar and menu widths. + + * w32fns.c (x_real_positions): Remove setting of x_pixels_diff, + y_pixels_diff. + + * frame.h (struct frame): Remove x_pixels_diff, y_pixels_diff. + 2015-02-25 Paul Eggert Backtrace after malloc arena is corrupted diff --git a/src/frame.h b/src/frame.h index 6f5de3f5689..ddbf93e98f5 100644 --- a/src/frame.h +++ b/src/frame.h @@ -396,10 +396,6 @@ struct frame widths) in pixels. */ int pixel_width, pixel_height; - /* These many pixels are the difference between the outer window (i.e. the - left and top of the window manager decoration) and FRAME_X_WINDOW. */ - int x_pixels_diff, y_pixels_diff; - /* This is the gravity value for the specified window position. */ int win_gravity; diff --git a/src/w32fns.c b/src/w32fns.c index 1e685ad6d98..6f404e98a62 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -346,10 +346,6 @@ x_real_positions (struct frame *f, int *xptr, int *yptr) /* Convert (0, 0) in the client area to screen co-ordinates. */ ClientToScreen (FRAME_W32_WINDOW (f), &pt); - /* Remember x_pixels_diff and y_pixels_diff. */ - f->x_pixels_diff = pt.x - rect.left; - f->y_pixels_diff = pt.y - rect.top; - *xptr = rect.left; *yptr = rect.top; } diff --git a/src/xfns.c b/src/xfns.c index 80be6ac257c..afbd460b7c8 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -168,12 +168,25 @@ check_x_display_info (Lisp_Object object) return dpyinfo; } -/* Store the screen positions of frame F into XPTR and YPTR. +/* Return the screen positions and offsets of frame F. + Store the offsets between FRAME_OUTER_WINDOW and the containing + window manager window into LEFT_OFFSET_X, RIGHT_OFFSET_X, + TOP_OFFSET_Y and BOTTOM_OFFSET_Y. + Store the offsets between FRAME_X_WINDOW and the containing + window manager window into X_PIXELS_DIFF and Y_PIXELS_DIFF. + Store the screen positions of frame F into XPTR and YPTR. These are the positions of the containing window manager window, not Emacs's own window. */ - void -x_real_positions (struct frame *f, int *xptr, int *yptr) +x_real_pos_and_offsets (struct frame *f, + int *left_offset_x, + int *right_offset_x, + int *top_offset_y, + int *bottom_offset_y, + int *x_pixels_diff, + int *y_pixels_diff, + int *xptr, + int *yptr) { int win_x, win_y, outer_x IF_LINT (= 0), outer_y IF_LINT (= 0); int real_x = 0, real_y = 0; @@ -187,6 +200,7 @@ x_real_positions (struct frame *f, int *xptr, int *yptr) Display *dpy = FRAME_X_DISPLAY (f); unsigned char *tmp_data = NULL; Atom target_type = XA_CARDINAL; + unsigned int ow IF_LINT (= 0), oh IF_LINT (= 0); block_input (); @@ -230,7 +244,7 @@ x_real_positions (struct frame *f, int *xptr, int *yptr) /* Get the real coordinates for the WM window upper left corner */ XGetGeometry (FRAME_X_DISPLAY (f), win, - &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign); + &rootw, &real_x, &real_y, &ow, &oh, &ign, &ign); /* Translate real coordinates to coordinates relative to our window. For our window, the upper left corner is 0, 0. @@ -310,16 +324,38 @@ x_real_positions (struct frame *f, int *xptr, int *yptr) if (had_errors) return; - f->x_pixels_diff = -win_x; - f->y_pixels_diff = -win_y; + if (x_pixels_diff) *x_pixels_diff = -win_x; + if (y_pixels_diff) *y_pixels_diff = -win_y; - FRAME_X_OUTPUT (f)->x_pixels_outer_diff = -outer_x; - FRAME_X_OUTPUT (f)->y_pixels_outer_diff = -outer_y; + if (left_offset_x) *left_offset_x = -outer_x; + if (top_offset_y) *top_offset_y = -outer_x; - *xptr = real_x; - *yptr = real_y; + if (xptr) *xptr = real_x; + if (yptr) *yptr = real_y; + + if (right_offset_x || bottom_offset_y) + { + unsigned int ign, fw, fh; + Window rootw; + + XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), + &rootw, &ign, &ign, &fw, &fh, &ign, &ign); + if (right_offset_x) *right_offset_x = ow - fw + outer_x; + if (bottom_offset_y) *bottom_offset_y = oh - fh + outer_y; + } } +/* Store the screen positions of frame F into XPTR and YPTR. + These are the positions of the containing window manager window, + not Emacs's own window. */ + +void +x_real_positions (struct frame *f, int *xptr, int *yptr) +{ + x_real_pos_and_offsets (f, NULL, NULL, NULL, NULL, NULL, NULL, xptr, yptr); +} + + /* Get the mouse position in frame relative coordinates. */ void @@ -351,11 +387,19 @@ x_relative_mouse_position (struct frame *f, int *x, int *y) we don't care. */ (unsigned int *) &dummy); - unblock_input (); + XTranslateCoordinates (FRAME_X_DISPLAY (f), - /* Translate root window coordinates to window coordinates. */ - *x -= f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); - *y -= f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); + /* From-window, to-window. */ + FRAME_DISPLAY_INFO (f)->root_window, + FRAME_X_WINDOW (f), + + /* From-position, to-position. */ + *x, *y, x, y, + + /* Child of win. */ + &dummy_window); + + unblock_input (); } /* Gamma-correct COLOR on frame F. */ @@ -4279,13 +4323,23 @@ elements (all size values are in pixels). Lisp_Object fullscreen = Fframe_parameter (frame, Qfullscreen); int menu_bar_height, menu_bar_width, tool_bar_height, tool_bar_width; - border = FRAME_OUTER_TO_INNER_DIFF_X (f); - title = FRAME_X_OUTPUT (f)->y_pixels_outer_diff - border; + int left_off, right_off, top_off, bottom_off; + XWindowAttributes atts; - outer_width = FRAME_PIXEL_WIDTH (f) + 2 * border; - outer_height = (FRAME_PIXEL_HEIGHT (f) - + FRAME_OUTER_TO_INNER_DIFF_Y (f) - + FRAME_OUTER_TO_INNER_DIFF_X (f)); + block_input (); + + XGetWindowAttributes (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &atts); + + x_real_pos_and_offsets (f, &left_off, &right_off, &top_off, &bottom_off, + NULL, NULL, NULL, NULL); + + unblock_input (); + + border = atts.border_width; + title = top_off; + + outer_width = FRAME_PIXEL_WIDTH (f) + 2 * border + right_off + left_off; + outer_height = FRAME_PIXEL_HEIGHT (f) + 2 * border + top_off + bottom_off; #if defined (USE_GTK) { @@ -4298,16 +4352,10 @@ elements (all size values are in pixels). tool_bar_height = (tool_bar_left_right ? FRAME_PIXEL_HEIGHT (f) : FRAME_TOOLBAR_HEIGHT (f)); - if (tool_bar_left_right) - /* For some reason FRAME_OUTER_TO_INNER_DIFF_X does not count the - width of a tool bar. */ - outer_width += FRAME_TOOLBAR_WIDTH (f); } #else tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f); - tool_bar_width = ((tool_bar_height > 0) - ? outer_width - 2 * FRAME_INTERNAL_BORDER_WIDTH (f) - : 0); + tool_bar_width = tool_bar_height > 0 ? FRAME_PIXEL_WIDTH (f) : 0; #endif #if defined (USE_X_TOOLKIT) || defined (USE_GTK) @@ -4316,9 +4364,7 @@ elements (all size values are in pixels). menu_bar_height = FRAME_MENU_BAR_HEIGHT (f); #endif - menu_bar_width = ((menu_bar_height > 0) - ? outer_width - 2 * border - : 0); + menu_bar_width = menu_bar_height > 0 ? FRAME_PIXEL_WIDTH (f) : 0; if (!FRAME_EXTERNAL_MENU_BAR (f)) inner_height -= menu_bar_height; diff --git a/src/xmenu.c b/src/xmenu.c index fdf1f6f4d84..c9f150f67f3 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1211,13 +1211,25 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv, if (use_pos_func) { + Window dummy_window; + /* Not invoked by a click. pop up at x/y. */ pos_func = menu_position_func; /* Adjust coordinates to be root-window-relative. */ - x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); - y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); + block_input (); + XTranslateCoordinates (FRAME_X_DISPLAY (f), + /* From-window, to-window. */ + FRAME_X_WINDOW (f), + FRAME_DISPLAY_INFO (f)->root_window, + + /* From-position, to-position. */ + x, y, &x, &y, + + /* Child of win. */ + &dummy_window); + unblock_input (); popup_x_y.x = x; popup_x_y.y = y; popup_x_y.f = f; diff --git a/src/xterm.h b/src/xterm.h index e597227c81c..16868f114e8 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -628,15 +628,6 @@ struct x_output They are changed only when a different background is involved. */ unsigned long relief_background; - /* As x_pixels_diff, but to FRAME_OUTER_WINDOW. For some reason the - two might differ by a pixel, depending on WM */ - int x_pixels_outer_diff; - - /* As y_pixels_diff, but to FRAME_OUTER_WINDOW. In the toolkit version, - these may differ because this does not take into account possible - menubar. y_pixels_diff is with menubar height included */ - int y_pixels_outer_diff; - /* Keep track of focus. May be EXPLICIT if we received a FocusIn for this frame, or IMPLICIT if we received an EnterNotify. FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */ @@ -759,16 +750,6 @@ enum /* This is the Colormap which frame F uses. */ #define FRAME_X_COLORMAP(f) FRAME_DISPLAY_INFO (f)->cmap -/* The difference in pixels between the top left corner of the - Emacs window (including possible window manager decorations) - and FRAME_X_WINDOW (f). */ -#define FRAME_OUTER_TO_INNER_DIFF_X(f) \ - ((f)->output_data.x->x_pixels_outer_diff) -#define FRAME_OUTER_TO_INNER_DIFF_Y(f) \ - ((f)->output_data.x->y_pixels_outer_diff \ - + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f)) - - #define FRAME_XIC(f) ((f)->output_data.x->xic) #define FRAME_X_XIM(f) (FRAME_DISPLAY_INFO (f)->xim) #define FRAME_X_XIM_STYLES(f) (FRAME_DISPLAY_INFO (f)->xim_styles) @@ -971,6 +952,15 @@ SELECTION_EVENT_DISPLAY (struct input_event *ev) extern void x_free_gcs (struct frame *); extern void x_relative_mouse_position (struct frame *, int *, int *); +extern void x_real_pos_and_offsets (struct frame *f, + int *left_offset_x, + int *right_offset_x, + int *top_offset_y, + int *bottom_offset_y, + int *x_pixels_diff, + int *y_pixels_diff, + int *xptr, + int *yptr); /* From xrdb.c. */ From b206b9d73728dec9b71a41ac4e1622ec795d6fd0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 26 Feb 2015 11:01:10 +0900 Subject: [PATCH 174/457] dbus.el: fix ":argN" keyword recognition * net/dbus.el (dbus-register-signal): Convert "N" of ":argN" to integer before comparison. --- lisp/ChangeLog | 5 +++++ lisp/net/dbus.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7f7eac64b6e..33e04807e87 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-26 Daiki Ueno + + * net/dbus.el (dbus-register-signal): Convert "N" of ":argN" to + integer before comparison. + 2015-02-25 Nicolas Richard * progmodes/elisp-mode.el (elisp--eval-last-sexp): Document argument. diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index bbce300af40..b2c1ba883a4 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -707,7 +707,8 @@ Example: (setq counter (match-string 2 (symbol-name key)) args (cdr args) value (car args)) - (unless (and (<= counter 63) (stringp value)) + (unless (and (<= (string-to-number counter) 63) + (stringp value)) (signal 'wrong-type-argument (list "Wrong argument" key value))) (format From f376a4b747421b4c6456500051489ae162d21957 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 26 Feb 2015 03:24:48 +0000 Subject: [PATCH 175/457] Gnus: Improve parts deletion and stripping behavior * gnus-art.el (gnus-article-edit-part): Make jumping to the next part really work when deleting or stripping. (gnus-mime-buttonize-attachments-in-header): Make header attachment buttons identical to the one in the article body so as to work deleting and stripping. --- lisp/gnus/ChangeLog | 8 ++++++++ lisp/gnus/gnus-art.el | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 671e171e93e..7f8971de1d5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2015-02-26 Katsumi Yamaoka + + * gnus-art.el (gnus-article-edit-part): Make jumping to the next part + really work when deleting or stripping. + (gnus-mime-buttonize-attachments-in-header): Make header attachment + buttons identical to the one in the article body so as to work deleting + and stripping. + 2015-02-25 Katsumi Yamaoka * mm-decode.el (mm-shr) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 83a2f941e9c..f88e7d5eec3 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -5064,6 +5064,7 @@ and `gnus-mime-delete-part', and not provided at run-time normally." (let ((gnus-mime-buttonized-part-id current-id)) (gnus-article-edit-done)) (gnus-configure-windows 'article) + (sit-for 0) (when (and current-id (integerp gnus-auto-select-part)) (gnus-article-jump-to-part (min (max (+ current-id gnus-auto-select-part) 1) @@ -6432,8 +6433,7 @@ in the body. Use `gnus-header-face-alist' to highlight buttons." (dolist (button (nreverse buttons)) (setq st (point)) (insert " ") - (mm-handle-set-undisplayer - (setq handle (copy-sequence (cdr button))) nil) + (mm-handle-set-undisplayer (setq handle (cdr button)) nil) (gnus-insert-mime-button handle (car button)) (skip-chars-backward "\t\n ") (delete-region (point) (point-max)) From 4f9befb3b81e967696f40a0ef7a758d6e56e2933 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 26 Feb 2015 03:29:36 +0000 Subject: [PATCH 176/457] lisp/gnus/ChangeLog: Fix typo --- lisp/gnus/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7f8971de1d5..454957ecbb5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -3,7 +3,7 @@ * gnus-art.el (gnus-article-edit-part): Make jumping to the next part really work when deleting or stripping. (gnus-mime-buttonize-attachments-in-header): Make header attachment - buttons identical to the one in the article body so as to work deleting + buttons identical to the ones in the article body so as to work deleting and stripping. 2015-02-25 Katsumi Yamaoka From 8ae2142555b313c6939d7659e9db65431db06837 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 25 Feb 2015 20:43:25 -0800 Subject: [PATCH 177/457] * xfns.c (x_real_pos_and_offsets): Fix pointer signedness. --- src/ChangeLog | 4 ++++ src/xfns.c | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e4506968baa..37e6d20eb83 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-02-26 Paul Eggert + + * xfns.c (x_real_pos_and_offsets): Fix pointer signedness. + 2015-02-25 Jan Djärv * xterm.h (struct x_output): Remove x_pixels_outer_diff, diff --git a/src/xfns.c b/src/xfns.c index afbd460b7c8..4fc92c3fed2 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -334,15 +334,16 @@ x_real_pos_and_offsets (struct frame *f, if (yptr) *yptr = real_y; if (right_offset_x || bottom_offset_y) - { - unsigned int ign, fw, fh; - Window rootw; + { + int xy_ign; + unsigned int ign, fw, fh; + Window rootw; - XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), - &rootw, &ign, &ign, &fw, &fh, &ign, &ign); - if (right_offset_x) *right_offset_x = ow - fw + outer_x; - if (bottom_offset_y) *bottom_offset_y = oh - fh + outer_y; - } + XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), + &rootw, &xy_ign, &xy_ign, &fw, &fh, &ign, &ign); + if (right_offset_x) *right_offset_x = ow - fw + outer_x; + if (bottom_offset_y) *bottom_offset_y = oh - fh + outer_y; + } } /* Store the screen positions of frame F into XPTR and YPTR. From 48598095b3b777dfaa80fd85ba8246de6e18b3cd Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 26 Feb 2015 06:39:11 +0000 Subject: [PATCH 178/457] Fix point motion when removing displayed MIME part * gnus-art.el (gnus-mime-inline-part, gnus-mm-display-part): Fix point motion when removing displayed MIME part. --- lisp/gnus/ChangeLog | 6 ++++-- lisp/gnus/gnus-art.el | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 454957ecbb5..af49782a035 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,7 +1,9 @@ 2015-02-26 Katsumi Yamaoka - * gnus-art.el (gnus-article-edit-part): Make jumping to the next part - really work when deleting or stripping. + * gnus-art.el (gnus-mime-inline-part, gnus-mm-display-part): + Fix point motion when removing displayed MIME part. + (gnus-article-edit-part): Make jumping to the next part really work + when deleting or stripping. (gnus-mime-buttonize-attachments-in-header): Make header attachment buttons identical to the ones in the article body so as to work deleting and stripping. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index f88e7d5eec3..5de4b5829ce 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -5360,7 +5360,10 @@ Compressed files like .gz and .bz2 are decompressed." 'gnus-data)))) (setq b btn)) (if (and (not arg) (mm-handle-undisplayer handle)) - (mm-remove-part handle) + (progn + (setq b (copy-marker b) + btn (copy-marker btn)) + (mm-remove-part handle)) (cond ((not arg) nil) ((numberp arg) @@ -5374,6 +5377,9 @@ Compressed files like .gz and .bz2 are decompressed." (forward-line 1)) (mm-display-inline handle)) ;; Toggle the button appearance between `[button]...' and `[button]'. + (when (markerp btn) + (setq btn (prog1 (marker-position btn) + (set-marker btn nil)))) (goto-char btn) (let ((displayed-p (mm-handle-displayed-p handle))) (gnus-insert-mime-button handle (get-text-property btn 'gnus-part) @@ -5409,6 +5415,9 @@ Compressed files like .gz and .bz2 are decompressed." '((gnus-treat-highlight-headers gnus-article-highlight-headers)))) (gnus-treat-article 'head))))) + (when (markerp b) + (setq b (prog1 (marker-position b) + (set-marker b nil)))) (goto-char b)))) (defun gnus-mime-set-charset-parameters (handle charset) @@ -5731,7 +5740,8 @@ all parts." point (previous-single-property-change start 'gnus-data)) (if (mm-handle-displayed-p handle) ;; This will remove the part. - (setq retval (mm-display-part handle)) + (setq point (copy-marker point) + retval (mm-display-part handle)) (let ((part (or (and (mm-inlinable-p handle) (mm-inlined-p handle) t) @@ -5762,6 +5772,9 @@ all parts." ,(point-max-marker))))))) (part (mm-display-inline handle)))))) + (when (markerp point) + (setq point (prog1 (marker-position point) + (set-marker point nil)))) (goto-char point) ;; Toggle the button appearance between `[button]...' and `[button]'. (let ((displayed-p (mm-handle-displayed-p handle))) From b5a0603eb41c7a350c16a1b3ec5c1b8d8c84a4eb Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Thu, 26 Feb 2015 15:46:12 +0100 Subject: [PATCH 179/457] Use vc-switches on vc-*-annotate-command This also removes switch "-C -C" from vc-git-annotate-command. Fixes: debbugs:17945 * vc/vc.el (vc-annotate-switches): New defcustom. * vc/vc-bzr.el (vc-bzr-annotate-switches): New defcustom. (vc-bzr-annotate-command): Use it. * vc/vc-cvs.el (vc-cvs-annotate-switches): New defcustom. (vc-cvs-annotate-command): Use it. * vc/vc-git.el (vc-git-annotate-switches): New defcustom. (vc-git-annotate-command): Use it. * vc/vc-hg.el (vc-hg-annotate-switches): New defcustom. (vc-hg-annotate-command): Use it. * vc/vc-mtn.el (vc-mtn-annotate-switches): New defcustom. (vc-mtn-annotate-command): Use it. * vc/vc-svn.el (vc-svn-annotate-switches): New defcustom. (vc-svn-annotate-command): Use it. --- lisp/ChangeLog | 16 ++++++++++++++++ lisp/vc/vc-bzr.el | 13 ++++++++++++- lisp/vc/vc-cvs.el | 22 +++++++++++++++++----- lisp/vc/vc-git.el | 14 +++++++++++++- lisp/vc/vc-hg.el | 16 ++++++++++++++-- lisp/vc/vc-mtn.el | 16 ++++++++++++++-- lisp/vc/vc-svn.el | 15 ++++++++++++++- lisp/vc/vc.el | 20 ++++++++++++++++++++ 8 files changed, 120 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ccc2c35b1f..749bd343973 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2015-02-26 Oscar Fuentes + + * vc/vc.el (vc-annotate-switches): New defcustom. + * vc/vc-bzr.el (vc-bzr-annotate-switches): New defcustom. + (vc-bzr-annotate-command): Use it. + * vc/vc-cvs.el (vc-cvs-annotate-switches): New defcustom. + (vc-cvs-annotate-command): Use it. + * vc/vc-git.el (vc-git-annotate-switches): New defcustom. + (vc-git-annotate-command): Use it. + * vc/vc-hg.el (vc-hg-annotate-switches): New defcustom. + (vc-hg-annotate-command): Use it. + * vc/vc-mtn.el (vc-mtn-annotate-switches): New defcustom. + (vc-mtn-annotate-command): Use it. + * vc/vc-svn.el (vc-svn-annotate-switches): New defcustom. + (vc-svn-annotate-command): Use it. + 2015-02-26 Alan Mackenzie Handle "#" operator properly inside macro. Fix coding bug. diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 96d6d1da48c..811f9e80b0c 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -73,6 +73,16 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (repeat :tag "Argument List" :value ("") string)) :group 'vc-bzr) +(defcustom vc-bzr-annotate-switches nil + "String or list of strings specifying switches for bzr annotate under VC. +If nil, use the value of `vc-annotate-switches'. If t, use no switches." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" :value ("") string)) + :version "25.1" + :group 'vc-bzr) + (defcustom vc-bzr-log-switches nil "String or list of strings specifying switches for bzr log under VC." :type '(choice (const :tag "None" nil) @@ -826,7 +836,8 @@ If LIMIT is non-nil, show no more than this many entries." Each line is tagged with the revision number, which has a `help-echo' property containing author and date information." (apply #'vc-bzr-command "annotate" buffer 'async file "--long" "--all" - (if revision (list "-r" revision))) + (append (vc-switches 'bzr 'annotate) + (if revision (list "-r" revision)))) (let ((table (make-hash-table :test 'equal))) (set-process-filter (get-buffer-process buffer) diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 707090a10eb..232dcc2185e 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -96,6 +96,17 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "21.1" :group 'vc-cvs) +(defcustom vc-cvs-annotate-switches nil + "String or list of strings specifying switches for cvs annotate under VC. +If nil, use the value of `vc-annotate-switches'. If t, use no +switches." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" :value ("") string)) + :version "25.1" + :group 'vc-cvs) + (defcustom vc-cvs-header '("\$Id\$") "Header keywords to be inserted by `vc-insert-headers'." :version "24.1" ; no longer consult the obsolete vc-header-alist @@ -623,11 +634,12 @@ Remaining arguments are ignored." (defun vc-cvs-annotate-command (file buffer &optional revision) "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER. Optional arg REVISION is a revision to annotate from." - (vc-cvs-command buffer - (if (vc-cvs-stay-local-p file) - 'async 0) - file "annotate" - (if revision (concat "-r" revision))) + (apply #'vc-cvs-command buffer + (if (vc-cvs-stay-local-p file) + 'async 0) + file "annotate" + (append (vc-switches 'cvs 'annotate) + (if revision (list (concat "-r" revision))))) ;; Strip the leading few lines. (let ((proc (get-buffer-process buffer))) (if proc diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index a31c121b89b..48e22c82647 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -120,6 +120,16 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "23.1" :group 'vc-git) +(defcustom vc-git-annotate-switches nil + "String or list of strings specifying switches for Git blame under VC. +If nil, use the value of `vc-annotate-switches'. If t, use no switches." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" :value ("") string)) + :version "25.1" + :group 'vc-git) + (defcustom vc-git-program "git" "Name of the Git executable (excluding any arguments)." :version "24.1" @@ -1013,7 +1023,9 @@ or BRANCH^ (where \"^\" can be repeated)." (defun vc-git-annotate-command (file buf &optional rev) (let ((name (file-relative-name file))) - (vc-git-command buf 'async nil "blame" "--date=iso" "-C" "-C" rev "--" name))) + (apply #'vc-git-command buf 'async nil "blame" "--date=iso" + (append (vc-switches 'git 'annotate) + (list rev "--" name))))) (declare-function vc-annotate-convert-time "vc-annotate" (time)) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 8b4067f536b..c841dfcdf54 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -131,6 +131,17 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "23.1" :group 'vc-hg) +(defcustom vc-hg-annotate-switches nil + "String or list of strings specifying switches for hg annotate under VC. +If nil, use the value of `vc-annotate-switches'. If t, use no +switches." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" :value ("") string)) + :version "25.1" + :group 'vc-hg) + (defcustom vc-hg-program "hg" "Name of the Mercurial executable (excluding any arguments)." :type 'string @@ -358,8 +369,9 @@ If LIMIT is non-nil, show no more than this many entries." (defun vc-hg-annotate-command (file buffer &optional revision) "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER. Optional arg REVISION is a revision to annotate from." - (vc-hg-command buffer 0 file "annotate" "-d" "-n" "--follow" - (when revision (concat "-r" revision)))) + (apply #'vc-hg-command buffer 0 file "annotate" "-d" "-n" "--follow" + (append (vc-switches 'hg 'annotate) + (if revision (list (concat "-r" revision)))))) (declare-function vc-annotate-convert-time "vc-annotate" (time)) diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index d783572678c..cd84ebe7afa 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -49,6 +49,17 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "23.1" :group 'vc-mtn) +(defcustom vc-mtn-annotate-switches nil + "String or list of strings specifying switches for mtn annotate under VC. +If nil, use the value of `vc-annotate-switches'. If t, use no +switches." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" :value ("") string)) + :version "25.1" + :group 'vc-mtn) + (define-obsolete-variable-alias 'vc-mtn-command 'vc-mtn-program "23.1") (defcustom vc-mtn-program "mtn" "Name of the monotone executable." @@ -246,8 +257,9 @@ If LIMIT is non-nil, show no more than this many entries." (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2))))) (defun vc-mtn-annotate-command (file buf &optional rev) - (apply 'vc-mtn-command buf 'async file "annotate" - (if rev (list "-r" rev)))) + (apply #'vc-mtn-command buf 'async file "annotate" + (append (vc-switches 'mtn 'annotate) + (if rev (list "-r" rev))))) (declare-function vc-annotate-convert-time "vc-annotate" (time)) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index d74daf9c36f..5ce9afa02c6 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -95,6 +95,17 @@ If you want to force an empty list of arguments, use t." :version "22.1" :group 'vc-svn) +(defcustom vc-svn-annotate-switches nil + "String or list of strings specifying switches for svn annotate under VC. +If nil, use the value of `vc-annotate-switches'. If t, use no +switches." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" :value ("") string)) + :version "25.1" + :group 'vc-svn) + (defcustom vc-svn-header '("\$Id\$") "Header keywords to be inserted by `vc-insert-headers'." :version "24.1" ; no longer consult the obsolete vc-header-alist @@ -736,7 +747,9 @@ Set file properties accordingly. If FILENAME is non-nil, return its status." ;; Support for `svn annotate' (defun vc-svn-annotate-command (file buf &optional rev) - (vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev)))) + (apply #'vc-svn-command buf 'async file "annotate" + (append (vc-switches 'svn 'annotate) + (if rev (list (concat "-r" rev)))))) (defun vc-svn-annotate-time-of-rev (rev) ;; Arbitrarily assume 10 commits per day. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 54b221428a5..e8e8202dbbb 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -780,6 +780,26 @@ not specific to any particular backend." :group 'vc :version "21.1") +(defcustom vc-annotate-switches nil + "A string or list of strings specifying switches for annotate under VC. +When running annotate under a given BACKEND, VC uses the first +non-nil value of `vc-BACKEND-annotate-switches', `vc-annotate-switches', +and `annotate-switches', in that order. Since nil means to check the +next variable in the sequence, either of the first two may use +the value t to mean no switches at all. `vc-annotate-switches' +should contain switches that are specific to version control, but +not specific to any particular backend. + +As very few switches (if any) are used across different VC tools, +please consider using the specific `vc-BACKEND-annotate-switches' +for the backend you use." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" :value ("") string)) + :group 'vc + :version "25.1") + (defcustom vc-log-show-limit 2000 "Limit the number of items shown by the VC log commands. Zero means unlimited. From 0ed52489b93648ea278bfb1ba12f351c48ab60dd Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Thu, 26 Feb 2015 15:58:30 +0100 Subject: [PATCH 180/457] Fixed previous ChangeLog entry --- lisp/ChangeLog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 749bd343973..c8e307b213b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,17 +2,17 @@ * vc/vc.el (vc-annotate-switches): New defcustom. * vc/vc-bzr.el (vc-bzr-annotate-switches): New defcustom. - (vc-bzr-annotate-command): Use it. + (vc-bzr-annotate-command): Use vc-switches. * vc/vc-cvs.el (vc-cvs-annotate-switches): New defcustom. - (vc-cvs-annotate-command): Use it. + (vc-cvs-annotate-command): Use vc-switches. * vc/vc-git.el (vc-git-annotate-switches): New defcustom. - (vc-git-annotate-command): Use it. + (vc-git-annotate-command): Use vc-switches. * vc/vc-hg.el (vc-hg-annotate-switches): New defcustom. - (vc-hg-annotate-command): Use it. + (vc-hg-annotate-command): Use vc-switches. * vc/vc-mtn.el (vc-mtn-annotate-switches): New defcustom. - (vc-mtn-annotate-command): Use it. + (vc-mtn-annotate-command): Use vc-switches. * vc/vc-svn.el (vc-svn-annotate-switches): New defcustom. - (vc-svn-annotate-command): Use it. + (vc-svn-annotate-command): Use vc-switches. 2015-02-26 Alan Mackenzie From 5917b7907ad0cdc38f14967d16aa8472be572e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 26 Feb 2015 16:42:03 +0100 Subject: [PATCH 181/457] Don't use OUTER_TO_INNER macros for plain X and lucid. * xmenu.c (create_and_show_popup_menu): Call XTranslateCoordinates, dont use OUTER_TO_INNER macros. (x_menu_show): Call x_real_pos_and_offsets, don't use OUTER_TO_INNER macros. --- src/ChangeLog | 7 +++++++ src/xmenu.c | 31 +++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f0ec092c068..bf4043666c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-02-26 Jan Djärv + + * xmenu.c (create_and_show_popup_menu): Call XTranslateCoordinates, + dont use OUTER_TO_INNER macros. + (x_menu_show): Call x_real_pos_and_offsets, don't use + OUTER_TO_INNER macros. + 2015-02-26 Eli Zaretskii * dispextern.h (FACE_FOR_CHAR): Fix the commentary. diff --git a/src/xmenu.c b/src/xmenu.c index c9f150f67f3..5794f12ccb7 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1313,6 +1313,7 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv, XButtonPressedEvent *event = &(dummy.xbutton); LWLIB_ID menu_id; Widget menu; + Window dummy_window; eassert (FRAME_X_P (f)); @@ -1338,8 +1339,20 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv, event->y = y; /* Adjust coordinates to be root-window-relative. */ - x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); - y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); + block_input (); + x += FRAME_LEFT_SCROLL_BAR_AREA_WIDTH (f); + XTranslateCoordinates (FRAME_X_DISPLAY (f), + + /* From-window, to-window. */ + FRAME_X_WINDOW (f), + FRAME_DISPLAY_INFO (f)->root_window, + + /* From-position, to-position. */ + x, y, &x, &y, + + /* Child of win. */ + &dummy_window); + unblock_input (); event->x_root = x; event->y_root = y; @@ -2059,12 +2072,18 @@ x_menu_show (struct frame *f, int x, int y, int menuflags, inhibit_garbage_collection (); #ifdef HAVE_X_WINDOWS - /* Adjust coordinates to relative to the outer (window manager) window. */ - x += FRAME_OUTER_TO_INNER_DIFF_X (f); - y += FRAME_OUTER_TO_INNER_DIFF_Y (f); + { + /* Adjust coordinates to relative to the outer (window manager) window. */ + int left_off, top_off; + + x_real_pos_and_offsets (f, &left_off, NULL, &top_off, NULL, + NULL, NULL, NULL, NULL); + + x += left_off; + y += top_off; + } #endif /* HAVE_X_WINDOWS */ - /* Adjust coordinates to be root-window-relative. */ x += f->left_pos; y += f->top_pos; From 619fc5c197ebef5444aed24fe30657989fc2a839 Mon Sep 17 00:00:00 2001 From: Ivan Shmakov Date: Thu, 26 Feb 2015 18:09:48 +0000 Subject: [PATCH 182/457] Fix 'face property handling in facemenu-add-face. * lisp/faces.el (face-list-p): Split from face-at-point. (face-at-point): Use it. * lisp/facemenu.el (facemenu-add-face): Likewise. Fixes: debbugs:19912 --- lisp/ChangeLog | 6 ++++++ lisp/facemenu.el | 2 +- lisp/faces.el | 17 ++++++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c8e307b213b..e9f62365f03 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-26 Ivan Shmakov + + * faces.el (face-list-p): Split from face-at-point. + (face-at-point): Use it. + * facemenu.el (facemenu-add-face): Likewise. (Bug#19912) + 2015-02-26 Oscar Fuentes * vc/vc.el (vc-annotate-switches): New defcustom. diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 1a765f9ebdb..2c246b44d54 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -732,7 +732,7 @@ effect. See `facemenu-remove-face-function'." face (facemenu-active-faces (cons face - (if (listp prev) + (if (face-list-p prev) prev (list prev))) ;; Specify the selected frame diff --git a/lisp/faces.el b/lisp/faces.el index ce74c728474..54e444b730a 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -273,6 +273,17 @@ If FRAME is omitted or nil, use the selected frame." (not (internal-lisp-face-empty-p face frame))) +(defun face-list-p (face-or-list) + "True if FACE-OR-LIST is a list of faces. +Return nil if FACE-OR-LIST is a non-nil atom, or a cons cell whose car +is either 'foreground-color, 'background-color, or a keyword." + ;; The logic of merge_face_ref (xfaces.c) is recreated here. + (and (listp face-or-list) + (not (memq (car face-or-list) + '(foreground-color background-color))) + (not (keywordp (car face-or-list))))) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Setting face attributes from X resources. @@ -1922,11 +1933,7 @@ Return nil if there is no face." (get-char-property (point) 'face)))) (cond ((facep faceprop) (push faceprop faces)) - ((and (listp faceprop) - ;; Don't treat an attribute spec as a list of faces. - (not (keywordp (car faceprop))) - (not (memq (car faceprop) - '(foreground-color background-color)))) + ((face-list-p faceprop) (dolist (face faceprop) (if (facep face) (push face faces)))))) From 6ef14349fa73922473ba8202e256f20e17661b25 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 27 Feb 2015 00:04:39 -0800 Subject: [PATCH 183/457] Don't require GNU putenv * configure.ac: Use system putenv even if it lacks GNU features, as we don't need them. This works around a bug in FreeBSD 10.1 getenv. Fixes: bug#19874 --- ChangeLog | 7 +++++++ configure.ac | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 47ef578fb7c..0bfdfbbd8b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-02-27 Paul Eggert + + Don't require GNU putenv + * configure.ac: Use system putenv even if it lacks GNU features, as + we don't need them. This works around a bug in FreeBSD 10.1 getenv. + Fixes: bug#19874 + 2015-02-25 Paul Eggert Merge from gnulib diff --git a/configure.ac b/configure.ac index 0bcc55c4c20..e7408f11ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -780,6 +780,11 @@ AC_DEFUN([gl_CRYPTO_CHECK]) # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW, # as we don't use them. AC_DEFUN([gl_FCNTL_O_FLAGS]) +# Use the system putenv even if it lacks GNU features, as we don't need them, +# and the gnulib replacement runs afoul of a FreeBSD 10.1 bug; see Bug#19874. +AC_CHECK_FUNCS_ONCE([putenv]) +AC_DEFUN([gl_FUNC_PUTENV], + [test "$ac_cv_func_putenv" = yes || REPLACE_PUTENV=1]) # Initialize gnulib right after choosing the compiler. dnl Amongst other things, this sets AR and ARFLAGS. From 805fe507087b9675a010a30a8a8840587ffdf5be Mon Sep 17 00:00:00 2001 From: Mark Laws Date: Fri, 27 Feb 2015 12:43:30 +0200 Subject: [PATCH 184/457] Support daemon mode on MS-Windows (bug#19688) src/emacs.c [WINDOWSNT]: New global var. (main) [WINDOWSNT]: Initialize it to NULL. Create the event to signal clients we are ready for connections. (Fdaemon_initialized): Use DAEMON_RUNNING. [WINDOWSNT]: MS-Windows specific code to signal clients we are ready for connections. src/lisp.h (DAEMON_RUNNING): New macro, encapsulates Posix and MS-Windows conditions for running in daemon mode. src/minibuf.c (read_minibuf): Use DAEMON_RUNNING. src/keyboard.c (kbd_buffer_get_event): Use DAEMON_RUNNING. src/dispnew.c (init_display) [WINDOWSNT]: Initialize frames/terminal even in daemon mode. nt/inc/ms-w32.h (W32_DAEMON_EVENT): New macro. lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Don't reject empty arguments for --alternate-editor. (print_help_and_exit) [WINDOWSNT]: Don't refrain from advertising empty arguments for --alternate-editor. (start_daemon_and_retry_set_socket) [WINDOWSNT]: MS-Windows specific code to start Emacs in daemon mode and wait for it to be ready for client connections. lisp/server.el (server-process-filter): Force GUI frames on MS-Windows in daemon mode, even if a TTY frame was requested. lisp/frameset.el (frameset-keep-original-display-p): Don't assume windows-nt cannot be in daemon mode. lisp/frame.el (window-system-for-display): Don't assume windows-nt cannot be in daemon mode. --- lib-src/ChangeLog | 11 ++++++ lib-src/emacsclient.c | 81 +++++++++++++++++++++++++++++++++++++------ lisp/ChangeLog | 12 +++++++ lisp/frame.el | 3 +- lisp/frameset.el | 4 +-- lisp/server.el | 12 +++++-- nt/ChangeLog | 5 +++ nt/inc/ms-w32.h | 2 ++ src/ChangeLog | 20 +++++++++++ src/dispnew.c | 5 ++- src/emacs.c | 37 ++++++++++++++++---- src/keyboard.c | 2 +- src/lisp.h | 9 ++++- src/minibuf.c | 2 +- 14 files changed, 179 insertions(+), 26 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 5c55bcea506..83855afa675 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,14 @@ +2015-02-27 Mark Laws + + Support daemon mode on MS-Windows (bug#19688) + * emacsclient.c (decode_options) [WINDOWSNT]: Don't reject empty + arguments for --alternate-editor. + (print_help_and_exit) [WINDOWSNT]: Don't refrain from advertising + empty arguments for --alternate-editor. + (start_daemon_and_retry_set_socket) [WINDOWSNT]: MS-Windows + specific code to start Emacs in daemon mode and wait for it to be + ready for client connections. + 2015-02-23 Pete Williamson (tiny change) Use ${EXEEXT} more uniformly in makefiles diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index a04dda6408f..806275f5b1d 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -595,13 +595,6 @@ decode_options (int argc, char **argv) display = NULL; tty = 1; } - - if (alternate_editor && alternate_editor[0] == '\0') - { - message (true, "--alternate-editor argument or ALTERNATE_EDITOR variable cannot be\n\ -an empty string"); - exit (EXIT_FAILURE); - } #endif /* WINDOWSNT */ } @@ -642,10 +635,8 @@ The following OPTIONS are accepted:\n\ Set filename of the TCP authentication file\n\ -a EDITOR, --alternate-editor=EDITOR\n\ Editor to fallback to if the server is not running\n" -#ifndef WINDOWSNT " If EDITOR is the empty string, start Emacs in daemon\n\ mode and try connecting again\n" -#endif /* not WINDOWSNT */ "\n\ Report bugs with M-x report-emacs-bug.\n"); exit (EXIT_SUCCESS); @@ -1511,7 +1502,77 @@ start_daemon_and_retry_set_socket (void) execvp ("emacs", d_argv); message (true, "%s: error starting emacs daemon\n", progname); } -#endif /* WINDOWSNT */ +#else /* WINDOWSNT */ + DWORD wait_result; + HANDLE w32_daemon_event; + STARTUPINFO si; + PROCESS_INFORMATION pi; + + ZeroMemory (&si, sizeof si); + si.cb = sizeof si; + ZeroMemory (&pi, sizeof pi); + + /* We start Emacs in daemon mode, and then wait for it to signal us + it is ready to accept client connections, by asserting an event + whose name is known to the daemon (defined by nt/inc/ms-w32.h). */ + + if (!CreateProcess (NULL, "emacs --daemon", NULL, NULL, FALSE, + CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) + { + char* msg = NULL; + + FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM + | FORMAT_MESSAGE_ALLOCATE_BUFFER + | FORMAT_MESSAGE_ARGUMENT_ARRAY, + NULL, GetLastError (), 0, (LPTSTR)&msg, 0, NULL); + message (true, "%s: error starting emacs daemon (%s)\n", progname, msg); + exit (EXIT_FAILURE); + } + + w32_daemon_event = CreateEvent (NULL, TRUE, FALSE, W32_DAEMON_EVENT); + if (w32_daemon_event == NULL) + { + message (true, "Couldn't create Windows daemon event"); + exit (EXIT_FAILURE); + } + if ((wait_result = WaitForSingleObject (w32_daemon_event, INFINITE)) + != WAIT_OBJECT_0) + { + char *msg = NULL; + + switch (wait_result) + { + case WAIT_ABANDONED: + msg = "The daemon exited unexpectedly"; + break; + case WAIT_TIMEOUT: + /* Can't happen due to INFINITE. */ + default: + case WAIT_FAILED: + FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM + | FORMAT_MESSAGE_ALLOCATE_BUFFER + | FORMAT_MESSAGE_ARGUMENT_ARRAY, + NULL, GetLastError (), 0, (LPTSTR)&msg, 0, NULL); + break; + } + message (true, "Error: Could not start the Emacs daemon: %s\n", msg); + exit (EXIT_FAILURE); + } + CloseHandle (w32_daemon_event); + + /* Try connecting, the daemon should have started by now. */ + /* It's just a progress message, so don't pop a dialog if this is + emacsclientw. */ + if (!w32_window_app ()) + message (true, + "Emacs daemon should have started, trying to connect again\n"); + if ((emacs_socket = set_socket (1)) == INVALID_SOCKET) + { + message (true, + "Error: Cannot connect even after starting the Emacs daemon\n"); + exit (EXIT_FAILURE); + } +#endif /* WINDOWSNT */ } int diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9f62365f03..b9681d35cf0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2015-02-27 Mark Laws + + Support daemon mode on MS-Windows (bug#19688) + * server.el (server-process-filter): Force GUI frames on + MS-Windows in daemon mode, even if a TTY frame was requested. + + * frameset.el (frameset-keep-original-display-p): Don't assume + windows-nt cannot be in daemon mode. + + * frame.el (window-system-for-display): Don't assume windows-nt + cannot be in daemon mode. + 2015-02-26 Ivan Shmakov * faces.el (face-list-p): Split from face-at-point. diff --git a/lisp/frame.el b/lisp/frame.el index 0096ef9696a..c81ee9bfa61 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -546,7 +546,8 @@ is not considered (see `next-frame')." Return nil if we don't know how to interpret DISPLAY." ;; MS-Windows doesn't know how to create a GUI frame in a -nw session. (if (and (eq system-type 'windows-nt) - (null (window-system))) + (null (window-system)) + (not (daemonp))) nil (cl-loop for descriptor in display-format-alist for pattern = (car descriptor) diff --git a/lisp/frameset.el b/lisp/frameset.el index 4a0637439db..17fe39be844 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -1022,8 +1022,8 @@ Internal use only." (defun frameset-keep-original-display-p (force-display) "True if saved frames' displays should be honored. For the meaning of FORCE-DISPLAY, see `frameset-restore'." - (cond ((daemonp) t) - ((eq system-type 'windows-nt) nil) ;; Does ns support more than one display? + (cond ((eq system-type 'windows-nt) nil) ;; Does ns support more than one display? + ((daemonp) t) (t (not force-display)))) (defun frameset-minibufferless-first-p (frame1 _frame2) diff --git a/lisp/server.el b/lisp/server.el index 166cd44bb2e..9585b1755c6 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1139,9 +1139,12 @@ The following commands are accepted by the client: ;; frame. If running a GUI server, force the frame ;; type to GUI. (Cygwin is perfectly happy with ;; multi-tty support, so don't override the user's - ;; choice there.) + ;; choice there.) In daemon mode on Windows, we can't + ;; make tty frames, so force the frame type to GUI + ;; there too. (when (and (eq system-type 'windows-nt) - (eq window-system 'w32)) + (or (daemonp) + (eq window-system 'w32))) (push "-window-system" args-left))) ;; -position LINE[:COLUMN]: Set point to the given @@ -1215,7 +1218,10 @@ The following commands are accepted by the client: terminal-frame))))) (setq tty-name nil tty-type nil) (if display (server-select-display display))) - ((eq tty-name 'window-system) + ((or (and (eq system-type 'windows-nt) + (daemonp) + (setq display "w32")) + (eq tty-name 'window-system)) (server-create-window-system-frame display nowait proc parent-id frame-parameters)) diff --git a/nt/ChangeLog b/nt/ChangeLog index b9966fb27d8..240f58c850b 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2015-02-27 Mark Laws + + Support daemon mode on MS-Windows (bug#19688) + * inc/ms-w32.h (W32_DAEMON_EVENT): New macro. + 2015-01-16 Eli Zaretskii * Makefile.in (AM_V_CC, am__v_CC_, am__v_CC_0, am__v_CC_1) diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index adac2e3b4a1..c06ed588818 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -597,5 +597,7 @@ extern void _DebPrint (const char *fmt, ...); #endif #endif +/* Event name for when emacsclient starts the Emacs daemon on Windows. */ +#define W32_DAEMON_EVENT "EmacsServerEvent" /* ============================================================ */ diff --git a/src/ChangeLog b/src/ChangeLog index bf4043666c6..61bb321649f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,23 @@ +2015-02-27 Mark Laws + + Support daemon mode on MS-Windows (bug#19688) + * emacs.c [WINDOWSNT]: New global var. + (main) [WINDOWSNT]: Initialize it to NULL. Create the event to + signal clients we are ready for connections. + (Fdaemon_initialized): Use DAEMON_RUNNING. + [WINDOWSNT]: MS-Windows specific code to signal clients we are + ready for connections. + + * lisp.h (DAEMON_RUNNING): New macro, encapsulates Posix and + MS-Windows conditions for running in daemon mode. + + * minibuf.c (read_minibuf): Use DAEMON_RUNNING. + + * keyboard.c (kbd_buffer_get_event): Use DAEMON_RUNNING. + + * dispnew.c (init_display) [WINDOWSNT]: Initialize frames/terminal + even in daemon mode. + 2015-02-26 Jan Djärv * xmenu.c (create_and_show_popup_menu): Call XTranslateCoordinates, diff --git a/src/dispnew.c b/src/dispnew.c index a1782913154..6bc24697cb7 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5949,9 +5949,12 @@ init_display (void) } #endif /* SIGWINCH */ - /* If running as a daemon, no need to initialize any frames/terminal. */ + /* If running as a daemon, no need to initialize any frames/terminal, + except on Windows, where we at least want to initialize it. */ +#ifndef WINDOWSNT if (IS_DAEMON) return; +#endif /* If the user wants to use a window system, we shouldn't bother initializing the terminal. This is especially important when the diff --git a/src/emacs.c b/src/emacs.c index cb0c8417794..ca5633da2dd 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -195,9 +195,13 @@ bool no_site_lisp; /* Name for the server started by the daemon.*/ static char *daemon_name; +#ifndef WINDOWSNT /* Pipe used to send exit notification to the daemon parent at startup. */ int daemon_pipe[2]; +#else +HANDLE w32_daemon_event; +#endif /* Save argv and argc. */ char **initial_argv; @@ -982,8 +986,12 @@ main (int argc, char **argv) exit (0); } +#ifndef WINDOWSNT /* Make sure IS_DAEMON starts up as false. */ daemon_pipe[1] = 0; +#else + w32_daemon_event = NULL; +#endif if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args) || argmatch (argv, argc, "-daemon", "--daemon", 5, &dname_arg, &skip_args)) @@ -1107,16 +1115,25 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem } #endif /* DAEMON_MUST_EXEC */ - if (dname_arg) - daemon_name = xstrdup (dname_arg); /* Close unused reading end of the pipe. */ emacs_close (daemon_pipe[0]); setsid (); -#else /* DOS_NT */ +#elif defined(WINDOWSNT) + /* Indicate that we want daemon mode. */ + w32_daemon_event = CreateEvent (NULL, TRUE, FALSE, W32_DAEMON_EVENT); + if (w32_daemon_event == NULL) + { + fprintf (stderr, "Couldn't create MS-Windows event for daemon: %s\n", + w32_strerror (0)); + exit (1); + } +#else /* MSDOS */ fprintf (stderr, "This platform does not support the -daemon flag.\n"); exit (1); -#endif /* DOS_NT */ +#endif /* MSDOS */ + if (dname_arg) + daemon_name = xstrdup (dname_arg); } #if defined HAVE_PTHREAD && !defined SYSTEM_MALLOC \ @@ -2313,17 +2330,18 @@ This finishes the daemonization process by doing the other half of detaching from the parent process and its tty file descriptors. */) (void) { - int nfd; bool err = 0; if (!IS_DAEMON) error ("This function can only be called if emacs is run as a daemon"); - if (daemon_pipe[1] < 0) + if (!DAEMON_RUNNING) error ("The daemon has already been initialized"); if (NILP (Vafter_init_time)) error ("This function can only be called after loading the init files"); +#ifndef WINDOWSNT + int nfd; /* Get rid of stdin, stdout and stderr. */ nfd = emacs_open ("/dev/null", O_RDWR, 0); @@ -2344,6 +2362,13 @@ from the parent process and its tty file descriptors. */) err |= emacs_close (daemon_pipe[1]) != 0; /* Set it to an invalid value so we know we've already run this function. */ daemon_pipe[1] = -1; +#else /* WINDOWSNT */ + /* Signal the waiting emacsclient process. */ + err |= SetEvent (w32_daemon_event) == 0; + err |= CloseHandle (w32_daemon_event) == 0; + /* Set it to an invalid value so we know we've already run this function. */ + w32_daemon_event = INVALID_HANDLE_VALUE; +#endif if (err) error ("I/O error during daemon initialization"); diff --git a/src/keyboard.c b/src/keyboard.c index c2174539ea7..e1c5691324d 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3853,7 +3853,7 @@ kbd_buffer_get_event (KBOARD **kbp, if (noninteractive /* In case we are running as a daemon, only do this before detaching from the terminal. */ - || (IS_DAEMON && daemon_pipe[1] >= 0)) + || (IS_DAEMON && DAEMON_RUNNING)) { int c = getchar (); XSETINT (obj, c); diff --git a/src/lisp.h b/src/lisp.h index 9764b096ef0..fb436776121 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4222,9 +4222,16 @@ extern bool noninteractive; extern bool no_site_lisp; /* Pipe used to send exit notification to the daemon parent at - startup. */ + startup. On Windows, we use a kernel event instead. */ +#ifndef WINDOWSNT extern int daemon_pipe[2]; #define IS_DAEMON (daemon_pipe[1] != 0) +#define DAEMON_RUNNING (daemon_pipe[1] >= 0) +#else /* WINDOWSNT */ +extern void *w32_daemon_event; +#define IS_DAEMON (w32_daemon_event != NULL) +#define DAEMON_RUNNING (w32_daemon_event != INVALID_HANDLE_VALUE) +#endif /* True if handling a fatal error already. */ extern bool fatal_error_in_progress; diff --git a/src/minibuf.c b/src/minibuf.c index 2dc5c544457..e7c288b251b 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -459,7 +459,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, if ((noninteractive /* In case we are running as a daemon, only do this before detaching from the terminal. */ - || (IS_DAEMON && (daemon_pipe[1] >= 0))) + || (IS_DAEMON && DAEMON_RUNNING)) && NILP (Vexecuting_kbd_macro)) { val = read_minibuf_noninteractive (map, initial, prompt, From b2a590d4e3dc692a97c1b53e015b945d84b4b4c7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 27 Feb 2015 16:20:56 +0200 Subject: [PATCH 185/457] Documentation followup for daemon mode on MS-Windows doc/lispref/os.texi (Startup Summary): doc/lispref/display.texi (Window Systems): Mention peculiarities of daemon mode on MS-Windows. etc/NEWS: Mention the new support for daemon mode on MS-Windows. --- doc/lispref/ChangeLog | 6 ++++++ doc/lispref/display.texi | 5 +++-- doc/lispref/os.texi | 5 +++-- etc/NEWS | 3 +++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 285c725caef..bff469a5188 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2015-02-27 Eli Zaretskii + + * os.texi (Startup Summary): + * display.texi (Window Systems): Mention peculiarities of daemon + mode on MS-Windows. + 2015-02-11 Martin Rudalics * frames.texi (Size Parameters): Update description of diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index b09b82a6724..5dd74d25e8f 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -6728,8 +6728,9 @@ Emacs is displaying the frame on a character-based terminal. This variable holds the value of @code{window-system} used for the first frame created by Emacs during startup. (When Emacs is invoked with the @option{--daemon} option, it does not create any initial -frames, so @code{initial-window-system} is @code{nil}. @xref{Initial -Options, daemon,, emacs, The GNU Emacs Manual}.) +frames, so @code{initial-window-system} is @code{nil}, except on +MS-Windows, where it is still @code{w32}. @xref{Initial Options, +daemon,, emacs, The GNU Emacs Manual}.) @end defvar @defun window-system &optional frame diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 46df0e78928..4df4a597ea6 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -244,8 +244,9 @@ options were specified. @item If the option @code{--daemon} was specified, it calls -@code{server-start} and detaches from the controlling terminal. -@xref{Emacs Server,,, emacs, The GNU Emacs Manual}. +@code{server-start}, and on Posix systems also detaches from the +controlling terminal. @xref{Emacs Server,,, emacs, The GNU Emacs +Manual}. @item If started by the X session manager, it calls diff --git a/etc/NEWS b/etc/NEWS index 3f88d3d297a..d5cb9474c83 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -756,6 +756,9 @@ Those features have been deprecated in Gtk+ for a long time. or Windows Server 2003. The built binaries still run on all versions of Windows starting with Windows 9X. ++++ +** Emacs running on MS-Windows now supports the daemon mode. + ** OS X 10.5 or older is no longer supported. ** OS X on PowerPC is no longer supported. From 0537943561a37b54467bec19d1b8afbeba8e1e58 Mon Sep 17 00:00:00 2001 From: Jan D Date: Fri, 27 Feb 2015 18:46:26 +0100 Subject: [PATCH 186/457] Adjust offset and border calculations for X. * xfns.c (x_real_pos_and_offsets): Take outer_border as arg also. Initialize all args. Get outer_border from window attributes. Fix typo for top_offset_y. (x_real_positions): Adjust for new arg to x_real_pos_and_offsets. (Fx_frame_geometry): Get outer_border also. Use attrs.width/height. * xmenu.c (x_menu_show): Adjust for new arg to x_real_pos_and_offsets. * xterm.h (x_real_pos_and_offsets): Take outer_border as arg also. --- src/ChangeLog | 12 ++++++++++++ src/xfns.c | 36 +++++++++++++++++++++++++++++------- src/xmenu.c | 2 +- src/xterm.h | 3 ++- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 61bb321649f..df687914911 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2015-02-27 Jan Djärv + + * xterm.h (x_real_pos_and_offsets): Take outer_border as arg also. + + * xmenu.c (x_menu_show): Adjust for new arg to x_real_pos_and_offsets. + + * xfns.c (x_real_pos_and_offsets): Take outer_border as arg also. + Initialize all args. Get outer_border from window attributes. + Fix typo for top_offset_y. + (x_real_positions): Adjust for new arg to x_real_pos_and_offsets. + (Fx_frame_geometry): Get outer_border also. Use attrs.width/height. + 2015-02-27 Mark Laws Support daemon mode on MS-Windows (bug#19688) diff --git a/src/xfns.c b/src/xfns.c index 4fc92c3fed2..bd1db1013d0 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -186,7 +186,8 @@ x_real_pos_and_offsets (struct frame *f, int *x_pixels_diff, int *y_pixels_diff, int *xptr, - int *yptr) + int *yptr, + int *outer_border) { int win_x, win_y, outer_x IF_LINT (= 0), outer_y IF_LINT (= 0); int real_x = 0, real_y = 0; @@ -206,6 +207,16 @@ x_real_pos_and_offsets (struct frame *f, x_catch_errors (dpy); + if (x_pixels_diff) *x_pixels_diff = 0; + if (y_pixels_diff) *y_pixels_diff = 0; + if (left_offset_x) *left_offset_x = 0; + if (top_offset_y) *top_offset_y = 0; + if (right_offset_x) *right_offset_x = 0; + if (bottom_offset_y) *bottom_offset_y = 0; + if (xptr) *xptr = 0; + if (yptr) *yptr = 0; + if (outer_border) *outer_border = 0; + if (win == dpyinfo->root_window) win = FRAME_OUTER_WINDOW (f); @@ -246,6 +257,13 @@ x_real_pos_and_offsets (struct frame *f, XGetGeometry (FRAME_X_DISPLAY (f), win, &rootw, &real_x, &real_y, &ow, &oh, &ign, &ign); + if (outer_border) + { + XWindowAttributes atts; + XGetWindowAttributes (FRAME_X_DISPLAY (f), win, &atts); + *outer_border = atts.border_width; + } + /* Translate real coordinates to coordinates relative to our window. For our window, the upper left corner is 0, 0. Since the upper left corner of the WM window is outside @@ -328,7 +346,7 @@ x_real_pos_and_offsets (struct frame *f, if (y_pixels_diff) *y_pixels_diff = -win_y; if (left_offset_x) *left_offset_x = -outer_x; - if (top_offset_y) *top_offset_y = -outer_x; + if (top_offset_y) *top_offset_y = -outer_y; if (xptr) *xptr = real_x; if (yptr) *yptr = real_y; @@ -353,7 +371,8 @@ x_real_pos_and_offsets (struct frame *f, void x_real_positions (struct frame *f, int *xptr, int *yptr) { - x_real_pos_and_offsets (f, NULL, NULL, NULL, NULL, NULL, NULL, xptr, yptr); + x_real_pos_and_offsets (f, NULL, NULL, NULL, NULL, NULL, NULL, xptr, yptr, + NULL); } @@ -4324,7 +4343,7 @@ elements (all size values are in pixels). Lisp_Object fullscreen = Fframe_parameter (frame, Qfullscreen); int menu_bar_height, menu_bar_width, tool_bar_height, tool_bar_width; - int left_off, right_off, top_off, bottom_off; + int left_off, right_off, top_off, bottom_off, outer_border; XWindowAttributes atts; block_input (); @@ -4332,15 +4351,18 @@ elements (all size values are in pixels). XGetWindowAttributes (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &atts); x_real_pos_and_offsets (f, &left_off, &right_off, &top_off, &bottom_off, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, &outer_border); + unblock_input (); border = atts.border_width; title = top_off; - outer_width = FRAME_PIXEL_WIDTH (f) + 2 * border + right_off + left_off; - outer_height = FRAME_PIXEL_HEIGHT (f) + 2 * border + top_off + bottom_off; + outer_width = atts.width + 2 * border + right_off + left_off + + 2 * outer_border; + outer_height = atts.height + 2 * border + top_off + bottom_off + + 2 * outer_border; #if defined (USE_GTK) { diff --git a/src/xmenu.c b/src/xmenu.c index 5794f12ccb7..f183c70b110 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2077,7 +2077,7 @@ x_menu_show (struct frame *f, int x, int y, int menuflags, int left_off, top_off; x_real_pos_and_offsets (f, &left_off, NULL, &top_off, NULL, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); x += left_off; y += top_off; diff --git a/src/xterm.h b/src/xterm.h index 16868f114e8..0366261b2f4 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -960,7 +960,8 @@ extern void x_real_pos_and_offsets (struct frame *f, int *x_pixels_diff, int *y_pixels_diff, int *xptr, - int *yptr); + int *yptr, + int *outer_border); /* From xrdb.c. */ From f1601063f29c99be77d2513320ed6d2494926c1d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 28 Feb 2015 12:33:32 +0200 Subject: [PATCH 187/457] Avoid assertion violations in Rmail due to newline cache src/search.c (find_newline): Avoid assertion violations in CHAR_TO_BYTE when a portion of the buffer was deleted and we look for newlines near the end of the buffer. This happens in Rmail hen JIT font-lock fontifies a newly displayed portion of the buffer. --- src/ChangeLog | 8 ++++++++ src/search.c | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index a2ac5389f20..ca5f85a0157 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2015-02-28 Eli Zaretskii + + * search.c (find_newline): Avoid assertion violations in + CHAR_TO_BYTE when a portion of the buffer was deleted and we look + for newlines near the end of the buffer. This happens in Rmail + hen JIT font-lock fontifies a newly displayed portion of the + buffer. + 2015-02-23 Eli Zaretskii * w32fns.c (Fw32__menu_bar_in_use): New internal function. diff --git a/src/search.c b/src/search.c index eec642ecb20..73641813604 100644 --- a/src/search.c +++ b/src/search.c @@ -731,6 +731,12 @@ find_newline (ptrdiff_t start, ptrdiff_t start_byte, ptrdiff_t end, start, &next_change); if (result) { + /* When the cache revalidation is deferred, + next-change might point beyond ZV, which will + cause assertion violation in CHAR_TO_BYTE below. + Limit next_change to ZV to avoid that. */ + if (next_change > ZV) + next_change = ZV; start = next_change; lim1 = next_change = end; } From 31ecbf8d513540855aa07588f6746942aed453ba Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 28 Feb 2015 14:03:34 +0200 Subject: [PATCH 188/457] Better decoding of HTML payload in Rmail lisp/mail/rmailmm.el (rmail-mime-insert-html): Decode HTML payload when the charset is only given by the HTML , and allow to specify the encoding with "C-x RET c". --- lisp/ChangeLog | 6 ++++++ lisp/mail/rmailmm.el | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b9681d35cf0..1cfd08fc95d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-28 Eli Zaretskii + + * mail/rmailmm.el (rmail-mime-insert-html): Decode HTML payload + when the charset is only given by the HTML , and allow to + specify the encoding with "C-x RET c". + 2015-02-27 Mark Laws Support daemon mode on MS-Windows (bug#19688) diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index 120d517f55c..00fc25dd440 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el @@ -661,6 +661,7 @@ HEADER is a header component of a MIME-entity object (see (transfer-encoding (rmail-mime-entity-transfer-encoding entity)) (charset (cdr (assq 'charset (cdr (rmail-mime-entity-type entity))))) (buffer (current-buffer)) + (case-fold-search t) coding-system) (if charset (setq coding-system (coding-system-from-name charset))) (or (and coding-system (coding-system-p coding-system)) @@ -674,6 +675,22 @@ HEADER is a header component of a MIME-entity object (see (ignore-errors (base64-decode-region (point-min) (point-max)))) ((string= transfer-encoding "quoted-printable") (quoted-printable-decode-region (point-min) (point-max)))) + ;; Some broken MUAs state the charset only in the HTML , + ;; so if we don't have a non-trivial coding-system at this + ;; point, make one last attempt to find it there. + (if (eq coding-system 'undecided) + (save-excursion + (goto-char (point-min)) + (when (re-search-forward + "^ Date: Sat, 28 Feb 2015 14:25:35 +0200 Subject: [PATCH 189/457] Improve [:alpha:] and [:alnum:] for multibyte characters (Bug#19878) src/character.c (alphabeticp, decimalnump): New functions. src/character.h (alphabeticp, decimalnump): Add prototypes. src/regex.c (ISALNUM, ISALPHA): Check Unicode character properties for multibyte characters by calling alphabeticp and decimalnump. (BIT_ALPHA, BIT_ALNUM): New bit masks. (re_wctype_to_bit): Return them when the class is RECC_ALPHA or RECC_ALNUM. (re_match_2_internal): Call ISALPHA and ISALNUM when appropriate. doc/lispref/searching.texi (Char Classes): Update the documentation of [:alpha:] and [:alnum:]. etc/NEWS: Mention the changes in [:alpha:] and [:alnum:]. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/searching.texi | 12 +++++++---- etc/NEWS | 6 ++++++ src/ChangeLog | 13 ++++++++++++ src/character.c | 42 ++++++++++++++++++++++++++++++++++++++ src/character.h | 3 +++ src/regex.c | 18 ++++++++++------ 7 files changed, 89 insertions(+), 10 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index bff469a5188..78f7e34ca01 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2015-02-28 Eli Zaretskii + + * searching.texi (Char Classes): Update the documentation of + [:alpha:] and [:alnum:]. (Bug#19878) + 2015-02-27 Eli Zaretskii * os.texi (Startup Summary): diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 61fac78e4a8..87513e8f9ce 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -541,11 +541,15 @@ and what they mean: @item [:ascii:] This matches any @acronym{ASCII} character (codes 0--127). @item [:alnum:] -This matches any letter or digit. (At present, for multibyte -characters, it matches anything that has word syntax.) +This matches any letter or digit. For multibyte characters, it +matches characters whose Unicode @samp{general-category} property +(@pxref{Character Properties}) indicates they are alphabetic or +decimal number characters. @item [:alpha:] -This matches any letter. (At present, for multibyte characters, it -matches anything that has word syntax.) +This matches any letter. For multibyte characters, it matches +characters whose Unicode @samp{general-category} property +(@pxref{Character Properties}) indicates they are alphabetic +characters. @item [:blank:] This matches space and tab only. @item [:cntrl:] diff --git a/etc/NEWS b/etc/NEWS index d5cb9474c83..3be820e0d5f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -612,6 +612,12 @@ when signaling a file error. For example, it now reports "Permission denied" instead of "permission denied". The old behavior was problematic in languages like German where downcasing rules depend on grammar. ++++ +** The character classes [:alpha:] and [:alnum:] in regular expressions +now match multibyte characters using Unicode character properties. +If you want the old behavior where they matched any character with +word syntax, use `\sw' instead. + * Lisp Changes in Emacs 25.1 diff --git a/src/ChangeLog b/src/ChangeLog index df687914911..97ecbac0953 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,16 @@ +2015-02-28 Eli Zaretskii + + * character.c (alphabeticp, decimalnump): New functions. + * character.h (alphabeticp, decimalnump): Add prototypes. + + * regex.c (ISALNUM, ISALPHA): Check Unicode character properties + for multibyte characters by calling alphabeticp and decimalnump. + (BIT_ALPHA, BIT_ALNUM): New bit masks. + (re_wctype_to_bit): Return them when the class is RECC_ALPHA or + RECC_ALNUM. + (re_match_2_internal): Call ISALPHA and ISALNUM when appropriate. + (Bug#19878) + 2015-02-27 Jan Djärv * xterm.h (x_real_pos_and_offsets): Take outer_border as arg also. diff --git a/src/character.c b/src/character.c index 39d32c9d41a..999f99aa003 100644 --- a/src/character.c +++ b/src/character.c @@ -984,6 +984,48 @@ character is not ASCII nor 8-bit character, an error is signaled. */) #ifdef emacs +/* Return 'true' if C is an alphabetic character as defined by its + Unicode properties. */ +bool +alphabeticp (int c) +{ + Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); + + if (INTEGERP (category)) + { + unicode_category_t gen_cat = XINT (category); + + /* See UTS #18. There are additional characters that should be + here, those designated as Other_uppercase, Other_lowercase, + and Other_alphabetic; FIXME. */ + return (gen_cat == UNICODE_CATEGORY_Lu + || gen_cat == UNICODE_CATEGORY_Ll + || gen_cat == UNICODE_CATEGORY_Lt + || gen_cat == UNICODE_CATEGORY_Lm + || gen_cat == UNICODE_CATEGORY_Lo + || gen_cat == UNICODE_CATEGORY_Mn + || gen_cat == UNICODE_CATEGORY_Mc + || gen_cat == UNICODE_CATEGORY_Me + || gen_cat == UNICODE_CATEGORY_Nl) ? true : false; + } +} + +/* Return 'true' if C is an decimal-number character as defined by its + Unicode properties. */ +bool +decimalnump (int c) +{ + Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); + + if (INTEGERP (category)) + { + unicode_category_t gen_cat = XINT (category); + + /* See UTS #18. */ + return (gen_cat == UNICODE_CATEGORY_Nd) ? true : false; + } +} + void syms_of_character (void) { diff --git a/src/character.h b/src/character.h index 5043880cb42..7d902952db6 100644 --- a/src/character.h +++ b/src/character.h @@ -660,6 +660,9 @@ extern ptrdiff_t lisp_string_width (Lisp_Object, ptrdiff_t, extern Lisp_Object Vchar_unify_table; extern Lisp_Object string_escape_byte8 (Lisp_Object); +extern bool alphabeticp (int); +extern bool decimalnump (int); + /* Return a translation table of id number ID. */ #define GET_TRANSLATION_TABLE(id) \ (XCDR (XVECTOR (Vtranslation_table_vector)->contents[(id)])) diff --git a/src/regex.c b/src/regex.c index 41fe3fa8088..1afc5037594 100644 --- a/src/regex.c +++ b/src/regex.c @@ -324,12 +324,12 @@ enum syntaxcode { Swhitespace = 0, Sword = 1, Ssymbol = 2 }; ? (((c) >= 'a' && (c) <= 'z') \ || ((c) >= 'A' && (c) <= 'Z') \ || ((c) >= '0' && (c) <= '9')) \ - : SYNTAX (c) == Sword) + : (alphabeticp (c) || decimalnump (c))) # define ISALPHA(c) (IS_REAL_ASCII (c) \ ? (((c) >= 'a' && (c) <= 'z') \ || ((c) >= 'A' && (c) <= 'Z')) \ - : SYNTAX (c) == Sword) + : alphabeticp (c)) # define ISLOWER(c) lowercasep (c) @@ -1872,6 +1872,8 @@ struct range_table_work_area #define BIT_SPACE 0x8 #define BIT_UPPER 0x10 #define BIT_MULTIBYTE 0x20 +#define BIT_ALPHA 0x40 +#define BIT_ALNUM 0x80 /* Set the bit for character C in a list. */ @@ -2072,7 +2074,9 @@ re_wctype_to_bit (re_wctype_t cc) { case RECC_NONASCII: case RECC_PRINT: case RECC_GRAPH: case RECC_MULTIBYTE: return BIT_MULTIBYTE; - case RECC_ALPHA: case RECC_ALNUM: case RECC_WORD: return BIT_WORD; + case RECC_ALPHA: return BIT_ALPHA; + case RECC_ALNUM: return BIT_ALNUM; + case RECC_WORD: return BIT_WORD; case RECC_LOWER: return BIT_LOWER; case RECC_UPPER: return BIT_UPPER; case RECC_PUNCT: return BIT_PUNCT; @@ -2930,7 +2934,7 @@ regex_compile (const_re_char *pattern, size_t size, reg_syntax_t syntax, #endif /* emacs */ /* In most cases the matching rule for char classes only uses the syntax table for multibyte chars, - so that the content of the syntax-table it is not + so that the content of the syntax-table is not hardcoded in the range_table. SPACE and WORD are the two exceptions. */ if ((1 << cc) & ((1 << RECC_SPACE) | (1 << RECC_WORD))) @@ -2945,7 +2949,7 @@ regex_compile (const_re_char *pattern, size_t size, reg_syntax_t syntax, p = class_beg; SET_LIST_BIT ('['); - /* Because the `:' may starts the range, we + /* Because the `:' may start the range, we can't simply set bit and repeat the loop. Instead, just set it to C and handle below. */ c = ':'; @@ -5513,7 +5517,9 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, | (class_bits & BIT_PUNCT && ISPUNCT (c)) | (class_bits & BIT_SPACE && ISSPACE (c)) | (class_bits & BIT_UPPER && ISUPPER (c)) - | (class_bits & BIT_WORD && ISWORD (c))) + | (class_bits & BIT_WORD && ISWORD (c)) + | (class_bits & BIT_ALPHA && ISALPHA (c)) + | (class_bits & BIT_ALNUM && ISALNUM (c))) not = !not; else CHARSET_LOOKUP_RANGE_TABLE_RAW (not, c, range_table, count); From e605af8880f9e0670f62e6646bb12e53c9c5cfa8 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sat, 28 Feb 2015 16:20:45 +0100 Subject: [PATCH 190/457] * xlwmenu.c (remap_menubar): Re-realize menu to force move under Gnome 3. --- lwlib/ChangeLog | 5 +++++ lwlib/xlwmenu.c | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 8d536f0b3ad..c98d72575a8 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,8 @@ +2015-02-28 Jan Djärv + + * xlwmenu.c (remap_menubar): Re-realize menu to force move under + Gnome 3. + 2015-01-04 Paul Eggert Less 'make' chatter for lwlib diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 4cd0e42b895..f781b7ee54c 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1510,17 +1510,21 @@ remap_menubar (XlwMenuWidget mw) if (mw->menu.horizontal && i == 1) ws->y += mw->menu.margin; + /* WMs like Gnome 3 ignores requests to move windows. So we + must destroy the current one and create a new to get it to move. */ + XtUnrealizeWidget (ws->w); + XtRealizeWidget (ws->w); + ws->window = XtWindow (ws->w); + size_menu (mw, i); fit_to_screen (mw, ws, previous_ws, mw->menu.horizontal && i == 1); create_pixmap_for_menu (ws, mw); - XtMoveWidget (ws->w, ws->x, ws->y); - XtPopup (ws->w, XtGrabNone); - XtResizeWidget (ws->w, ws->width, ws->height, - mw->core.border_width); - XtResizeWindow (ws->w); + XtConfigureWidget (ws->w, ws->x, ws->y, ws->width, ws->height, + ws->w->core.border_width); display_menu (mw, i, False, &selection_position, NULL, NULL); + XtPopup (ws->w, XtGrabNone); } /* unmap the menus that popped down */ @@ -2615,6 +2619,7 @@ pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent *event) mw->menu.popped_up = True; if (XtIsShell (XtParent ((Widget)mw))) { + fprintf(stderr, "Config %d %d\n", x, y); XtConfigureWidget (XtParent ((Widget)mw), x, y, w, h, XtParent ((Widget)mw)->core.border_width); XtPopup (XtParent ((Widget)mw), XtGrabExclusive); From 5dd2272ef31e5b3894514b0c5f5db5a0b7dadc4f Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 28 Feb 2015 19:40:31 +0100 Subject: [PATCH 191/457] Set can_x_set_window_size and after_make_frame in terminal frames (Bug#19962) * frame.c (make_initial_frame, Fmake_terminal_frame): Set can_x_set_window_size and after_make_frame. (Bug#19962). --- src/ChangeLog | 5 +++++ src/frame.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 97ecbac0953..63ee7dffa21 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-02-28 Martin Rudalics + + * frame.c (make_initial_frame, Fmake_terminal_frame): Set + can_x_set_window_size and after_make_frame (Bug#19962). + 2015-02-28 Eli Zaretskii * character.c (alphabeticp, decimalnump): New functions. diff --git a/src/frame.c b/src/frame.c index d82df0912b4..4a526e228f9 100644 --- a/src/frame.c +++ b/src/frame.c @@ -871,6 +871,9 @@ make_initial_frame (void) last_nonminibuf_frame = f; + f->can_x_set_window_size = true; + f->after_make_frame = true; + return f; } @@ -1064,6 +1067,10 @@ affects all frames on the same terminal device. */) be copied as well. */ for (tem = f->face_alist; CONSP (tem); tem = XCDR (tem)) XSETCDR (XCAR (tem), Fcopy_sequence (XCDR (XCAR (tem)))); + + f->can_x_set_window_size = true; + f->after_make_frame = true; + return frame; } From 159e9f4b1c119ef0172ad22520e8342db337ff7d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 28 Feb 2015 13:19:55 -0800 Subject: [PATCH 192/457] * character.c (alphabeticp, decimalnump): Avoid undefined behavior if CATEGORY is not an integer, or is an integer out of unicode_category_t range. --- src/ChangeLog | 6 ++++++ src/character.c | 44 ++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 63ee7dffa21..4aa64c1d6f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-28 Paul Eggert + + * character.c (alphabeticp, decimalnump): Avoid undefined behavior + if CATEGORY is not an integer, or is an integer out of + unicode_category_t range. + 2015-02-28 Martin Rudalics * frame.c (make_initial_frame, Fmake_terminal_frame): Set diff --git a/src/character.c b/src/character.c index 999f99aa003..ad78f512f43 100644 --- a/src/character.c +++ b/src/character.c @@ -990,24 +990,22 @@ bool alphabeticp (int c) { Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); + if (! INTEGERP (category)) + return false; + EMACS_INT gen_cat = XINT (category); - if (INTEGERP (category)) - { - unicode_category_t gen_cat = XINT (category); - - /* See UTS #18. There are additional characters that should be - here, those designated as Other_uppercase, Other_lowercase, - and Other_alphabetic; FIXME. */ - return (gen_cat == UNICODE_CATEGORY_Lu - || gen_cat == UNICODE_CATEGORY_Ll - || gen_cat == UNICODE_CATEGORY_Lt - || gen_cat == UNICODE_CATEGORY_Lm - || gen_cat == UNICODE_CATEGORY_Lo - || gen_cat == UNICODE_CATEGORY_Mn - || gen_cat == UNICODE_CATEGORY_Mc - || gen_cat == UNICODE_CATEGORY_Me - || gen_cat == UNICODE_CATEGORY_Nl) ? true : false; - } + /* See UTS #18. There are additional characters that should be + here, those designated as Other_uppercase, Other_lowercase, + and Other_alphabetic; FIXME. */ + return (gen_cat == UNICODE_CATEGORY_Lu + || gen_cat == UNICODE_CATEGORY_Ll + || gen_cat == UNICODE_CATEGORY_Lt + || gen_cat == UNICODE_CATEGORY_Lm + || gen_cat == UNICODE_CATEGORY_Lo + || gen_cat == UNICODE_CATEGORY_Mn + || gen_cat == UNICODE_CATEGORY_Mc + || gen_cat == UNICODE_CATEGORY_Me + || gen_cat == UNICODE_CATEGORY_Nl); } /* Return 'true' if C is an decimal-number character as defined by its @@ -1016,14 +1014,12 @@ bool decimalnump (int c) { Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); + if (! INTEGERP (category)) + return false; + EMACS_INT gen_cat = XINT (category); - if (INTEGERP (category)) - { - unicode_category_t gen_cat = XINT (category); - - /* See UTS #18. */ - return (gen_cat == UNICODE_CATEGORY_Nd) ? true : false; - } + /* See UTS #18. */ + return gen_cat == UNICODE_CATEGORY_Nd; } void From 2294380798e9fd20077905ec7f7f127feee9b185 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 1 Mar 2015 12:17:52 +0100 Subject: [PATCH 193/457] * lisp/net/shr.el (shr-insert): Remove soft hyphens. --- lisp/ChangeLog | 4 ++++ lisp/net/shr.el | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1cfd08fc95d..c6ef7177d02 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-01 Lars Magne Ingebrigtsen + + * net/shr.el (shr-insert): Remove soft hyphens. + 2015-02-28 Eli Zaretskii * mail/rmailmm.el (rmail-mime-insert-html): Decode HTML payload diff --git a/lisp/net/shr.el b/lisp/net/shr.el index f6a390e4d0a..868af3837a9 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -512,6 +512,10 @@ size, and full-buffer size." (replace-match "" t t)) (while (re-search-forward "[ \t\n\r ]+" nil t) (replace-match " " t t)) + ;; Remove soft hyphens. + (goto-char (point-min)) + (while (search-forward "­" nil t) + (replace-match "" t t)) (goto-char (point-max))) ;; We may have removed everything we inserted if if was just ;; spaces. From bb13183c1bb56724fc3c4ab5ed8f1eaf6ed5338d Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 1 Mar 2015 12:21:43 +0100 Subject: [PATCH 194/457] (shr-insert): Also remove soft hypens from non-folded text. --- lisp/ChangeLog | 1 + lisp/net/shr.el | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c6ef7177d02..1bcc4f11912 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2015-03-01 Lars Magne Ingebrigtsen * net/shr.el (shr-insert): Remove soft hyphens. + (shr-insert): Also remove soft hypens from non-folded text. 2015-02-28 Eli Zaretskii diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 868af3837a9..9d88d1ff441 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -495,7 +495,15 @@ size, and full-buffer size." (insert "\n")) (cond ((eq shr-folding-mode 'none) - (insert text)) + (let ((start (point))) + (insert text) + (save-restriction + (narrow-to-region start (point)) + ;; Remove soft hyphens. + (goto-char (point-min)) + (while (search-forward "­" nil t) + (replace-match "" t t)) + (goto-char (point-max))))) (t (let ((font-start (point))) (when (and (string-match "\\`[ \t\n\r ]" text) From 15d78a2464a284ee29013dcce9431d446f962179 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 1 Mar 2015 07:24:12 -0500 Subject: [PATCH 195/457] # Auto-commit of loaddefs files. --- lisp/ldefs-boot.el | 2299 ++++++++++++++++++++++---------------------- 1 file changed, 1143 insertions(+), 1156 deletions(-) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index e511aa40342..449fbacddc5 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3,7 +3,7 @@ ;;; Code: -;;;### (autoloads nil "5x5" "play/5x5.el" (21710 25465 294934 381000)) +;;;### (autoloads nil "5x5" "play/5x5.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -65,8 +65,8 @@ should return a grid vector array that is the new solution. ;;;*** -;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21710 25547 -;;;;;; 169569 365000)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -85,8 +85,8 @@ Ada mode is the major mode for editing Ada code. ;;;*** -;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21710 25465 -;;;;;; 300934 355000)) +;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload 'ada-header "ada-stmt" "\ @@ -96,8 +96,8 @@ Insert a descriptive header at the top of the file. ;;;*** -;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21710 25547 -;;;;;; 169569 365000)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -108,8 +108,8 @@ Completion is available. ;;;*** -;;;### (autoloads nil "add-log" "vc/add-log.el" (21710 25547 218569 -;;;;;; 146000)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -238,8 +238,8 @@ old-style time formats for entries are supported. ;;;*** -;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21710 25465 -;;;;;; 124935 139000)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -374,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) ;;;*** -;;;### (autoloads nil "align" "align.el" (21710 25465 76935 353000)) +;;;### (autoloads nil "align" "align.el" (21669 40236 816336 299000)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -477,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** -;;;### (autoloads nil "allout" "allout.el" (21710 25465 78935 344000)) +;;;### (autoloads nil "allout" "allout.el" (21669 40236 816336 299000)) ;;; Generated autoloads from allout.el (push (purecopy '(allout 2 3)) package--builtin-versions) @@ -837,8 +837,8 @@ for details on preparing Emacs for automatic allout activation. ;;;*** -;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21710 -;;;;;; 25547 51569 891000)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from allout-widgets.el (push (purecopy '(allout-widgets 1 0)) package--builtin-versions) @@ -896,8 +896,8 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** -;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21710 25547 141569 -;;;;;; 489000)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -918,8 +918,8 @@ directory, so that Emacs will know its current contents. ;;;*** -;;;### (autoloads nil "animate" "play/animate.el" (21710 25465 294934 -;;;;;; 381000)) +;;;### (autoloads nil "animate" "play/animate.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -951,8 +951,8 @@ the buffer *Birthday-Present-for-Name*. ;;;*** -;;;### (autoloads nil "ansi-color" "ansi-color.el" (21710 25465 78935 -;;;;;; 344000)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from ansi-color.el (push (purecopy '(ansi-color 3 4 2)) package--builtin-versions) @@ -978,8 +978,8 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** -;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21710 -;;;;;; 25465 301934 350000)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from progmodes/antlr-mode.el (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions) @@ -1015,8 +1015,8 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;*** -;;;### (autoloads nil "appt" "calendar/appt.el" (21710 25547 57569 -;;;;;; 864000)) +;;;### (autoloads nil "appt" "calendar/appt.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1037,7 +1037,8 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21710 25547 52569 886000)) +;;;### (autoloads nil "apropos" "apropos.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1152,8 +1153,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads nil "arc-mode" "arc-mode.el" (21710 25547 52569 -;;;;;; 886000)) +;;;### (autoloads nil "arc-mode" "arc-mode.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1173,7 +1174,7 @@ archive. ;;;*** -;;;### (autoloads nil "array" "array.el" (21710 25465 79935 340000)) +;;;### (autoloads nil "array" "array.el" (21669 40236 816336 299000)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1244,8 +1245,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads nil "artist" "textmodes/artist.el" (21710 25465 -;;;;;; 348934 141000)) +;;;### (autoloads nil "artist" "textmodes/artist.el" (21715 24393 +;;;;;; 407468 552000)) ;;; Generated autoloads from textmodes/artist.el (push (purecopy '(artist 1 2 6)) package--builtin-versions) @@ -1451,8 +1452,8 @@ Keymap summary ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21710 25465 -;;;;;; 301934 350000)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1479,8 +1480,8 @@ Special commands: ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21710 -;;;;;; 25547 99569 677000)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1492,7 +1493,8 @@ let-binding.") ;;;*** -;;;### (autoloads nil "autoarg" "autoarg.el" (21710 25465 79935 340000)) +;;;### (autoloads nil "autoarg" "autoarg.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1552,8 +1554,8 @@ This is similar to `autoarg-mode' but rebinds the keypad keys ;;;*** -;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21710 25465 -;;;;;; 301934 350000)) +;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1563,8 +1565,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21710 25547 52569 -;;;;;; 886000)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1602,8 +1604,8 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21710 -;;;;;; 25547 75569 784000)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1652,8 +1654,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (21710 25465 79935 -;;;;;; 340000)) +;;;### (autoloads nil "autorevert" "autorevert.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1741,7 +1743,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (21710 25465 80935 335000)) +;;;### (autoloads nil "avoid" "avoid.el" (21669 40236 816336 299000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1779,8 +1781,8 @@ definition of \"random distance\".) ;;;*** -;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21710 25465 -;;;;;; 301934 350000)) +;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/bat-mode.el (add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode)) @@ -1798,7 +1800,8 @@ Run script using `bat-run' and `bat-run-args'. ;;;*** -;;;### (autoloads nil "battery" "battery.el" (21710 25465 80935 335000)) +;;;### (autoloads nil "battery" "battery.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1833,8 +1836,8 @@ seconds. ;;;*** -;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21710 -;;;;;; 25465 124935 139000)) +;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1870,8 +1873,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21710 25547 -;;;;;; 208569 191000)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1963,7 +1966,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'. ;;;*** ;;;### (autoloads nil "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (21710 25465 348934 141000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1973,8 +1976,8 @@ Major mode for editing BibTeX style files. ;;;*** -;;;### (autoloads nil "binhex" "mail/binhex.el" (21710 25465 224934 -;;;;;; 693000)) +;;;### (autoloads nil "binhex" "mail/binhex.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -1998,8 +2001,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads nil "blackbox" "play/blackbox.el" (21710 25465 -;;;;;; 294934 381000)) +;;;### (autoloads nil "blackbox" "play/blackbox.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2118,8 +2121,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21710 25547 53569 -;;;;;; 882000)) +;;;### (autoloads nil "bookmark" "bookmark.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2311,8 +2314,8 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (21710 25547 -;;;;;; 141569 489000)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (21741 514 +;;;;;; 655319 165000)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2427,29 +2430,23 @@ used instead of `browse-url-new-window-flag'. (autoload 'browse-url-firefox "browse-url" "\ Ask the Firefox WWW browser to load URL. -Default to the URL around or before point. The strings in -variable `browse-url-firefox-arguments' are also passed to -Firefox. +Defaults to the URL around or before point. Passes the strings +in the variable `browse-url-firefox-arguments' to Firefox. -When called interactively, if variable -`browse-url-new-window-flag' is non-nil, load the document in a -new Firefox window, otherwise use a random existing one. A -non-nil interactive prefix argument reverses the effect of -`browse-url-new-window-flag'. +Interactively, if the variable `browse-url-new-window-flag' is non-nil, +loads the document in a new Firefox window. A non-nil prefix argument +reverses the effect of `browse-url-new-window-flag'. If `browse-url-firefox-new-window-is-tab' is non-nil, then whenever a document would otherwise be loaded in a new window, it is loaded in a new tab in an existing window instead. -When called non-interactively, optional second argument -NEW-WINDOW is used instead of `browse-url-new-window-flag'. +Non-interactively, this uses the optional second argument NEW-WINDOW +instead of `browse-url-new-window-flag'. -On MS-Windows systems the optional `new-window' parameter is -ignored. Firefox for Windows does not support the \"-remote\" -command line parameter. Therefore, the -`browse-url-new-window-flag' and `browse-url-firefox-new-window-is-tab' -are ignored as well. Firefox on Windows will always open the requested -URL in a new window. +On MS Windows, this ignores `browse-url-new-window-flag' and +`browse-url-firefox-new-window-is-tab', as well as the NEW-WINDOW argument. +It always uses a new window. \(fn URL &optional NEW-WINDOW)" t nil) @@ -2627,7 +2624,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (21710 25547 53569 882000)) +;;;### (autoloads nil "bs" "bs.el" (21669 40236 816336 299000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2668,8 +2665,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21710 25547 165569 -;;;;;; 382000)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2691,7 +2688,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (21710 25465 301934 350000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2711,8 +2708,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21710 -;;;;;; 25547 77569 775000)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2832,8 +2829,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21710 -;;;;;; 25547 57569 864000)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2842,8 +2839,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21710 25547 -;;;;;; 58569 859000)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2854,8 +2851,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21710 -;;;;;; 25547 58569 859000)) +;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2869,7 +2866,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (21710 25547 57569 864000)) +;;;### (autoloads nil "calc" "calc/calc.el" (21669 40236 816336 299000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2953,8 +2950,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21710 25465 -;;;;;; 87935 304000)) +;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from calc/calc-undo.el (autoload 'calc-undo "calc-undo" "\ @@ -2964,8 +2961,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21710 25547 57569 -;;;;;; 864000)) +;;;### (autoloads nil "calculator" "calculator.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2976,8 +2973,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21710 25547 -;;;;;; 59569 855000)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3020,8 +3017,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "canlock" "gnus/canlock.el" (21710 25465 166934 -;;;;;; 952000)) +;;;### (autoloads nil "canlock" "gnus/canlock.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -3038,8 +3035,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21710 -;;;;;; 25547 170569 360000)) +;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from progmodes/cap-words.el (autoload 'capitalized-words-mode "cap-words" "\ @@ -3079,7 +3076,7 @@ Obsoletes `c-forward-into-nomenclature'. ;;;*** ;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21710 -;;;;;; 25547 173569 347000)) +;;;;;; 6472 78891 397000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3089,8 +3086,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21710 25547 -;;;;;; 174569 342000)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3188,8 +3185,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21713 24233 -;;;;;; 279494 843000)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21711 27340 +;;;;;; 416042 87000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3346,8 +3343,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21710 -;;;;;; 25547 175569 338000)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3398,8 +3395,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21710 25547 -;;;;;; 176569 334000)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3407,8 +3404,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (21710 25547 123569 -;;;;;; 570000)) +;;;### (autoloads nil "ccl" "international/ccl.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3668,8 +3665,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21710 25547 -;;;;;; 77569 775000)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3688,15 +3685,15 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cedet" "cedet/cedet.el" (21710 25465 97935 -;;;;;; 260000)) +;;;### (autoloads nil "cedet" "cedet/cedet.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21710 25547 -;;;;;; 176569 334000)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 3)) package--builtin-versions) @@ -3726,15 +3723,15 @@ on the buffer contents ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21710 25547 -;;;;;; 77569 775000)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (21710 25465 126935 130000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3751,8 +3748,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21710 -;;;;;; 25465 126935 130000)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (push (purecopy '(checkdoc 0 6 2)) package--builtin-versions) (put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp) @@ -3952,8 +3949,8 @@ checking of documentation strings. ;;;*** -;;;### (autoloads nil "china-util" "language/china-util.el" (21710 -;;;;;; 25465 206934 774000)) +;;;### (autoloads nil "china-util" "language/china-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -3990,8 +3987,8 @@ Encode the text in the current buffer to HZ. ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (21710 25465 115935 -;;;;;; 179000)) +;;;### (autoloads nil "chistory" "chistory.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -4030,8 +4027,8 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21710 -;;;;;; 25547 78569 770000)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4109,8 +4106,8 @@ For example, the function `case' has an indent property ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21710 25547 -;;;;;; 78569 770000)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) @@ -4140,8 +4137,8 @@ a future Emacs interpreter will be able to use it.") ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21710 25465 -;;;;;; 307934 323000)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4161,8 +4158,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21710 25465 115935 -;;;;;; 179000)) +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4182,7 +4179,7 @@ is run). ;;;*** -;;;### (autoloads nil "color" "color.el" (21710 25465 115935 179000)) +;;;### (autoloads nil "color" "color.el" (21669 40236 816336 299000)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4201,7 +4198,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21710 25547 70569 806000)) +;;;### (autoloads nil "comint" "comint.el" (21735 9668 456748 276000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4300,8 +4297,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21710 25547 -;;;;;; 218569 146000)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4334,8 +4331,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21710 25547 -;;;;;; 177569 329000)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4516,8 +4513,8 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** -;;;### (autoloads nil "completion" "completion.el" (21710 25547 71569 -;;;;;; 802000)) +;;;### (autoloads nil "completion" "completion.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4539,8 +4536,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21710 -;;;;;; 25547 208569 191000)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4695,8 +4692,8 @@ For details see `conf-mode'. Example: ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (21710 25465 294934 -;;;;;; 381000)) +;;;### (autoloads nil "cookie1" "play/cookie1.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4724,8 +4721,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21710 -;;;;;; 25465 128935 122000)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4763,8 +4760,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21710 -;;;;;; 25547 178569 324000)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4962,8 +4959,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21710 25465 310934 -;;;;;; 310000)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4981,8 +4978,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21710 25465 128935 -;;;;;; 122000)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -5008,8 +5005,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21710 25547 -;;;;;; 208569 191000)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5019,8 +5016,8 @@ Major mode to edit Cascading Style Sheets. ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21710 25547 -;;;;;; 86569 735000)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5065,8 +5062,8 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;*** -;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21710 25465 -;;;;;; 138935 77000)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -5077,8 +5074,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21710 25547 72569 -;;;;;; 797000)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5390,8 +5387,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21710 25465 118935 -;;;;;; 166000)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5424,8 +5421,8 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** -;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21710 25465 -;;;;;; 366934 60000)) +;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5435,8 +5432,8 @@ Mode used for cvs status output. ;;;*** -;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21710 25547 178569 -;;;;;; 324000)) +;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) @@ -5480,8 +5477,8 @@ See `cwarn-mode' for more information on Cwarn mode. ;;;*** -;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21710 -;;;;;; 25465 206934 774000)) +;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5509,8 +5506,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (21710 25465 118935 -;;;;;; 166000)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5556,8 +5553,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21710 25465 -;;;;;; 97935 260000)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5567,7 +5564,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21710 25547 142569 485000)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5580,8 +5577,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21710 25465 -;;;;;; 310934 310000)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5707,8 +5704,8 @@ There is some minimal font-lock support (see vars ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21710 25465 -;;;;;; 129935 117000)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5751,8 +5748,8 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** -;;;### (autoloads nil "decipher" "play/decipher.el" (21710 25465 -;;;;;; 294934 381000)) +;;;### (autoloads nil "decipher" "play/decipher.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5780,8 +5777,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (21710 25465 118935 -;;;;;; 166000)) +;;;### (autoloads nil "delim-col" "delim-col.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5806,7 +5803,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21710 25465 118935 166000)) +;;;### (autoloads nil "delsel" "delsel.el" (21669 40236 816336 299000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5834,8 +5831,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21710 25547 -;;;;;; 79569 766000)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5901,8 +5898,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21710 25547 72569 -;;;;;; 797000)) +;;;### (autoloads nil "descr-text" "descr-text.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5936,7 +5933,8 @@ relevant to POS. ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21710 25547 73569 793000)) +;;;### (autoloads nil "desktop" "desktop.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6141,8 +6139,8 @@ Revert to the last loaded desktop. ;;;*** -;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21710 25465 -;;;;;; 166934 952000)) +;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -6174,8 +6172,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21710 -;;;;;; 25547 60569 851000)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6217,7 +6215,7 @@ Major mode for editing the diary file. ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (21710 25465 367934 56000)) +;;;### (autoloads nil "diff" "vc/diff.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6265,8 +6263,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21710 25547 -;;;;;; 218569 146000)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6298,7 +6296,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "dig" "net/dig.el" (21710 25465 242934 613000)) +;;;### (autoloads nil "dig" "net/dig.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6309,7 +6307,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21710 25547 74569 788000)) +;;;### (autoloads nil "dired" "dired.el" (21670 36217 665624 229000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6429,8 +6427,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (21710 25465 121935 -;;;;;; 153000)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6460,8 +6458,8 @@ from `default-directory'. ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21710 25465 -;;;;;; 129935 117000)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6475,8 +6473,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21710 25465 121935 -;;;;;; 153000)) +;;;### (autoloads nil "disp-table" "disp-table.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6597,8 +6595,8 @@ in `.emacs'. ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (21710 25465 -;;;;;; 294934 381000)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6614,7 +6612,7 @@ Default is 2. ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (21710 25547 74569 788000)) +;;;### (autoloads nil "dnd" "dnd.el" (21669 40236 816336 299000)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\ @@ -6634,8 +6632,8 @@ if some action was made, or nil if the URL is ignored.") ;;;*** -;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21710 25465 -;;;;;; 350934 132000)) +;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6658,8 +6656,8 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads nil "doc-view" "doc-view.el" (21710 25547 75569 -;;;;;; 784000)) +;;;### (autoloads nil "doc-view" "doc-view.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6705,8 +6703,8 @@ See the command `doc-view-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (21710 25465 295934 -;;;;;; 377000)) +;;;### (autoloads nil "doctor" "play/doctor.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6716,7 +6714,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (21710 25465 122935 148000)) +;;;### (autoloads nil "double" "double.el" (21669 40236 816336 299000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6732,8 +6730,8 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21710 25547 166569 -;;;;;; 378000)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) @@ -6744,8 +6742,8 @@ Switch to *dungeon* buffer and start game. ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21710 -;;;;;; 25547 79569 766000)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6884,8 +6882,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21710 -;;;;;; 25465 129935 117000)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7023,8 +7021,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21710 25465 -;;;;;; 312934 301000)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7289,8 +7287,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21710 25465 -;;;;;; 313934 297000)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7438,8 +7436,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21710 25465 122935 -;;;;;; 148000)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7471,8 +7469,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (21710 25465 122935 -;;;;;; 148000)) +;;;### (autoloads nil "echistory" "echistory.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7483,8 +7481,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21710 25465 -;;;;;; 166934 952000)) +;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7494,7 +7492,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (21710 25547 62569 842000)) +;;;### (autoloads nil "ede" "cedet/ede.el" (21669 40236 816336 299000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7520,8 +7518,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21710 25547 -;;;;;; 80569 762000)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7585,7 +7583,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (21710 25465 369934 47000)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -7857,8 +7855,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21710 25465 -;;;;;; 367934 56000)) +;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7868,8 +7866,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21710 25465 -;;;;;; 368934 51000)) +;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7881,8 +7879,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21710 25547 -;;;;;; 219569 142000)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7901,8 +7899,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (21710 25465 122935 -;;;;;; 148000)) +;;;### (autoloads nil "edmacro" "edmacro.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -7951,8 +7949,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21710 25547 86569 -;;;;;; 735000)) +;;;### (autoloads nil "edt" "emulation/edt.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -7969,7 +7967,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21710 25465 122935 148000)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21669 40236 816336 299000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8005,15 +8003,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21710 25547 -;;;;;; 82569 753000)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21670 36216 +;;;;;; 665623 730000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21710 -;;;;;; 25547 81569 757000)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8029,8 +8027,8 @@ It creates an autoload function for CNAME's constructor. ;;;*** -;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21710 25547 -;;;;;; 82569 753000)) +;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -8073,8 +8071,8 @@ Emacs Lisp mode) that support ElDoc.") ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (21710 25465 122935 -;;;;;; 148000)) +;;;### (autoloads nil "elec-pair" "elec-pair.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from elec-pair.el (defvar electric-pair-text-pairs '((34 . 34)) "\ @@ -8109,8 +8107,8 @@ closing parenthesis. (Likewise for brackets, etc.). ;;;*** -;;;### (autoloads nil "elide-head" "elide-head.el" (21710 25465 123935 -;;;;;; 144000)) +;;;### (autoloads nil "elide-head" "elide-head.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -8125,8 +8123,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21710 25465 -;;;;;; 132935 104000)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8161,8 +8159,8 @@ optional prefix argument REINIT is non-nil. ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21710 25465 132935 -;;;;;; 104000)) +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8196,8 +8194,8 @@ displayed. ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21710 25465 138935 -;;;;;; 77000)) +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8224,8 +8222,8 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21710 25547 -;;;;;; 134569 521000)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8238,8 +8236,8 @@ Prompts for bug subject. Leaves you in a mail buffer. ;;;*** -;;;### (autoloads nil "emerge" "vc/emerge.el" (21710 25547 220569 -;;;;;; 137000)) +;;;### (autoloads nil "emerge" "vc/emerge.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -8299,8 +8297,8 @@ Emerge two RCS revisions of a file, with another revision as ancestor. ;;;*** -;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21710 25547 -;;;;;; 208569 191000)) +;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -8335,7 +8333,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21710 25547 86569 735000)) +;;;### (autoloads nil "epa" "epa.el" (21669 40236 816336 299000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8513,8 +8511,8 @@ Insert selected KEYS after the point. ;;;*** -;;;### (autoloads nil "epa-dired" "epa-dired.el" (21710 25465 142935 -;;;;;; 59000)) +;;;### (autoloads nil "epa-dired" "epa-dired.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8539,8 +8537,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (21710 25547 86569 -;;;;;; 735000)) +;;;### (autoloads nil "epa-file" "epa-file.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8560,8 +8558,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-mail" "epa-mail.el" (21710 25547 86569 -;;;;;; 735000)) +;;;### (autoloads nil "epa-mail" "epa-mail.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8638,7 +8636,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21710 25547 87569 730000)) +;;;### (autoloads nil "epg" "epg.el" (21669 40236 816336 299000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8649,8 +8647,8 @@ Return a context object. ;;;*** -;;;### (autoloads nil "epg-config" "epg-config.el" (21710 25465 142935 -;;;;;; 59000)) +;;;### (autoloads nil "epg-config" "epg-config.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8670,8 +8668,9 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21710 25465 149935 28000)) +;;;### (autoloads nil "erc" "erc/erc.el" (21732 33477 285319 343000)) ;;; Generated autoloads from erc/erc.el +(push (purecopy '(erc 5 3)) package--builtin-versions) (autoload 'erc-select-read-args "erc" "\ Prompt the user for values of nick, server, port, and password. @@ -8718,36 +8717,36 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21710 -;;;;;; 25465 145935 46000)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21710 25465 -;;;;;; 145935 46000)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21710 25465 -;;;;;; 145935 46000)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21710 25465 -;;;;;; 145935 46000)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21710 25547 87569 -;;;;;; 730000)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8777,14 +8776,14 @@ that subcommand. ;;;*** ;;;### (autoloads nil "erc-desktop-notifications" "erc/erc-desktop-notifications.el" -;;;;;; (21710 25547 87569 730000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from erc/erc-desktop-notifications.el (autoload 'erc-notifications-mode "erc-desktop-notifications" "" t) ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21710 -;;;;;; 25465 146935 41000)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8846,8 +8845,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21710 25465 146935 -;;;;;; 41000)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8859,8 +8858,8 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'. ;;;*** -;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21710 25465 -;;;;;; 146935 41000)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8881,8 +8880,8 @@ system. ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21710 25465 -;;;;;; 146935 41000)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8892,22 +8891,22 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21710 25465 146935 -;;;;;; 41000)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21710 25465 146935 -;;;;;; 41000)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21710 25465 146935 -;;;;;; 41000)) +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8936,8 +8935,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21710 25465 -;;;;;; 146935 41000)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -8983,15 +8982,15 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21710 25465 146935 -;;;;;; 41000)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21710 -;;;;;; 25465 146935 41000)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9002,8 +9001,8 @@ Show who's gone. ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21710 -;;;;;; 25465 147935 37000)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -9020,8 +9019,8 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21710 25465 -;;;;;; 147935 37000)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9039,36 +9038,36 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21710 25465 147935 -;;;;;; 37000)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21710 -;;;;;; 25465 147935 37000)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21710 25465 -;;;;;; 147935 37000)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21710 25465 147935 -;;;;;; 37000)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21710 -;;;;;; 25465 147935 37000)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9085,15 +9084,15 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21710 25465 -;;;;;; 147935 37000)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21710 -;;;;;; 25465 147935 37000)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9104,22 +9103,22 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21710 -;;;;;; 25465 147935 37000)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21710 25465 -;;;;;; 147935 37000)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21710 25465 -;;;;;; 147935 37000)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9144,8 +9143,8 @@ keybindings will not do anything useful. ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21710 -;;;;;; 25465 148935 32000)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9164,8 +9163,8 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21710 25465 148935 -;;;;;; 32000)) +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9176,8 +9175,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21710 25547 82569 -;;;;;; 753000)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9242,8 +9241,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** -;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21710 25465 -;;;;;; 132935 104000)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9255,8 +9254,8 @@ Kill all test buffers that are still live. ;;;*** -;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21710 25465 -;;;;;; 151935 19000)) +;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9266,8 +9265,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (21710 25547 88569 -;;;;;; 726000)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9302,8 +9301,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21710 25547 179569 -;;;;;; 320000)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9611,8 +9610,8 @@ for \\[find-tag] (which see). ;;;*** -;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21710 -;;;;;; 25465 206934 774000)) +;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9780,7 +9779,7 @@ With ARG, insert that many delimiters. ;;;*** -;;;### (autoloads nil "eudc" "net/eudc.el" (21710 25547 142569 485000)) +;;;### (autoloads nil "eudc" "net/eudc.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9834,8 +9833,8 @@ This does nothing except loading eudc by autoload side-effect. ;;;*** -;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21710 25547 142569 -;;;;;; 485000)) +;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -9870,8 +9869,8 @@ Display a button for the JPEG DATA. ;;;*** -;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21710 25547 -;;;;;; 142569 485000)) +;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9887,8 +9886,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** -;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21710 -;;;;;; 25547 142569 485000)) +;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9898,8 +9897,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21710 25465 133935 -;;;;;; 99000)) +;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -9925,7 +9924,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21710 25547 143569 481000)) +;;;### (autoloads nil "eww" "net/eww.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -9948,8 +9947,8 @@ Render a file using EWW. ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (21710 -;;;;;; 25465 313934 297000)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -9990,7 +9989,7 @@ file modes. ;;;*** -;;;### (autoloads nil "expand" "expand.el" (21710 25465 152935 14000)) +;;;### (autoloads nil "expand" "expand.el" (21669 40236 816336 299000)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -10039,8 +10038,8 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads nil "f90" "progmodes/f90.el" (21710 25547 179569 -;;;;;; 320000)) +;;;### (autoloads nil "f90" "progmodes/f90.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10107,8 +10106,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (21710 25465 152935 -;;;;;; 14000)) +;;;### (autoloads nil "face-remap" "face-remap.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10267,8 +10266,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;*** -;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21710 25465 -;;;;;; 225934 689000)) +;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/feedmail.el (push (purecopy '(feedmail 11)) package--builtin-versions) @@ -10322,7 +10321,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21710 25547 89569 721000)) +;;;### (autoloads nil "ffap" "ffap.el" (21669 40236 816336 299000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10385,8 +10384,8 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (21710 25465 153935 -;;;;;; 10000)) +;;;### (autoloads nil "filecache" "filecache.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -10443,8 +10442,8 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads nil "filenotify" "filenotify.el" (21710 25465 153935 -;;;;;; 10000)) +;;;### (autoloads nil "filenotify" "filenotify.el" (21686 24133 544625 +;;;;;; 151000)) ;;; Generated autoloads from filenotify.el (autoload 'file-notify-handle-event "filenotify" "\ @@ -10459,8 +10458,8 @@ Otherwise, signal a `file-notify-error'. ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21710 25465 153935 -;;;;;; 10000)) +;;;### (autoloads nil "files-x" "files-x.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10525,8 +10524,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21710 25465 155935 -;;;;;; 1000)) +;;;### (autoloads nil "filesets" "filesets.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10537,8 +10536,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (21710 25547 90569 -;;;;;; 717000)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10558,8 +10557,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21710 25465 155935 -;;;;;; 1000)) +;;;### (autoloads nil "find-dired" "find-dired.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10599,8 +10598,8 @@ use in place of \"-ls\" as the final argument. ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (21710 25465 156934 -;;;;;; 997000)) +;;;### (autoloads nil "find-file" "find-file.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\ @@ -10690,8 +10689,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21710 -;;;;;; 25547 82569 753000)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10849,8 +10848,8 @@ Define some key bindings for the find-function family of functions. ;;;*** -;;;### (autoloads nil "find-lisp" "find-lisp.el" (21710 25465 156934 -;;;;;; 997000)) +;;;### (autoloads nil "find-lisp" "find-lisp.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10870,7 +10869,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21710 25465 156934 997000)) +;;;### (autoloads nil "finder" "finder.el" (21669 40236 816336 299000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -10892,8 +10891,8 @@ Find packages matching a given keyword. ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21710 25465 156934 -;;;;;; 997000)) +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -10914,8 +10913,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21710 25465 -;;;;;; 166934 952000)) +;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -10930,8 +10929,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21710 25465 -;;;;;; 314934 292000)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -10961,8 +10960,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21710 25465 -;;;;;; 350934 132000)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21726 16215 +;;;;;; 785464 581000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11032,14 +11031,14 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (21710 25465 156934 -;;;;;; 997000)) +;;;### (autoloads nil "foldout" "foldout.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21710 25465 156934 997000)) +;;;### (autoloads nil "follow" "follow.el" (21669 40236 816336 299000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11107,8 +11106,8 @@ selected if the original window is the first one in the frame. ;;;*** -;;;### (autoloads nil "footnote" "mail/footnote.el" (21710 25465 -;;;;;; 225934 689000)) +;;;### (autoloads nil "footnote" "mail/footnote.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) @@ -11127,7 +11126,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (21710 25465 158934 988000)) +;;;### (autoloads nil "forms" "forms.el" (21669 40236 816336 299000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11163,8 +11162,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21710 25465 -;;;;;; 315934 288000)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11241,8 +11240,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "fortune" "play/fortune.el" (21710 25465 295934 -;;;;;; 377000)) +;;;### (autoloads nil "fortune" "play/fortune.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11290,8 +11289,8 @@ and choose the directory as the fortune-file. ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (21710 25547 92569 -;;;;;; 708000)) +;;;### (autoloads nil "frameset" "frameset.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from frameset.el (defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\ @@ -11471,15 +11470,15 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21710 25547 -;;;;;; 166569 378000)) +;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21710 25465 -;;;;;; 315934 288000)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11556,8 +11555,8 @@ detailed description of this mode. ;;;*** -;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21710 25465 -;;;;;; 133935 99000)) +;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11637,8 +11636,8 @@ regular expression that can be used as an element of ;;;*** -;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21710 25465 -;;;;;; 315934 288000)) +;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11652,8 +11651,8 @@ add virtual separators (like underscores) at places they belong to. ;;;*** -;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21710 25547 -;;;;;; 99569 677000)) +;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11707,7 +11706,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (21710 25547 110569 628000)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11757,8 +11756,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21710 25465 -;;;;;; 167934 948000)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11848,8 +11847,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21710 25547 -;;;;;; 100569 672000)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11859,8 +11858,8 @@ Make the current buffer look like a nice article. ;;;*** -;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21710 -;;;;;; 25547 101569 668000)) +;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -11883,8 +11882,8 @@ deletion, or > if it is flagged for displaying. ;;;*** -;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21710 25547 -;;;;;; 101569 668000)) +;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -11925,8 +11924,8 @@ supported. ;;;*** -;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21710 25547 -;;;;;; 102569 663000)) +;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11961,8 +11960,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21710 25465 -;;;;;; 170934 934000)) +;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -11977,8 +11976,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21710 25465 -;;;;;; 170934 934000)) +;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -11988,8 +11987,8 @@ Convenience method to turn on gnus-dired-mode. ;;;*** -;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21710 25465 -;;;;;; 170934 934000)) +;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -11999,8 +11998,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21710 25547 -;;;;;; 102569 663000)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus-random-x-face "gnus-fun" "\ @@ -12044,8 +12043,8 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to ;;;*** -;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21710 -;;;;;; 25465 171934 930000)) +;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -12062,8 +12061,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21710 25547 -;;;;;; 102569 663000)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12080,8 +12079,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21710 25547 -;;;;;; 103569 659000)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12096,8 +12095,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21710 25465 -;;;;;; 172934 925000)) +;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12110,8 +12109,8 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;*** -;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21710 25465 172934 -;;;;;; 925000)) +;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -12134,8 +12133,8 @@ Minor mode for providing mailing-list commands. ;;;*** -;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21710 25547 -;;;;;; 103569 659000)) +;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -12235,8 +12234,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21710 25547 -;;;;;; 103569 659000)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12263,7 +12262,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads nil "gnus-notifications" "gnus/gnus-notifications.el" -;;;;;; (21710 25547 103569 659000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus-notifications.el (autoload 'gnus-notifications "gnus-notifications" "\ @@ -12279,8 +12278,8 @@ This is typically a function to add in ;;;*** -;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21710 25547 -;;;;;; 104569 654000)) +;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12303,8 +12302,8 @@ If picons are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21710 25465 -;;;;;; 173934 921000)) +;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12371,8 +12370,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21710 -;;;;;; 25547 104569 654000)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12387,8 +12386,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21710 25465 -;;;;;; 174934 916000)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12415,8 +12414,8 @@ See the documentation for these variables and functions for details. ;;;*** -;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21710 25547 -;;;;;; 104569 654000)) +;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12426,8 +12425,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21710 25547 -;;;;;; 106569 646000)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12437,8 +12436,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21710 25547 -;;;;;; 109569 632000)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12449,8 +12448,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21710 25465 -;;;;;; 179934 894000)) +;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12465,8 +12464,8 @@ Install the sync hooks. ;;;*** -;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21710 25465 -;;;;;; 180934 890000)) +;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12476,8 +12475,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (21710 25547 143569 -;;;;;; 481000)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12493,8 +12492,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21710 25465 296934 -;;;;;; 372000)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12520,8 +12519,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21710 25465 -;;;;;; 243934 609000)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12562,8 +12561,8 @@ Like `goto-address-mode', but only for comments and strings. ;;;*** -;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21710 25547 -;;;;;; 110569 628000)) +;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -12579,8 +12578,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (21710 25547 180569 -;;;;;; 316000)) +;;;### (autoloads nil "grep" "progmodes/grep.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12744,7 +12743,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'. ;;;*** -;;;### (autoloads nil "gs" "gs.el" (21710 25465 192934 836000)) +;;;### (autoloads nil "gs" "gs.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12757,8 +12756,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21710 25547 180569 -;;;;;; 316000)) +;;;### (autoloads nil "gud" "progmodes/gud.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12846,8 +12845,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21710 25547 83569 -;;;;;; 748000)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -12949,8 +12948,8 @@ binding mode. ;;;*** -;;;### (autoloads nil "handwrite" "play/handwrite.el" (21710 25465 -;;;;;; 296934 372000)) +;;;### (autoloads nil "handwrite" "play/handwrite.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -12967,8 +12966,8 @@ Variables: `handwrite-linespace' (default 12) ;;;*** -;;;### (autoloads nil "hanoi" "play/hanoi.el" (21710 25465 296934 -;;;;;; 372000)) +;;;### (autoloads nil "hanoi" "play/hanoi.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -12995,8 +12994,8 @@ to be updated. ;;;*** -;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21710 25547 -;;;;;; 134569 521000)) +;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -13038,8 +13037,8 @@ Prefix arg sets default accept amount temporarily. ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21710 25465 192934 -;;;;;; 836000)) +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -13166,8 +13165,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21710 25547 118569 -;;;;;; 592000)) +;;;### (autoloads nil "help-fns" "help-fns.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13246,8 +13245,8 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file. ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (21710 25465 192934 -;;;;;; 836000)) +;;;### (autoloads nil "help-macro" "help-macro.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13261,8 +13260,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21710 25547 118569 -;;;;;; 592000)) +;;;### (autoloads nil "help-mode" "help-mode.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13361,8 +13360,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21710 25465 -;;;;;; 133935 99000)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13377,7 +13376,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21710 25547 119569 588000)) +;;;### (autoloads nil "hexl" "hexl.el" (21669 40237 316336 766000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13471,8 +13470,8 @@ This discards the buffer's undo information. ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (21710 25547 119569 -;;;;;; 588000)) +;;;### (autoloads nil "hi-lock" "hi-lock.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13639,8 +13638,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21710 25547 -;;;;;; 180569 316000)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13683,8 +13682,8 @@ Several variables affect how the hiding is done: ;;;*** -;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21710 25547 -;;;;;; 181569 311000)) +;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13746,8 +13745,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21710 25465 194934 -;;;;;; 827000)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13878,8 +13877,8 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21710 25547 119569 -;;;;;; 588000)) +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -13911,8 +13910,8 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (21710 25465 194934 -;;;;;; 827000)) +;;;### (autoloads nil "hl-line" "hl-line.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -13961,8 +13960,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (21710 25547 -;;;;;; 60569 851000)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -14110,8 +14109,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (21710 25465 -;;;;;; 181934 885000)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14121,8 +14120,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21710 25547 -;;;;;; 119569 588000)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21670 36217 +;;;;;; 165621 979000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14155,8 +14154,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'. ;;;*** -;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21710 25547 120569 -;;;;;; 583000)) +;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14244,8 +14243,8 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21710 25547 120569 -;;;;;; 583000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21670 36217 165621 +;;;;;; 979000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14284,8 +14283,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21710 -;;;;;; 25547 61569 846000)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14338,8 +14337,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21710 25547 120569 -;;;;;; 583000)) +;;;### (autoloads nil "icomplete" "icomplete.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14374,8 +14373,8 @@ completions: ;;;*** -;;;### (autoloads nil "icon" "progmodes/icon.el" (21710 25465 317934 -;;;;;; 279000)) +;;;### (autoloads nil "icon" "progmodes/icon.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14415,8 +14414,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21710 -;;;;;; 25547 182569 307000)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14441,8 +14440,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21710 25547 -;;;;;; 183569 302000)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14571,7 +14570,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21710 25547 121569 579000)) +;;;### (autoloads nil "ido" "ido.el" (21669 40237 316336 766000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14833,7 +14832,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21710 25547 121569 579000)) +;;;### (autoloads nil "ielm" "ielm.el" (21669 40237 316336 766000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -14845,7 +14844,7 @@ See `inferior-emacs-lisp-mode' for details. ;;;*** -;;;### (autoloads nil "iimage" "iimage.el" (21710 25465 196934 818000)) +;;;### (autoloads nil "iimage" "iimage.el" (21669 40237 316336 766000)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -14861,7 +14860,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (21710 25465 197934 814000)) +;;;### (autoloads nil "image" "image.el" (21669 40237 316336 766000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15054,8 +15053,8 @@ If Emacs is compiled without ImageMagick support, this does nothing. ;;;*** -;;;### (autoloads nil "image-dired" "image-dired.el" (21710 25465 -;;;;;; 197934 814000)) +;;;### (autoloads nil "image-dired" "image-dired.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) @@ -15192,8 +15191,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads nil "image-file" "image-file.el" (21710 25465 197934 -;;;;;; 814000)) +;;;### (autoloads nil "image-file" "image-file.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\ @@ -15255,8 +15254,8 @@ An image file is one whose name has an extension in ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (21710 25547 122569 -;;;;;; 574000)) +;;;### (autoloads nil "image-mode" "image-mode.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15303,7 +15302,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21710 25547 122569 574000)) +;;;### (autoloads nil "imenu" "imenu.el" (21669 40237 316336 766000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15441,8 +15440,8 @@ for more information. ;;;*** -;;;### (autoloads nil "ind-util" "language/ind-util.el" (21710 25465 -;;;;;; 210934 756000)) +;;;### (autoloads nil "ind-util" "language/ind-util.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -15472,8 +15471,8 @@ Convert old Emacs Devanagari characters to UCS. ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21710 25547 -;;;;;; 183569 302000)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15491,7 +15490,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21710 25547 123569 570000)) +;;;### (autoloads nil "info" "info.el" (21669 40237 316336 766000)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -15701,8 +15700,8 @@ Otherwise, visit the manual in a new Info buffer. ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (21710 25465 198934 -;;;;;; 809000)) +;;;### (autoloads nil "info-look" "info-look.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15749,8 +15748,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (21710 25465 198934 -;;;;;; 809000)) +;;;### (autoloads nil "info-xref" "info-xref.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -15833,8 +15832,8 @@ the sources handy. ;;;*** -;;;### (autoloads nil "informat" "informat.el" (21710 25465 199934 -;;;;;; 805000)) +;;;### (autoloads nil "informat" "informat.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15879,8 +15878,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inversion" "cedet/inversion.el" (21710 25465 -;;;;;; 100935 246000)) +;;;### (autoloads nil "inversion" "cedet/inversion.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) @@ -15892,8 +15891,8 @@ Only checks one based on which kind of Emacs is being run. ;;;*** -;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21710 -;;;;;; 25465 200934 800000)) +;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -15913,8 +15912,8 @@ Toggle input method in interactive search. ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (21710 25465 204934 -;;;;;; 783000)) +;;;### (autoloads nil "isearchb" "isearchb.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -15928,8 +15927,8 @@ accessed via isearchb. ;;;*** -;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21710 -;;;;;; 25465 200934 800000)) +;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -16020,15 +16019,15 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (21710 25465 200934 800000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from international/iso-transl.el (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap) ;;;*** -;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21710 25547 -;;;;;; 209569 186000)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16261,8 +16260,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to ;;;*** -;;;### (autoloads nil "japan-util" "language/japan-util.el" (21710 -;;;;;; 25465 211934 751000)) +;;;### (autoloads nil "japan-util" "language/japan-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -16339,8 +16338,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (21710 25465 205934 -;;;;;; 778000)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16363,8 +16362,8 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21710 25547 184569 -;;;;;; 298000)) +;;;### (autoloads nil "js" "progmodes/js.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16376,14 +16375,14 @@ Major mode for editing JavaScript. ;;;*** -;;;### (autoloads nil "json" "json.el" (21710 25465 205934 778000)) +;;;### (autoloads nil "json" "json.el" (21669 40237 316336 766000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "keypad" "emulation/keypad.el" (21710 25465 -;;;;;; 139935 72000)) +;;;### (autoloads nil "keypad" "emulation/keypad.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16438,8 +16437,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** -;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21710 -;;;;;; 25465 200934 800000)) +;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -16460,8 +16459,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (21710 25465 201934 -;;;;;; 796000)) +;;;### (autoloads nil "kkc" "international/kkc.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16483,7 +16482,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21710 25465 205934 778000)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21669 40237 316336 766000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16595,8 +16594,8 @@ If kbd macro currently being defined end it before activating it. ;;;*** -;;;### (autoloads nil "korea-util" "language/korea-util.el" (21710 -;;;;;; 25465 211934 751000)) +;;;### (autoloads nil "korea-util" "language/korea-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16610,8 +16609,8 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "landmark" "play/landmark.el" (21710 25547 -;;;;;; 167569 373000)) +;;;### (autoloads nil "landmark" "play/landmark.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16641,8 +16640,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "lao-util" "language/lao-util.el" (21710 25465 -;;;;;; 211934 751000)) +;;;### (autoloads nil "lao-util" "language/lao-util.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16679,8 +16678,8 @@ Transcribe Romanized Lao string STR to Lao character string. ;;;*** -;;;### (autoloads nil "latexenc" "international/latexenc.el" (21710 -;;;;;; 25465 201934 796000)) +;;;### (autoloads nil "latexenc" "international/latexenc.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/latexenc.el (defvar latex-inputenc-coding-alist (purecopy '(("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ @@ -16712,7 +16711,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el" -;;;;;; (21710 25465 201934 796000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16753,8 +16752,8 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** -;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21710 -;;;;;; 25465 321934 261000)) +;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16764,7 +16763,7 @@ A major mode to edit GNU ld script files ;;;*** -;;;### (autoloads nil "life" "play/life.el" (21710 25465 296934 372000)) +;;;### (autoloads nil "life" "play/life.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -16777,7 +16776,7 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads nil "linum" "linum.el" (21710 25547 134569 521000)) +;;;### (autoloads nil "linum" "linum.el" (21669 40237 316336 766000)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -16814,8 +16813,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21710 25465 223934 -;;;;;; 698000)) +;;;### (autoloads nil "loadhist" "loadhist.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16846,7 +16845,7 @@ something strange, such as redefining an Emacs function. ;;;*** -;;;### (autoloads nil "locate" "locate.el" (21710 25465 224934 693000)) +;;;### (autoloads nil "locate" "locate.el" (21669 40237 316336 766000)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -16898,8 +16897,8 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21710 25465 370934 -;;;;;; 43000)) +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16930,8 +16929,8 @@ done. Otherwise, it uses the current buffer. ;;;*** -;;;### (autoloads nil "log-view" "vc/log-view.el" (21710 25465 370934 -;;;;;; 43000)) +;;;### (autoloads nil "log-view" "vc/log-view.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -16941,7 +16940,7 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (21710 25465 224934 693000)) +;;;### (autoloads nil "lpr" "lpr.el" (21669 40237 316336 766000)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17036,8 +17035,8 @@ for further customization of the printer command. ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21710 25547 134569 -;;;;;; 521000)) +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -17048,8 +17047,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads nil "lunar" "calendar/lunar.el" (21710 25547 61569 -;;;;;; 846000)) +;;;### (autoloads nil "lunar" "calendar/lunar.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -17063,8 +17062,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21710 25547 -;;;;;; 184569 298000)) +;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17074,7 +17073,7 @@ A major mode to edit m4 macro files. ;;;*** -;;;### (autoloads nil "macros" "macros.el" (21710 25465 224934 693000)) +;;;### (autoloads nil "macros" "macros.el" (21669 40237 316336 766000)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17163,8 +17162,8 @@ and then select the region of un-tablified names and use ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21710 25465 -;;;;;; 226934 684000)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17194,8 +17193,8 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;*** -;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21710 25465 -;;;;;; 226934 684000)) +;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17224,8 +17223,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21710 25465 -;;;;;; 226934 684000)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17299,8 +17298,8 @@ matches may be returned from the message body. ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21710 25465 -;;;;;; 226934 684000)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17349,8 +17348,8 @@ double-quotes. ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21710 25465 -;;;;;; 226934 684000)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17403,8 +17402,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any. ;;;*** -;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21710 25465 -;;;;;; 226934 684000)) +;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -17416,8 +17415,8 @@ The mail client is taken to be the handler of mailto URLs. ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21710 -;;;;;; 25465 321934 261000)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17534,8 +17533,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (21710 25465 230934 -;;;;;; 667000)) +;;;### (autoloads nil "makesum" "makesum.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -17546,7 +17545,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads nil "man" "man.el" (21710 25547 136569 512000)) +;;;### (autoloads nil "man" "man.el" (21669 40237 316336 766000)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17600,7 +17599,7 @@ Default bookmark handler for Man buffers. ;;;*** -;;;### (autoloads nil "master" "master.el" (21710 25465 230934 667000)) +;;;### (autoloads nil "master" "master.el" (21669 40237 316336 766000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) @@ -17623,8 +17622,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads nil "mb-depth" "mb-depth.el" (21710 25465 230934 -;;;;;; 667000)) +;;;### (autoloads nil "mb-depth" "mb-depth.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -17651,14 +17650,14 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "md4" "md4.el" (21710 25465 230934 667000)) +;;;### (autoloads nil "md4" "md4.el" (21669 40237 316336 766000)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21710 25547 111569 -;;;;;; 623000)) +;;;### (autoloads nil "message" "gnus/message.el" (21706 9418 86773 +;;;;;; 130000)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -17823,8 +17822,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21710 -;;;;;; 25465 321934 261000)) +;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) @@ -17840,8 +17839,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (21710 25465 -;;;;;; 226934 684000)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17884,8 +17883,8 @@ redisplayed as output is inserted. ;;;*** -;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21710 25465 234934 -;;;;;; 649000)) +;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -17975,7 +17974,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21710 25547 138569 503000)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21669 40237 316336 766000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -17992,8 +17991,8 @@ Display version information about MH-E and the MH mail handling system. ;;;*** -;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21710 25465 -;;;;;; 235934 644000)) +;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18074,8 +18073,8 @@ perform the operation on all messages in that region. ;;;*** -;;;### (autoloads nil "midnight" "midnight.el" (21710 25465 238934 -;;;;;; 631000)) +;;;### (autoloads nil "midnight" "midnight.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -18101,8 +18100,8 @@ to its second argument TM. ;;;*** -;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21710 25465 -;;;;;; 238934 631000)) +;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18131,7 +18130,7 @@ is modified to remove the default indication. ;;;*** -;;;### (autoloads nil "misc" "misc.el" (21710 25465 239934 627000)) +;;;### (autoloads nil "misc" "misc.el" (21669 40237 316336 766000)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18159,8 +18158,8 @@ The return value is always nil. ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (21710 25547 139569 -;;;;;; 498000)) +;;;### (autoloads nil "misearch" "misearch.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18241,8 +18240,8 @@ whose file names match the specified wildcard. ;;;*** -;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21710 -;;;;;; 25465 322934 257000)) +;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) @@ -18253,8 +18252,8 @@ Major mode for the mixal asm language. ;;;*** -;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21710 25465 -;;;;;; 183934 876000)) +;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/mm-encode.el (autoload 'mm-default-file-encoding "mm-encode" "\ @@ -18264,8 +18263,8 @@ Return a default encoding for FILE. ;;;*** -;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21710 25547 -;;;;;; 112569 619000)) +;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -18283,8 +18282,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21710 25465 -;;;;;; 183934 876000)) +;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -18297,8 +18296,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21710 25547 112569 -;;;;;; 619000)) +;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18314,8 +18313,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21710 25547 112569 -;;;;;; 619000)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18334,7 +18333,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** -;;;### (autoloads nil "mml" "gnus/mml.el" (21710 25547 113569 614000)) +;;;### (autoloads nil "mml" "gnus/mml.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18359,8 +18358,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21710 25547 113569 -;;;;;; 614000)) +;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -18375,8 +18374,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21710 25547 113569 -;;;;;; 614000)) +;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18416,16 +18415,16 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21710 25465 -;;;;;; 101935 242000)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) ;;;*** -;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21710 25465 -;;;;;; 322934 257000)) +;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18458,8 +18457,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (21710 25547 167569 -;;;;;; 373000)) +;;;### (autoloads nil "morse" "play/morse.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18484,8 +18483,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** -;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21710 25465 239934 -;;;;;; 627000)) +;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18532,7 +18531,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21710 25547 140569 494000)) +;;;### (autoloads nil "mpc" "mpc.el" (21669 40237 316336 766000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18542,7 +18541,7 @@ Main entry point for MPC. ;;;*** -;;;### (autoloads nil "mpuz" "play/mpuz.el" (21710 25465 297934 368000)) +;;;### (autoloads nil "mpuz" "play/mpuz.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18552,7 +18551,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21710 25547 140569 494000)) +;;;### (autoloads nil "msb" "msb.el" (21669 40237 316336 766000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18577,8 +18576,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21710 -;;;;;; 25547 124569 565000)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -18710,8 +18709,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (21710 -;;;;;; 25547 124569 565000)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -18842,8 +18841,8 @@ per-character basis, this may not be accurate. ;;;*** -;;;### (autoloads nil "net-utils" "net/net-utils.el" (21710 25465 -;;;;;; 244934 604000)) +;;;### (autoloads nil "net-utils" "net/net-utils.el" (21679 50887 +;;;;;; 336751 696000)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -18937,8 +18936,8 @@ Open a network connection to HOST on PORT. ;;;*** -;;;### (autoloads nil "netrc" "net/netrc.el" (21710 25465 244934 -;;;;;; 604000)) +;;;### (autoloads nil "netrc" "net/netrc.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -18950,8 +18949,8 @@ listed in the PORTS list. ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (21710 -;;;;;; 25547 143569 481000)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (21716 +;;;;;; 45255 735319 375000)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19044,8 +19043,8 @@ a greeting from the server. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21710 -;;;;;; 25547 144569 476000)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19067,7 +19066,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (21710 25547 144569 476000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19077,8 +19076,8 @@ Start newsticker plainview. ;;;*** -;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21710 -;;;;;; 25547 144569 476000)) +;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -19088,8 +19087,8 @@ Start reading news. You may want to bind this to a key. ;;;*** -;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21710 -;;;;;; 25547 145569 472000)) +;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -19109,8 +19108,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21710 -;;;;;; 25547 145569 472000)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19120,15 +19119,15 @@ Start newsticker treeview. ;;;*** -;;;### (autoloads nil "newsticker" "net/newsticker.el" (21710 25547 -;;;;;; 145569 472000)) +;;;### (autoloads nil "newsticker" "net/newsticker.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/newsticker.el (push (purecopy '(newsticker 1 99)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21710 25465 185934 -;;;;;; 867000)) +;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19138,8 +19137,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21710 25465 185934 -;;;;;; 867000)) +;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -19153,8 +19152,8 @@ symbol in the alist. ;;;*** -;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21710 25547 -;;;;;; 114569 610000)) +;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -19165,7 +19164,7 @@ This command does not work if you use short group names. ;;;*** -;;;### (autoloads nil "nnml" "gnus/nnml.el" (21710 25465 188934 854000)) +;;;### (autoloads nil "nnml" "gnus/nnml.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19175,7 +19174,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21710 25465 254934 560000)) +;;;### (autoloads nil "novice" "novice.el" (21669 40237 316336 766000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19207,8 +19206,8 @@ future sessions. ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21710 -;;;;;; 25465 352934 123000)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19222,14 +19221,14 @@ closing requests for requests that are used in matched pairs. ;;;*** -;;;### (autoloads nil "ntlm" "net/ntlm.el" (21710 25547 146569 467000)) +;;;### (autoloads nil "ntlm" "net/ntlm.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21710 25465 -;;;;;; 254934 560000)) +;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19241,8 +19240,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21710 25547 -;;;;;; 150569 450000)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19302,8 +19301,8 @@ Many aspects this mode can be customized using ;;;*** -;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21710 25465 -;;;;;; 255934 555000)) +;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -19315,8 +19314,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21710 25547 -;;;;;; 185569 293000)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19353,8 +19352,8 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21710 25547 -;;;;;; 185569 293000)) +;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/opascal.el (define-obsolete-function-alias 'delphi-mode 'opascal-mode "24.4") @@ -19389,7 +19388,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (21710 25547 163569 392000)) +;;;### (autoloads nil "org" "org/org.el" (21669 40237 316336 766000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19610,8 +19609,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21710 25465 -;;;;;; 277934 457000)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -19884,8 +19883,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (21710 25465 -;;;;;; 278934 453000)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -19927,8 +19926,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (21710 25465 -;;;;;; 278934 453000)) +;;;### (autoloads nil "org-colview" "org/org-colview.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from org/org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -19991,8 +19990,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21710 25547 -;;;;;; 157569 418000)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -20002,8 +20001,8 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (21710 25465 281934 -;;;;;; 439000)) +;;;### (autoloads nil "org-macs" "org/org-macs.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from org/org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -20013,8 +20012,8 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** -;;;### (autoloads nil "org-version" "org/org-version.el" (21710 25465 -;;;;;; 284934 426000)) +;;;### (autoloads nil "org-version" "org/org-version.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from org/org-version.el (autoload 'org-release "org-version" "\ @@ -20031,8 +20030,8 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21710 25547 165569 -;;;;;; 382000)) +;;;### (autoloads nil "outline" "outline.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20093,8 +20092,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21710 25547 -;;;;;; 84569 744000)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21676 11899 +;;;;;; 256354 520000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20166,7 +20165,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads nil "paren" "paren.el" (21710 25547 165569 382000)) +;;;### (autoloads nil "paren" "paren.el" (21669 40237 316336 766000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20192,8 +20191,8 @@ matching parenthesis is highlighted in `show-paren-style' after ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21710 -;;;;;; 25547 61569 846000)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20206,8 +20205,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21710 25465 -;;;;;; 323934 252000)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20256,8 +20255,8 @@ See also the user variables `pascal-type-keywords', `pascal-start-keywords' and ;;;*** -;;;### (autoloads nil "password-cache" "password-cache.el" (21710 -;;;;;; 25465 293934 386000)) +;;;### (autoloads nil "password-cache" "password-cache.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20278,8 +20277,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21710 25547 -;;;;;; 84569 744000)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20340,8 +20339,8 @@ of the form (UPAT EXP). ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21710 25465 293934 -;;;;;; 386000)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20351,8 +20350,8 @@ Completion rules for the `cvs' command. ;;;*** -;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21710 25547 165569 -;;;;;; 382000)) +;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20379,8 +20378,8 @@ Completion for the GNU tar utility. ;;;*** -;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21710 25465 -;;;;;; 293934 386000)) +;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20400,8 +20399,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21710 25465 293934 -;;;;;; 386000)) +;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20411,8 +20410,8 @@ Completion for the `rpm' command. ;;;*** -;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21710 25465 293934 -;;;;;; 386000)) +;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20467,8 +20466,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21710 25465 293934 -;;;;;; 386000)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20492,8 +20491,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (21710 25465 293934 -;;;;;; 386000)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (21689 338 694604 +;;;;;; 955000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20550,7 +20549,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21710 25465 371934 38000)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -20625,8 +20624,8 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21710 25465 -;;;;;; 370934 43000)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ @@ -20634,8 +20633,8 @@ Global menu used by PCL-CVS.") ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21710 -;;;;;; 25547 185569 293000)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20696,8 +20695,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21710 25465 -;;;;;; 352934 123000)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -20777,8 +20776,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "plstore" "gnus/plstore.el" (21710 25465 190934 -;;;;;; 845000)) +;;;### (autoloads nil "plstore" "gnus/plstore.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -20793,8 +20792,8 @@ Major mode for editing PLSTORE files. ;;;*** -;;;### (autoloads nil "po" "textmodes/po.el" (21710 25465 352934 -;;;;;; 123000)) +;;;### (autoloads nil "po" "textmodes/po.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -20805,7 +20804,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads nil "pong" "play/pong.el" (21710 25465 297934 368000)) +;;;### (autoloads nil "pong" "play/pong.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -20821,7 +20820,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21710 25547 117569 596000)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -20832,8 +20831,8 @@ Use streaming commands. ;;;*** -;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21710 25547 84569 -;;;;;; 744000)) +;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -20883,8 +20882,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (21710 25547 168569 -;;;;;; 369000)) +;;;### (autoloads nil "printing" "printing.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21472,7 +21471,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (21710 25547 168569 369000)) +;;;### (autoloads nil "proced" "proced.el" (21669 40237 316336 766000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21490,8 +21489,8 @@ Proced buffers. ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (21710 25465 299934 -;;;;;; 359000)) +;;;### (autoloads nil "profiler" "profiler.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21519,8 +21518,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21710 25547 -;;;;;; 186569 289000)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21553,7 +21552,7 @@ With prefix argument ARG, restart the Prolog process if running before. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21710 25465 334934 203000)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21669 40237 826337 297000)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ @@ -21564,8 +21563,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21710 25547 -;;;;;; 186569 289000)) +;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) @@ -21612,8 +21611,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (21710 25547 197569 -;;;;;; 240000)) +;;;### (autoloads nil "ps-print" "ps-print.el" (21670 36217 165621 +;;;;;; 979000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -21810,17 +21809,17 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (21710 25547 64569 -;;;;;; 833000)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21710 25547 -;;;;;; 187569 284000)) +;;;### (autoloads nil "python" "progmodes/python.el" (21737 51412 +;;;;;; 646766 605000)) ;;; Generated autoloads from progmodes/python.el -(push (purecopy '(python 0 24 4)) package--builtin-versions) +(push (purecopy '(python 0 24 5)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) @@ -21852,7 +21851,7 @@ Major mode for editing Python files. ;;;*** -;;;### (autoloads nil "qp" "gnus/qp.el" (21710 25465 190934 845000)) +;;;### (autoloads nil "qp" "gnus/qp.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -21871,8 +21870,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (21710 25547 -;;;;;; 125569 561000)) +;;;### (autoloads nil "quail" "international/quail.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22102,8 +22101,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21710 -;;;;;; 25465 220934 711000)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22116,7 +22115,7 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'. ;;;*** ;;;### (autoloads nil "quail/uni-input" "leim/quail/uni-input.el" -;;;;;; (21710 25465 223934 698000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from leim/quail/uni-input.el (autoload 'ucs-input-activate "quail/uni-input" "\ @@ -22130,8 +22129,8 @@ While this input method is active, the variable ;;;*** -;;;### (autoloads nil "quickurl" "net/quickurl.el" (21710 25465 247934 -;;;;;; 591000)) +;;;### (autoloads nil "quickurl" "net/quickurl.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -22202,8 +22201,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21710 25547 146569 -;;;;;; 467000)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22241,8 +22240,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21710 -;;;;;; 25465 135935 90000)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22260,8 +22259,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (21710 25465 336934 -;;;;;; 194000)) +;;;### (autoloads nil "recentf" "recentf.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22287,7 +22286,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21710 25547 197569 240000)) +;;;### (autoloads nil "rect" "rect.el" (21669 40237 826337 297000)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22427,8 +22426,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "refill" "textmodes/refill.el" (21710 25465 -;;;;;; 353934 118000)) +;;;### (autoloads nil "refill" "textmodes/refill.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -22448,8 +22447,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21710 25547 -;;;;;; 212569 173000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21704 54100 +;;;;;; 244617 275000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -22498,8 +22497,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21710 -;;;;;; 25547 209569 186000)) +;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload 'reftex-citation "reftex-cite" "\ @@ -22529,7 +22528,7 @@ While entering the regexp, completion on knows citation keys is possible. ;;;*** ;;;### (autoloads nil "reftex-global" "textmodes/reftex-global.el" -;;;;;; (21710 25547 209569 186000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload 'reftex-isearch-minor-mode "reftex-global" "\ @@ -22546,7 +22545,7 @@ With no argument, this command toggles ;;;*** ;;;### (autoloads nil "reftex-index" "textmodes/reftex-index.el" -;;;;;; (21710 25547 210569 182000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload 'reftex-index-phrases-mode "reftex-index" "\ @@ -22579,7 +22578,7 @@ Here are all local bindings. ;;;*** ;;;### (autoloads nil "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (21710 25547 210569 182000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload 'reftex-all-document-files "reftex-parse" "\ @@ -22591,8 +22590,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21710 -;;;;;; 25547 211569 177000)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21707 +;;;;;; 30279 916059 915000)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22601,8 +22600,8 @@ of master file. ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21710 -;;;;;; 25547 84569 744000)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22631,15 +22630,15 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21710 25465 136935 -;;;;;; 86000)) +;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (21710 25547 -;;;;;; 213569 169000)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -22693,7 +22692,7 @@ to turn the *scratch* buffer into your notes buffer. ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (21710 25465 336934 194000)) +;;;### (autoloads nil "repeat" "repeat.el" (21669 40237 826337 297000)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -22716,8 +22715,8 @@ recently executed command not bound to an input event\". ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (21710 25465 -;;;;;; 226934 684000)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -22748,8 +22747,8 @@ mail-sending package is used for editing and sending the message. ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (21710 25465 337934 -;;;;;; 190000)) +;;;### (autoloads nil "reposition" "reposition.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -22775,7 +22774,7 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads nil "reveal" "reveal.el" (21710 25547 197569 240000)) +;;;### (autoloads nil "reveal" "reveal.el" (21669 40237 826337 297000)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -22810,8 +22809,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21710 25465 136935 -;;;;;; 86000)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -22826,8 +22825,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (21710 25465 247934 -;;;;;; 591000)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -22871,8 +22870,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21710 25547 135569 -;;;;;; 516000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21670 36217 165621 +;;;;;; 979000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23069,8 +23068,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21710 25465 -;;;;;; 228934 676000)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23134,8 +23133,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21710 25465 -;;;;;; 255934 555000)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23146,8 +23145,8 @@ Return a pattern. ;;;*** -;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21710 25465 -;;;;;; 255934 555000)) +;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23159,8 +23158,8 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil. ;;;*** -;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21710 25465 -;;;;;; 256934 551000)) +;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23190,8 +23189,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21710 25465 256934 -;;;;;; 551000)) +;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23218,8 +23217,8 @@ must be equal. ;;;*** -;;;### (autoloads nil "robin" "international/robin.el" (21710 25465 -;;;;;; 203934 787000)) +;;;### (autoloads nil "robin" "international/robin.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -23251,7 +23250,7 @@ Start using robin package NAME, which is a string. ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (21710 25465 337934 190000)) +;;;### (autoloads nil "rot13" "rot13.el" (21669 40237 826337 297000)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23288,8 +23287,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21710 25547 213569 -;;;;;; 169000)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23319,8 +23318,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21710 -;;;;;; 25547 188569 280000)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23337,8 +23336,8 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21710 25547 198569 -;;;;;; 235000)) +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23356,8 +23355,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21710 25465 136935 -;;;;;; 86000)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -23668,15 +23667,15 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21710 25465 -;;;;;; 248934 587000)) +;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21710 25547 198569 -;;;;;; 235000)) +;;;### (autoloads nil "savehist" "savehist.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -23708,8 +23707,8 @@ histories, which is probably undesirable. ;;;*** -;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21710 25547 -;;;;;; 188569 280000)) +;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -23748,8 +23747,8 @@ that variable's value is a string. ;;;*** -;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21710 25465 -;;;;;; 190934 845000)) +;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -23762,8 +23761,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (21710 25547 198569 -;;;;;; 235000)) +;;;### (autoloads nil "scroll-all" "scroll-all.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23788,8 +23787,8 @@ one window apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21710 25465 -;;;;;; 337934 190000)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -23805,16 +23804,16 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (21710 25465 248934 -;;;;;; 587000)) +;;;### (autoloads nil "secrets" "net/secrets.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) ;;;*** -;;;### (autoloads nil "semantic" "cedet/semantic.el" (21710 25547 -;;;;;; 64569 833000)) +;;;### (autoloads nil "semantic" "cedet/semantic.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) @@ -23872,7 +23871,7 @@ Semantic mode. ;;;*** ;;;### (autoloads nil "semantic/bovine/grammar" "cedet/semantic/bovine/grammar.el" -;;;;;; (21710 25547 65569 828000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from cedet/semantic/bovine/grammar.el (autoload 'bovine-grammar-mode "semantic/bovine/grammar" "\ @@ -23883,7 +23882,7 @@ Major mode for editing Bovine grammars. ;;;*** ;;;### (autoloads nil "semantic/wisent/grammar" "cedet/semantic/wisent/grammar.el" -;;;;;; (21710 25465 113935 188000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from cedet/semantic/wisent/grammar.el (autoload 'wisent-grammar-mode "semantic/wisent/grammar" "\ @@ -23893,8 +23892,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21710 25465 -;;;;;; 229934 671000)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24175,7 +24174,7 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "server" "server.el" (21710 25547 198569 235000)) +;;;### (autoloads nil "server" "server.el" (21669 40237 826337 297000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24242,7 +24241,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21710 25547 199569 231000)) +;;;### (autoloads nil "ses" "ses.el" (21669 40237 826337 297000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24286,8 +24285,8 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21710 -;;;;;; 25547 214569 164000)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24352,8 +24351,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21710 -;;;;;; 25547 188569 280000)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21676 +;;;;;; 11881 756047 924000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24416,8 +24415,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21710 25465 -;;;;;; 136935 86000)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24466,8 +24465,8 @@ function, `load-path-shadows-find'. ;;;*** -;;;### (autoloads nil "shadowfile" "shadowfile.el" (21710 25465 339934 -;;;;;; 181000)) +;;;### (autoloads nil "shadowfile" "shadowfile.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -24505,7 +24504,7 @@ Set up file shadowing. ;;;*** -;;;### (autoloads nil "shell" "shell.el" (21710 25547 199569 231000)) +;;;### (autoloads nil "shell" "shell.el" (21669 40237 826337 297000)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24553,7 +24552,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21710 25547 147569 463000)) +;;;### (autoloads nil "shr" "net/shr.el" (21669 40237 316336 766000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24570,8 +24569,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (21710 25465 191934 -;;;;;; 841000)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24596,8 +24595,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21710 25465 -;;;;;; 191934 841000)) +;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -24612,8 +24611,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simula" "progmodes/simula.el" (21710 25465 -;;;;;; 326934 239000)) +;;;### (autoloads nil "simula" "progmodes/simula.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -24661,8 +24660,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21710 25547 201569 -;;;;;; 222000)) +;;;### (autoloads nil "skeleton" "skeleton.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -24780,8 +24779,8 @@ symmetrical ones, and the same character twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21710 25547 -;;;;;; 220569 137000)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -24808,8 +24807,8 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** -;;;### (autoloads nil "smiley" "gnus/smiley.el" (21710 25465 191934 -;;;;;; 841000)) +;;;### (autoloads nil "smiley" "gnus/smiley.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -24826,8 +24825,8 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** -;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21710 25547 -;;;;;; 136569 512000)) +;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -24842,8 +24841,8 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads nil "snake" "play/snake.el" (21710 25465 297934 -;;;;;; 368000)) +;;;### (autoloads nil "snake" "play/snake.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -24866,8 +24865,8 @@ Snake mode keybindings: ;;;*** -;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21710 25465 -;;;;;; 248934 587000)) +;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -24896,8 +24895,8 @@ then `snmpv2-mode-hook'. ;;;*** -;;;### (autoloads nil "solar" "calendar/solar.el" (21710 25465 95935 -;;;;;; 269000)) +;;;### (autoloads nil "solar" "calendar/solar.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -24912,8 +24911,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "solitaire" "play/solitaire.el" (21710 25465 -;;;;;; 297934 368000)) +;;;### (autoloads nil "solitaire" "play/solitaire.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -24988,7 +24987,7 @@ Pick your favorite shortcuts: ;;;*** -;;;### (autoloads nil "sort" "sort.el" (21710 25465 341934 172000)) +;;;### (autoloads nil "sort" "sort.el" (21669 40237 826337 297000)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25163,7 +25162,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (21710 25547 118569 592000)) +;;;### (autoloads nil "spam" "gnus/spam.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25177,8 +25176,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21710 -;;;;;; 25465 191934 841000)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25220,8 +25219,8 @@ Spam reports will be queued with the method used when ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (21710 25547 202569 -;;;;;; 218000)) +;;;### (autoloads nil "speedbar" "speedbar.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25245,8 +25244,8 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (21710 25465 297934 -;;;;;; 368000)) +;;;### (autoloads nil "spook" "play/spook.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25261,8 +25260,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21710 25547 189569 -;;;;;; 276000)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 4)) package--builtin-versions) @@ -25723,15 +25722,15 @@ buffer. ;;;*** -;;;### (autoloads nil "srecode" "cedet/srecode.el" (21710 25465 113935 -;;;;;; 188000)) +;;;### (autoloads nil "srecode" "cedet/srecode.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (21710 25547 69569 810000)) +;;;;;; (21669 40236 816336 299000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -25743,8 +25742,8 @@ Major-mode for writing SRecode macros. ;;;*** -;;;### (autoloads nil "starttls" "gnus/starttls.el" (21710 25465 -;;;;;; 192934 836000)) +;;;### (autoloads nil "starttls" "gnus/starttls.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -25767,8 +25766,8 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21710 25465 343934 -;;;;;; 163000)) +;;;### (autoloads nil "strokes" "strokes.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -25881,8 +25880,8 @@ Read a complex stroke and insert its glyph into the current buffer. ;;;*** -;;;### (autoloads nil "studly" "play/studly.el" (21710 25465 297934 -;;;;;; 368000)) +;;;### (autoloads nil "studly" "play/studly.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/studly.el (autoload 'studlify-region "studly" "\ @@ -25902,8 +25901,8 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (21710 25547 -;;;;;; 189569 276000)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from progmodes/subword.el (autoload 'subword-mode "subword" "\ @@ -25997,8 +25996,8 @@ See `superword-mode' for more information on Superword mode. ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (21710 25465 -;;;;;; 229934 671000)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -26030,8 +26029,8 @@ and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (21710 25465 344934 -;;;;;; 158000)) +;;;### (autoloads nil "t-mouse" "t-mouse.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -26059,7 +26058,7 @@ It relies on the `gpm' daemon being activated. ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (21710 25465 344934 158000)) +;;;### (autoloads nil "tabify" "tabify.el" (21669 40237 826337 297000)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -26088,8 +26087,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (21710 25465 358934 -;;;;;; 96000)) +;;;### (autoloads nil "table" "textmodes/table.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -26681,7 +26680,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads nil "talk" "talk.el" (21710 25465 344934 158000)) +;;;### (autoloads nil "talk" "talk.el" (21669 40237 826337 297000)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -26696,8 +26695,8 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (21710 25547 204569 -;;;;;; 209000)) +;;;### (autoloads nil "tar-mode" "tar-mode.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -26720,8 +26719,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21710 25465 328934 -;;;;;; 230000)) +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -26769,8 +26768,8 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (21710 25465 249934 -;;;;;; 582000)) +;;;### (autoloads nil "telnet" "net/telnet.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/telnet.el (autoload 'telnet "telnet" "\ @@ -26795,7 +26794,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21710 25547 205569 204000)) +;;;### (autoloads nil "term" "term.el" (21669 40237 826337 297000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -26837,8 +26836,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21710 -;;;;;; 25465 137935 81000)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -26848,8 +26847,8 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads nil "tetris" "play/tetris.el" (21710 25465 297934 -;;;;;; 368000)) +;;;### (autoloads nil "tetris" "play/tetris.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) @@ -26874,8 +26873,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21710 25547 -;;;;;; 214569 164000)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27176,8 +27175,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21710 25465 -;;;;;; 360934 87000)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27216,8 +27215,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21710 25465 -;;;;;; 360934 87000)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27301,8 +27300,8 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads nil "thai-util" "language/thai-util.el" (21710 -;;;;;; 25465 211934 751000)) +;;;### (autoloads nil "thai-util" "language/thai-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27329,8 +27328,8 @@ Compose Thai characters in the current buffer. ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (21710 25465 361934 -;;;;;; 83000)) +;;;### (autoloads nil "thingatpt" "thingatpt.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27394,7 +27393,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21710 25465 361934 83000)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21669 40237 826337 297000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27428,8 +27427,8 @@ In dired, call the setroot program on the image at point. ;;;*** -;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21710 -;;;;;; 25465 212934 747000)) +;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -27502,8 +27501,8 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21710 25547 -;;;;;; 215569 160000)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from textmodes/tildify.el (push (purecopy '(tildify 4 5)) package--builtin-versions) @@ -27527,7 +27526,7 @@ This function performs no refilling of the changed text. ;;;*** -;;;### (autoloads nil "time" "time.el" (21710 25465 361934 83000)) +;;;### (autoloads nil "time" "time.el" (21669 40237 826337 297000)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -27589,8 +27588,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21710 -;;;;;; 25547 61569 846000)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27701,8 +27700,8 @@ This function does not work for SECONDS greater than `most-positive-fixnum'. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (21710 25465 361934 -;;;;;; 83000)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -27742,8 +27741,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21710 -;;;;;; 25547 61569 846000)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -27853,7 +27852,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (21710 25465 204934 783000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -27875,7 +27874,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (21710 25547 215569 160000)) +;;;### (autoloads nil "tmm" "tmm.el" (21669 40237 826337 297000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27917,8 +27916,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21710 -;;;;;; 25465 96935 264000)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21715 +;;;;;; 24393 407468 552000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -27985,8 +27984,8 @@ Mode for displaying and reprioritizing top priority Todo. ;;;*** -;;;### (autoloads nil "tool-bar" "tool-bar.el" (21710 25465 362934 -;;;;;; 78000)) +;;;### (autoloads nil "tool-bar" "tool-bar.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -28056,8 +28055,8 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21710 25465 137935 -;;;;;; 81000)) +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -28070,8 +28069,8 @@ to a tcp server on another machine. ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21710 25465 -;;;;;; 137935 81000)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -28116,8 +28115,8 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21713 24233 279494 -;;;;;; 843000)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21712 48204 744664 +;;;;;; 78000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28232,8 +28231,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21710 25465 -;;;;;; 250934 578000)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28243,8 +28242,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21710 25465 362934 -;;;;;; 78000)) +;;;### (autoloads nil "tutorial" "tutorial.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28268,8 +28267,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "tv-util" "language/tv-util.el" (21710 25465 -;;;;;; 212934 747000)) +;;;### (autoloads nil "tv-util" "language/tv-util.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from language/tv-util.el (autoload 'tai-viet-composition-function "tv-util" "\ @@ -28279,8 +28278,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21710 -;;;;;; 25465 361934 83000)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28327,8 +28326,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (21710 25547 216569 -;;;;;; 155000)) +;;;### (autoloads nil "type-break" "type-break.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28460,7 +28459,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (21710 25465 230934 667000)) +;;;### (autoloads nil "uce" "mail/uce.el" (21669 40237 316336 766000)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -28474,7 +28473,7 @@ You might need to set `uce-mail-reader' before using this. ;;;*** ;;;### (autoloads nil "ucs-normalize" "international/ucs-normalize.el" -;;;;;; (21710 25465 204934 783000)) +;;;;;; (21669 40237 316336 766000)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -28539,8 +28538,8 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus. ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (21710 -;;;;;; 25465 361934 83000)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28560,8 +28559,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21710 25465 230934 -;;;;;; 667000)) +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -28581,8 +28580,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use. ;;;*** -;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21710 25465 -;;;;;; 137935 81000)) +;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21669 40236 +;;;;;; 816336 299000)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -28594,7 +28593,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (21710 25547 217569 151000)) +;;;### (autoloads nil "url" "url/url.el" (21669 40237 826337 297000)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -28641,8 +28640,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (21710 25465 363934 -;;;;;; 74000)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -28683,8 +28682,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** -;;;### (autoloads nil "url-cache" "url/url-cache.el" (21710 25547 -;;;;;; 216569 155000)) +;;;### (autoloads nil "url-cache" "url/url-cache.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -28705,8 +28704,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-cid" "url/url-cid.el" (21710 25465 363934 -;;;;;; 74000)) +;;;### (autoloads nil "url-cid" "url/url-cid.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -28716,8 +28715,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-dav" "url/url-dav.el" (21710 25547 216569 -;;;;;; 155000)) +;;;### (autoloads nil "url-dav" "url/url-dav.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -28751,8 +28750,8 @@ added to this list, so most requests can just pass in nil. ;;;*** -;;;### (autoloads nil "url-file" "url/url-file.el" (21710 25465 364934 -;;;;;; 69000)) +;;;### (autoloads nil "url-file" "url/url-file.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -28762,8 +28761,8 @@ Handle file: and ftp: URLs. ;;;*** -;;;### (autoloads nil "url-gw" "url/url-gw.el" (21710 25547 217569 -;;;;;; 151000)) +;;;### (autoloads nil "url-gw" "url/url-gw.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -28781,8 +28780,8 @@ Might do a non-blocking connection; use `process-status' to check. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21710 -;;;;;; 25547 217569 151000)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28836,8 +28835,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (21710 25547 217569 -;;;;;; 151000)) +;;;### (autoloads nil "url-http" "url/url-http.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -28849,8 +28848,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-irc" "url/url-irc.el" (21710 25465 365934 -;;;;;; 65000)) +;;;### (autoloads nil "url-irc" "url/url-irc.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -28860,8 +28859,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21710 25465 365934 -;;;;;; 65000)) +;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -28874,8 +28873,8 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** -;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21710 25465 -;;;;;; 365934 65000)) +;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -28890,8 +28889,8 @@ Handle the mailto: URL syntax. ;;;*** -;;;### (autoloads nil "url-misc" "url/url-misc.el" (21710 25465 365934 -;;;;;; 65000)) +;;;### (autoloads nil "url-misc" "url/url-misc.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -28922,8 +28921,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-news" "url/url-news.el" (21710 25465 365934 -;;;;;; 65000)) +;;;### (autoloads nil "url-news" "url/url-news.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -28938,8 +28937,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-ns" "url/url-ns.el" (21710 25465 365934 -;;;;;; 65000)) +;;;### (autoloads nil "url-ns" "url/url-ns.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -28979,8 +28978,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-parse" "url/url-parse.el" (21710 25465 -;;;;;; 365934 65000)) +;;;### (autoloads nil "url-parse" "url/url-parse.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -29031,8 +29030,8 @@ parses to ;;;*** -;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21710 25465 -;;;;;; 365934 65000)) +;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -29042,8 +29041,8 @@ Setup variables that expose info about you and your system. ;;;*** -;;;### (autoloads nil "url-queue" "url/url-queue.el" (21710 25547 -;;;;;; 217569 151000)) +;;;### (autoloads nil "url-queue" "url/url-queue.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -29057,8 +29056,8 @@ The variable `url-queue-timeout' sets a timeout. ;;;*** -;;;### (autoloads nil "url-util" "url/url-util.el" (21710 25547 217569 -;;;;;; 151000)) +;;;### (autoloads nil "url-util" "url/url-util.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29226,8 +29225,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21710 25465 366934 -;;;;;; 60000)) +;;;### (autoloads nil "userlock" "userlock.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29255,8 +29254,8 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (21710 25465 -;;;;;; 204934 783000)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29281,7 +29280,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf7" "gnus/utf7.el" (21710 25465 192934 836000)) +;;;### (autoloads nil "utf7" "gnus/utf7.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29291,8 +29290,8 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;*** -;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21710 25465 -;;;;;; 230934 667000)) +;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21669 40237 +;;;;;; 316336 766000)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29316,7 +29315,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (21710 25547 224569 119000)) +;;;### (autoloads nil "vc" "vc/vc.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29601,8 +29600,8 @@ Return the branch part of a revision number REV. ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21710 25547 -;;;;;; 220569 137000)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21669 40237 +;;;;;; 826337 297000)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29639,8 +29638,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21710 25547 221569 -;;;;;; 133000)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29650,8 +29649,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21710 25547 221569 -;;;;;; 133000)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -29667,8 +29666,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21710 25547 221569 -;;;;;; 133000)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -29679,8 +29678,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21710 25547 221569 -;;;;;; 133000)) +;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -29704,8 +29703,8 @@ These are the commands available for use in the file status buffer: ;;;*** -;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21710 -;;;;;; 25547 222569 128000)) +;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -29728,8 +29727,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21710 25547 222569 -;;;;;; 128000)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -29740,7 +29739,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21710 25547 222569 128000)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21669 40237 826337 297000)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -29751,8 +29750,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21710 25547 223569 -;;;;;; 124000)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -29768,8 +29767,8 @@ Name of the monotone directory's format file.") ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21710 25547 223569 -;;;;;; 124000)) +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -29782,8 +29781,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21710 25547 223569 -;;;;;; 124000)) +;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -29801,8 +29800,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21710 25547 223569 -;;;;;; 124000)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29815,8 +29814,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21710 -;;;;;; 25547 190569 271000)) +;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/vera-mode.el (push (purecopy '(vera-mode 2 28)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -29875,7 +29874,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21710 25547 192569 262000)) +;;;;;; (21669 40237 826337 297000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30014,8 +30013,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21710 -;;;;;; 25547 195569 249000)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -30569,8 +30568,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "viet-util" "language/viet-util.el" (21710 -;;;;;; 25465 212934 747000)) +;;;### (autoloads nil "viet-util" "language/viet-util.el" (21669 +;;;;;; 40237 316336 766000)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -30614,7 +30613,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics. ;;;*** -;;;### (autoloads nil "view" "view.el" (21710 25465 376934 16000)) +;;;### (autoloads nil "view" "view.el" (21669 40237 826337 297000)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -30870,8 +30869,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "viper" "emulation/viper.el" (21710 25465 141935 -;;;;;; 64000)) +;;;### (autoloads nil "viper" "emulation/viper.el" (21669 40236 816336 +;;;;;; 299000)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) @@ -30888,8 +30887,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21710 -;;;;;; 25465 138935 77000)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21669 +;;;;;; 40236 816336 299000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -30979,7 +30978,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (21710 25465 377934 11000)) +;;;### (autoloads nil "wdired" "wdired.el" (21669 40237 826337 297000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -30997,8 +30996,8 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads nil "webjump" "net/webjump.el" (21710 25465 253934 -;;;;;; 564000)) +;;;### (autoloads nil "webjump" "net/webjump.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -31014,8 +31013,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21710 -;;;;;; 25547 195569 249000)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21669 +;;;;;; 40237 826337 297000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31045,8 +31044,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21710 25547 225569 -;;;;;; 115000)) +;;;### (autoloads nil "whitespace" "whitespace.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31445,8 +31444,8 @@ cleaning up these problems. ;;;*** -;;;### (autoloads nil "wid-browse" "wid-browse.el" (21710 25465 377934 -;;;;;; 11000)) +;;;### (autoloads nil "wid-browse" "wid-browse.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -31474,8 +31473,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21710 25547 226569 -;;;;;; 111000)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31517,8 +31516,8 @@ Setup current buffer so editing string widgets works. ;;;*** -;;;### (autoloads nil "windmove" "windmove.el" (21710 25465 378934 -;;;;;; 7000)) +;;;### (autoloads nil "windmove" "windmove.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -31570,7 +31569,7 @@ Default MODIFIER is 'shift. ;;;*** -;;;### (autoloads nil "winner" "winner.el" (21710 25547 227569 106000)) +;;;### (autoloads nil "winner" "winner.el" (21669 40237 826337 297000)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -31593,7 +31592,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21710 25547 228569 102000)) +;;;### (autoloads nil "woman" "woman.el" (21669 40237 826337 297000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31642,7 +31641,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (21710 25465 380933 998000)) +;;;### (autoloads nil "xml" "xml.el" (21669 40237 826337 297000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -31698,8 +31697,8 @@ Both features can be combined by providing a cons cell ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21710 25465 256934 -;;;;;; 551000)) +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21669 40237 316336 +;;;;;; 766000)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -31717,8 +31716,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21710 25547 228569 -;;;;;; 102000)) +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21669 40237 826337 +;;;;;; 297000)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -31747,7 +31746,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** -;;;### (autoloads nil "yenc" "gnus/yenc.el" (21710 25465 192934 836000)) +;;;### (autoloads nil "yenc" "gnus/yenc.el" (21669 40237 316336 766000)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -31762,7 +31761,7 @@ Extract file name from an yenc header. ;;;*** -;;;### (autoloads nil "zone" "play/zone.el" (21710 25465 297934 368000)) +;;;### (autoloads nil "zone" "play/zone.el" (21669 40237 316336 766000)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -31807,16 +31806,14 @@ Zone out, completely. ;;;;;; "cedet/ede/util.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" ;;;;;; "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el" ;;;;;; "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el" -;;;;;; "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el" -;;;;;; "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el" -;;;;;; "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el" -;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el" -;;;;;; "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el" -;;;;;; "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el" -;;;;;; "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el" -;;;;;; "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el" -;;;;;; "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el" -;;;;;; "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" +;;;;;; "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el" +;;;;;; "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el" +;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm.el" +;;;;;; "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" +;;;;;; "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el" +;;;;;; "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" +;;;;;; "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el" +;;;;;; "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" ;;;;;; "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el" ;;;;;; "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el" ;;;;;; "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el" @@ -31834,42 +31831,39 @@ Zone out, completely. ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" -;;;;;; "cedet/semantic/wisent/javat-wy.el" "cedet/semantic/wisent/js-wy.el" -;;;;;; "cedet/semantic/wisent/python-wy.el" "cedet/semantic/wisent/python.el" -;;;;;; "cedet/semantic/wisent/wisent.el" "cedet/srecode/args.el" -;;;;;; "cedet/srecode/compile.el" "cedet/srecode/cpp.el" "cedet/srecode/ctxt.el" -;;;;;; "cedet/srecode/dictionary.el" "cedet/srecode/document.el" +;;;;;; "cedet/semantic/wisent/python.el" "cedet/semantic/wisent/wisent.el" +;;;;;; "cedet/srecode/args.el" "cedet/srecode/compile.el" "cedet/srecode/cpp.el" +;;;;;; "cedet/srecode/ctxt.el" "cedet/srecode/dictionary.el" "cedet/srecode/document.el" ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" ;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" -;;;;;; "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" -;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" -;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el" -;;;;;; "dos-w32.el" "dynamic-setting.el" "emacs-lisp/authors.el" -;;;;;; "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" -;;;;;; "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" -;;;;;; "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-custom.el" -;;;;;; "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-opt.el" -;;;;;; "emacs-lisp/eieio-speedbar.el" "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" -;;;;;; "emacs-lisp/package-x.el" "emacs-lisp/smie.el" "emacs-lisp/subr-x.el" -;;;;;; "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el" -;;;;;; "emulation/cua-gmrk.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el" -;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/viper-cmd.el" -;;;;;; "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el" -;;;;;; "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el" -;;;;;; "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el" -;;;;;; "erc/erc-lang.el" "eshell/em-alias.el" "eshell/em-banner.el" -;;;;;; "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el" -;;;;;; "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el" -;;;;;; "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el" -;;;;;; "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el" -;;;;;; "eshell/em-tramp.el" "eshell/em-unix.el" "eshell/em-xtra.el" -;;;;;; "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el" -;;;;;; "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el" -;;;;;; "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el" -;;;;;; "ezimage.el" "format-spec.el" "fringe.el" "generic-x.el" -;;;;;; "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" +;;;;;; "cedet/srecode/srt.el" "cedet/srecode/table.el" "cedet/srecode/template.el" +;;;;;; "cedet/srecode/texi.el" "cus-dep.el" "dframe.el" "dired-aux.el" +;;;;;; "dired-x.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "dynamic-setting.el" +;;;;;; "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" +;;;;;; "emacs-lisp/byte-opt.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" +;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" +;;;;;; "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el" +;;;;;; "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el" +;;;;;; "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" +;;;;;; "emacs-lisp/smie.el" "emacs-lisp/subr-x.el" "emacs-lisp/tcover-ses.el" +;;;;;; "emacs-lisp/tcover-unsafep.el" "emulation/cua-gmrk.el" "emulation/edt-lk201.el" +;;;;;; "emulation/edt-mapper.el" "emulation/edt-pc.el" "emulation/edt-vt100.el" +;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el" +;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el" +;;;;;; "emulation/viper-util.el" "erc/erc-backend.el" "erc/erc-goodies.el" +;;;;;; "erc/erc-ibuffer.el" "erc/erc-lang.el" "eshell/em-alias.el" +;;;;;; "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el" +;;;;;; "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el" +;;;;;; "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el" +;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" +;;;;;; "eshell/em-term.el" "eshell/em-tramp.el" "eshell/em-unix.el" +;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" +;;;;;; "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-module.el" +;;;;;; "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el" +;;;;;; "eshell/esh-var.el" "ezimage.el" "format-spec.el" "fringe.el" +;;;;;; "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" ;;;;;; "gnus/gnus-cite.el" "gnus/gnus-cus.el" "gnus/gnus-demon.el" ;;;;;; "gnus/gnus-dup.el" "gnus/gnus-eform.el" "gnus/gnus-ems.el" ;;;;;; "gnus/gnus-icalendar.el" "gnus/gnus-int.el" "gnus/gnus-logic.el" @@ -31892,15 +31886,8 @@ Zone out, completely. ;;;;;; "gnus/spam-wash.el" "hex-util.el" "hfy-cmap.el" "ibuf-ext.el" ;;;;;; "international/cp51932.el" "international/eucjp-ms.el" "international/fontset.el" ;;;;;; "international/iso-ascii.el" "international/ja-dic-cnv.el" -;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "international/uni-bidi.el" -;;;;;; "international/uni-category.el" "international/uni-combining.el" -;;;;;; "international/uni-comment.el" "international/uni-decimal.el" -;;;;;; "international/uni-decomposition.el" "international/uni-digit.el" -;;;;;; "international/uni-lowercase.el" "international/uni-mirrored.el" -;;;;;; "international/uni-name.el" "international/uni-numeric.el" -;;;;;; "international/uni-old-name.el" "international/uni-titlecase.el" -;;;;;; "international/uni-uppercase.el" "kermit.el" "language/hanja-util.el" -;;;;;; "language/thai-word.el" "ldefs-boot.el" "leim/ja-dic/ja-dic.el" +;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "kermit.el" +;;;;;; "language/hanja-util.el" "language/thai-word.el" "ldefs-boot.el" ;;;;;; "leim/quail/arabic.el" "leim/quail/croatian.el" "leim/quail/cyril-jis.el" ;;;;;; "leim/quail/cyrillic.el" "leim/quail/czech.el" "leim/quail/ethiopic.el" ;;;;;; "leim/quail/georgian.el" "leim/quail/greek.el" "leim/quail/hanja-jis.el" @@ -31988,8 +31975,8 @@ Zone out, completely. ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21713 25981 85824 -;;;;;; 32000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21747 1197 271747 +;;;;;; 619000)) ;;;*** From 7f9b037245ddb662ad98685e429a2498ae6b7c62 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 1 Mar 2015 17:51:31 +0100 Subject: [PATCH 196/457] Fix problems found by vc-tests.el * vc/vc-hooks.el (vc-state, vc-working-revision): Use `vc-responsible-backend' in order to support unregistered files. * vc/vc-rcs.el (vc-rcs-fetch-master-state): * vc/vc-sccs.el (vc-sccs-working-revision): Handle undefined master name. * vc/vc-rcs.el (vc-rcs-unregister): Support unregistered files. * vc/vc-src.el (vc-src-working-revision): Do not return an empty string. --- lisp/ChangeLog | 13 ++++ lisp/vc/vc-hooks.el | 4 +- lisp/vc/vc-rcs.el | 164 ++++++++++++++++++++++---------------------- lisp/vc/vc-sccs.el | 15 ++-- lisp/vc/vc-src.el | 8 +-- 5 files changed, 110 insertions(+), 94 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1bcc4f11912..3a8cfb98e8f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2015-03-01 Michael Albinus + + * vc/vc-hooks.el (vc-state, vc-working-revision): + Use `vc-responsible-backend' in order to support unregistered files. + + * vc/vc-rcs.el (vc-rcs-unregister): Support unregistered files. + + * vc/vc-rcs.el (vc-rcs-fetch-master-state): + * vc/vc-sccs.el (vc-sccs-working-revision): Handle undefined + master name. + + * vc/vc-src.el (vc-src-working-revision): Do not return an empty string. + 2015-03-01 Lars Magne Ingebrigtsen * net/shr.el (shr-insert): Remove soft hyphens. diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 7801f4f8ed9..251fecb49c0 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -476,7 +476,7 @@ status of this file. Otherwise, the value returned is one of: ;; - `copied' and `moved' (might be handled by `removed' and `added') (or (vc-file-getprop file 'vc-state) (when (> (length file) 0) ;Why?? --Stef - (setq backend (or backend (vc-backend file))) + (setq backend (or backend (vc-responsible-backend file))) (when backend (vc-state-refresh file backend))))) @@ -495,7 +495,7 @@ status of this file. Otherwise, the value returned is one of: If FILE is not registered, this function always returns nil." (or (vc-file-getprop file 'vc-working-revision) (progn - (setq backend (or backend (vc-backend file))) + (setq backend (or backend (vc-responsible-backend file))) (when backend (vc-file-setprop file 'vc-working-revision (vc-call-backend backend 'working-revision file)))))) diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index d575530c98b..8aedc00269d 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -288,20 +288,21 @@ to the RCS command." "Unregister FILE from RCS. If this leaves the RCS subdirectory empty, ask the user whether to remove it." - (let* ((master (vc-master-name file)) - (dir (file-name-directory master)) - (backup-info (find-backup-file-name master))) - (if (not backup-info) - (delete-file master) - (rename-file master (car backup-info) 'ok-if-already-exists) - (dolist (f (cdr backup-info)) (ignore-errors (delete-file f)))) - (and (string= (file-name-nondirectory (directory-file-name dir)) "RCS") - ;; check whether RCS dir is empty, i.e. it does not - ;; contain any files except "." and ".." - (not (directory-files dir nil - "^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*")) - (yes-or-no-p (format "Directory %s is empty; remove it? " dir)) - (delete-directory dir)))) + (unless (memq (vc-state file) '(nil unregistered)) + (let* ((master (vc-master-name file)) + (dir (file-name-directory master)) + (backup-info (find-backup-file-name master))) + (if (not backup-info) + (delete-file master) + (rename-file master (car backup-info) 'ok-if-already-exists) + (dolist (f (cdr backup-info)) (ignore-errors (delete-file f)))) + (and (string= (file-name-nondirectory (directory-file-name dir)) "RCS") + ;; check whether RCS dir is empty, i.e. it does not + ;; contain any files except "." and ".." + (not (directory-files dir nil + "^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*")) + (yes-or-no-p (format "Directory %s is empty; remove it? " dir)) + (delete-directory dir))))) ;; It used to be possible to pass in a value for the variable rev, but ;; nothing in the rest of VC used this capability. Removing it makes the @@ -971,74 +972,75 @@ otherwise determine the workfile version based on the master file. This function sets the properties `vc-working-revision' and `vc-checkout-model' to their correct values, based on the master file." - (with-temp-buffer - (if (or (not (vc-insert-file (vc-master-name file) "^[0-9]")) - (progn (goto-char (point-min)) - (not (looking-at "^head[ \t\n]+[^;]+;$")))) - (error "File %s is not an RCS master file" (vc-master-name file))) - (let ((workfile-is-latest nil) - (default-branch (vc-parse-buffer "^branch[ \t\n]+\\([^;]*\\);" 1))) - (vc-file-setprop file 'vc-rcs-default-branch default-branch) - (unless working-revision - ;; Workfile version not known yet. Determine that first. It - ;; is either the head of the trunk, the head of the default - ;; branch, or the "default branch" itself, if that is a full - ;; revision number. - (cond - ;; no default branch - ((or (not default-branch) (string= "" default-branch)) - (setq working-revision - (vc-parse-buffer "^head[ \t\n]+\\([^;]+\\);" 1)) - (setq workfile-is-latest t)) - ;; default branch is actually a revision - ((string-match "^[0-9]+\\.[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*$" - default-branch) - (setq working-revision default-branch)) - ;; else, search for the head of the default branch - (t (vc-insert-file (vc-master-name file) "^desc") + (when (and (file-regular-p file) (vc-master-name file)) + (with-temp-buffer + (if (or (not (vc-insert-file (vc-master-name file) "^[0-9]")) + (progn (goto-char (point-min)) + (not (looking-at "^head[ \t\n]+[^;]+;$")))) + (error "File %s is not an RCS master file" (vc-master-name file))) + (let ((workfile-is-latest nil) + (default-branch (vc-parse-buffer "^branch[ \t\n]+\\([^;]*\\);" 1))) + (vc-file-setprop file 'vc-rcs-default-branch default-branch) + (unless working-revision + ;; Workfile version not known yet. Determine that first. It + ;; is either the head of the trunk, the head of the default + ;; branch, or the "default branch" itself, if that is a full + ;; revision number. + (cond + ;; no default branch + ((or (not default-branch) (string= "" default-branch)) (setq working-revision - (vc-rcs-find-most-recent-rev default-branch)) - (setq workfile-is-latest t))) - (vc-file-setprop file 'vc-working-revision working-revision)) - ;; Check strict locking - (goto-char (point-min)) - (vc-file-setprop file 'vc-checkout-model - (if (re-search-forward ";[ \t\n]*strict;" nil t) - 'locking 'implicit)) - ;; Compute state of workfile version - (goto-char (point-min)) - (let ((locking-user - (vc-parse-buffer (concat "^locks[ \t\n]+[^;]*[ \t\n]+\\([^:]+\\):" - (regexp-quote working-revision) - "[^0-9.]") - 1))) - (cond - ;; not locked - ((not locking-user) - (if (or workfile-is-latest - (vc-rcs-latest-on-branch-p file working-revision)) - ;; workfile version is latest on branch - 'up-to-date - ;; workfile version is not latest on branch - 'needs-update)) - ;; locked by the calling user - ((and (stringp locking-user) - (string= locking-user (vc-user-login-name file))) - ;; Don't call `vc-rcs-checkout-model' to avoid inf-looping. - (if (or (eq (vc-file-getprop file 'vc-checkout-model) 'locking) - workfile-is-latest - (vc-rcs-latest-on-branch-p file working-revision)) - 'edited - ;; Locking is not used for the file, but the owner does - ;; have a lock, and there is a higher version on the current - ;; branch. Not sure if this can occur, and if it is right - ;; to use `needs-merge' in this case. - 'needs-merge)) - ;; locked by somebody else - ((stringp locking-user) - locking-user) - (t - (error "Error getting state of RCS file"))))))) + (vc-parse-buffer "^head[ \t\n]+\\([^;]+\\);" 1)) + (setq workfile-is-latest t)) + ;; default branch is actually a revision + ((string-match "^[0-9]+\\.[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*$" + default-branch) + (setq working-revision default-branch)) + ;; else, search for the head of the default branch + (t (vc-insert-file (vc-master-name file) "^desc") + (setq working-revision + (vc-rcs-find-most-recent-rev default-branch)) + (setq workfile-is-latest t))) + (vc-file-setprop file 'vc-working-revision working-revision)) + ;; Check strict locking + (goto-char (point-min)) + (vc-file-setprop file 'vc-checkout-model + (if (re-search-forward ";[ \t\n]*strict;" nil t) + 'locking 'implicit)) + ;; Compute state of workfile version + (goto-char (point-min)) + (let ((locking-user + (vc-parse-buffer (concat "^locks[ \t\n]+[^;]*[ \t\n]+\\([^:]+\\):" + (regexp-quote working-revision) + "[^0-9.]") + 1))) + (cond + ;; not locked + ((not locking-user) + (if (or workfile-is-latest + (vc-rcs-latest-on-branch-p file working-revision)) + ;; workfile version is latest on branch + 'up-to-date + ;; workfile version is not latest on branch + 'needs-update)) + ;; locked by the calling user + ((and (stringp locking-user) + (string= locking-user (vc-user-login-name file))) + ;; Don't call `vc-rcs-checkout-model' to avoid inf-looping. + (if (or (eq (vc-file-getprop file 'vc-checkout-model) 'locking) + workfile-is-latest + (vc-rcs-latest-on-branch-p file working-revision)) + 'edited + ;; Locking is not used for the file, but the owner does + ;; have a lock, and there is a higher version on the current + ;; branch. Not sure if this can occur, and if it is right + ;; to use `needs-merge' in this case. + 'needs-merge)) + ;; locked by somebody else + ((stringp locking-user) + locking-user) + (t + (error "Error getting state of RCS file")))))))) (defun vc-rcs-consult-headers (file) "Search for RCS headers in FILE, and set properties accordingly. diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 1b959e22e23..8d8d9e844ed 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -149,13 +149,14 @@ For a description of possible values, see `vc-check-master-templates'." (defun vc-sccs-working-revision (file) "SCCS-specific version of `vc-working-revision'." - (with-temp-buffer - ;; The working revision is always the latest revision number. - ;; To find this number, search the entire delta table, - ;; rather than just the first entry, because the - ;; first entry might be a deleted ("R") revision. - (vc-insert-file (vc-master-name file) "^\001e\n\001[^s]") - (vc-parse-buffer "^\001d D \\([^ ]+\\)" 1))) + (when (and (file-regular-p file) (vc-master-name file)) + (with-temp-buffer + ;; The working revision is always the latest revision number. + ;; To find this number, search the entire delta table, + ;; rather than just the first entry, because the + ;; first entry might be a deleted ("R") revision. + (vc-insert-file (vc-master-name file) "^\001e\n\001[^s]") + (vc-parse-buffer "^\001d D \\([^ ]+\\)" 1)))) ;; Cf vc-sccs-find-revision. (defun vc-sccs-write-revision (file outfile &optional rev) diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index f497f951005..d9aa1b13e88 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -200,10 +200,10 @@ This function differs from vc-do-command in that it invokes `vc-src-program'." (defun vc-src-working-revision (file) "SRC-specific version of `vc-working-revision'." - (or (ignore-errors - (with-output-to-string - (vc-src-command standard-output file "list" "-f{1}" "@"))) - "0")) + (let ((result (ignore-errors + (with-output-to-string + (vc-src-command standard-output file "list" "-f{1}" "@"))))) + (if (zerop (length result)) "0" result))) ;;; ;;; State-changing functions From 992f8fad978690c1aa981193d67c2f96271b890f Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 1 Mar 2015 18:05:19 +0100 Subject: [PATCH 197/457] Extend vc-tests.el * automated/vc-tests.el (vc-test--create-repo): Add check for `vc-responsible-backend'. (vc-test--register): Do not print a message when unsupported. (vc-test--state, vc-test--working-revision): Rework. Raise no error in case of inconsistent result, but document everything. (vc-test--checkout-model): New defun. (vc-test-*-checkout-model): New tests. --- test/ChangeLog | 10 ++ test/automated/vc-tests.el | 248 +++++++++++++++++++++++++++++-------- 2 files changed, 205 insertions(+), 53 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index ff3042e8cbf..cf1b2c13d7e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,13 @@ +2015-03-01 Michael Albinus + + * automated/vc-tests.el (vc-test--create-repo): Add check for + `vc-responsible-backend'. + (vc-test--register): Do not print a message when unsupported. + (vc-test--state, vc-test--working-revision): Rework. Raise no + error in case of inconsistent result, but document everything. + (vc-test--checkout-model): New defun. + (vc-test-*-checkout-model): New tests. + 2015-02-26 Fabián Ezequiel Gallina * automated/python-tests.el diff --git a/test/automated/vc-tests.el b/test/automated/vc-tests.el index 4d9aefad7fb..44f25728447 100644 --- a/test/automated/vc-tests.el +++ b/test/automated/vc-tests.el @@ -27,29 +27,29 @@ ;; BACKEND PROPERTIES ;; -;; * revision-granularity +;; * revision-granularity DONE ;; STATE-QUERYING FUNCTIONS ;; -;; * registered (file) -;; * state (file) +;; * registered (file) DONE +;; * state (file) DONE ;; - dir-status (dir update-function) ;; - dir-status-files (dir files default-state update-function) ;; - dir-extra-headers (dir) ;; - dir-printer (fileinfo) ;; - status-fileinfo-extra (file) -;; * working-revision (file) +;; * working-revision (file) DONE ;; - latest-on-branch-p (file) -;; * checkout-model (files) +;; * checkout-model (files) DONE ;; - mode-line-string (file) ;; STATE-CHANGING FUNCTIONS ;; -;; * create-repo (backend) -;; * register (files &optional comment) +;; * create-repo (backend) DONE +;; * register (files &optional comment) DONE ;; - responsible-p (file) ;; - receive-file (file rev) -;; - unregister (file) +;; - unregister (file) DONE ;; * checkin (files comment) ;; * find-revision (file rev buffer) ;; * checkout (file &optional rev) @@ -178,12 +178,13 @@ For backends which dont support it, it is emulated." ;; Check the revision granularity. (should (memq (vc-test--revision-granularity-function backend) - '(file repository))) + '(file repository))) ;; Create empty repository. (make-directory default-directory) (should (file-directory-p default-directory)) - (vc-test--create-repo-function backend)) + (vc-test--create-repo-function backend) + (should (eq (vc-responsible-backend default-directory) backend))) ;; Save exit. (ignore-errors (run-hooks 'vc-test--cleanup-hook))))) @@ -229,8 +230,7 @@ For backends which dont support it, `vc-not-supported' is signalled." (write-region "bla" nil tmp-name2 nil 'nomessage) (should (file-exists-p tmp-name2)) (should-not (vc-registered tmp-name2)) - (vc-register - (list backend (list tmp-name1 tmp-name2))) + (vc-register (list backend (list tmp-name1 tmp-name2))) (should (file-exists-p tmp-name1)) (should (vc-registered tmp-name1)) (should (file-exists-p tmp-name2)) @@ -244,15 +244,14 @@ For backends which dont support it, `vc-not-supported' is signalled." (vc-test--unregister-function backend tmp-name2) (should-not (vc-registered tmp-name2))) ;; CVS, SVN, SCCS, SRC and Mtn are not supported. - (vc-not-supported (message "%s" (error-message-string err)))) + (vc-not-supported t)) + ;; The files shall still exist. (should (file-exists-p tmp-name1)) (should (file-exists-p tmp-name2)))) ;; Save exit. (ignore-errors (run-hooks 'vc-test--cleanup-hook))))) -;; `vc-state' returns different results for different backends. So we -;; don't check with `should', but print the results for analysis. (defun vc-test--state (backend) "Check the different states of a file." @@ -261,7 +260,7 @@ For backends which dont support it, `vc-not-supported' is signalled." (file-name-as-directory (expand-file-name (make-temp-name "vc-test") temporary-file-directory))) - vc-test--cleanup-hook errors) + vc-test--cleanup-hook) (unwind-protect (progn @@ -270,36 +269,64 @@ For backends which dont support it, `vc-not-supported' is signalled." 'vc-test--cleanup-hook `(lambda () (delete-directory ,default-directory 'recursive))) - ;; Create empty repository. + ;; Create empty repository. Check repository state. (make-directory default-directory) (vc-test--create-repo-function backend) - (message "%s" (vc-state default-directory backend)) - ;(should (eq (vc-state default-directory backend) 'up-to-date)) + ;; nil: Hg Mtn RCS + ;; added: Git + ;; unregistered: CVS SCCS SRC + ;; up-to-date: Bzr SVN + (should (eq (vc-state default-directory) + (vc-state default-directory backend))) + (should (memq (vc-state default-directory) + '(nil added unregistered up-to-date))) (let ((tmp-name (expand-file-name "foo" default-directory))) - ;; Check for initial state. - (message "%s" (vc-state tmp-name backend)) - ;(should (eq (vc-state tmp-name backend) 'unregistered)) + ;; Check state of an empty file. - ;; Write a new file. Check for state. + ;; nil: Hg Mtn SRC SVN + ;; added: Git + ;; unregistered: RCS SCCS + ;; up-to-date: Bzr CVS + (should (eq (vc-state tmp-name) (vc-state tmp-name backend))) + (should (memq (vc-state tmp-name) + '(nil added unregistered up-to-date))) + + ;; Write a new file. Check state. (write-region "foo" nil tmp-name nil 'nomessage) - (message "%s" (vc-state tmp-name backend)) - ;(should (eq (vc-state tmp-name backend) 'unregistered)) - ;; Register a file. Check for state. + ;; nil: Mtn + ;; added: Git + ;; unregistered: Hg RCS SCCS SRC SVN + ;; up-to-date: Bzr CVS + (should (eq (vc-state tmp-name) (vc-state tmp-name backend))) + (should (memq (vc-state tmp-name) + '(nil added unregistered up-to-date))) + + ;; Register a file. Check state. (vc-register (list backend (list (file-name-nondirectory tmp-name)))) - (message "%s" (vc-state tmp-name backend)) - ;(should (eq (vc-state tmp-name backend) 'added)) - ;; Unregister the file. Check for state. + ;; added: Git Mtn + ;; unregistered: Hg RCS SCCS SRC SVN + ;; up-to-date: Bzr CVS + (should (eq (vc-state tmp-name) (vc-state tmp-name backend))) + (should (memq (vc-state tmp-name) '(added unregistered up-to-date))) + + ;; Unregister the file. Check state. (condition-case nil (progn (vc-test--unregister-function backend tmp-name) - (message "%s" (vc-state tmp-name backend)) - );(should (eq (vc-state tmp-name backend) 'unregistered))) - (vc-not-supported (message "%s" 'unsupported))))) + + ;; added: Git + ;; unregistered: Hg + ;; unsupported: CVS Mtn SCCS SRC SVN + ;; up-to-date: Bzr + (should (eq (vc-state tmp-name) (vc-state tmp-name backend))) + (should (memq (vc-state tmp-name) + '(added unregistered up-to-date)))) + (vc-not-supported t)))) ;; Save exit. (ignore-errors (run-hooks 'vc-test--cleanup-hook))))) @@ -312,7 +339,7 @@ For backends which dont support it, `vc-not-supported' is signalled." (file-name-as-directory (expand-file-name (make-temp-name "vc-test") temporary-file-directory))) - vc-test--cleanup-hook errors) + vc-test--cleanup-hook) (unwind-protect (progn @@ -321,40 +348,141 @@ For backends which dont support it, `vc-not-supported' is signalled." 'vc-test--cleanup-hook `(lambda () (delete-directory ,default-directory 'recursive))) - ;; Create empty repository. + ;; Create empty repository. Check working revision of + ;; repository, should be nil. (make-directory default-directory) (vc-test--create-repo-function backend) + ;; nil: CVS Mtn RCS SCCS + ;; "0": Bzr Hg SRC SVN + ;; "master": Git + (should (eq (vc-working-revision default-directory) + (vc-working-revision default-directory backend))) (should (member - (vc-working-revision default-directory backend) '("0" "master"))) + (vc-working-revision default-directory) '(nil "0" "master"))) (let ((tmp-name (expand-file-name "foo" default-directory))) - ;; Check for initial state, should be nil until it's registered. - ;; Don't pass the backend explicitly, otherwise some - ;; implementations return non-nil. - (should (null (vc-working-revision tmp-name))) + ;; Check initial working revision, should be nil until + ;; it's registered. - ;; Write a new file. Check state. + ;; nil: CVS Mtn RCS SCCS SVN + ;; "0": Bzr Hg SRC + ;; "master": Git + (should (eq (vc-working-revision tmp-name) + (vc-working-revision tmp-name backend))) + (should + (member (vc-working-revision tmp-name) '(nil "0" "master"))) + + ;; Write a new file. Check working revision. (write-region "foo" nil tmp-name nil 'nomessage) - (should (null (vc-working-revision tmp-name))) - ;; Register a file. Check for state. + ;; nil: CVS Mtn RCS SCCS SVN + ;; "0": Bzr Hg SRC + ;; "master": Git + (should (eq (vc-working-revision tmp-name) + (vc-working-revision tmp-name backend))) + (should + (member (vc-working-revision tmp-name) '(nil "0" "master"))) + + ;; Register a file. Check working revision. (vc-register (list backend (list (file-name-nondirectory tmp-name)))) - ;; FIXME: Don't pass the backend. Emacs should be able to - ;; figure it out. - (should - (member (vc-working-revision tmp-name backend) '("0" "master"))) - ;; Unregister the file. Check for working-revision. + ;; nil: Mtn RCS SCCS + ;; "0": Bzr CVS Hg SRC SVN + ;; "master": Git + (should (eq (vc-working-revision tmp-name) + (vc-working-revision tmp-name backend))) + (should + (member (vc-working-revision tmp-name) '(nil "0" "master"))) + + ;; Unregister the file. Check working revision. (condition-case nil (progn (vc-test--unregister-function backend tmp-name) + + ;; nil: RCS + ;; "0": Bzr Hg + ;; "master": Git + ;; unsupported: CVS Mtn SCCS SRC SVN + (should (eq (vc-working-revision tmp-name) + (vc-working-revision tmp-name backend))) (should (member - (vc-working-revision tmp-name backend) '("0" "master")))) - (vc-not-supported (message "%s" 'unsupported))))) + (vc-working-revision tmp-name) '(nil "0" "master")))) + (vc-not-supported t)))) + + ;; Save exit. + (ignore-errors (run-hooks 'vc-test--cleanup-hook))))) + +(defun vc-test--checkout-model (backend) + "Check the checkout model of a repository." + + (let ((vc-handled-backends `(,backend)) + (default-directory + (file-name-as-directory + (expand-file-name + (make-temp-name "vc-test") temporary-file-directory))) + vc-test--cleanup-hook) + + (unwind-protect + (progn + ;; Cleanup. + (add-hook + 'vc-test--cleanup-hook + `(lambda () (delete-directory ,default-directory 'recursive))) + + ;; Create empty repository. Check repository checkout model. + (make-directory default-directory) + (vc-test--create-repo-function backend) + + ;; Surprisingly, none of the backends returns 'announce. + ;; nil: RCS + ;; implicit: Bzr CVS Git Hg Mtn SRC SVN + ;; locking: SCCS + (should (memq (vc-checkout-model backend default-directory) + '(announce implicit locking))) + + (let ((tmp-name (expand-file-name "foo" default-directory))) + ;; Check checkout model of an empty file. + + ;; nil: RCS + ;; implicit: Bzr CVS Git Hg Mtn SRC SVN + ;; locking: SCCS + (should (memq (vc-checkout-model backend tmp-name) + '(announce implicit locking))) + + ;; Write a new file. Check checkout model. + (write-region "foo" nil tmp-name nil 'nomessage) + + ;; nil: RCS + ;; implicit: Bzr CVS Git Hg Mtn SRC SVN + ;; locking: SCCS + (should (memq (vc-checkout-model backend tmp-name) + '(announce implicit locking))) + + ;; Register a file. Check checkout model. + (vc-register + (list backend (list (file-name-nondirectory tmp-name)))) + + ;; nil: RCS + ;; implicit: Bzr CVS Git Hg Mtn SRC SVN + ;; locking: SCCS + (should (memq (vc-checkout-model backend tmp-name) + '(announce implicit locking))) + + ;; Unregister the file. Check checkout model. + (condition-case nil + (progn + (vc-test--unregister-function backend tmp-name) + + ;; nil: RCS + ;; implicit: Bzr Git Hg + ;; unsupported: CVS Mtn SCCS SRC SVN + (should (memq (vc-checkout-model backend tmp-name) + '(announce implicit locking)))) + (vc-not-supported t)))) ;; Save exit. (ignore-errors (run-hooks 'vc-test--cleanup-hook))))) @@ -394,11 +522,11 @@ For backends which dont support it, `vc-not-supported' is signalled." (defun vc-test--mtn-enabled () (executable-find vc-mtn-program)) +;; Obsoleted. (defvar vc-arch-program) (defun vc-test--arch-enabled () (executable-find vc-arch-program)) - ;; There are too many failed test cases yet. We suppress them on hydra. (if (getenv "NIX_STORE") (ert-deftest vc-test () @@ -415,7 +543,8 @@ For backends which dont support it, `vc-not-supported' is signalled." (ert-deftest ,(intern (format "vc-test-%s00-create-repo" backend-string)) () - ,(format "Check `vc-create-repo' for the %s backend." backend-string) + ,(format "Check `vc-create-repo' for the %s backend." + backend-string) (vc-test--create-repo ',backend)) (ert-deftest @@ -444,14 +573,27 @@ For backends which dont support it, `vc-not-supported' is signalled." (ert-deftest ,(intern (format "vc-test-%s03-working-revision" backend-string)) () - ,(format "Check `vc-working-revision' for the %s backend." backend-string) + ,(format "Check `vc-working-revision' for the %s backend." + backend-string) (skip-unless (ert-test-passed-p (ert-test-most-recent-result (ert-get-test ',(intern (format "vc-test-%s01-register" backend-string)))))) - (vc-test--working-revision ',backend))))))) + (vc-test--working-revision ',backend)) + + (ert-deftest + ,(intern (format "vc-test-%s04-checkout-model" backend-string)) () + ,(format "Check `vc-checkout-model' for the %s backend." + backend-string) + (skip-unless + (ert-test-passed-p + (ert-test-most-recent-result + (ert-get-test + ',(intern + (format "vc-test-%s01-register" backend-string)))))) + (vc-test--checkout-model ',backend))))))) (provide 'vc-tests) ;;; vc-tests.el ends here From da02eb556a8751c59d5946dec353804bb826c712 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sun, 1 Mar 2015 18:31:28 -0800 Subject: [PATCH 198/457] Add autoload cooking for vc-responsible-backend * lisp/vc/vc.el (vc-responsible-backend): Add autoload cooking for `vc-responsible-backend'. --- lisp/ChangeLog | 5 +++++ lisp/vc/vc.el | 1 + 2 files changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a8cfb98e8f..7ce2e816d45 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-02 Daniel Colascione + + * vc/vc.el (vc-responsible-backend): Add autoload cooking for + `vc-responsible-backend'. + 2015-03-01 Michael Albinus * vc/vc-hooks.el (vc-state, vc-working-revision): diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index e8e8202dbbb..bb4dd607bdd 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -950,6 +950,7 @@ use." (vc-call-backend bk 'create-repo)) (throw 'found bk)))) +;;;###autoload (defun vc-responsible-backend (file) "Return the name of a backend system that is responsible for FILE. From 04fb1029e4fd008e853558a910aa2b2710cf82d7 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Mon, 2 Mar 2015 08:52:22 -0500 Subject: [PATCH 199/457] configure.ac: Error out if with-file-notification=w32 is specified on Cygwin Fixes: 19909 Copyright-paperwork-exempt: yes --- ChangeLog | 5 +++++ configure.ac | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0bfdfbbd8b9..5e5c922fd45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-03-02 Robert Pluim (tiny change) + + * configure.ac: Error out if with-file-notification=w32 is + specified on Cygwin. (Bug#19909) + 2015-02-27 Paul Eggert Don't require GNU putenv diff --git a/configure.ac b/configure.ac index e7408f11ed4..d65494ac675 100644 --- a/configure.ac +++ b/configure.ac @@ -2664,6 +2664,11 @@ fi dnl MS Windows native file monitor is available for mingw32 only. case $with_file_notification,$opsys in + w32,cygwin) + AC_MSG_ERROR([`--with-file-notification=w32' was specified, but + this is only supported on MS-Windows native and MinGW32 builds. + Consider using gfile instead.]) + ;; w32,* | yes,mingw32) AC_CHECK_HEADER(windows.h) if test "$ac_cv_header_windows_h" = yes ; then From b149ecd8aa3aa9c179dd5496f64e1f50750414fa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 2 Mar 2015 13:18:43 -0500 Subject: [PATCH 200/457] # Auto-commit of loaddefs files. --- lisp/ldefs-boot.el | 2597 ++++++++++++++++++++++---------------------- 1 file changed, 1326 insertions(+), 1271 deletions(-) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 8341c380c42..e0f80fe0d64 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3,7 +3,7 @@ ;;; Code: -;;;### (autoloads nil "5x5" "play/5x5.el" (21710 32133 703297 588000)) +;;;### (autoloads nil "5x5" "play/5x5.el" (21670 32331 385639 720000)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -65,8 +65,8 @@ should return a grid vector array that is the new solution. ;;;*** -;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21710 32133 -;;;;;; 713297 640000)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -85,8 +85,8 @@ Ada mode is the major mode for editing Ada code. ;;;*** -;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21710 32133 -;;;;;; 713297 640000)) +;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload 'ada-header "ada-stmt" "\ @@ -96,8 +96,8 @@ Insert a descriptive header at the top of the file. ;;;*** -;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21710 32133 -;;;;;; 714297 645000)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -108,8 +108,8 @@ Completion is available. ;;;*** -;;;### (autoloads nil "add-log" "vc/add-log.el" (21710 32133 814298 -;;;;;; 165000)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -238,8 +238,8 @@ old-style time formats for entries are supported. ;;;*** -;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21710 32133 -;;;;;; 447296 257000)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -374,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) ;;;*** -;;;### (autoloads nil "align" "align.el" (21710 32133 376295 888000)) +;;;### (autoloads nil "align" "align.el" (21670 32330 885624 725000)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -477,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** -;;;### (autoloads nil "allout" "allout.el" (21710 32133 379295 903000)) +;;;### (autoloads nil "allout" "allout.el" (21670 32330 885624 725000)) ;;; Generated autoloads from allout.el (push (purecopy '(allout 2 3)) package--builtin-versions) @@ -837,8 +837,8 @@ for details on preparing Emacs for automatic allout activation. ;;;*** -;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21710 -;;;;;; 32133 377295 893000)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from allout-widgets.el (push (purecopy '(allout-widgets 1 0)) package--builtin-versions) @@ -896,8 +896,8 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** -;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21710 32133 627297 -;;;;;; 192000)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21696 56380 925320 +;;;;;; 624000)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -918,8 +918,8 @@ directory, so that Emacs will know its current contents. ;;;*** -;;;### (autoloads nil "animate" "play/animate.el" (21710 32133 704297 -;;;;;; 593000)) +;;;### (autoloads nil "animate" "play/animate.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -951,8 +951,8 @@ the buffer *Birthday-Present-for-Name*. ;;;*** -;;;### (autoloads nil "ansi-color" "ansi-color.el" (21710 32133 379295 -;;;;;; 903000)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from ansi-color.el (push (purecopy '(ansi-color 3 4 2)) package--builtin-versions) @@ -978,8 +978,8 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** -;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21710 -;;;;;; 32133 715297 650000)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/antlr-mode.el (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions) @@ -1015,8 +1015,8 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;*** -;;;### (autoloads nil "appt" "calendar/appt.el" (21710 32133 399296 -;;;;;; 7000)) +;;;### (autoloads nil "appt" "calendar/appt.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1037,8 +1037,8 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21710 32133 380295 -;;;;;; 908000)) +;;;### (autoloads nil "apropos" "apropos.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1153,8 +1153,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads nil "arc-mode" "arc-mode.el" (21710 32133 380295 -;;;;;; 908000)) +;;;### (autoloads nil "arc-mode" "arc-mode.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1174,7 +1174,7 @@ archive. ;;;*** -;;;### (autoloads nil "array" "array.el" (21710 32133 381295 913000)) +;;;### (autoloads nil "array" "array.el" (21670 32330 885624 725000)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1245,8 +1245,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads nil "artist" "textmodes/artist.el" (21710 32133 -;;;;;; 788298 29000)) +;;;### (autoloads nil "artist" "textmodes/artist.el" (21704 50495 +;;;;;; 455324 752000)) ;;; Generated autoloads from textmodes/artist.el (push (purecopy '(artist 1 2 6)) package--builtin-versions) @@ -1452,8 +1452,8 @@ Keymap summary ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21710 32133 -;;;;;; 715297 650000)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1480,8 +1480,8 @@ Special commands: ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21710 -;;;;;; 32133 514296 605000)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1493,8 +1493,8 @@ let-binding.") ;;;*** -;;;### (autoloads nil "autoarg" "autoarg.el" (21710 32133 381295 -;;;;;; 913000)) +;;;### (autoloads nil "autoarg" "autoarg.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1554,8 +1554,8 @@ This is similar to `autoarg-mode' but rebinds the keypad keys ;;;*** -;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21710 32133 -;;;;;; 715297 650000)) +;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1565,8 +1565,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21710 32133 381295 -;;;;;; 913000)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1604,8 +1604,8 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21710 -;;;;;; 32133 448296 262000)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21673 +;;;;;; 8506 69195 402000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1656,8 +1656,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (21710 32133 381295 -;;;;;; 913000)) +;;;### (autoloads nil "autorevert" "autorevert.el" (21737 47805 354975 +;;;;;; 322000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1745,7 +1745,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (21710 32133 381295 913000)) +;;;### (autoloads nil "avoid" "avoid.el" (21670 32330 885624 725000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1783,8 +1783,8 @@ definition of \"random distance\".) ;;;*** -;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21710 32133 -;;;;;; 715297 650000)) +;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/bat-mode.el (add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode)) @@ -1802,8 +1802,8 @@ Run script using `bat-run' and `bat-run-args'. ;;;*** -;;;### (autoloads nil "battery" "battery.el" (21710 32133 382295 -;;;;;; 919000)) +;;;### (autoloads nil "battery" "battery.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1838,8 +1838,8 @@ seconds. ;;;*** -;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21710 -;;;;;; 32133 448296 262000)) +;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1875,8 +1875,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21710 32133 -;;;;;; 790298 40000)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1968,7 +1968,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'. ;;;*** ;;;### (autoloads nil "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (21710 32133 788298 29000)) +;;;;;; (21670 32331 885635 586000)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1978,8 +1978,8 @@ Major mode for editing BibTeX style files. ;;;*** -;;;### (autoloads nil "binhex" "mail/binhex.el" (21710 32133 599297 -;;;;;; 47000)) +;;;### (autoloads nil "binhex" "mail/binhex.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -2003,8 +2003,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads nil "blackbox" "play/blackbox.el" (21710 32133 -;;;;;; 704297 593000)) +;;;### (autoloads nil "blackbox" "play/blackbox.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2123,8 +2123,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21710 32133 383295 -;;;;;; 924000)) +;;;### (autoloads nil "bookmark" "bookmark.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2317,8 +2317,8 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (21710 32384 -;;;;;; 457601 257000)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (21711 23743 +;;;;;; 625328 319000)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2633,7 +2633,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (21710 32133 383295 924000)) +;;;### (autoloads nil "bs" "bs.el" (21670 32330 885624 725000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2674,8 +2674,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21710 32133 704297 -;;;;;; 593000)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2697,7 +2697,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (21710 32133 715297 650000)) +;;;;;; (21670 32331 385639 720000)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2717,8 +2717,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21710 -;;;;;; 32133 451296 277000)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21729 +;;;;;; 53695 825320 214000)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2838,8 +2838,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21710 -;;;;;; 32133 399296 7000)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2848,8 +2848,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21710 32133 -;;;;;; 400296 12000)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2860,8 +2860,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21710 -;;;;;; 32133 400296 12000)) +;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2873,7 +2873,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (21710 32133 396295 992000)) +;;;### (autoloads nil "calc" "calc/calc.el" (21670 32330 885624 725000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2959,8 +2959,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21710 32133 -;;;;;; 394295 981000)) +;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from calc/calc-undo.el (autoload 'calc-undo "calc-undo" "\ @@ -2970,8 +2970,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21710 32133 399296 -;;;;;; 7000)) +;;;### (autoloads nil "calculator" "calculator.el" (21702 8774 274627 +;;;;;; 813000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2982,8 +2982,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21710 32133 -;;;;;; 403296 28000)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3026,8 +3026,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "canlock" "gnus/canlock.el" (21710 32133 514296 -;;;;;; 605000)) +;;;### (autoloads nil "canlock" "gnus/canlock.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -3044,8 +3044,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21710 -;;;;;; 32133 721297 681000)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21743 +;;;;;; 190 195328 729000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3055,8 +3055,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21710 32133 -;;;;;; 722297 686000)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3154,8 +3154,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21710 32133 -;;;;;; 724297 697000)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21743 190 +;;;;;; 195328 729000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3312,8 +3312,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21710 -;;;;;; 32133 724297 697000)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3364,8 +3364,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21710 32133 -;;;;;; 725297 702000)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3373,8 +3373,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (21710 32133 564296 -;;;;;; 865000)) +;;;### (autoloads nil "ccl" "international/ccl.el" (21682 23484 726747 +;;;;;; 991000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3667,8 +3667,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21710 32133 -;;;;;; 451296 277000)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21716 41663 +;;;;;; 456033 27000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3687,15 +3687,15 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cedet" "cedet/cedet.el" (21710 32133 409296 -;;;;;; 59000)) +;;;### (autoloads nil "cedet" "cedet/cedet.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21710 32133 -;;;;;; 725297 702000)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21695 35516 +;;;;;; 595262 313000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 3)) package--builtin-versions) @@ -3724,15 +3724,15 @@ Choose `cfengine2-mode' or `cfengine3-mode' by buffer contents. ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21710 32133 -;;;;;; 451296 277000)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21679 47292 +;;;;;; 556033 759000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (21710 32133 451296 277000)) +;;;;;; (21742 67 198174 224000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3749,8 +3749,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21710 -;;;;;; 32133 452296 283000)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21733 +;;;;;; 50750 334730 5000)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (push (purecopy '(checkdoc 0 6 2)) package--builtin-versions) (put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp) @@ -3950,8 +3950,8 @@ checking of documentation strings. ;;;*** -;;;### (autoloads nil "china-util" "language/china-util.el" (21710 -;;;;;; 32133 574296 917000)) +;;;### (autoloads nil "china-util" "language/china-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -3988,8 +3988,8 @@ Encode the text in the current buffer to HZ. ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (21710 32133 434296 -;;;;;; 189000)) +;;;### (autoloads nil "chistory" "chistory.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -4028,8 +4028,8 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21710 -;;;;;; 32133 453296 288000)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4112,8 +4112,8 @@ instead. ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21710 32133 -;;;;;; 453296 288000)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21727 11963 +;;;;;; 635339 992000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) @@ -4129,22 +4129,10 @@ printer proceeds to the next function on the list. This variable is not used at present, but it is defined in hopes that a future Emacs interpreter will be able to use it.") -(define-error 'cl-assertion-failed (purecopy "Assertion failed")) - -(autoload 'cl--defsubst-expand "cl-macs") - -(put 'cl-defun 'doc-string-elt 3) - -(put 'cl-defmacro 'doc-string-elt 3) - -(put 'cl-defsubst 'doc-string-elt 3) - -(put 'cl-defstruct 'doc-string-elt 2) - ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21710 32133 -;;;;;; 725297 702000)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4164,8 +4152,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21710 32133 434296 -;;;;;; 189000)) +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4185,7 +4173,7 @@ is run). ;;;*** -;;;### (autoloads nil "color" "color.el" (21710 32133 435296 194000)) +;;;### (autoloads nil "color" "color.el" (21670 32330 885624 725000)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4204,7 +4192,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21710 32133 436296 200000)) +;;;### (autoloads nil "comint" "comint.el" (21740 47646 728890 593000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4305,8 +4293,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21710 32133 -;;;;;; 814298 165000)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4342,8 +4330,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21710 32133 -;;;;;; 726297 707000)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4524,8 +4512,8 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** -;;;### (autoloads nil "completion" "completion.el" (21710 32133 436296 -;;;;;; 200000)) +;;;### (autoloads nil "completion" "completion.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4547,8 +4535,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21710 -;;;;;; 32133 790298 40000)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4703,8 +4691,8 @@ For details see `conf-mode'. Example: ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (21710 32133 704297 -;;;;;; 593000)) +;;;### (autoloads nil "cookie1" "play/cookie1.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4732,8 +4720,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21710 -;;;;;; 32133 455296 298000)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4771,8 +4759,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21710 -;;;;;; 32133 729297 723000)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4970,8 +4958,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21710 32133 729297 -;;;;;; 723000)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4989,8 +4977,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21710 32133 455296 -;;;;;; 298000)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -5016,8 +5004,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21710 32133 -;;;;;; 790298 40000)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21721 59582 +;;;;;; 784612 824000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5033,8 +5021,8 @@ Major mode to edit \"Sassy CSS\" files. ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21710 32133 -;;;;;; 469296 371000)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5079,8 +5067,8 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;*** -;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21710 32133 -;;;;;; 470296 376000)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -5091,8 +5079,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21710 32133 438296 -;;;;;; 210000)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5411,8 +5399,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21710 32133 439296 -;;;;;; 215000)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5445,8 +5433,8 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** -;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21710 32133 -;;;;;; 815298 170000)) +;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5456,8 +5444,8 @@ Mode used for cvs status output. ;;;*** -;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21710 32133 729297 -;;;;;; 723000)) +;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) @@ -5501,8 +5489,8 @@ See `cwarn-mode' for more information on Cwarn mode. ;;;*** -;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21710 -;;;;;; 32133 574296 917000)) +;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5530,8 +5518,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (21710 32133 439296 -;;;;;; 215000)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5577,8 +5565,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21710 32133 -;;;;;; 409296 59000)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5588,7 +5576,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21710 32133 628297 198000)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21743 190 195328 729000)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5601,8 +5589,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21710 32133 -;;;;;; 729297 723000)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5728,8 +5716,8 @@ There is some minimal font-lock support (see vars ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21710 32133 -;;;;;; 455296 298000)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21741 44862 +;;;;;; 355415 471000)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5772,8 +5760,8 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** -;;;### (autoloads nil "decipher" "play/decipher.el" (21710 32133 -;;;;;; 705297 598000)) +;;;### (autoloads nil "decipher" "play/decipher.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5801,8 +5789,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (21710 32133 440296 -;;;;;; 220000)) +;;;### (autoloads nil "delim-col" "delim-col.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5827,7 +5815,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21710 32133 440296 220000)) +;;;### (autoloads nil "delsel" "delsel.el" (21716 41663 456033 27000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5855,8 +5843,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21710 32133 -;;;;;; 456296 304000)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21703 29629 +;;;;;; 608890 826000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5924,8 +5912,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21710 32133 440296 -;;;;;; 220000)) +;;;### (autoloads nil "descr-text" "descr-text.el" (21695 35516 595262 +;;;;;; 313000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5974,8 +5962,8 @@ This function is meant to be used as a value of ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21710 32133 441296 -;;;;;; 225000)) +;;;### (autoloads nil "desktop" "desktop.el" (21732 29888 498897 +;;;;;; 471000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6180,8 +6168,8 @@ Revert to the last loaded desktop. ;;;*** -;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21710 32133 -;;;;;; 514296 605000)) +;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -6213,8 +6201,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21710 -;;;;;; 32133 403296 28000)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6256,7 +6244,7 @@ Major mode for editing the diary file. ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (21710 32133 815298 170000)) +;;;### (autoloads nil "diff" "vc/diff.el" (21670 32331 885635 586000)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6304,8 +6292,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21710 32133 -;;;;;; 815298 170000)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6337,7 +6325,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "dig" "net/dig.el" (21710 32133 628297 198000)) +;;;### (autoloads nil "dig" "net/dig.el" (21670 32331 385639 720000)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6348,7 +6336,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21710 32133 443296 236000)) +;;;### (autoloads nil "dired" "dired.el" (21670 32624 385626 484000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6468,8 +6456,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (21710 32133 444296 -;;;;;; 241000)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6499,8 +6487,8 @@ from `default-directory'. ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21710 32133 -;;;;;; 456296 304000)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6514,8 +6502,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21710 32133 444296 -;;;;;; 241000)) +;;;### (autoloads nil "disp-table" "disp-table.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6636,8 +6624,8 @@ in `.emacs'. ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (21710 32133 -;;;;;; 705297 598000)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6653,7 +6641,7 @@ Default is 2. ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (21710 32133 444296 241000)) +;;;### (autoloads nil "dnd" "dnd.el" (21670 32330 885624 725000)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\ @@ -6673,8 +6661,8 @@ if some action was made, or nil if the URL is ignored.") ;;;*** -;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21710 32133 -;;;;;; 790298 40000)) +;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6697,8 +6685,8 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads nil "doc-view" "doc-view.el" (21710 32133 444296 -;;;;;; 241000)) +;;;### (autoloads nil "doc-view" "doc-view.el" (21716 41663 456033 +;;;;;; 27000)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6744,8 +6732,8 @@ See the command `doc-view-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (21710 32133 705297 -;;;;;; 598000)) +;;;### (autoloads nil "doctor" "play/doctor.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6755,7 +6743,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (21710 32133 445296 246000)) +;;;### (autoloads nil "double" "double.el" (21670 32330 885624 725000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6771,8 +6759,8 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21710 32133 706297 -;;;;;; 603000)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) @@ -6783,8 +6771,8 @@ Switch to *dungeon* buffer and start game. ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21710 -;;;;;; 32133 456296 304000)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21732 +;;;;;; 29888 498897 471000)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6820,9 +6808,12 @@ Optional KEYMAP is the default keymap bound to the mode keymap. BODY contains code to execute each time the mode is enabled or disabled. It is executed after toggling the mode, and before running MODE-hook. Before the actual body code, you can write keyword arguments, i.e. - alternating keywords and values. These following special keywords - are supported (other keywords are passed to `defcustom' if the minor - mode is global): + alternating keywords and values. If you provide BODY, then you must + provide (even if just nil) INIT-VALUE, LIGHTER, and KEYMAP, or provide + at least one keyword argument, or both; otherwise, BODY would be + misinterpreted as the first omitted argument. The following special + keywords are supported (other keywords are 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\". @@ -6925,8 +6916,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21710 -;;;;;; 32133 456296 304000)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7064,8 +7055,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21710 32133 -;;;;;; 732297 738000)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7330,8 +7321,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21710 32133 -;;;;;; 733297 744000)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7479,8 +7470,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21710 32133 445296 -;;;;;; 246000)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7512,8 +7503,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (21710 32133 445296 -;;;;;; 246000)) +;;;### (autoloads nil "echistory" "echistory.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7524,8 +7515,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21710 32133 -;;;;;; 514296 605000)) +;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7535,7 +7526,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (21710 32133 410296 64000)) +;;;### (autoloads nil "ede" "cedet/ede.el" (21715 20800 626041 761000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7561,8 +7552,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21710 32133 -;;;;;; 457296 309000)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21741 44862 +;;;;;; 856033 862000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7626,7 +7617,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (21710 32133 820298 196000)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (21670 32331 885635 586000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -7898,8 +7889,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21710 32133 -;;;;;; 816298 175000)) +;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7909,8 +7900,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21710 32133 -;;;;;; 817298 180000)) +;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7922,8 +7913,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21710 32133 -;;;;;; 819298 191000)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7942,8 +7933,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (21710 32133 446296 -;;;;;; 252000)) +;;;### (autoloads nil "edmacro" "edmacro.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -7992,8 +7983,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21710 32133 471296 -;;;;;; 381000)) +;;;### (autoloads nil "edt" "emulation/edt.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -8010,7 +8001,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21710 32133 446296 252000)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21670 32330 885624 725000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8046,15 +8037,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21710 32133 -;;;;;; 459296 319000)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21735 6155 666757 +;;;;;; 201000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21710 -;;;;;; 32133 458296 314000)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21729 +;;;;;; 53695 825320 214000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8070,8 +8061,8 @@ It creates an autoload function for CNAME's constructor. ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (21710 32133 446296 -;;;;;; 252000)) +;;;### (autoloads nil "elec-pair" "elec-pair.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from elec-pair.el (defvar electric-pair-text-pairs '((34 . 34)) "\ @@ -8106,8 +8097,8 @@ closing parenthesis. (Likewise for brackets, etc.). ;;;*** -;;;### (autoloads nil "elide-head" "elide-head.el" (21710 32133 446296 -;;;;;; 252000)) +;;;### (autoloads nil "elide-head" "elide-head.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -8122,8 +8113,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21710 32133 -;;;;;; 460296 324000)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8158,8 +8149,8 @@ optional prefix argument REINIT is non-nil. ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21710 32133 460296 -;;;;;; 324000)) +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8193,8 +8184,8 @@ displayed. ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21710 32133 468296 -;;;;;; 366000)) +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8221,8 +8212,8 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21710 32133 -;;;;;; 600297 52000)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8235,8 +8226,8 @@ Prompts for bug subject. Leaves you in a mail buffer. ;;;*** -;;;### (autoloads nil "emerge" "vc/emerge.el" (21710 32133 820298 -;;;;;; 196000)) +;;;### (autoloads nil "emerge" "vc/emerge.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -8296,8 +8287,8 @@ Emerge two RCS revisions of a file, with another revision as ancestor. ;;;*** -;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21710 32133 -;;;;;; 791298 45000)) +;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21691 38459 +;;;;;; 74604 918000)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -8332,7 +8323,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21710 32133 475296 402000)) +;;;### (autoloads nil "epa" "epa.el" (21670 32330 885624 725000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8520,8 +8511,8 @@ Insert selected KEYS after the point. ;;;*** -;;;### (autoloads nil "epa-dired" "epa-dired.el" (21710 32133 475296 -;;;;;; 402000)) +;;;### (autoloads nil "epa-dired" "epa-dired.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8546,8 +8537,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (21710 32133 475296 -;;;;;; 402000)) +;;;### (autoloads nil "epa-file" "epa-file.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8567,8 +8558,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-mail" "epa-mail.el" (21710 32133 475296 -;;;;;; 402000)) +;;;### (autoloads nil "epa-mail" "epa-mail.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8645,7 +8636,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21710 32133 476296 407000)) +;;;### (autoloads nil "epg" "epg.el" (21670 32330 885624 725000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8656,8 +8647,8 @@ Return a context object. ;;;*** -;;;### (autoloads nil "epg-config" "epg-config.el" (21710 32133 475296 -;;;;;; 402000)) +;;;### (autoloads nil "epg-config" "epg-config.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8677,7 +8668,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21710 32133 487296 465000)) +;;;### (autoloads nil "erc" "erc/erc.el" (21670 32330 885624 725000)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8725,36 +8716,36 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21710 -;;;;;; 32133 480296 428000)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21710 32133 -;;;;;; 481296 433000)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21710 32133 -;;;;;; 481296 433000)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21710 32133 -;;;;;; 481296 433000)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21710 32133 481296 -;;;;;; 433000)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21696 56380 925320 +;;;;;; 624000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8784,14 +8775,14 @@ that subcommand. ;;;*** ;;;### (autoloads nil "erc-desktop-notifications" "erc/erc-desktop-notifications.el" -;;;;;; (21710 32133 481296 433000)) +;;;;;; (21670 32330 885624 725000)) ;;; Generated autoloads from erc/erc-desktop-notifications.el (autoload 'erc-notifications-mode "erc-desktop-notifications" "" t) ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21710 -;;;;;; 32133 482296 439000)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8853,8 +8844,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21710 32133 482296 -;;;;;; 439000)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8866,8 +8857,8 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'. ;;;*** -;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21710 32133 -;;;;;; 482296 439000)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8888,8 +8879,8 @@ system. ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21710 32133 -;;;;;; 482296 439000)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8899,22 +8890,22 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21710 32133 482296 -;;;;;; 439000)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21710 32133 482296 -;;;;;; 439000)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21710 32133 483296 -;;;;;; 444000)) +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8943,8 +8934,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21710 32133 -;;;;;; 483296 444000)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -8990,15 +8981,15 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21710 32133 483296 -;;;;;; 444000)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21710 -;;;;;; 32133 483296 444000)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9009,8 +9000,8 @@ Show who's gone. ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21710 -;;;;;; 32133 483296 444000)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -9027,8 +9018,8 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21710 32133 -;;;;;; 483296 444000)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9046,36 +9037,36 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21710 32133 483296 -;;;;;; 444000)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21710 -;;;;;; 32133 484296 449000)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21710 32133 -;;;;;; 484296 449000)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21710 32133 484296 -;;;;;; 449000)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21710 -;;;;;; 32133 484296 449000)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9092,15 +9083,15 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21710 32133 -;;;;;; 484296 449000)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21710 -;;;;;; 32133 484296 449000)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9111,22 +9102,22 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21710 -;;;;;; 32133 484296 449000)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21727 +;;;;;; 11963 635339 992000)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21710 32133 -;;;;;; 484296 449000)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21710 32133 -;;;;;; 485296 454000)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9151,8 +9142,8 @@ keybindings will not do anything useful. ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21710 -;;;;;; 32133 485296 454000)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9171,8 +9162,8 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21710 32133 485296 -;;;;;; 454000)) +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9183,8 +9174,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21710 32133 461296 -;;;;;; 329000)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9253,8 +9244,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** -;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21710 32133 -;;;;;; 460296 324000)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9266,8 +9257,8 @@ Kill all test buffers that are still live. ;;;*** -;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21710 32133 -;;;;;; 490296 480000)) +;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9277,8 +9268,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (21710 32133 491296 -;;;;;; 485000)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9313,8 +9304,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21710 32133 734297 -;;;;;; 749000)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (21696 56380 925320 +;;;;;; 624000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9629,8 +9620,8 @@ for \\[find-tag] (which see). ;;;*** -;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21710 -;;;;;; 32133 575296 922000)) +;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9798,7 +9789,7 @@ With ARG, insert that many delimiters. ;;;*** -;;;### (autoloads nil "eudc" "net/eudc.el" (21710 32133 629297 203000)) +;;;### (autoloads nil "eudc" "net/eudc.el" (21704 50495 455324 752000)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9852,8 +9843,8 @@ This does nothing except loading eudc by autoload side-effect. ;;;*** -;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21710 32133 628297 -;;;;;; 198000)) +;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21704 50495 455324 +;;;;;; 752000)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -9888,8 +9879,8 @@ Display a button for the JPEG DATA. ;;;*** -;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21710 32133 -;;;;;; 629297 203000)) +;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21704 50495 +;;;;;; 455324 752000)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9905,8 +9896,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** -;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21710 -;;;;;; 32133 629297 203000)) +;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21704 +;;;;;; 50495 455324 752000)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9916,8 +9907,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21710 32133 461296 -;;;;;; 329000)) +;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -9943,9 +9934,17 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21710 32133 630297 208000)) +;;;### (autoloads nil "eww" "net/eww.el" (21731 9021 668220 181000)) ;;; Generated autoloads from net/eww.el +(defvar eww-suggest-uris '(eww-links-at-point url-get-url-at-point eww-current-url) "\ +List of functions called to form the list of default URIs for `eww'. +Each of the elements is a function returning either a string or a list +of strings. The results will be joined into a single list with +duplicate entries (if any) removed.") + +(custom-autoload 'eww-suggest-uris "eww" t) + (autoload 'eww "eww" "\ Fetch URL and render the page. If the input doesn't look like an URL or a domain name, the @@ -9965,6 +9964,11 @@ See the `eww-search-prefix' variable for the search engine used. \(fn &optional BEG END)" t nil) +(autoload 'eww-mode "eww" "\ +Mode for browsing the web. + +\(fn)" t nil) + (autoload 'eww-browse-url "eww" "\ @@ -9977,8 +9981,8 @@ Display the bookmarks. ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (21710 -;;;;;; 32133 734297 749000)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -10019,7 +10023,7 @@ file modes. ;;;*** -;;;### (autoloads nil "expand" "expand.el" (21710 32133 492296 491000)) +;;;### (autoloads nil "expand" "expand.el" (21670 32330 885624 725000)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -10068,8 +10072,8 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads nil "f90" "progmodes/f90.el" (21710 32133 735297 -;;;;;; 754000)) +;;;### (autoloads nil "f90" "progmodes/f90.el" (21740 23998 526747 +;;;;;; 884000)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10136,8 +10140,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (21710 32133 492296 -;;;;;; 491000)) +;;;### (autoloads nil "face-remap" "face-remap.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10296,8 +10300,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;*** -;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21710 32133 -;;;;;; 601297 57000)) +;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/feedmail.el (push (purecopy '(feedmail 11)) package--builtin-versions) @@ -10351,7 +10355,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21710 32133 494296 501000)) +;;;### (autoloads nil "ffap" "ffap.el" (21696 56380 925320 624000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10414,8 +10418,8 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (21710 32133 494296 -;;;;;; 501000)) +;;;### (autoloads nil "filecache" "filecache.el" (21740 23998 26747 +;;;;;; 125000)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -10472,8 +10476,8 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads nil "filenotify" "filenotify.el" (21710 32133 494296 -;;;;;; 501000)) +;;;### (autoloads nil "filenotify" "filenotify.el" (21704 50495 455324 +;;;;;; 752000)) ;;; Generated autoloads from filenotify.el (autoload 'file-notify-handle-event "filenotify" "\ @@ -10488,8 +10492,8 @@ Otherwise, signal a `file-notify-error'. ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21710 32133 494296 -;;;;;; 501000)) +;;;### (autoloads nil "files-x" "files-x.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10554,8 +10558,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21710 32133 497296 -;;;;;; 517000)) +;;;### (autoloads nil "filesets" "filesets.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10566,8 +10570,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (21710 32133 497296 -;;;;;; 517000)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10587,8 +10591,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21710 32133 497296 -;;;;;; 517000)) +;;;### (autoloads nil "find-dired" "find-dired.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10628,8 +10632,8 @@ use in place of \"-ls\" as the final argument. ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (21710 32133 498296 -;;;;;; 522000)) +;;;### (autoloads nil "find-file" "find-file.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\ @@ -10719,8 +10723,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21710 -;;;;;; 32133 461296 329000)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21700 +;;;;;; 53432 444919 658000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10878,8 +10882,8 @@ Define some key bindings for the find-function family of functions. ;;;*** -;;;### (autoloads nil "find-lisp" "find-lisp.el" (21710 32133 498296 -;;;;;; 522000)) +;;;### (autoloads nil "find-lisp" "find-lisp.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10899,7 +10903,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21710 32133 498296 522000)) +;;;### (autoloads nil "finder" "finder.el" (21670 32330 885624 725000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -10921,8 +10925,8 @@ Find packages matching a given keyword. ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21710 32133 498296 -;;;;;; 522000)) +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -10943,8 +10947,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21710 32133 -;;;;;; 514296 605000)) +;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -10959,8 +10963,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21710 32133 -;;;;;; 736297 759000)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -10990,8 +10994,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21710 32133 -;;;;;; 792298 50000)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21727 11963 +;;;;;; 635339 992000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11061,14 +11065,14 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (21710 32133 498296 -;;;;;; 522000)) +;;;### (autoloads nil "foldout" "foldout.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21710 32133 499296 527000)) +;;;### (autoloads nil "follow" "follow.el" (21670 32330 885624 725000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11136,8 +11140,8 @@ selected if the original window is the first one in the frame. ;;;*** -;;;### (autoloads nil "footnote" "mail/footnote.el" (21710 32133 -;;;;;; 601297 57000)) +;;;### (autoloads nil "footnote" "mail/footnote.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) @@ -11156,7 +11160,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (21710 32133 500296 532000)) +;;;### (autoloads nil "forms" "forms.el" (21670 32330 885624 725000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11192,8 +11196,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21710 32133 -;;;;;; 736297 759000)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11270,8 +11274,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "fortune" "play/fortune.el" (21710 32133 706297 -;;;;;; 603000)) +;;;### (autoloads nil "fortune" "play/fortune.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11319,8 +11323,8 @@ and choose the directory as the fortune-file. ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (21710 32133 502296 -;;;;;; 543000)) +;;;### (autoloads nil "frameset" "frameset.el" (21744 21055 525326 +;;;;;; 515000)) ;;; Generated autoloads from frameset.el (defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\ @@ -11506,15 +11510,15 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21710 32133 -;;;;;; 706297 603000)) +;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21720 38720 +;;;;;; 956749 443000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21710 32133 -;;;;;; 738297 770000)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21724 35774 +;;;;;; 954622 790000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11591,8 +11595,8 @@ detailed description of this mode. ;;;*** -;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21710 32133 -;;;;;; 461296 329000)) +;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11672,8 +11676,8 @@ regular expression that can be used as an element of ;;;*** -;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21710 32133 -;;;;;; 738297 770000)) +;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11687,8 +11691,8 @@ add virtual separators (like underscores) at places they belong to. ;;;*** -;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21710 32133 -;;;;;; 515296 610000)) +;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11742,7 +11746,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (21710 32133 534296 709000)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (21670 32330 885624 725000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11792,8 +11796,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21710 32133 -;;;;;; 516296 615000)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11883,8 +11887,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21710 32133 -;;;;;; 518296 626000)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21743 190 195328 +;;;;;; 729000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11894,8 +11898,8 @@ Make the current buffer look like a nice article. ;;;*** -;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21710 -;;;;;; 32133 518296 626000)) +;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -11918,8 +11922,8 @@ deletion, or > if it is flagged for displaying. ;;;*** -;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21710 32133 -;;;;;; 519296 631000)) +;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -11960,8 +11964,8 @@ supported. ;;;*** -;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21710 32133 -;;;;;; 520296 636000)) +;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11996,8 +12000,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21710 32133 -;;;;;; 520296 636000)) +;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -12012,8 +12016,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21710 32133 -;;;;;; 520296 636000)) +;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -12023,8 +12027,8 @@ Convenience method to turn on gnus-dired-mode. ;;;*** -;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21710 32133 -;;;;;; 520296 636000)) +;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -12034,8 +12038,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21710 32133 -;;;;;; 520296 636000)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus--random-face-with-type "gnus-fun" "\ @@ -12100,8 +12104,8 @@ Insert a random Face header from `gnus-face-directory'. ;;;*** -;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21710 -;;;;;; 32133 521296 641000)) +;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -12118,8 +12122,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21710 32133 -;;;;;; 522296 647000)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21702 8774 +;;;;;; 274627 813000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12136,8 +12140,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21710 32133 -;;;;;; 522296 647000)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12152,8 +12156,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21710 32133 -;;;;;; 523296 652000)) +;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12166,8 +12170,8 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;*** -;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21710 32133 523296 -;;;;;; 652000)) +;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -12190,8 +12194,8 @@ Minor mode for providing mailing-list commands. ;;;*** -;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21710 32133 -;;;;;; 523296 652000)) +;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -12291,8 +12295,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21710 32133 -;;;;;; 524296 657000)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21725 56638 +;;;;;; 795320 63000)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12319,7 +12323,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads nil "gnus-notifications" "gnus/gnus-notifications.el" -;;;;;; (21710 32133 524296 657000)) +;;;;;; (21670 32330 885624 725000)) ;;; Generated autoloads from gnus/gnus-notifications.el (autoload 'gnus-notifications "gnus-notifications" "\ @@ -12335,8 +12339,8 @@ This is typically a function to add in ;;;*** -;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21710 32133 -;;;;;; 524296 657000)) +;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12359,8 +12363,8 @@ If picons are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21710 32133 -;;;;;; 524296 657000)) +;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12427,8 +12431,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21710 -;;;;;; 32133 525296 662000)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21707 +;;;;;; 26689 135319 638000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12443,8 +12447,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21710 32133 -;;;;;; 526296 667000)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12471,8 +12475,8 @@ See the documentation for these variables and functions for details. ;;;*** -;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21710 32133 -;;;;;; 526296 667000)) +;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12482,8 +12486,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21710 32133 -;;;;;; 527296 673000)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21716 41663 +;;;;;; 456033 27000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12493,8 +12497,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21710 32133 -;;;;;; 530296 688000)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21715 20800 +;;;;;; 626041 761000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12505,8 +12509,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21710 32133 -;;;;;; 531296 693000)) +;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12521,8 +12525,8 @@ Install the sync hooks. ;;;*** -;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21710 32133 -;;;;;; 533296 704000)) +;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12532,8 +12536,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (21710 32133 630297 -;;;;;; 208000)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12549,8 +12553,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21710 32133 707297 -;;;;;; 608000)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12576,8 +12580,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21710 32133 -;;;;;; 630297 208000)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12618,8 +12622,8 @@ Like `goto-address-mode', but only for comments and strings. ;;;*** -;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21710 32133 -;;;;;; 534296 709000)) +;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -12635,8 +12639,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (21710 32133 738297 -;;;;;; 770000)) +;;;### (autoloads nil "grep" "progmodes/grep.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12800,7 +12804,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'. ;;;*** -;;;### (autoloads nil "gs" "gs.el" (21710 32133 552296 802000)) +;;;### (autoloads nil "gs" "gs.el" (21670 32331 385639 720000)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12813,8 +12817,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21710 32133 739297 -;;;;;; 775000)) +;;;### (autoloads nil "gud" "progmodes/gud.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12909,8 +12913,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21710 32133 462296 -;;;;;; 335000)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -13012,8 +13016,8 @@ binding mode. ;;;*** -;;;### (autoloads nil "handwrite" "play/handwrite.el" (21710 32133 -;;;;;; 707297 608000)) +;;;### (autoloads nil "handwrite" "play/handwrite.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -13030,8 +13034,8 @@ Variables: `handwrite-linespace' (default 12) ;;;*** -;;;### (autoloads nil "hanoi" "play/hanoi.el" (21710 32133 708297 -;;;;;; 614000)) +;;;### (autoloads nil "hanoi" "play/hanoi.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -13058,8 +13062,8 @@ to be updated. ;;;*** -;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21710 32133 -;;;;;; 601297 57000)) +;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -13101,8 +13105,8 @@ Prefix arg sets default accept amount temporarily. ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21710 32133 552296 -;;;;;; 802000)) +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -13229,8 +13233,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21710 32133 553296 -;;;;;; 808000)) +;;;### (autoloads nil "help-fns" "help-fns.el" (21721 59582 784612 +;;;;;; 824000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13281,6 +13285,14 @@ it is displayed along with the global value. \(fn VARIABLE &optional BUFFER FRAME)" t nil) +(autoload 'describe-function-or-variable "help-fns" "\ +Display the full documentation of the function or variable SYMBOL. +If SYMBOL is a variable and has a buffer-local value in BUFFER or FRAME +\(default to the current buffer and current frame), it is displayed along +with the global value. + +\(fn SYMBOL &optional BUFFER FRAME)" t nil) + (autoload 'describe-syntax "help-fns" "\ Describe the syntax specifications in the syntax table of BUFFER. The descriptions are inserted in a help buffer, which is then displayed. @@ -13308,8 +13320,8 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file. ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (21710 32133 553296 -;;;;;; 808000)) +;;;### (autoloads nil "help-macro" "help-macro.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13323,8 +13335,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21710 32133 553296 -;;;;;; 808000)) +;;;### (autoloads nil "help-mode" "help-mode.el" (21733 50750 334730 +;;;;;; 5000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13414,6 +13426,14 @@ Add xrefs for symbols in `pp's output between FROM and TO. \(fn FROM TO)" nil nil) +(autoload 'help-xref-interned "help-mode" "\ +Follow a hyperlink which appeared to be an arbitrary interned SYMBOL. +Both variable, function and face documentation are extracted into a single +help buffer. If SYMBOL is a variable, include buffer-local value for optional +BUFFER or FRAME. + +\(fn SYMBOL &optional BUFFER FRAME)" nil nil) + (autoload 'help-bookmark-jump "help-mode" "\ Jump to help-mode bookmark BOOKMARK. Handler function for record returned by `help-bookmark-make-record'. @@ -13423,8 +13443,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21710 32133 -;;;;;; 462296 335000)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13439,7 +13459,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21710 32133 554296 813000)) +;;;### (autoloads nil "hexl" "hexl.el" (21695 35516 595262 313000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13533,8 +13553,7 @@ This discards the buffer's undo information. ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (21710 32133 555296 -;;;;;; 818000)) +;;;### (autoloads nil "hi-lock" "hi-lock.el" (21741 1161 438890 423000)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13701,8 +13720,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21710 32133 -;;;;;; 740297 780000)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13749,8 +13768,8 @@ Several variables affect how the hiding is done: ;;;*** -;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21710 32133 -;;;;;; 740297 780000)) +;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13812,8 +13831,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21710 32133 555296 -;;;;;; 818000)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13944,8 +13963,8 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21710 32133 555296 -;;;;;; 818000)) +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -13977,8 +13996,8 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (21710 32133 555296 -;;;;;; 818000)) +;;;### (autoloads nil "hl-line" "hl-line.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -14027,8 +14046,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (21710 32133 -;;;;;; 404296 33000)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from calendar/holidays.el (defvar holiday-general-holidays (mapcar 'purecopy '((holiday-fixed 1 1 "New Year's Day") (holiday-float 1 1 3 "Martin Luther King Day") (holiday-fixed 2 2 "Groundhog Day") (holiday-fixed 2 14 "Valentine's Day") (holiday-float 2 1 3 "President's Day") (holiday-fixed 3 17 "St. Patrick's Day") (holiday-fixed 4 1 "April Fools' Day") (holiday-float 5 0 2 "Mother's Day") (holiday-float 5 1 -1 "Memorial Day") (holiday-fixed 6 14 "Flag Day") (holiday-float 6 0 3 "Father's Day") (holiday-fixed 7 4 "Independence Day") (holiday-float 9 1 1 "Labor Day") (holiday-float 10 1 2 "Columbus Day") (holiday-fixed 10 31 "Halloween") (holiday-fixed 11 11 "Veteran's Day") (holiday-float 11 4 4 "Thanksgiving"))) "\ @@ -14138,8 +14157,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (21710 32133 -;;;;;; 534296 709000)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14149,8 +14168,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21710 32133 -;;;;;; 556296 823000)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21670 32624 +;;;;;; 385626 484000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14183,8 +14202,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'. ;;;*** -;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21710 32133 557296 -;;;;;; 829000)) +;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14286,8 +14305,8 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21710 32133 557296 -;;;;;; 829000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21670 32624 385626 +;;;;;; 484000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14326,8 +14345,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21710 -;;;;;; 32133 404296 33000)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14380,8 +14399,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21710 32133 558296 -;;;;;; 834000)) +;;;### (autoloads nil "icomplete" "icomplete.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14420,8 +14439,8 @@ completions: ;;;*** -;;;### (autoloads nil "icon" "progmodes/icon.el" (21710 32133 740297 -;;;;;; 780000)) +;;;### (autoloads nil "icon" "progmodes/icon.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14461,8 +14480,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21710 -;;;;;; 32133 742297 790000)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14487,8 +14506,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21710 32133 -;;;;;; 745297 806000)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14617,7 +14636,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21710 32133 559296 839000)) +;;;### (autoloads nil "ido" "ido.el" (21694 14651 747488 989000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14879,7 +14898,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21710 32133 559296 839000)) +;;;### (autoloads nil "ielm" "ielm.el" (21695 35516 595262 313000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -14891,7 +14910,7 @@ See `inferior-emacs-lisp-mode' for details. ;;;*** -;;;### (autoloads nil "iimage" "iimage.el" (21710 32133 559296 839000)) +;;;### (autoloads nil "iimage" "iimage.el" (21670 32331 385639 720000)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -14907,7 +14926,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (21710 32133 561296 849000)) +;;;### (autoloads nil "image" "image.el" (21670 32331 385639 720000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15100,8 +15119,8 @@ If Emacs is compiled without ImageMagick support, this does nothing. ;;;*** -;;;### (autoloads nil "image-dired" "image-dired.el" (21710 32133 -;;;;;; 560296 844000)) +;;;### (autoloads nil "image-dired" "image-dired.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) @@ -15238,8 +15257,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads nil "image-file" "image-file.el" (21710 32133 560296 -;;;;;; 844000)) +;;;### (autoloads nil "image-file" "image-file.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\ @@ -15301,8 +15320,8 @@ An image file is one whose name has an extension in ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (21710 32133 560296 -;;;;;; 844000)) +;;;### (autoloads nil "image-mode" "image-mode.el" (21716 41663 456033 +;;;;;; 27000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15349,7 +15368,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21710 32133 561296 849000)) +;;;### (autoloads nil "imenu" "imenu.el" (21670 32331 385639 720000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15487,8 +15506,8 @@ for more information. ;;;*** -;;;### (autoloads nil "ind-util" "language/ind-util.el" (21710 32133 -;;;;;; 580296 948000)) +;;;### (autoloads nil "ind-util" "language/ind-util.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -15518,8 +15537,8 @@ Convert old Emacs Devanagari characters to UCS. ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21710 32133 -;;;;;; 745297 806000)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15537,7 +15556,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21710 32133 563296 860000)) +;;;### (autoloads nil "info" "info.el" (21670 32331 385639 720000)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -15749,8 +15768,8 @@ completion alternatives to currently visited manuals. ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (21710 32133 562296 -;;;;;; 854000)) +;;;### (autoloads nil "info-look" "info-look.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15797,8 +15816,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (21710 32133 562296 -;;;;;; 854000)) +;;;### (autoloads nil "info-xref" "info-xref.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -15881,8 +15900,8 @@ the sources handy. ;;;*** -;;;### (autoloads nil "informat" "informat.el" (21710 32133 564296 -;;;;;; 865000)) +;;;### (autoloads nil "informat" "informat.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15927,8 +15946,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inline" "emacs-lisp/inline.el" (21710 32133 -;;;;;; 462296 335000)) +;;;### (autoloads nil "inline" "emacs-lisp/inline.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/inline.el (autoload 'define-inline "inline" "\ @@ -15942,8 +15961,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inversion" "cedet/inversion.el" (21710 32133 -;;;;;; 414296 85000)) +;;;### (autoloads nil "inversion" "cedet/inversion.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) @@ -15955,8 +15974,8 @@ Only checks one based on which kind of Emacs is being run. ;;;*** -;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21710 -;;;;;; 32133 565296 870000)) +;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -15976,8 +15995,8 @@ Toggle input method in interactive search. ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (21710 32133 573296 -;;;;;; 912000)) +;;;### (autoloads nil "isearchb" "isearchb.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -15991,8 +16010,8 @@ accessed via isearchb. ;;;*** -;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21710 -;;;;;; 32133 566296 875000)) +;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -16083,15 +16102,15 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (21710 32133 566296 875000)) +;;;;;; (21670 32331 385639 720000)) ;;; Generated autoloads from international/iso-transl.el (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap) ;;;*** -;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21710 32133 -;;;;;; 793298 56000)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16324,8 +16343,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to ;;;*** -;;;### (autoloads nil "japan-util" "language/japan-util.el" (21710 -;;;;;; 32133 580296 948000)) +;;;### (autoloads nil "japan-util" "language/japan-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -16402,8 +16421,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (21710 32133 573296 -;;;;;; 912000)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16426,8 +16445,7 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21710 32133 746297 -;;;;;; 811000)) +;;;### (autoloads nil "js" "progmodes/js.el" (21681 2618 385332 620000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16441,14 +16459,14 @@ Major mode for editing JavaScript. ;;;*** -;;;### (autoloads nil "json" "json.el" (21710 32133 573296 912000)) +;;;### (autoloads nil "json" "json.el" (21716 41663 456033 27000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "keypad" "emulation/keypad.el" (21710 32133 -;;;;;; 471296 381000)) +;;;### (autoloads nil "keypad" "emulation/keypad.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16503,8 +16521,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** -;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21710 -;;;;;; 32133 566296 875000)) +;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -16525,8 +16543,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (21710 32133 566296 -;;;;;; 875000)) +;;;### (autoloads nil "kkc" "international/kkc.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16548,7 +16566,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21710 32133 574296 917000)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21670 32331 385639 720000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16660,8 +16678,8 @@ If kbd macro currently being defined end it before activating it. ;;;*** -;;;### (autoloads nil "korea-util" "language/korea-util.el" (21710 -;;;;;; 32133 580296 948000)) +;;;### (autoloads nil "korea-util" "language/korea-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16675,8 +16693,8 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "landmark" "play/landmark.el" (21710 32133 -;;;;;; 708297 614000)) +;;;### (autoloads nil "landmark" "play/landmark.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from play/landmark.el (push (purecopy '(landmark 1 0)) package--builtin-versions) @@ -16707,8 +16725,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "lao-util" "language/lao-util.el" (21710 32133 -;;;;;; 581296 953000)) +;;;### (autoloads nil "lao-util" "language/lao-util.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16745,8 +16763,8 @@ Transcribe Romanized Lao string STR to Lao character string. ;;;*** -;;;### (autoloads nil "latexenc" "international/latexenc.el" (21710 -;;;;;; 32133 567296 881000)) +;;;### (autoloads nil "latexenc" "international/latexenc.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from international/latexenc.el (defvar latex-inputenc-coding-alist (purecopy '(("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ @@ -16778,7 +16796,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el" -;;;;;; (21710 32133 567296 881000)) +;;;;;; (21670 32331 385639 720000)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16819,8 +16837,8 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** -;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21710 -;;;;;; 32133 746297 811000)) +;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16830,8 +16848,8 @@ A major mode to edit GNU ld script files ;;;*** -;;;### (autoloads nil "let-alist" "let-alist.el" (21710 32133 598297 -;;;;;; 42000)) +;;;### (autoloads nil "let-alist" "let-alist.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from let-alist.el (push (purecopy '(let-alist 1 0 3)) package--builtin-versions) @@ -16870,7 +16888,7 @@ displayed in the example above. ;;;*** -;;;### (autoloads nil "life" "play/life.el" (21710 32133 708297 614000)) +;;;### (autoloads nil "life" "play/life.el" (21670 32331 385639 720000)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -16883,7 +16901,7 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads nil "linum" "linum.el" (21710 32133 598297 42000)) +;;;### (autoloads nil "linum" "linum.el" (21670 32331 385639 720000)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -16920,8 +16938,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21710 32133 598297 -;;;;;; 42000)) +;;;### (autoloads nil "loadhist" "loadhist.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16952,7 +16970,7 @@ something strange, such as redefining an Emacs function. ;;;*** -;;;### (autoloads nil "locate" "locate.el" (21710 32133 599297 47000)) +;;;### (autoloads nil "locate" "locate.el" (21670 32331 385639 720000)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -17004,8 +17022,8 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21710 32133 821298 -;;;;;; 201000)) +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -17036,8 +17054,8 @@ done. Otherwise, it uses the current buffer. ;;;*** -;;;### (autoloads nil "log-view" "vc/log-view.el" (21710 32133 821298 -;;;;;; 201000)) +;;;### (autoloads nil "log-view" "vc/log-view.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -17047,7 +17065,7 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (21710 32133 599297 47000)) +;;;### (autoloads nil "lpr" "lpr.el" (21670 32331 385639 720000)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17142,8 +17160,8 @@ for further customization of the printer command. ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21710 32133 599297 -;;;;;; 47000)) +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -17154,8 +17172,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads nil "lunar" "calendar/lunar.el" (21710 32133 405296 -;;;;;; 38000)) +;;;### (autoloads nil "lunar" "calendar/lunar.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -17167,8 +17185,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21710 32133 -;;;;;; 746297 811000)) +;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17178,7 +17196,7 @@ A major mode to edit m4 macro files. ;;;*** -;;;### (autoloads nil "macros" "macros.el" (21710 32133 599297 47000)) +;;;### (autoloads nil "macros" "macros.el" (21670 32331 385639 720000)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17267,8 +17285,8 @@ and then select the region of un-tablified names and use ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21710 32133 -;;;;;; 602297 62000)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17298,8 +17316,8 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;*** -;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21710 32133 -;;;;;; 602297 62000)) +;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17328,8 +17346,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21710 32133 -;;;;;; 602297 62000)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17403,8 +17421,8 @@ matches may be returned from the message body. ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21710 32133 -;;;;;; 602297 62000)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17453,8 +17471,8 @@ double-quotes. ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21710 32133 -;;;;;; 602297 62000)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17507,8 +17525,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any. ;;;*** -;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21710 32133 -;;;;;; 602297 62000)) +;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -17520,8 +17538,8 @@ The mail client is taken to be the handler of mailto URLs. ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21710 -;;;;;; 32133 747297 816000)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17638,8 +17656,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (21710 32133 609297 -;;;;;; 99000)) +;;;### (autoloads nil "makesum" "makesum.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -17650,7 +17668,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads nil "man" "man.el" (21710 32133 609297 99000)) +;;;### (autoloads nil "man" "man.el" (21670 32331 385639 720000)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17706,7 +17724,7 @@ Default bookmark handler for Man buffers. ;;;*** -;;;### (autoloads nil "master" "master.el" (21710 32133 609297 99000)) +;;;### (autoloads nil "master" "master.el" (21670 32331 385639 720000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) @@ -17729,8 +17747,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads nil "mb-depth" "mb-depth.el" (21710 32133 609297 -;;;;;; 99000)) +;;;### (autoloads nil "mb-depth" "mb-depth.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -17757,13 +17775,13 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "md4" "md4.el" (21710 32133 609297 99000)) +;;;### (autoloads nil "md4" "md4.el" (21670 32331 385639 720000)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21710 32133 537296 +;;;### (autoloads nil "message" "gnus/message.el" (21706 5826 304666 ;;;;;; 725000)) ;;; Generated autoloads from gnus/message.el @@ -17929,8 +17947,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21710 -;;;;;; 32133 747297 816000)) +;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) @@ -17946,8 +17964,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (21710 32133 -;;;;;; 603297 68000)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17990,8 +18008,8 @@ redisplayed as output is inserted. ;;;*** -;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21710 32133 615297 -;;;;;; 130000)) +;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -18081,7 +18099,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21710 32133 616297 135000)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21670 32331 385639 720000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -18098,8 +18116,8 @@ Display version information about MH-E and the MH mail handling system. ;;;*** -;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21710 32133 -;;;;;; 617297 141000)) +;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18180,8 +18198,8 @@ perform the operation on all messages in that region. ;;;*** -;;;### (autoloads nil "midnight" "midnight.el" (21710 32133 621297 -;;;;;; 161000)) +;;;### (autoloads nil "midnight" "midnight.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -18207,8 +18225,8 @@ to its second argument TM. ;;;*** -;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21710 32133 -;;;;;; 621297 161000)) +;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18237,7 +18255,7 @@ is modified to remove the default indication. ;;;*** -;;;### (autoloads nil "misc" "misc.el" (21710 32133 623297 172000)) +;;;### (autoloads nil "misc" "misc.el" (21670 32331 385639 720000)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18265,8 +18283,8 @@ The return value is always nil. ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (21710 32133 623297 -;;;;;; 172000)) +;;;### (autoloads nil "misearch" "misearch.el" (21691 38459 74604 +;;;;;; 918000)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18351,8 +18369,8 @@ whose file names match the specified wildcard. ;;;*** -;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21710 -;;;;;; 32133 747297 816000)) +;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) @@ -18363,8 +18381,8 @@ Major mode for the mixal asm language. ;;;*** -;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21710 32133 -;;;;;; 538296 730000)) +;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from gnus/mm-encode.el (autoload 'mm-default-file-encoding "mm-encode" "\ @@ -18374,8 +18392,8 @@ Return a default encoding for FILE. ;;;*** -;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21710 32133 -;;;;;; 538296 730000)) +;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -18393,8 +18411,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21710 32133 -;;;;;; 538296 730000)) +;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -18407,8 +18425,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21710 32133 538296 -;;;;;; 730000)) +;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18424,8 +18442,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21710 32133 539296 -;;;;;; 735000)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18444,7 +18462,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** -;;;### (autoloads nil "mml" "gnus/mml.el" (21710 32133 540296 740000)) +;;;### (autoloads nil "mml" "gnus/mml.el" (21670 32331 385639 720000)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18469,8 +18487,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21710 32133 540296 -;;;;;; 740000)) +;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -18485,8 +18503,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21710 32133 541296 -;;;;;; 745000)) +;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18526,16 +18544,16 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21710 32133 -;;;;;; 415296 90000)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) ;;;*** -;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21710 32133 -;;;;;; 748297 822000)) +;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18568,8 +18586,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (21710 32133 708297 -;;;;;; 614000)) +;;;### (autoloads nil "morse" "play/morse.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18594,8 +18612,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** -;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21710 32133 623297 -;;;;;; 172000)) +;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18642,7 +18660,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21710 32133 625297 182000)) +;;;### (autoloads nil "mpc" "mpc.el" (21670 32331 385639 720000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18652,7 +18670,7 @@ Main entry point for MPC. ;;;*** -;;;### (autoloads nil "mpuz" "play/mpuz.el" (21710 32133 708297 614000)) +;;;### (autoloads nil "mpuz" "play/mpuz.el" (21670 32331 385639 720000)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18662,7 +18680,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21710 32133 625297 182000)) +;;;### (autoloads nil "msb" "msb.el" (21670 32331 385639 720000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18687,8 +18705,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21710 -;;;;;; 32133 569296 891000)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -18820,8 +18838,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (21710 -;;;;;; 32133 569296 891000)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -18952,8 +18970,8 @@ per-character basis, this may not be accurate. ;;;*** -;;;### (autoloads nil "net-utils" "net/net-utils.el" (21710 32133 -;;;;;; 632297 218000)) +;;;### (autoloads nil "net-utils" "net/net-utils.el" (21704 50495 +;;;;;; 455324 752000)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -19047,8 +19065,8 @@ Open a network connection to HOST on PORT. ;;;*** -;;;### (autoloads nil "netrc" "net/netrc.el" (21710 32133 632297 -;;;;;; 218000)) +;;;### (autoloads nil "netrc" "net/netrc.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -19060,8 +19078,8 @@ listed in the PORTS list. ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (21710 -;;;;;; 32133 632297 218000)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (21716 +;;;;;; 41663 456033 27000)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19157,8 +19175,8 @@ asynchronously, if possible. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21710 -;;;;;; 32133 633297 224000)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19180,7 +19198,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (21710 32133 634297 229000)) +;;;;;; (21670 32331 385639 720000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19190,8 +19208,8 @@ Start newsticker plainview. ;;;*** -;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21710 -;;;;;; 32133 634297 229000)) +;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -19201,8 +19219,8 @@ Start reading news. You may want to bind this to a key. ;;;*** -;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21710 -;;;;;; 32133 634297 229000)) +;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -19222,8 +19240,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21710 -;;;;;; 32133 634297 229000)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19233,8 +19251,8 @@ Start newsticker treeview. ;;;*** -;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21710 32133 541296 -;;;;;; 745000)) +;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19244,8 +19262,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21710 32133 542296 -;;;;;; 750000)) +;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -19259,8 +19277,8 @@ symbol in the alist. ;;;*** -;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21710 32133 -;;;;;; 542296 750000)) +;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -19271,7 +19289,7 @@ This command does not work if you use short group names. ;;;*** -;;;### (autoloads nil "nnml" "gnus/nnml.el" (21710 32133 546296 771000)) +;;;### (autoloads nil "nnml" "gnus/nnml.el" (21670 32331 385639 720000)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19281,7 +19299,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21710 32133 645297 286000)) +;;;### (autoloads nil "novice" "novice.el" (21670 32331 385639 720000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19313,8 +19331,8 @@ future sessions. ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21710 -;;;;;; 32133 793298 56000)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19328,14 +19346,14 @@ closing requests for requests that are used in matched pairs. ;;;*** -;;;### (autoloads nil "ntlm" "net/ntlm.el" (21710 32133 635297 234000)) +;;;### (autoloads nil "ntlm" "net/ntlm.el" (21670 32331 385639 720000)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21710 32133 -;;;;;; 645297 286000)) +;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19347,8 +19365,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21710 32133 -;;;;;; 646297 291000)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19408,8 +19426,8 @@ Many aspects this mode can be customized using ;;;*** -;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21710 32133 -;;;;;; 647297 296000)) +;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -19421,8 +19439,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21710 32133 -;;;;;; 748297 822000)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21695 35516 +;;;;;; 595262 313000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19459,8 +19477,8 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21710 32133 -;;;;;; 749297 827000)) +;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/opascal.el (define-obsolete-function-alias 'delphi-mode 'opascal-mode "24.4") @@ -19495,7 +19513,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (21710 32133 694297 541000)) +;;;### (autoloads nil "org" "org/org.el" (21670 32331 385639 720000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19716,8 +19734,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21710 32133 -;;;;;; 676297 447000)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -19990,8 +20008,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (21710 32133 -;;;;;; 678297 458000)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -20033,8 +20051,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (21710 32133 -;;;;;; 679297 463000)) +;;;### (autoloads nil "org-colview" "org/org-colview.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from org/org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -20097,8 +20115,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21710 32133 -;;;;;; 679297 463000)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -20108,8 +20126,8 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (21710 32133 684297 -;;;;;; 489000)) +;;;### (autoloads nil "org-macs" "org/org-macs.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from org/org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -20119,8 +20137,8 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** -;;;### (autoloads nil "org-version" "org/org-version.el" (21710 32133 -;;;;;; 687297 504000)) +;;;### (autoloads nil "org-version" "org/org-version.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from org/org-version.el (autoload 'org-release "org-version" "\ @@ -20137,8 +20155,8 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21710 32133 702297 -;;;;;; 582000)) +;;;### (autoloads nil "outline" "outline.el" (21720 38720 956749 +;;;;;; 443000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20181,8 +20199,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21710 32133 -;;;;;; 464296 345000)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21737 47805 +;;;;;; 354975 322000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20202,6 +20220,19 @@ Install the package PKG. PKG can be a package-desc or the package name of one the available packages in an archive in `package-archives'. Interactively, prompt for its name. +If called interactively or if DONT-SELECT nil, add PKG to +`package-selected-packages'. + +If PKG is a package-desc and it is already installed, don't try +to install it but still mark it as selected. + +\(fn PKG &optional DONT-SELECT)" t nil) + +(autoload 'package-reinstall "package" "\ +Reinstall package PKG. +PKG should be either a symbol, the package name, or a package-desc +object. + \(fn PKG)" t nil) (autoload 'package-install-from-buffer "package" "\ @@ -20224,6 +20255,21 @@ The file can either be a tar file or an Emacs Lisp file. \(fn FILE)" t nil) +(autoload 'package-install-user-selected-packages "package" "\ +Ensure packages in `package-selected-packages' are installed. +If some packages are not installed propose to install them. + +\(fn)" t nil) + +(autoload 'package-autoremove "package" "\ +Remove packages that are no more needed. + +Packages that are no more needed by other packages in +`package-selected-packages' and their dependencies +will be deleted. + +\(fn)" t nil) + (autoload 'package-import-keyring "package" "\ Import keys from FILE. @@ -20260,7 +20306,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads nil "paren" "paren.el" (21710 32133 702297 582000)) +;;;### (autoloads nil "paren" "paren.el" (21670 32331 385639 720000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20286,8 +20332,8 @@ matching parenthesis is highlighted in `show-paren-style' after ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21710 -;;;;;; 32133 405296 38000)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20300,8 +20346,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21710 32133 -;;;;;; 749297 827000)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20350,8 +20396,8 @@ See also the user variables `pascal-type-keywords', `pascal-start-keywords' and ;;;*** -;;;### (autoloads nil "password-cache" "password-cache.el" (21710 -;;;;;; 32133 702297 582000)) +;;;### (autoloads nil "password-cache" "password-cache.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20372,8 +20418,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21710 32133 -;;;;;; 465296 350000)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21739 3132 687120 +;;;;;; 143000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20426,6 +20472,16 @@ The exhaustive version of `pcase' (which see). (function-put 'pcase-exhaustive 'lisp-indent-function '1) +(autoload 'pcase-lambda "pcase" "\ +Like `lambda' but allow each argument to be a pattern. +`&rest' argument is supported. + +\(fn LAMBDA-LIST &rest BODY)" nil t) + +(function-put 'pcase-lambda 'doc-string-elt '2) + +(function-put 'pcase-lambda 'lisp-indent-function 'defun) + (autoload 'pcase-let* "pcase" "\ Like `let*' but where you can use `pcase' patterns for bindings. BODY should be an expression, and BINDINGS should be a list of bindings @@ -20455,8 +20511,8 @@ Define a pcase UPattern macro. ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21710 32133 702297 -;;;;;; 582000)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20466,8 +20522,8 @@ Completion rules for the `cvs' command. ;;;*** -;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21710 32133 702297 -;;;;;; 582000)) +;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20494,8 +20550,8 @@ Completion for the GNU tar utility. ;;;*** -;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21710 32133 -;;;;;; 702297 582000)) +;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20515,8 +20571,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21710 32133 702297 -;;;;;; 582000)) +;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20526,8 +20582,8 @@ Completion for the `rpm' command. ;;;*** -;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21710 32133 703297 -;;;;;; 588000)) +;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20582,8 +20638,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21710 32133 703297 -;;;;;; 588000)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20607,8 +20663,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (21710 32133 703297 -;;;;;; 588000)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (21688 62278 418203 +;;;;;; 119000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20665,7 +20721,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21710 32133 822298 206000)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21670 32331 885635 586000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -20740,8 +20796,8 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21710 32133 -;;;;;; 821298 201000)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ @@ -20749,8 +20805,8 @@ Global menu used by PCL-CVS.") ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21710 -;;;;;; 32133 749297 827000)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20811,8 +20867,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21710 32133 -;;;;;; 794298 61000)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -20892,8 +20948,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "plstore" "gnus/plstore.el" (21710 32133 548296 -;;;;;; 782000)) +;;;### (autoloads nil "plstore" "gnus/plstore.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -20908,8 +20964,8 @@ Major mode for editing PLSTORE files. ;;;*** -;;;### (autoloads nil "po" "textmodes/po.el" (21710 32133 794298 -;;;;;; 61000)) +;;;### (autoloads nil "po" "textmodes/po.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -20920,7 +20976,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads nil "pong" "play/pong.el" (21710 32133 708297 614000)) +;;;### (autoloads nil "pong" "play/pong.el" (21670 32331 385639 720000)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -20936,7 +20992,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21710 32133 549296 787000)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21670 32331 385639 720000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -20947,8 +21003,8 @@ Use streaming commands. ;;;*** -;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21710 32133 465296 -;;;;;; 350000)) +;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -20998,8 +21054,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (21710 32133 711297 -;;;;;; 629000)) +;;;### (autoloads nil "printing" "printing.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21587,7 +21643,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (21710 32133 711297 629000)) +;;;### (autoloads nil "proced" "proced.el" (21670 32331 385639 720000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21605,8 +21661,8 @@ Proced buffers. ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (21710 32133 712297 -;;;;;; 634000)) +;;;### (autoloads nil "profiler" "profiler.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21634,8 +21690,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21710 32133 -;;;;;; 751297 837000)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21668,7 +21724,7 @@ With prefix argument ARG, restart the Prolog process if running before. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21710 32133 766297 915000)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21670 32331 885635 586000)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ @@ -21679,8 +21735,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21710 32133 -;;;;;; 751297 837000)) +;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) @@ -21726,8 +21782,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (21710 32133 768297 -;;;;;; 925000)) +;;;### (autoloads nil "ps-print" "ps-print.el" (21670 32624 385626 +;;;;;; 484000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -21924,15 +21980,15 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (21710 32133 415296 -;;;;;; 90000)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21710 32133 -;;;;;; 752297 842000)) +;;;### (autoloads nil "python" "progmodes/python.el" (21743 190 195328 +;;;;;; 729000)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 4)) package--builtin-versions) @@ -21969,7 +22025,7 @@ Major mode for editing Python files. ;;;*** -;;;### (autoloads nil "qp" "gnus/qp.el" (21710 32133 549296 787000)) +;;;### (autoloads nil "qp" "gnus/qp.el" (21670 32331 385639 720000)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -21988,8 +22044,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (21710 32133 -;;;;;; 571296 901000)) +;;;### (autoloads nil "quail" "international/quail.el" (21673 8506 +;;;;;; 69195 402000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22219,8 +22275,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21710 -;;;;;; 32133 593297 16000)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22233,7 +22289,7 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'. ;;;*** ;;;### (autoloads nil "quail/uni-input" "leim/quail/uni-input.el" -;;;;;; (21710 32133 597297 37000)) +;;;;;; (21670 32331 385639 720000)) ;;; Generated autoloads from leim/quail/uni-input.el (autoload 'ucs-input-activate "quail/uni-input" "\ @@ -22247,8 +22303,8 @@ While this input method is active, the variable ;;;*** -;;;### (autoloads nil "quickurl" "net/quickurl.el" (21710 32133 635297 -;;;;;; 234000)) +;;;### (autoloads nil "quickurl" "net/quickurl.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -22319,8 +22375,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21710 32133 636297 -;;;;;; 239000)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22358,8 +22414,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21710 -;;;;;; 32133 465296 350000)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22377,8 +22433,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (21710 32133 769297 -;;;;;; 931000)) +;;;### (autoloads nil "recentf" "recentf.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22404,7 +22460,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21710 32133 769297 931000)) +;;;### (autoloads nil "rect" "rect.el" (21733 50750 334730 5000)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22544,8 +22600,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "refill" "textmodes/refill.el" (21710 32133 -;;;;;; 795298 66000)) +;;;### (autoloads nil "refill" "textmodes/refill.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -22565,8 +22621,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21710 32133 -;;;;;; 799298 87000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21704 50495 +;;;;;; 455324 752000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'reftex-citation "reftex-cite" nil t) (autoload 'reftex-all-document-files "reftex-parse") @@ -22619,8 +22675,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21710 -;;;;;; 32133 798298 81000)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21743 +;;;;;; 190 195328 729000)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22629,8 +22685,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21710 -;;;;;; 32133 465296 350000)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22659,15 +22715,15 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21710 32133 465296 -;;;;;; 350000)) +;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (21710 32133 -;;;;;; 799298 87000)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -22721,7 +22777,7 @@ to turn the *scratch* buffer into your notes buffer. ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (21710 32133 769297 931000)) +;;;### (autoloads nil "repeat" "repeat.el" (21670 32331 885635 586000)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -22744,8 +22800,8 @@ recently executed command not bound to an input event\". ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (21710 32133 -;;;;;; 603297 68000)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -22776,8 +22832,8 @@ mail-sending package is used for editing and sending the message. ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (21710 32133 770297 -;;;;;; 936000)) +;;;### (autoloads nil "reposition" "reposition.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -22803,7 +22859,7 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads nil "reveal" "reveal.el" (21710 32133 770297 936000)) +;;;### (autoloads nil "reveal" "reveal.el" (21670 32331 885635 586000)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -22838,8 +22894,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21710 32133 465296 -;;;;;; 350000)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -22854,8 +22910,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (21710 32133 636297 -;;;;;; 239000)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -22899,8 +22955,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21710 32133 605297 -;;;;;; 78000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21748 38880 365329 +;;;;;; 577000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23097,8 +23153,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21710 32133 -;;;;;; 606297 83000)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23162,8 +23218,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21710 32133 -;;;;;; 647297 296000)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23174,8 +23230,8 @@ Return a pattern. ;;;*** -;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21710 32133 -;;;;;; 648297 302000)) +;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23187,8 +23243,8 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil. ;;;*** -;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21710 32133 -;;;;;; 649297 307000)) +;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23218,8 +23274,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21710 32133 649297 -;;;;;; 307000)) +;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23246,8 +23302,8 @@ must be equal. ;;;*** -;;;### (autoloads nil "robin" "international/robin.el" (21710 32133 -;;;;;; 571296 901000)) +;;;### (autoloads nil "robin" "international/robin.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -23279,7 +23335,7 @@ Start using robin package NAME, which is a string. ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (21710 32133 770297 936000)) +;;;### (autoloads nil "rot13" "rot13.el" (21670 32331 885635 586000)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23316,8 +23372,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21710 32133 800298 -;;;;;; 92000)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23347,8 +23403,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21710 -;;;;;; 32133 753297 848000)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23365,8 +23421,8 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21710 32133 771297 -;;;;;; 941000)) +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23384,8 +23440,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21710 32133 466296 -;;;;;; 355000)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -23696,15 +23752,15 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21710 32133 -;;;;;; 636297 239000)) +;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21710 32133 771297 -;;;;;; 941000)) +;;;### (autoloads nil "savehist" "savehist.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -23736,8 +23792,8 @@ histories, which is probably undesirable. ;;;*** -;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21710 32133 -;;;;;; 753297 848000)) +;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -23776,8 +23832,8 @@ that variable's value is a string. ;;;*** -;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21710 32133 -;;;;;; 550296 792000)) +;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -23790,8 +23846,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (21710 32133 771297 -;;;;;; 941000)) +;;;### (autoloads nil "scroll-all" "scroll-all.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23816,8 +23872,8 @@ one window apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21710 32133 -;;;;;; 771297 941000)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -23833,16 +23889,16 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (21710 32133 637297 -;;;;;; 244000)) +;;;### (autoloads nil "secrets" "net/secrets.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) ;;;*** -;;;### (autoloads nil "semantic" "cedet/semantic.el" (21710 32133 -;;;;;; 415296 90000)) +;;;### (autoloads nil "semantic" "cedet/semantic.el" (21679 47292 +;;;;;; 556033 759000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) @@ -23900,7 +23956,7 @@ Semantic mode. ;;;*** ;;;### (autoloads nil "semantic/bovine/grammar" "cedet/semantic/bovine/grammar.el" -;;;;;; (21710 32133 418296 106000)) +;;;;;; (21670 32330 885624 725000)) ;;; Generated autoloads from cedet/semantic/bovine/grammar.el (autoload 'bovine-grammar-mode "semantic/bovine/grammar" "\ @@ -23911,7 +23967,7 @@ Major mode for editing Bovine grammars. ;;;*** ;;;### (autoloads nil "semantic/wisent/grammar" "cedet/semantic/wisent/grammar.el" -;;;;;; (21710 32133 430296 168000)) +;;;;;; (21670 32330 885624 725000)) ;;; Generated autoloads from cedet/semantic/wisent/grammar.el (autoload 'wisent-grammar-mode "semantic/wisent/grammar" "\ @@ -23921,8 +23977,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21710 32133 -;;;;;; 607297 89000)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24203,14 +24259,14 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "seq" "emacs-lisp/seq.el" (21710 32133 466296 -;;;;;; 355000)) +;;;### (autoloads nil "seq" "emacs-lisp/seq.el" (21724 35774 954622 +;;;;;; 790000)) ;;; Generated autoloads from emacs-lisp/seq.el -(push (purecopy '(seq 1 0)) package--builtin-versions) +(push (purecopy '(seq 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "server" "server.el" (21710 32133 772297 946000)) +;;;### (autoloads nil "server" "server.el" (21744 21055 525326 515000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24277,7 +24333,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21710 32133 773297 952000)) +;;;### (autoloads nil "ses" "ses.el" (21670 32331 885635 586000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24321,8 +24377,8 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21710 -;;;;;; 32133 801298 97000)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24387,8 +24443,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21710 -;;;;;; 32133 754297 853000)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21704 +;;;;;; 50495 455324 752000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24451,8 +24507,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21710 32133 -;;;;;; 466296 355000)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24501,8 +24557,8 @@ function, `load-path-shadows-find'. ;;;*** -;;;### (autoloads nil "shadowfile" "shadowfile.el" (21710 32133 773297 -;;;;;; 952000)) +;;;### (autoloads nil "shadowfile" "shadowfile.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -24540,7 +24596,7 @@ Set up file shadowing. ;;;*** -;;;### (autoloads nil "shell" "shell.el" (21710 32133 774297 957000)) +;;;### (autoloads nil "shell" "shell.el" (21678 26426 225333 737000)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24588,7 +24644,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21710 32133 637297 244000)) +;;;### (autoloads nil "shr" "net/shr.el" (21748 18111 534605 274000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24605,8 +24661,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (21710 32133 550296 -;;;;;; 792000)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24631,8 +24687,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21710 32133 -;;;;;; 550296 792000)) +;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -24647,8 +24703,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simula" "progmodes/simula.el" (21710 32133 -;;;;;; 755297 858000)) +;;;### (autoloads nil "simula" "progmodes/simula.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -24696,8 +24752,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21710 32133 777297 -;;;;;; 972000)) +;;;### (autoloads nil "skeleton" "skeleton.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -24815,8 +24871,8 @@ symmetrical ones, and the same character twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21710 32133 -;;;;;; 823298 212000)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -24843,8 +24899,8 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** -;;;### (autoloads nil "smiley" "gnus/smiley.el" (21710 32133 550296 -;;;;;; 792000)) +;;;### (autoloads nil "smiley" "gnus/smiley.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -24861,8 +24917,8 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** -;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21710 32133 -;;;;;; 607297 89000)) +;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -24877,8 +24933,8 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads nil "snake" "play/snake.el" (21710 32133 709297 -;;;;;; 619000)) +;;;### (autoloads nil "snake" "play/snake.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -24901,8 +24957,8 @@ Snake mode keybindings: ;;;*** -;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21710 32133 -;;;;;; 638297 250000)) +;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -24931,8 +24987,8 @@ then `snmpv2-mode-hook'. ;;;*** -;;;### (autoloads nil "solar" "calendar/solar.el" (21710 32133 405296 -;;;;;; 38000)) +;;;### (autoloads nil "solar" "calendar/solar.el" (21735 6077 666769 +;;;;;; 364000)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -24947,8 +25003,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "solitaire" "play/solitaire.el" (21710 32133 -;;;;;; 709297 619000)) +;;;### (autoloads nil "solitaire" "play/solitaire.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -25023,7 +25079,7 @@ Pick your favorite shortcuts: ;;;*** -;;;### (autoloads nil "sort" "sort.el" (21710 32133 777297 972000)) +;;;### (autoloads nil "sort" "sort.el" (21670 32331 885635 586000)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25198,7 +25254,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (21710 32133 552296 802000)) +;;;### (autoloads nil "spam" "gnus/spam.el" (21670 32331 385639 720000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25212,8 +25268,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21710 -;;;;;; 32133 551296 797000)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25255,8 +25311,8 @@ Spam reports will be queued with the method used when ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (21710 32133 778297 -;;;;;; 977000)) +;;;### (autoloads nil "speedbar" "speedbar.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25280,8 +25336,8 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (21710 32133 709297 -;;;;;; 619000)) +;;;### (autoloads nil "spook" "play/spook.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25296,8 +25352,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21710 32133 756297 -;;;;;; 863000)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 4)) package--builtin-versions) @@ -25763,15 +25819,15 @@ Run vsql as an inferior process. ;;;*** -;;;### (autoloads nil "srecode" "cedet/srecode.el" (21710 32133 431296 -;;;;;; 173000)) +;;;### (autoloads nil "srecode" "cedet/srecode.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (21710 32133 434296 189000)) +;;;;;; (21670 32330 885624 725000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -25783,8 +25839,8 @@ Major-mode for writing SRecode macros. ;;;*** -;;;### (autoloads nil "starttls" "gnus/starttls.el" (21710 32133 -;;;;;; 552296 802000)) +;;;### (autoloads nil "starttls" "gnus/starttls.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -25807,8 +25863,8 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21710 32133 779297 -;;;;;; 983000)) +;;;### (autoloads nil "strokes" "strokes.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -25921,8 +25977,8 @@ Read a complex stroke and insert its glyph into the current buffer. ;;;*** -;;;### (autoloads nil "studly" "play/studly.el" (21710 32133 709297 -;;;;;; 619000)) +;;;### (autoloads nil "studly" "play/studly.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/studly.el (autoload 'studlify-region "studly" "\ @@ -25942,8 +25998,8 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (21710 32133 -;;;;;; 756297 863000)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from progmodes/subword.el (define-obsolete-function-alias 'capitalized-words-mode 'subword-mode "25.1") @@ -26035,8 +26091,8 @@ See `superword-mode' for more information on Superword mode. ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (21710 32133 -;;;;;; 608297 94000)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -26068,8 +26124,8 @@ and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (21710 32133 781297 -;;;;;; 993000)) +;;;### (autoloads nil "t-mouse" "t-mouse.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -26097,7 +26153,7 @@ It relies on the `gpm' daemon being activated. ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (21710 32133 781297 993000)) +;;;### (autoloads nil "tabify" "tabify.el" (21670 32331 885635 586000)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -26126,8 +26182,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (21710 32133 803298 -;;;;;; 108000)) +;;;### (autoloads nil "table" "textmodes/table.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -26719,7 +26775,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads nil "talk" "talk.el" (21710 32133 781297 993000)) +;;;### (autoloads nil "talk" "talk.el" (21670 32331 885635 586000)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -26734,8 +26790,8 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (21710 32133 782297 -;;;;;; 998000)) +;;;### (autoloads nil "tar-mode" "tar-mode.el" (21704 50495 455324 +;;;;;; 752000)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -26758,8 +26814,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21710 32133 757297 -;;;;;; 868000)) +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -26807,8 +26863,8 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (21710 32133 639297 -;;;;;; 255000)) +;;;### (autoloads nil "telnet" "net/telnet.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from net/telnet.el (autoload 'telnet "telnet" "\ @@ -26833,7 +26889,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21710 32133 783298 4000)) +;;;### (autoloads nil "term" "term.el" (21670 32331 885635 586000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -26875,8 +26931,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21710 -;;;;;; 32133 468296 366000)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -26886,8 +26942,8 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads nil "tetris" "play/tetris.el" (21710 32133 709297 -;;;;;; 619000)) +;;;### (autoloads nil "tetris" "play/tetris.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) @@ -26912,8 +26968,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21710 32133 -;;;;;; 804298 113000)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27214,8 +27270,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21710 32133 -;;;;;; 805298 118000)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27254,8 +27310,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21710 32133 -;;;;;; 805298 118000)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27339,8 +27395,8 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads nil "thai-util" "language/thai-util.el" (21710 -;;;;;; 32133 581296 953000)) +;;;### (autoloads nil "thai-util" "language/thai-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27367,8 +27423,8 @@ Compose Thai characters in the current buffer. ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (21710 32133 806298 -;;;;;; 123000)) +;;;### (autoloads nil "thingatpt" "thingatpt.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27432,7 +27488,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21710 32133 807298 128000)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21670 32331 885635 586000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27466,8 +27522,8 @@ In dired, call the setroot program on the image at point. ;;;*** -;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21710 -;;;;;; 32133 583296 964000)) +;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -27540,8 +27596,8 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21710 32133 -;;;;;; 806298 123000)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21695 35516 +;;;;;; 595262 313000)) ;;; Generated autoloads from textmodes/tildify.el (push (purecopy '(tildify 4 6 1)) package--builtin-versions) @@ -27607,7 +27663,7 @@ variable will be set to the representation. ;;;*** -;;;### (autoloads nil "time" "time.el" (21710 32133 807298 128000)) +;;;### (autoloads nil "time" "time.el" (21670 32331 885635 586000)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -27669,8 +27725,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21710 -;;;;;; 32133 405296 38000)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27773,8 +27829,8 @@ Convert the time interval in seconds to a short string. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (21710 32133 807298 -;;;;;; 128000)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -27814,8 +27870,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21710 -;;;;;; 32133 406296 44000)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -27925,7 +27981,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (21710 32133 571296 901000)) +;;;;;; (21670 32331 385639 720000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -27947,7 +28003,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (21710 32133 807298 128000)) +;;;### (autoloads nil "tmm" "tmm.el" (21670 32331 885635 586000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27989,8 +28045,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21710 -;;;;;; 32133 407296 49000)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -28057,8 +28113,8 @@ Mode for displaying and reprioritizing top priority Todo. ;;;*** -;;;### (autoloads nil "tool-bar" "tool-bar.el" (21710 32133 808298 -;;;;;; 133000)) +;;;### (autoloads nil "tool-bar" "tool-bar.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -28128,8 +28184,8 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21710 32133 468296 -;;;;;; 366000)) +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -28142,8 +28198,8 @@ to a tcp server on another machine. ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21710 32133 -;;;;;; 468296 366000)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -28188,8 +28244,8 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21710 32133 644297 -;;;;;; 281000)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21704 50495 455324 +;;;;;; 752000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28304,8 +28360,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21710 32133 -;;;;;; 640297 260000)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28315,8 +28371,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21710 32133 808298 -;;;;;; 133000)) +;;;### (autoloads nil "tutorial" "tutorial.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28340,8 +28396,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "tv-util" "language/tv-util.el" (21710 32133 -;;;;;; 583296 964000)) +;;;### (autoloads nil "tv-util" "language/tv-util.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from language/tv-util.el (autoload 'tai-viet-composition-function "tv-util" "\ @@ -28351,8 +28407,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21710 -;;;;;; 32133 806298 123000)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28399,8 +28455,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (21710 32133 809298 -;;;;;; 139000)) +;;;### (autoloads nil "type-break" "type-break.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28532,7 +28588,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (21710 32133 608297 94000)) +;;;### (autoloads nil "uce" "mail/uce.el" (21670 32331 385639 720000)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -28546,7 +28602,7 @@ You might need to set `uce-mail-reader' before using this. ;;;*** ;;;### (autoloads nil "ucs-normalize" "international/ucs-normalize.el" -;;;;;; (21710 32133 571296 901000)) +;;;;;; (21670 32331 385639 720000)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -28611,8 +28667,8 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus. ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (21710 -;;;;;; 32133 806298 123000)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28632,8 +28688,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21710 32133 608297 -;;;;;; 94000)) +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -28653,8 +28709,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use. ;;;*** -;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21710 32133 -;;;;;; 468296 366000)) +;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21670 32330 +;;;;;; 885624 725000)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -28666,7 +28722,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (21710 32133 814298 165000)) +;;;### (autoloads nil "url" "url/url.el" (21670 32331 885635 586000)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -28713,8 +28769,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (21710 32133 810298 -;;;;;; 144000)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -28755,8 +28811,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** -;;;### (autoloads nil "url-cache" "url/url-cache.el" (21710 32133 -;;;;;; 810298 144000)) +;;;### (autoloads nil "url-cache" "url/url-cache.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -28777,8 +28833,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-cid" "url/url-cid.el" (21710 32133 810298 -;;;;;; 144000)) +;;;### (autoloads nil "url-cid" "url/url-cid.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -28788,8 +28844,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-dav" "url/url-dav.el" (21710 32133 811298 -;;;;;; 149000)) +;;;### (autoloads nil "url-dav" "url/url-dav.el" (21696 56380 925320 +;;;;;; 624000)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -28823,8 +28879,8 @@ added to this list, so most requests can just pass in nil. ;;;*** -;;;### (autoloads nil "url-file" "url/url-file.el" (21710 32133 811298 -;;;;;; 149000)) +;;;### (autoloads nil "url-file" "url/url-file.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -28834,8 +28890,8 @@ Handle file: and ftp: URLs. ;;;*** -;;;### (autoloads nil "url-gw" "url/url-gw.el" (21710 32133 811298 -;;;;;; 149000)) +;;;### (autoloads nil "url-gw" "url/url-gw.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -28856,8 +28912,8 @@ overriding the value of `url-gateway-method'. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21710 -;;;;;; 32133 811298 149000)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28911,8 +28967,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (21710 32133 812298 -;;;;;; 154000)) +;;;### (autoloads nil "url-http" "url/url-http.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -28924,8 +28980,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-irc" "url/url-irc.el" (21710 32133 812298 -;;;;;; 154000)) +;;;### (autoloads nil "url-irc" "url/url-irc.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -28935,8 +28991,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21710 32133 812298 -;;;;;; 154000)) +;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -28949,8 +29005,8 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** -;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21710 32133 -;;;;;; 812298 154000)) +;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -28965,8 +29021,8 @@ Handle the mailto: URL syntax. ;;;*** -;;;### (autoloads nil "url-misc" "url/url-misc.el" (21710 32133 813298 -;;;;;; 160000)) +;;;### (autoloads nil "url-misc" "url/url-misc.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -28997,8 +29053,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-news" "url/url-news.el" (21710 32133 813298 -;;;;;; 160000)) +;;;### (autoloads nil "url-news" "url/url-news.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -29013,8 +29069,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-ns" "url/url-ns.el" (21710 32133 813298 -;;;;;; 160000)) +;;;### (autoloads nil "url-ns" "url/url-ns.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -29054,8 +29110,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-parse" "url/url-parse.el" (21710 32133 -;;;;;; 813298 160000)) +;;;### (autoloads nil "url-parse" "url/url-parse.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -29106,8 +29162,8 @@ parses to ;;;*** -;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21710 32133 -;;;;;; 813298 160000)) +;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -29117,8 +29173,8 @@ Setup variables that expose info about you and your system. ;;;*** -;;;### (autoloads nil "url-queue" "url/url-queue.el" (21710 32133 -;;;;;; 813298 160000)) +;;;### (autoloads nil "url-queue" "url/url-queue.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -29132,8 +29188,8 @@ The variable `url-queue-timeout' sets a timeout. ;;;*** -;;;### (autoloads nil "url-tramp" "url/url-tramp.el" (21710 32133 -;;;;;; 813298 160000)) +;;;### (autoloads nil "url-tramp" "url/url-tramp.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from url/url-tramp.el (defvar url-tramp-protocols '("ftp" "ssh" "scp" "rsync" "telnet") "\ @@ -29151,8 +29207,8 @@ would have been passed to OPERATION. ;;;*** -;;;### (autoloads nil "url-util" "url/url-util.el" (21710 32133 813298 -;;;;;; 160000)) +;;;### (autoloads nil "url-util" "url/url-util.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29320,8 +29376,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21710 32133 814298 -;;;;;; 165000)) +;;;### (autoloads nil "userlock" "userlock.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29349,8 +29405,8 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (21710 32133 -;;;;;; 571296 901000)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29375,7 +29431,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf7" "gnus/utf7.el" (21710 32133 552296 802000)) +;;;### (autoloads nil "utf7" "gnus/utf7.el" (21670 32331 385639 720000)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29385,8 +29441,8 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;*** -;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21710 32133 -;;;;;; 608297 94000)) +;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21670 32331 +;;;;;; 385639 720000)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29410,7 +29466,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (21710 32133 828298 237000)) +;;;### (autoloads nil "vc" "vc/vc.el" (21748 18111 534605 274000)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29431,6 +29487,16 @@ See `run-hooks'.") (custom-autoload 'vc-before-checkin-hook "vc" t) +(autoload 'vc-responsible-backend "vc" "\ +Return the name of a backend system that is responsible for FILE. + +If FILE is already registered, return the +backend of FILE. If FILE is not registered, then the +first backend in `vc-handled-backends' that declares itself +responsible for FILE is returned. + +\(fn FILE)" nil nil) + (autoload 'vc-next-action "vc" "\ Do the next logical version control operation on the current fileset. This requires that all files in the current VC fileset be in the @@ -29697,8 +29763,8 @@ Return the branch part of a revision number REV. ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21710 32133 -;;;;;; 823298 212000)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21670 32331 +;;;;;; 885635 586000)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29737,8 +29803,8 @@ should be applied to the background or to the foreground. ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21710 32133 824298 -;;;;;; 217000)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21744 21055 525326 +;;;;;; 515000)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -29754,8 +29820,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21710 32133 824298 -;;;;;; 217000)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21744 21055 525326 +;;;;;; 515000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -29766,8 +29832,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21710 32133 825298 -;;;;;; 222000)) +;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21694 14651 747488 +;;;;;; 989000)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -29791,8 +29857,8 @@ These are the commands available for use in the file status buffer: ;;;*** -;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21710 -;;;;;; 32133 825298 222000)) +;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -29815,8 +29881,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21710 32133 825298 -;;;;;; 222000)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21744 21055 525326 +;;;;;; 515000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -29827,7 +29893,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21710 32133 826298 227000)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21744 21055 525326 515000)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -29838,8 +29904,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21710 32133 826298 -;;;;;; 227000)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21744 21055 525326 +;;;;;; 515000)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -29855,8 +29921,8 @@ Name of the monotone directory's format file.") ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21710 32133 827298 -;;;;;; 232000)) +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21748 18111 534605 +;;;;;; 274000)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -29869,8 +29935,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21710 32133 827298 -;;;;;; 232000)) +;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21748 18111 534605 +;;;;;; 274000)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -29888,8 +29954,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-src" "vc/vc-src.el" (21710 32133 827298 -;;;;;; 232000)) +;;;### (autoloads nil "vc-src" "vc/vc-src.el" (21748 18111 534605 +;;;;;; 274000)) ;;; Generated autoloads from vc/vc-src.el (defvar vc-src-master-templates (purecopy '("%s.src/%s,v")) "\ @@ -29902,8 +29968,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21710 32133 827298 -;;;;;; 232000)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21744 21055 525326 +;;;;;; 515000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29916,8 +29982,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21710 -;;;;;; 32133 757297 868000)) +;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from progmodes/vera-mode.el (push (purecopy '(vera-mode 2 28)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -29976,7 +30042,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21710 32133 761297 889000)) +;;;;;; (21735 54828 874639 640000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30115,8 +30181,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21710 -;;;;;; 32133 765297 910000)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21735 +;;;;;; 53834 375321 1000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -30493,7 +30559,7 @@ Usage: VHDL STANDARDS: The VHDL standards to be used are specified in option `vhdl-standard'. - Available standards are: VHDL'87/'93(02), VHDL-AMS, and Math Packages. + Available standards are: VHDL'87/'93(02)/'08, VHDL-AMS, and Math Packages. KEYWORD CASE: @@ -30670,8 +30736,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "viet-util" "language/viet-util.el" (21710 -;;;;;; 32133 583296 964000)) +;;;### (autoloads nil "viet-util" "language/viet-util.el" (21670 +;;;;;; 32331 385639 720000)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -30715,7 +30781,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics. ;;;*** -;;;### (autoloads nil "view" "view.el" (21710 32133 829298 243000)) +;;;### (autoloads nil "view" "view.el" (21670 32331 885635 586000)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -30971,8 +31037,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "viper" "emulation/viper.el" (21710 32133 475296 -;;;;;; 402000)) +;;;### (autoloads nil "viper" "emulation/viper.el" (21670 32330 885624 +;;;;;; 725000)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) @@ -30989,8 +31055,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21710 -;;;;;; 32133 468296 366000)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21670 +;;;;;; 32330 885624 725000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -31080,7 +31146,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (21710 32133 830298 248000)) +;;;### (autoloads nil "wdired" "wdired.el" (21670 32331 885635 586000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -31098,8 +31164,8 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads nil "webjump" "net/webjump.el" (21710 32133 644297 -;;;;;; 281000)) +;;;### (autoloads nil "webjump" "net/webjump.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -31115,8 +31181,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21710 -;;;;;; 32133 765297 910000)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21670 +;;;;;; 32331 885635 586000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31146,8 +31212,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21710 32133 830298 -;;;;;; 248000)) +;;;### (autoloads nil "whitespace" "whitespace.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31515,8 +31581,8 @@ cleaning up these problems. ;;;*** -;;;### (autoloads nil "wid-browse" "wid-browse.el" (21710 32133 830298 -;;;;;; 248000)) +;;;### (autoloads nil "wid-browse" "wid-browse.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -31544,8 +31610,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21710 32133 831298 -;;;;;; 253000)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31587,8 +31653,8 @@ Setup current buffer so editing string widgets works. ;;;*** -;;;### (autoloads nil "windmove" "windmove.el" (21710 32133 832298 -;;;;;; 258000)) +;;;### (autoloads nil "windmove" "windmove.el" (21733 50750 334730 +;;;;;; 5000)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -31640,7 +31706,7 @@ Default MODIFIER is 'shift. ;;;*** -;;;### (autoloads nil "winner" "winner.el" (21710 32133 834298 269000)) +;;;### (autoloads nil "winner" "winner.el" (21733 50750 334730 5000)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -31663,7 +31729,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21710 32133 835298 274000)) +;;;### (autoloads nil "woman" "woman.el" (21670 32331 885635 586000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31712,7 +31778,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (21710 32133 836298 279000)) +;;;### (autoloads nil "xml" "xml.el" (21670 32331 885635 586000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -31768,8 +31834,8 @@ Both features can be combined by providing a cons cell ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21710 32133 649297 -;;;;;; 307000)) +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21670 32331 385639 +;;;;;; 720000)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -31787,8 +31853,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xref" "progmodes/xref.el" (21710 32133 765297 -;;;;;; 910000)) +;;;### (autoloads nil "xref" "progmodes/xref.el" (21739 3132 687120 +;;;;;; 143000)) ;;; Generated autoloads from progmodes/xref.el (autoload 'xref-pop-marker-stack "xref" "\ @@ -31837,8 +31903,8 @@ The argument has the same meaning as in `apropos'. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21710 32133 836298 -;;;;;; 279000)) +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21670 32331 885635 +;;;;;; 586000)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -31867,7 +31933,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** -;;;### (autoloads nil "yenc" "gnus/yenc.el" (21710 32133 552296 802000)) +;;;### (autoloads nil "yenc" "gnus/yenc.el" (21670 32331 385639 720000)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -31882,7 +31948,7 @@ Extract file name from an yenc header. ;;;*** -;;;### (autoloads nil "zone" "play/zone.el" (21710 32133 709297 619000)) +;;;### (autoloads nil "zone" "play/zone.el" (21670 32331 385639 720000)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -31898,46 +31964,44 @@ Zone out, completely. ;;;;;; "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el" ;;;;;; "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el" ;;;;;; "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el" -;;;;;; "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el" -;;;;;; "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el" -;;;;;; "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el" -;;;;;; "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el" -;;;;;; "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el" -;;;;;; "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el" -;;;;;; "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el" -;;;;;; "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el" -;;;;;; "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el" -;;;;;; "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el" -;;;;;; "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el" -;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el" -;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el" -;;;;;; "calendar/hol-loaddefs.el" "cdl.el" "cedet/cedet-cscope.el" -;;;;;; "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el" -;;;;;; "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" "cedet/ede/base.el" -;;;;;; "cedet/ede/config.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el" -;;;;;; "cedet/ede/detect.el" "cedet/ede/dired.el" "cedet/ede/emacs.el" -;;;;;; "cedet/ede/files.el" "cedet/ede/generic.el" "cedet/ede/linux.el" -;;;;;; "cedet/ede/locate.el" "cedet/ede/make.el" "cedet/ede/makefile-edit.el" -;;;;;; "cedet/ede/pconf.el" "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" -;;;;;; "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" -;;;;;; "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" -;;;;;; "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" -;;;;;; "cedet/ede/proj.el" "cedet/ede/project-am.el" "cedet/ede/shell.el" -;;;;;; "cedet/ede/simple.el" "cedet/ede/source.el" "cedet/ede/speedbar.el" -;;;;;; "cedet/ede/srecode.el" "cedet/ede/system.el" "cedet/ede/util.el" -;;;;;; "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" -;;;;;; "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el" -;;;;;; "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el" -;;;;;; "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el" -;;;;;; "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el" -;;;;;; "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el" -;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el" -;;;;;; "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el" -;;;;;; "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el" -;;;;;; "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el" -;;;;;; "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el" -;;;;;; "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el" -;;;;;; "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" +;;;;;; "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el" +;;;;;; "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el" +;;;;;; "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el" +;;;;;; "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el" +;;;;;; "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el" +;;;;;; "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el" +;;;;;; "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el" +;;;;;; "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el" +;;;;;; "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el" +;;;;;; "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el" +;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el" +;;;;;; "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el" +;;;;;; "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el" +;;;;;; "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el" +;;;;;; "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el" +;;;;;; "cedet/cedet-idutils.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" +;;;;;; "cedet/ede/base.el" "cedet/ede/config.el" "cedet/ede/cpp-root.el" +;;;;;; "cedet/ede/custom.el" "cedet/ede/detect.el" "cedet/ede/dired.el" +;;;;;; "cedet/ede/emacs.el" "cedet/ede/files.el" "cedet/ede/generic.el" +;;;;;; "cedet/ede/linux.el" "cedet/ede/loaddefs.el" "cedet/ede/locate.el" +;;;;;; "cedet/ede/make.el" "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" +;;;;;; "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" +;;;;;; "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" +;;;;;; "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" +;;;;;; "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" "cedet/ede/proj.el" +;;;;;; "cedet/ede/project-am.el" "cedet/ede/shell.el" "cedet/ede/simple.el" +;;;;;; "cedet/ede/source.el" "cedet/ede/speedbar.el" "cedet/ede/srecode.el" +;;;;;; "cedet/ede/system.el" "cedet/ede/util.el" "cedet/semantic/analyze.el" +;;;;;; "cedet/semantic/analyze/complete.el" "cedet/semantic/analyze/debug.el" +;;;;;; "cedet/semantic/analyze/fcn.el" "cedet/semantic/analyze/refs.el" +;;;;;; "cedet/semantic/bovine.el" "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el" +;;;;;; "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el" +;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm.el" +;;;;;; "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" +;;;;;; "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el" +;;;;;; "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" +;;;;;; "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el" +;;;;;; "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" ;;;;;; "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el" ;;;;;; "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el" ;;;;;; "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el" @@ -31945,103 +32009,94 @@ Zone out, completely. ;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el" ;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el" ;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" -;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" -;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" -;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" -;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" -;;;;;; "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el" -;;;;;; "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el" -;;;;;; "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" +;;;;;; "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el" +;;;;;; "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el" +;;;;;; "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el" +;;;;;; "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el" +;;;;;; "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el" +;;;;;; "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" -;;;;;; "cedet/semantic/wisent/javat-wy.el" "cedet/semantic/wisent/js-wy.el" -;;;;;; "cedet/semantic/wisent/python-wy.el" "cedet/semantic/wisent/python.el" -;;;;;; "cedet/semantic/wisent/wisent.el" "cedet/srecode/args.el" -;;;;;; "cedet/srecode/compile.el" "cedet/srecode/cpp.el" "cedet/srecode/ctxt.el" -;;;;;; "cedet/srecode/dictionary.el" "cedet/srecode/document.el" +;;;;;; "cedet/semantic/wisent/python.el" "cedet/semantic/wisent/wisent.el" +;;;;;; "cedet/srecode/args.el" "cedet/srecode/compile.el" "cedet/srecode/cpp.el" +;;;;;; "cedet/srecode/ctxt.el" "cedet/srecode/dictionary.el" "cedet/srecode/document.el" ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" -;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" -;;;;;; "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" +;;;;;; "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el" +;;;;;; "cedet/srecode/semantic.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" ;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" ;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dom.el" "dos-fns.el" ;;;;;; "dos-vars.el" "dos-w32.el" "dynamic-setting.el" "emacs-lisp/avl-tree.el" ;;;;;; "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/cl-extra.el" -;;;;;; "emacs-lisp/cl-generic.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" -;;;;;; "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-compat.el" -;;;;;; "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el" -;;;;;; "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el" -;;;;;; "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" "emacs-lisp/smie.el" -;;;;;; "emacs-lisp/subr-x.el" "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el" -;;;;;; "emulation/cua-gmrk.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el" -;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/viper-cmd.el" -;;;;;; "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el" -;;;;;; "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el" -;;;;;; "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el" -;;;;;; "erc/erc-lang.el" "eshell/em-alias.el" "eshell/em-banner.el" -;;;;;; "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el" -;;;;;; "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el" -;;;;;; "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el" -;;;;;; "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el" -;;;;;; "eshell/em-tramp.el" "eshell/em-unix.el" "eshell/em-xtra.el" -;;;;;; "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el" -;;;;;; "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el" -;;;;;; "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el" -;;;;;; "ezimage.el" "format-spec.el" "fringe.el" "generic-x.el" -;;;;;; "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" -;;;;;; "gnus/gnus-cite.el" "gnus/gnus-cloud.el" "gnus/gnus-cus.el" -;;;;;; "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el" -;;;;;; "gnus/gnus-ems.el" "gnus/gnus-icalendar.el" "gnus/gnus-int.el" -;;;;;; "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el" -;;;;;; "gnus/gnus-score.el" "gnus/gnus-srvr.el" "gnus/gnus-topic.el" -;;;;;; "gnus/gnus-undo.el" "gnus/gnus-util.el" "gnus/gnus-uu.el" -;;;;;; "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" "gnus/legacy-gnus-agent.el" -;;;;;; "gnus/mail-parse.el" "gnus/mail-prsvr.el" "gnus/mail-source.el" -;;;;;; "gnus/mailcap.el" "gnus/messcompat.el" "gnus/mm-archive.el" -;;;;;; "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-util.el" -;;;;;; "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" "gnus/nnagent.el" -;;;;;; "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" "gnus/nneething.el" -;;;;;; "gnus/nngateway.el" "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnir.el" -;;;;;; "gnus/nnmail.el" "gnus/nnmaildir.el" "gnus/nnmairix.el" "gnus/nnmbox.el" -;;;;;; "gnus/nnmh.el" "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnregistry.el" -;;;;;; "gnus/nnrss.el" "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnvirtual.el" -;;;;;; "gnus/nnweb.el" "gnus/registry.el" "gnus/rfc1843.el" "gnus/rfc2045.el" -;;;;;; "gnus/rfc2047.el" "gnus/rfc2104.el" "gnus/rfc2231.el" "gnus/rtree.el" -;;;;;; "gnus/sieve-manage.el" "gnus/smime.el" "gnus/spam-stat.el" +;;;;;; "emacs-lisp/cl-generic.el" "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el" +;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" +;;;;;; "emacs-lisp/eieio-compat.el" "emacs-lisp/eieio-custom.el" +;;;;;; "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-opt.el" +;;;;;; "emacs-lisp/eieio-speedbar.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" +;;;;;; "emacs-lisp/smie.el" "emacs-lisp/subr-x.el" "emacs-lisp/tcover-ses.el" +;;;;;; "emacs-lisp/tcover-unsafep.el" "emulation/cua-gmrk.el" "emulation/edt-lk201.el" +;;;;;; "emulation/edt-mapper.el" "emulation/edt-pc.el" "emulation/edt-vt100.el" +;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el" +;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el" +;;;;;; "emulation/viper-util.el" "erc/erc-backend.el" "erc/erc-goodies.el" +;;;;;; "erc/erc-ibuffer.el" "erc/erc-lang.el" "eshell/em-alias.el" +;;;;;; "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el" +;;;;;; "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el" +;;;;;; "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el" +;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" +;;;;;; "eshell/em-term.el" "eshell/em-tramp.el" "eshell/em-unix.el" +;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" +;;;;;; "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el" +;;;;;; "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el" +;;;;;; "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "format-spec.el" +;;;;;; "fringe.el" "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" +;;;;;; "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cloud.el" +;;;;;; "gnus/gnus-cus.el" "gnus/gnus-demon.el" "gnus/gnus-dup.el" +;;;;;; "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-icalendar.el" +;;;;;; "gnus/gnus-int.el" "gnus/gnus-logic.el" "gnus/gnus-mh.el" +;;;;;; "gnus/gnus-salt.el" "gnus/gnus-score.el" "gnus/gnus-srvr.el" +;;;;;; "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el" +;;;;;; "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" +;;;;;; "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" "gnus/mail-prsvr.el" +;;;;;; "gnus/mail-source.el" "gnus/mailcap.el" "gnus/messcompat.el" +;;;;;; "gnus/mm-archive.el" "gnus/mm-bodies.el" "gnus/mm-decode.el" +;;;;;; "gnus/mm-util.el" "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" +;;;;;; "gnus/nnagent.el" "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" +;;;;;; "gnus/nneething.el" "gnus/nngateway.el" "gnus/nnheader.el" +;;;;;; "gnus/nnimap.el" "gnus/nnir.el" "gnus/nnmail.el" "gnus/nnmaildir.el" +;;;;;; "gnus/nnmairix.el" "gnus/nnmbox.el" "gnus/nnmh.el" "gnus/nnnil.el" +;;;;;; "gnus/nnoo.el" "gnus/nnregistry.el" "gnus/nnrss.el" "gnus/nnspool.el" +;;;;;; "gnus/nntp.el" "gnus/nnvirtual.el" "gnus/nnweb.el" "gnus/registry.el" +;;;;;; "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el" "gnus/rfc2231.el" +;;;;;; "gnus/rtree.el" "gnus/sieve-manage.el" "gnus/smime.el" "gnus/spam-stat.el" ;;;;;; "gnus/spam-wash.el" "hex-util.el" "hfy-cmap.el" "ibuf-ext.el" ;;;;;; "international/cp51932.el" "international/eucjp-ms.el" "international/fontset.el" ;;;;;; "international/iso-ascii.el" "international/ja-dic-cnv.el" -;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "international/uni-bidi.el" -;;;;;; "international/uni-brackets.el" "international/uni-category.el" -;;;;;; "international/uni-combining.el" "international/uni-comment.el" -;;;;;; "international/uni-decimal.el" "international/uni-decomposition.el" -;;;;;; "international/uni-digit.el" "international/uni-lowercase.el" -;;;;;; "international/uni-mirrored.el" "international/uni-name.el" -;;;;;; "international/uni-numeric.el" "international/uni-old-name.el" -;;;;;; "international/uni-titlecase.el" "international/uni-uppercase.el" -;;;;;; "kermit.el" "language/hanja-util.el" "language/thai-word.el" -;;;;;; "ldefs-boot.el" "leim/ja-dic/ja-dic.el" "leim/quail/arabic.el" -;;;;;; "leim/quail/croatian.el" "leim/quail/cyril-jis.el" "leim/quail/cyrillic.el" -;;;;;; "leim/quail/czech.el" "leim/quail/ethiopic.el" "leim/quail/georgian.el" -;;;;;; "leim/quail/greek.el" "leim/quail/hanja-jis.el" "leim/quail/hanja.el" -;;;;;; "leim/quail/hanja3.el" "leim/quail/hebrew.el" "leim/quail/indian.el" -;;;;;; "leim/quail/ipa-praat.el" "leim/quail/ipa.el" "leim/quail/japanese.el" -;;;;;; "leim/quail/lao.el" "leim/quail/latin-alt.el" "leim/quail/latin-ltx.el" -;;;;;; "leim/quail/latin-post.el" "leim/quail/latin-pre.el" "leim/quail/lrt.el" -;;;;;; "leim/quail/persian.el" "leim/quail/py-punct.el" "leim/quail/pypunct-b5.el" -;;;;;; "leim/quail/rfc1345.el" "leim/quail/sgml-input.el" "leim/quail/sisheng.el" -;;;;;; "leim/quail/slovak.el" "leim/quail/symbol-ksc.el" "leim/quail/thai.el" -;;;;;; "leim/quail/tibetan.el" "leim/quail/viqr.el" "leim/quail/vntelex.el" -;;;;;; "leim/quail/vnvni.el" "leim/quail/welsh.el" "loadup.el" "mail/blessmail.el" -;;;;;; "mail/mailheader.el" "mail/mspools.el" "mail/rfc2368.el" -;;;;;; "mail/rfc822.el" "mail/rmail-spam-filter.el" "mail/rmailedit.el" -;;;;;; "mail/rmailkwd.el" "mail/rmailmm.el" "mail/rmailmsc.el" "mail/rmailsort.el" -;;;;;; "mail/rmailsum.el" "mail/undigest.el" "mh-e/mh-acros.el" -;;;;;; "mh-e/mh-alias.el" "mh-e/mh-buffers.el" "mh-e/mh-compat.el" -;;;;;; "mh-e/mh-funcs.el" "mh-e/mh-gnus.el" "mh-e/mh-identity.el" -;;;;;; "mh-e/mh-inc.el" "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el" +;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "kermit.el" +;;;;;; "language/hanja-util.el" "language/thai-word.el" "ldefs-boot.el" +;;;;;; "leim/quail/arabic.el" "leim/quail/croatian.el" "leim/quail/cyril-jis.el" +;;;;;; "leim/quail/cyrillic.el" "leim/quail/czech.el" "leim/quail/ethiopic.el" +;;;;;; "leim/quail/georgian.el" "leim/quail/greek.el" "leim/quail/hanja-jis.el" +;;;;;; "leim/quail/hanja.el" "leim/quail/hanja3.el" "leim/quail/hebrew.el" +;;;;;; "leim/quail/indian.el" "leim/quail/ipa-praat.el" "leim/quail/ipa.el" +;;;;;; "leim/quail/japanese.el" "leim/quail/lao.el" "leim/quail/latin-alt.el" +;;;;;; "leim/quail/latin-ltx.el" "leim/quail/latin-post.el" "leim/quail/latin-pre.el" +;;;;;; "leim/quail/lrt.el" "leim/quail/persian.el" "leim/quail/py-punct.el" +;;;;;; "leim/quail/pypunct-b5.el" "leim/quail/rfc1345.el" "leim/quail/sgml-input.el" +;;;;;; "leim/quail/sisheng.el" "leim/quail/slovak.el" "leim/quail/symbol-ksc.el" +;;;;;; "leim/quail/thai.el" "leim/quail/tibetan.el" "leim/quail/viqr.el" +;;;;;; "leim/quail/vntelex.el" "leim/quail/vnvni.el" "leim/quail/welsh.el" +;;;;;; "loadup.el" "mail/blessmail.el" "mail/mailheader.el" "mail/mspools.el" +;;;;;; "mail/rfc2368.el" "mail/rfc822.el" "mail/rmail-spam-filter.el" +;;;;;; "mail/rmailedit.el" "mail/rmailkwd.el" "mail/rmailmm.el" +;;;;;; "mail/rmailmsc.el" "mail/rmailsort.el" "mail/rmailsum.el" +;;;;;; "mail/undigest.el" "mh-e/mh-acros.el" "mh-e/mh-alias.el" +;;;;;; "mh-e/mh-buffers.el" "mh-e/mh-compat.el" "mh-e/mh-funcs.el" +;;;;;; "mh-e/mh-gnus.el" "mh-e/mh-identity.el" "mh-e/mh-inc.el" +;;;;;; "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el" ;;;;;; "mh-e/mh-loaddefs.el" "mh-e/mh-mime.el" "mh-e/mh-print.el" ;;;;;; "mh-e/mh-scan.el" "mh-e/mh-search.el" "mh-e/mh-seq.el" "mh-e/mh-show.el" ;;;;;; "mh-e/mh-speed.el" "mh-e/mh-thread.el" "mh-e/mh-tool-bar.el" @@ -32049,45 +32104,45 @@ Zone out, completely. ;;;;;; "net/dns.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" "net/eudcb-ldap.el" ;;;;;; "net/eudcb-mab.el" "net/eudcb-ph.el" "net/hmac-def.el" "net/hmac-md5.el" ;;;;;; "net/imap.el" "net/ldap.el" "net/mairix.el" "net/newsticker.el" -;;;;;; "net/nsm.el" "net/sasl-cram.el" "net/sasl-digest.el" "net/sasl.el" -;;;;;; "net/shr-color.el" "net/soap-client.el" "net/soap-inspect.el" -;;;;;; "net/socks.el" "net/tls.el" "net/tramp-adb.el" "net/tramp-cache.el" -;;;;;; "net/tramp-cmds.el" "net/tramp-compat.el" "net/tramp-gvfs.el" -;;;;;; "net/tramp-gw.el" "net/tramp-loaddefs.el" "net/tramp-sh.el" -;;;;;; "net/tramp-smb.el" "net/tramp-uu.el" "net/trampver.el" "net/zeroconf.el" -;;;;;; "notifications.el" "nxml/nxml-enc.el" "nxml/nxml-maint.el" -;;;;;; "nxml/nxml-ns.el" "nxml/nxml-outln.el" "nxml/nxml-parse.el" -;;;;;; "nxml/nxml-rap.el" "nxml/nxml-util.el" "nxml/rng-dt.el" "nxml/rng-loc.el" -;;;;;; "nxml/rng-maint.el" "nxml/rng-match.el" "nxml/rng-parse.el" -;;;;;; "nxml/rng-pttrn.el" "nxml/rng-uri.el" "nxml/rng-util.el" -;;;;;; "nxml/xsd-regexp.el" "org/ob-C.el" "org/ob-R.el" "org/ob-asymptote.el" -;;;;;; "org/ob-awk.el" "org/ob-calc.el" "org/ob-clojure.el" "org/ob-comint.el" -;;;;;; "org/ob-core.el" "org/ob-css.el" "org/ob-ditaa.el" "org/ob-dot.el" -;;;;;; "org/ob-emacs-lisp.el" "org/ob-eval.el" "org/ob-exp.el" "org/ob-fortran.el" -;;;;;; "org/ob-gnuplot.el" "org/ob-haskell.el" "org/ob-io.el" "org/ob-java.el" -;;;;;; "org/ob-js.el" "org/ob-keys.el" "org/ob-latex.el" "org/ob-ledger.el" -;;;;;; "org/ob-lilypond.el" "org/ob-lisp.el" "org/ob-lob.el" "org/ob-makefile.el" -;;;;;; "org/ob-matlab.el" "org/ob-maxima.el" "org/ob-mscgen.el" -;;;;;; "org/ob-ocaml.el" "org/ob-octave.el" "org/ob-org.el" "org/ob-perl.el" -;;;;;; "org/ob-picolisp.el" "org/ob-plantuml.el" "org/ob-python.el" -;;;;;; "org/ob-ref.el" "org/ob-ruby.el" "org/ob-sass.el" "org/ob-scala.el" -;;;;;; "org/ob-scheme.el" "org/ob-screen.el" "org/ob-sh.el" "org/ob-shen.el" -;;;;;; "org/ob-sql.el" "org/ob-sqlite.el" "org/ob-table.el" "org/ob-tangle.el" -;;;;;; "org/ob.el" "org/org-archive.el" "org/org-attach.el" "org/org-bbdb.el" -;;;;;; "org/org-bibtex.el" "org/org-clock.el" "org/org-crypt.el" -;;;;;; "org/org-ctags.el" "org/org-datetree.el" "org/org-docview.el" -;;;;;; "org/org-element.el" "org/org-entities.el" "org/org-eshell.el" -;;;;;; "org/org-faces.el" "org/org-feed.el" "org/org-footnote.el" -;;;;;; "org/org-gnus.el" "org/org-habit.el" "org/org-id.el" "org/org-indent.el" -;;;;;; "org/org-info.el" "org/org-inlinetask.el" "org/org-install.el" -;;;;;; "org/org-irc.el" "org/org-list.el" "org/org-macro.el" "org/org-mhe.el" -;;;;;; "org/org-mobile.el" "org/org-mouse.el" "org/org-pcomplete.el" -;;;;;; "org/org-plot.el" "org/org-protocol.el" "org/org-rmail.el" -;;;;;; "org/org-src.el" "org/org-table.el" "org/org-timer.el" "org/org-w3m.el" -;;;;;; "org/ox-ascii.el" "org/ox-beamer.el" "org/ox-html.el" "org/ox-icalendar.el" -;;;;;; "org/ox-latex.el" "org/ox-man.el" "org/ox-md.el" "org/ox-odt.el" -;;;;;; "org/ox-org.el" "org/ox-publish.el" "org/ox-texinfo.el" "org/ox.el" -;;;;;; "play/gametree.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" +;;;;;; "net/nsm.el" "net/rfc2104.el" "net/sasl-cram.el" "net/sasl-digest.el" +;;;;;; "net/sasl-scram-rfc.el" "net/sasl.el" "net/shr-color.el" +;;;;;; "net/soap-client.el" "net/soap-inspect.el" "net/socks.el" +;;;;;; "net/tls.el" "net/tramp-adb.el" "net/tramp-cache.el" "net/tramp-cmds.el" +;;;;;; "net/tramp-compat.el" "net/tramp-gvfs.el" "net/tramp-gw.el" +;;;;;; "net/tramp-loaddefs.el" "net/tramp-sh.el" "net/tramp-smb.el" +;;;;;; "net/tramp-uu.el" "net/trampver.el" "net/zeroconf.el" "notifications.el" +;;;;;; "nxml/nxml-enc.el" "nxml/nxml-maint.el" "nxml/nxml-ns.el" +;;;;;; "nxml/nxml-outln.el" "nxml/nxml-parse.el" "nxml/nxml-rap.el" +;;;;;; "nxml/nxml-util.el" "nxml/rng-dt.el" "nxml/rng-loc.el" "nxml/rng-maint.el" +;;;;;; "nxml/rng-match.el" "nxml/rng-parse.el" "nxml/rng-pttrn.el" +;;;;;; "nxml/rng-uri.el" "nxml/rng-util.el" "nxml/xsd-regexp.el" +;;;;;; "org/ob-C.el" "org/ob-R.el" "org/ob-asymptote.el" "org/ob-awk.el" +;;;;;; "org/ob-calc.el" "org/ob-clojure.el" "org/ob-comint.el" "org/ob-core.el" +;;;;;; "org/ob-css.el" "org/ob-ditaa.el" "org/ob-dot.el" "org/ob-emacs-lisp.el" +;;;;;; "org/ob-eval.el" "org/ob-exp.el" "org/ob-fortran.el" "org/ob-gnuplot.el" +;;;;;; "org/ob-haskell.el" "org/ob-io.el" "org/ob-java.el" "org/ob-js.el" +;;;;;; "org/ob-keys.el" "org/ob-latex.el" "org/ob-ledger.el" "org/ob-lilypond.el" +;;;;;; "org/ob-lisp.el" "org/ob-lob.el" "org/ob-makefile.el" "org/ob-matlab.el" +;;;;;; "org/ob-maxima.el" "org/ob-mscgen.el" "org/ob-ocaml.el" "org/ob-octave.el" +;;;;;; "org/ob-org.el" "org/ob-perl.el" "org/ob-picolisp.el" "org/ob-plantuml.el" +;;;;;; "org/ob-python.el" "org/ob-ref.el" "org/ob-ruby.el" "org/ob-sass.el" +;;;;;; "org/ob-scala.el" "org/ob-scheme.el" "org/ob-screen.el" "org/ob-sh.el" +;;;;;; "org/ob-shen.el" "org/ob-sql.el" "org/ob-sqlite.el" "org/ob-table.el" +;;;;;; "org/ob-tangle.el" "org/ob.el" "org/org-archive.el" "org/org-attach.el" +;;;;;; "org/org-bbdb.el" "org/org-bibtex.el" "org/org-clock.el" +;;;;;; "org/org-crypt.el" "org/org-ctags.el" "org/org-datetree.el" +;;;;;; "org/org-docview.el" "org/org-element.el" "org/org-entities.el" +;;;;;; "org/org-eshell.el" "org/org-faces.el" "org/org-feed.el" +;;;;;; "org/org-footnote.el" "org/org-gnus.el" "org/org-habit.el" +;;;;;; "org/org-id.el" "org/org-indent.el" "org/org-info.el" "org/org-inlinetask.el" +;;;;;; "org/org-install.el" "org/org-irc.el" "org/org-list.el" "org/org-loaddefs.el" +;;;;;; "org/org-macro.el" "org/org-mhe.el" "org/org-mobile.el" "org/org-mouse.el" +;;;;;; "org/org-pcomplete.el" "org/org-plot.el" "org/org-protocol.el" +;;;;;; "org/org-rmail.el" "org/org-src.el" "org/org-table.el" "org/org-timer.el" +;;;;;; "org/org-w3m.el" "org/ox-ascii.el" "org/ox-beamer.el" "org/ox-html.el" +;;;;;; "org/ox-icalendar.el" "org/ox-latex.el" "org/ox-man.el" "org/ox-md.el" +;;;;;; "org/ox-odt.el" "org/ox-org.el" "org/ox-publish.el" "org/ox-texinfo.el" +;;;;;; "org/ox.el" "play/gametree.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" ;;;;;; "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el" ;;;;;; "progmodes/cc-defs.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el" ;;;;;; "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" @@ -32110,8 +32165,8 @@ Zone out, completely. ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vc/vc-filewise.el" "vcursor.el" "vt-control.el" "vt100-led.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21710 33148 175417 -;;;;;; 782000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21748 43392 687411 +;;;;;; 995000)) ;;;*** From 9d8d0658147dfe5a90e2fb07ff666f35b1162d6e Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Mon, 2 Mar 2015 02:23:09 -0800 Subject: [PATCH 201/457] Add support for finalizers +2015-03-02 Daniel Colascione + + * NEWS: Mention finalizers. + 2015-02-09 Gareth Rees (tiny change) * NEWS.24: Fix typo (bug#19820) diff --git a/src/ChangeLog b/src/ChangeLog index 4aa64c1..2f04d0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,21 @@ +2015-03-02 Daniel Colascione + + * print.c (print_object): Print finalizers. + + * alloc.c: + (finalizers, doomed_finalizers): New variables. + (init_finalizer_list, finalizer_insert, unchain_finalizer) + (mark_finalizer_list, queue_doomed_finalizers) + (run_finalizer_handler, run_finalizer_function, run_finalizers): + New functions. + (garbage_collect_1, mark_object, sweep_misc) + (init_alloc_once, syms_of_alloc): Support finalizers. + (gc-precise-p): New Lisp variable. + + * lisp.h (Lisp_Misc_Type): New value Lisp_Misc_Finalizer. + (FINALIZERP, XFINALIZER): New functions. + (Lisp_Finalizer): New structure. + 2015-02-28 Paul Eggert * character.c (alphabeticp, decimalnump): Avoid undefined behavior diff --git a/test/ChangeLog b/test/ChangeLog index cf1b2c1..684e98f 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-03-02 Daniel Colascione + + * automated/finalizer-tests.el (finalizer-basic) + (finalizer-circular-reference, finalizer-cross-reference) + (finalizer-error): New tests. + 2015-03-01 Michael Albinus * automated/vc-tests.el (vc-test--create-repo): Add check for --- etc/ChangeLog | 4 + etc/NEWS | 3 + src/ChangeLog | 18 ++++ src/alloc.c | 172 +++++++++++++++++++++++++++++- src/lisp.h | 33 ++++++ src/print.c | 6 +- test/ChangeLog | 6 ++ test/automated/finalizer-tests.el | 78 ++++++++++++++ 8 files changed, 314 insertions(+), 6 deletions(-) create mode 100644 test/automated/finalizer-tests.el diff --git a/etc/ChangeLog b/etc/ChangeLog index 24cb6f24d22..99a74f942f2 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2015-03-02 Daniel Colascione + + * NEWS: Mention finalizers. + 2015-02-09 Gareth Rees (tiny change) * NEWS.24: Fix typo (bug#19820) diff --git a/etc/NEWS b/etc/NEWS index 3be820e0d5f..6c94a587ad5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -621,6 +621,9 @@ word syntax, use `\sw' instead. * Lisp Changes in Emacs 25.1 +** New finalizer facility for running code when objects + become unreachable. + ** lexical closures can use (:documentation
          ) to build their docstring. It should be placed right where the docstring would be, and is then evaluated (and should return a string) when the closure is built. diff --git a/src/ChangeLog b/src/ChangeLog index 4aa64c1d6f9..2f04d0b040a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,21 @@ +2015-03-02 Daniel Colascione + + * print.c (print_object): Print finalizers. + + * alloc.c: + (finalizers, doomed_finalizers): New variables. + (init_finalizer_list, finalizer_insert, unchain_finalizer) + (mark_finalizer_list, queue_doomed_finalizers) + (run_finalizer_handler, run_finalizer_function, run_finalizers): + New functions. + (garbage_collect_1, mark_object, sweep_misc) + (init_alloc_once, syms_of_alloc): Support finalizers. + (gc-precise-p): New Lisp variable. + + * lisp.h (Lisp_Misc_Type): New value Lisp_Misc_Finalizer. + (FINALIZERP, XFINALIZER): New functions. + (Lisp_Finalizer): New structure. + 2015-02-28 Paul Eggert * character.c (alphabeticp, decimalnump): Avoid undefined behavior diff --git a/src/alloc.c b/src/alloc.c index 9aa94b8a559..eec53e7d844 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -441,6 +441,15 @@ mmap_lisp_allowed_p (void) return pointers_fit_in_lispobj_p () && !might_dump; } +/* Head of a circularly-linked list of extant finalizers. */ +static struct Lisp_Finalizer finalizers; + +/* Head of a circularly-linked list of finalizers that must be invoked + because we deemed them unreachable. This list must be global, and + not a local inside garbage_collect_1, in case we GC again while + running finalizers. */ +static struct Lisp_Finalizer doomed_finalizers; + /************************************************************************ Malloc @@ -3695,6 +3704,131 @@ make_event_array (ptrdiff_t nargs, Lisp_Object *args) } } +static void +init_finalizer_list (struct Lisp_Finalizer *head) +{ + head->prev = head->next = head; +} + +/* Insert FINALIZER before ELEMENT. */ + +static void +finalizer_insert (struct Lisp_Finalizer *element, + struct Lisp_Finalizer* finalizer) +{ + eassert (finalizer->prev == NULL); + eassert (finalizer->next == NULL); + finalizer->next = element; + finalizer->prev = element->prev; + finalizer->prev->next = finalizer; + element->prev = finalizer; +} + +static void +unchain_finalizer (struct Lisp_Finalizer *finalizer) +{ + if (finalizer->prev != NULL) { + eassert (finalizer->next != NULL); + finalizer->prev->next = finalizer->next; + finalizer->next->prev = finalizer->prev; + finalizer->prev = finalizer->next = NULL; + } +} + +static void +mark_finalizer_list (struct Lisp_Finalizer *head) +{ + for (struct Lisp_Finalizer *finalizer = head->next; + finalizer != head; + finalizer = finalizer->next) + { + finalizer->base.gcmarkbit = 1; + mark_object (finalizer->function); + } +} + +/* Move doomed finalizers in list SRC onto list DEST. A doomed + finalizer is one that is not GC-reachable and whose + finalizer->function is non-nil. (We reset finalizer->function to + before attempting to run it.) */ + +static void +queue_doomed_finalizers (struct Lisp_Finalizer *dest, + struct Lisp_Finalizer *src) +{ + struct Lisp_Finalizer* finalizer = src->next; + while (finalizer != src) + { + struct Lisp_Finalizer *next = finalizer->next; + if (!finalizer->base.gcmarkbit && !NILP (finalizer->function)) + { + unchain_finalizer (finalizer); + finalizer_insert (dest, finalizer); + } + + finalizer = next; + } +} + +static Lisp_Object +run_finalizer_handler (Lisp_Object args) +{ + add_to_log ("finalizer failed: %S", args, Qnil); + return Qnil; +} + +static void +run_finalizer_function (Lisp_Object function) +{ + struct gcpro gcpro1; + ptrdiff_t count = SPECPDL_INDEX (); + + GCPRO1 (function); + specbind (Qinhibit_quit, Qt); + internal_condition_case_1 (call0, function, Qt, run_finalizer_handler); + unbind_to (count, Qnil); + UNGCPRO; +} + +static void +run_finalizers (struct Lisp_Finalizer* finalizers) +{ + struct Lisp_Finalizer* finalizer; + Lisp_Object function; + struct gcpro gcpro1; + + while (finalizers->next != finalizers) { + finalizer = finalizers->next; + eassert (finalizer->base.type == Lisp_Misc_Finalizer); + unchain_finalizer (finalizer); + function = finalizer->function; + if (!NILP (function)) + { + finalizer->function = Qnil; + run_finalizer_function (function); + } + } +} + +DEFUN ("make-finalizer", Fmake_finalizer, Smake_finalizer, 1, 1, 0, + doc: /* Make a finalizer that will run FUNCTION. +FUNCTION will be called after garbage collection when the returned +finalizer object becomes unreachable. If the finalizer object is +reachable only through references from finalizer objects, it does not +count as reachable for the purpose of deciding whether to run +FUNCTION. FUNCTION will be run once per finalizer object. */) + (Lisp_Object function) +{ + Lisp_Object val; + struct Lisp_Finalizer *finalizer; + + val = allocate_misc (Lisp_Misc_Finalizer); + finalizer = XFINALIZER (val); + finalizer->function = function; + finalizer->prev = finalizer->next = NULL; + finalizer_insert (&finalizers, finalizer); + return val; +} /************************************************************************ @@ -5613,9 +5747,9 @@ garbage_collect_1 (void *end) mark_stack (end); #endif - /* Everything is now marked, except for the data in font caches - and undo lists. They're compacted by removing an items which - aren't reachable otherwise. */ + /* Everything is now marked, except for the data in font caches, + undo lists, and finalizers. The first two are compacted by + removing an items which aren't reachable otherwise. */ compact_font_caches (); @@ -5628,6 +5762,16 @@ garbage_collect_1 (void *end) mark_object (BVAR (nextb, undo_list)); } + /* Now pre-sweep finalizers. Here, we add any unmarked finalizers + to doomed_finalizers so we can run their associated functions + after GC. It's important to scan finalizers at this stage so + that we can be sure that unmarked finalizers are really + unreachable except for references from their associated functions + and from other finalizers. */ + + queue_doomed_finalizers (&doomed_finalizers, &finalizers); + mark_finalizer_list (&doomed_finalizers); + gc_sweep (); /* Clear the mark bits that we set in certain root slots. */ @@ -5728,6 +5872,9 @@ garbage_collect_1 (void *end) } #endif + /* GC is complete: now we can run our finalizer callbacks. */ + run_finalizers (&doomed_finalizers); + if (!NILP (Vpost_gc_hook)) { ptrdiff_t gc_count = inhibit_garbage_collection (); @@ -6364,7 +6511,12 @@ mark_object (Lisp_Object arg) case Lisp_Misc_Overlay: mark_overlay (XOVERLAY (obj)); - break; + break; + + case Lisp_Misc_Finalizer: + XMISCANY (obj)->gcmarkbit = 1; + mark_object (XFINALIZER (obj)->function); + break; default: emacs_abort (); @@ -6746,6 +6898,8 @@ sweep_misc (void) { if (mblk->markers[i].m.u_any.type == Lisp_Misc_Marker) unchain_marker (&mblk->markers[i].m.u_marker); + if (mblk->markers[i].m.u_any.type == Lisp_Misc_Finalizer) + unchain_finalizer (&mblk->markers[i].m.u_finalizer); /* Set the type of the freed object to Lisp_Misc_Free. We could leave the type alone, since nobody checks it, but this might catch bugs faster. */ @@ -7115,11 +7269,14 @@ init_alloc_once (void) { /* Even though Qt's contents are not set up, its address is known. */ Vpurify_flag = Qt; + gc_precise_p = (GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE); purebeg = PUREBEG; pure_size = PURESIZE; verify_alloca (); + init_finalizer_list (&finalizers); + init_finalizer_list (&doomed_finalizers); #if GC_MARK_STACK || defined GC_MALLOC_CHECK mem_init (); @@ -7254,7 +7411,11 @@ do hash-consing of the objects allocated to pure space. */); doc: /* Accumulated time elapsed in garbage collections. The time is in seconds as a floating point value. */); DEFVAR_INT ("gcs-done", gcs_done, - doc: /* Accumulated number of garbage collections done. */); + doc: /* Accumulated number of garbage collections done. */); + + DEFVAR_BOOL ("gc-precise-p", gc_precise_p, + doc: /* Non-nil means GC stack marking is precise. +Useful mainly for automated GC tests. Build time constant.*/); defsubr (&Scons); defsubr (&Slist); @@ -7267,6 +7428,7 @@ The time is in seconds as a floating point value. */); defsubr (&Smake_bool_vector); defsubr (&Smake_symbol); defsubr (&Smake_marker); + defsubr (&Smake_finalizer); defsubr (&Spurecopy); defsubr (&Sgarbage_collect); defsubr (&Smemory_limit); diff --git a/src/lisp.h b/src/lisp.h index fb436776121..37f3b28242b 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -488,6 +488,7 @@ enum Lisp_Misc_Type Lisp_Misc_Marker, Lisp_Misc_Overlay, Lisp_Misc_Save_Value, + Lisp_Misc_Finalizer, /* Currently floats are not a misc type, but let's define this in case we want to change that. */ Lisp_Misc_Float, @@ -600,6 +601,7 @@ INLINE bool OVERLAYP (Lisp_Object); INLINE bool PROCESSP (Lisp_Object); INLINE bool PSEUDOVECTORP (Lisp_Object, int); INLINE bool SAVE_VALUEP (Lisp_Object); +INLINE bool FINALIZERP (Lisp_Object); INLINE void set_sub_char_table_contents (Lisp_Object, ptrdiff_t, Lisp_Object); INLINE bool STRINGP (Lisp_Object); @@ -610,6 +612,7 @@ INLINE bool (VECTORLIKEP) (Lisp_Object); INLINE bool WINDOWP (Lisp_Object); INLINE bool TERMINALP (Lisp_Object); INLINE struct Lisp_Save_Value *XSAVE_VALUE (Lisp_Object); +INLINE struct Lisp_Finalizer *XFINALIZER (Lisp_Object); INLINE struct Lisp_Symbol *(XSYMBOL) (Lisp_Object); INLINE void *(XUNTAG) (Lisp_Object, int); @@ -2183,6 +2186,21 @@ XSAVE_OBJECT (Lisp_Object obj, int n) return XSAVE_VALUE (obj)->data[n].object; } +/* A finalizer sentinel. We run FUNCTION when this value becomes + unreachable. We treat these values specially in the GC to ensure + that we still run the finalizer even if FUNCTION contains a + reference to the finalizer; i.e., we run a finalizer's function + when FUNCTION is reachable _only_ through finalizers. */ +struct Lisp_Finalizer + { + struct Lisp_Misc_Any base; + /* Circular list of all active weak references */ + struct Lisp_Finalizer *prev; + struct Lisp_Finalizer *next; + /* Called when this object becomes unreachable */ + Lisp_Object function; + }; + /* A miscellaneous object, when it's on the free list. */ struct Lisp_Free { @@ -2202,6 +2220,7 @@ union Lisp_Misc struct Lisp_Marker u_marker; struct Lisp_Overlay u_overlay; struct Lisp_Save_Value u_save_value; + struct Lisp_Finalizer u_finalizer; }; INLINE union Lisp_Misc * @@ -2243,6 +2262,14 @@ XSAVE_VALUE (Lisp_Object a) eassert (SAVE_VALUEP (a)); return & XMISC (a)->u_save_value; } + +INLINE struct Lisp_Finalizer * +XFINALIZER (Lisp_Object a) +{ + eassert (FINALIZERP (a)); + return & XMISC (a)->u_finalizer; +} + /* Forwarding pointer to an int variable. This is allowed only in the value cell of a symbol, @@ -2489,6 +2516,12 @@ SAVE_VALUEP (Lisp_Object x) return MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Save_Value; } +INLINE bool +FINALIZERP (Lisp_Object x) +{ + return MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Finalizer; +} + INLINE bool AUTOLOADP (Lisp_Object x) { diff --git a/src/print.c b/src/print.c index 1a0aebbeba7..d391fd5f7a3 100644 --- a/src/print.c +++ b/src/print.c @@ -2043,7 +2043,11 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) printcharfun); } PRINTCHAR ('>'); - break; + break; + + case Lisp_Misc_Finalizer: + strout ("#", -1, -1, printcharfun); + break; /* Remaining cases shouldn't happen in normal usage, but let's print them anyway for the benefit of the debugger. */ diff --git a/test/ChangeLog b/test/ChangeLog index cf1b2c13d7e..684e98f880e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-03-02 Daniel Colascione + + * automated/finalizer-tests.el (finalizer-basic) + (finalizer-circular-reference, finalizer-cross-reference) + (finalizer-error): New tests. + 2015-03-01 Michael Albinus * automated/vc-tests.el (vc-test--create-repo): Add check for diff --git a/test/automated/finalizer-tests.el b/test/automated/finalizer-tests.el new file mode 100644 index 00000000000..5308f01085b --- /dev/null +++ b/test/automated/finalizer-tests.el @@ -0,0 +1,78 @@ +;;; finalizer-tests.el --- Finalizer tests -*- lexical-binding: t -*- + +;; Copyright (C) 2015 Free Software Foundation, Inc. + +;; Author: Daniel Colascione +;; Keywords: + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +;; + +;;; Code: + +(require 'ert) +(require 'cl-lib) + +(ert-deftest finalizer-basic () + "Test that finalizers run at all." + (skip-unless gc-precise-p) + (let* ((finalized nil) + (finalizer (make-finalizer (lambda () (setf finalized t))))) + (garbage-collect) + (should (equal finalized nil)) + (setf finalizer nil) + (garbage-collect) + (should (equal finalized t)))) + +(ert-deftest finalizer-circular-reference () + "Test references from a callback to a finalizer." + (skip-unless gc-precise-p) + (let ((finalized nil)) + (let* ((value nil) + (finalizer (make-finalizer (lambda () (setf finalized value))))) + (setf value finalizer) + (setf finalizer nil)) + (garbage-collect) + (should finalized))) + +(ert-deftest finalizer-cross-reference () + "Test that between-finalizer references do not prevent collection." + (skip-unless gc-precise-p) + (let ((d nil) (fc 0)) + (let* ((f1-data (cons nil nil)) + (f2-data (cons nil nil)) + (f1 (make-finalizer + (lambda () (cl-incf fc) (setf d f1-data)))) + (f2 (make-finalizer + (lambda () (cl-incf fc) (setf d f2-data))))) + (setcar f1-data f2) + (setcar f2-data f1)) + (garbage-collect) + (should (equal fc 2)))) + +(ert-deftest finalizer-error () + "Test that finalizer errors are suppressed" + (skip-unless gc-precise-p) + (make-finalizer (lambda () (error "ABCDEF"))) + (garbage-collect) + (with-current-buffer "*Messages*" + (save-excursion + (goto-char (point-max)) + (forward-line -1) + (should (equal + (buffer-substring (point) (point-at-eol)) + "finalizer failed: (error \"ABCDEF\")"))))) From f6b5db6c45b773f86e203368aee9153ec8527205 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sun, 1 Mar 2015 23:57:51 -0800 Subject: [PATCH 202/457] Add support for generators diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 78f7e34..e7d79d5 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2015-03-02 Daniel Colascione + + * control.texi (Generators): New section + * elisp.text: Reference new section. + 2015-02-28 Eli Zaretskii * searching.texi (Char Classes): Update the documentation of diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 448c7f2..4e9c119 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2015-03-02 Daniel Colascione + + * cl.texi (Iteration Clauses): Mention iterator support. + 2015-02-25 Tassilo Horn * reftex.texi (Multifile Documents): Document diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ce2e81..4ab4406 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,8 @@ 2015-03-02 Daniel Colascione - * vc/vc.el (vc-responsible-backend): Add autoload cooking for + * emacs-lisp/generator.el: New file. + + * vc/vc.el (vc-responsible-backend): Add autoload cookie for `vc-responsible-backend'. 2015-03-01 Michael Albinus diff --git a/test/ChangeLog b/test/ChangeLog index 684e98f..64ad851 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,7 @@ 2015-03-02 Daniel Colascione + * automated/generator-tests.el: New tests + * automated/finalizer-tests.el (finalizer-basic) (finalizer-circular-reference, finalizer-cross-reference) (finalizer-error): New tests. --- doc/lispref/ChangeLog | 5 + doc/lispref/control.texi | 116 +++++ doc/lispref/elisp.texi | 1 + doc/misc/ChangeLog | 4 + doc/misc/cl.texi | 5 + etc/NEWS | 2 + lisp/ChangeLog | 4 +- lisp/emacs-lisp/generator.el | 789 ++++++++++++++++++++++++++++++ test/ChangeLog | 2 + test/automated/generator-tests.el | 288 +++++++++++ 10 files changed, 1215 insertions(+), 1 deletion(-) create mode 100644 lisp/emacs-lisp/generator.el create mode 100644 test/automated/generator-tests.el diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 78f7e34ca01..e7d79d55c7e 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2015-03-02 Daniel Colascione + + * control.texi (Generators): New section + * elisp.text: Reference new section. + 2015-02-28 Eli Zaretskii * searching.texi (Char Classes): Update the documentation of diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index d21292348a4..bec2bc92ac4 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -39,6 +39,7 @@ structure constructs (@pxref{Macros}). * Conditionals:: @code{if}, @code{cond}, @code{when}, @code{unless}. * Combining Conditions:: @code{and}, @code{or}, @code{not}. * Iteration:: @code{while} loops. +* Generators:: Generic sequences and coroutines. * Nonlocal Exits:: Jumping out of a sequence. @end menu @@ -620,6 +621,121 @@ Here is an example of using @code{dotimes} to do something 100 times: @end example @end defmac +@node Generators +@section Generators +@cindex generators + + A @dfn{generator} is a function that produces a potentially-infinite +stream of values. Each time the function produces a value, it +suspends itself and waits for a caller to request the next value. + +@defmac iter-defun name args [doc] [declare] [interactive] body@dots{} +@code{iter-defun} defines a generator function. A generator function +has the same signature as a normal function, but works differently. +Instead of executing @var{body} when called, a generator function +returns an iterator object. That iterator runs @var{body} to generate +values, emitting a value and pausing where @code{iter-yield} or +@code{iter-yield-from} appears. When @var{body} returns normally, +@code{iter-next} signals @code{iter-end-of-sequence} with @var{body}'s +result as its condition data. + +Any kind of Lisp code is valid inside @var{body}, but +@code{iter-yield} and @code{iter-yield-from} cannot appear inside +@code{unwind-protect} forms. + +@end defmac + +@defmac iter-lambda args [doc] [interactive] body@dots{} +@code{iter-lambda} produces an unnamed generator function that works +just like a generator function produced with @code{iter-defun}. +@end defmac + +@defmac iter-yield value +When it appears inside a generator function, @code{iter-yield} +indicates that the current iterator should pause and return +@var{value} from @code{iter-next}. @code{iter-yield} evaluates to the +@code{value} parameter of next call to @code{iter-next}. +@end defmac + +@defmac iter-yield-from iterator +@code{iter-yield-from} yields all the values that @var{iterator} +produces and evaluates to the value that @var{iterator}'s generator +function returns normally. While it has control, @var{iterator} +receives sent to the iterator using @code{iter-next}. +@end defmac + + To use a generator function, first call it normally, producing a +@dfn{iterator} object. An iterator is a specific instance of a +generator. Then use @code{iter-next} to retrieve values from this +iterator. When there are no more values to pull from an iterator, +@code{iter-next} raises an @code{iter-end-of-sequence} condition with +the iterator's final value. + +It's important to note that generator function bodies only execute +inside calls to @code{iter-next}. A call to a function defined with +@code{iter-defun} produces an iterator; you must ``drive'' this +iterator with @code{iter-next} for anything interesting to happen. +Each call to a generator function produces a @emph{different} +iterator, each with its own state. + +@defun iter-next iterator value +Retrieve the next value from @var{iterator}. If there are no more +values to be generated (because @var{iterator}'s generator function +returned), @code{iter-next} signals the @code{iter-end-of-sequence} +condition; the data value associated with this condition is the value +with which @var{iterator}'s generator function returned. + +@var{value} is sent into the iterator and becomes the value to which +@code{iter-yield} evaluates. @var{value} is ignored for the first +@code{iter-next} call to a given iterator, since at the start of +@var{iterator}'s generator function, the generator function is not +evaluating any @code{iter-yield} form. +@end defun + +@defun iter-close iterator +If @var{iterator} is suspended inside a @code{unwind-protect} and +becomes unreachable, Emacs will eventually run unwind handlers after a +garbage collection pass. To ensure that these handlers are run before +then, use @code{iter-close}. +@end defun + +Some convenience functions are provided to make working with +iterators easier: + +@defmac iter-do (var iterator) body @dots{} +Run @var{body} with @var{var} bound to each value that +@var{iterator} produces. +@end defmac + +The Common Lisp loop facility also contains features for working with +iterators. See @xref{Loop Facility,,,cl,Common Lisp Extensions}. + +The following piece of code demonstrates some important principles of +working with iterators. + +@example +(iter-defun my-iter (x) + (iter-yield (1+ (iter-yield (1+ x)))) + -1 ;; Return normally + ) + +(let* ((iter (my-iter 5)) + (iter2 (my-iter 0))) + ;; Prints 6 + (print (iter-next iter)) + ;; Prints 9 + (print (iter-next iter 8)) + ;; Prints 1; iter and iter2 have distinct states + (print (iter-next iter2 nil)) + + ;; We expect the iter sequence to end now + (condition-case x + (iter-next iter) + (iter-end-of-sequence + ;; Prints -1, which my-iter returned normally + (print (cdr x))))) +@end example + @node Nonlocal Exits @section Nonlocal Exits @cindex nonlocal exits diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index cdc443f07d5..3802e49ec3d 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -464,6 +464,7 @@ Control Structures * Conditionals:: @code{if}, @code{cond}, @code{when}, @code{unless}. * Combining Conditions:: @code{and}, @code{or}, @code{not}. * Iteration:: @code{while} loops. +* Generators:: Generic sequences and coroutines. * Nonlocal Exits:: Jumping out of a sequence. Nonlocal Exits diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 448c7f26c1a..4e9c119379d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2015-03-02 Daniel Colascione + + * cl.texi (Iteration Clauses): Mention iterator support. + 2015-02-25 Tassilo Horn * reftex.texi (Multifile Documents): Document diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 66776029353..052ca6bd786 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -2237,6 +2237,11 @@ This clause is like @code{always}, except that the loop returns This clause stops the loop when the specified form is non-@code{nil}; in this case, it returns that non-@code{nil} value. If all the values were @code{nil}, the loop returns @code{nil}. + +@item iter-by @var{iterator} +This clause iterates over the values from the specified form, an +iterator object. See (@pxref{Generators,,,elisp,GNU Emacs Lisp +Reference Manual}). @end table @node Accumulation Clauses diff --git a/etc/NEWS b/etc/NEWS index 6c94a587ad5..ad8b6f27812 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -621,6 +621,8 @@ word syntax, use `\sw' instead. * Lisp Changes in Emacs 25.1 +** Emacs Lisp now supports generators. + ** New finalizer facility for running code when objects become unreachable. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ce2e816d45..4ab4406dba1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,8 @@ 2015-03-02 Daniel Colascione - * vc/vc.el (vc-responsible-backend): Add autoload cooking for + * emacs-lisp/generator.el: New file. + + * vc/vc.el (vc-responsible-backend): Add autoload cookie for `vc-responsible-backend'. 2015-03-01 Michael Albinus diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el new file mode 100644 index 00000000000..4e21e792406 --- /dev/null +++ b/lisp/emacs-lisp/generator.el @@ -0,0 +1,789 @@ +;;; generator.el --- generators -*- lexical-binding: t -*- + +;;; Copyright (C) 2015 Free Software Foundation, Inc. + +;; Author: Daniel Colascione +;; Keywords: extensions, elisp +;; Package: emacs + +;; Copyright (C) Daniel Colascione + +;; 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 +;; 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This package implements generators for Emacs Lisp through a +;; continuation-passing transformation. It provides essentially the +;; same generator API and iterator facilties that Python and +;; JavaScript ES6 provide. +;; +;; `iter-lambda' and `iter-defun' work like `lambda' and `defun', +;; except that they evaluate to or define, respectively, generator +;; functions. These functions, when called, return an iterator. +;; An iterator is an opaque object that generates a sequence of +;; values. Callers use `iter-next' to retrieve the next value from +;; the sequence; when the sequence is exhausted, `iter-next' will +;; raise the `iter-end-of-sequence' condition. +;; +;; Generator functions are written like normal functions, except that +;; they can invoke `iter-yield' to suspend themselves and return a +;; value to callers; this value becomes the return value of +;; `iter-next'. On the next call to `iter-next', execution of the +;; generator function resumes where it left off. When a generator +;; function returns normally, the `iter-next' raises +;; `iter-end-of-sequence' with the value the function returned. +;; +;; `iter-yield-from' yields all the values from another iterator; it +;; then evaluates to the value the sub-iterator returned normally. +;; This facility is useful for functional composition of generators +;; and for implementing coroutines. +;; +;; `iter-yield' is illegal inside the UNWINDFORMS of an +;; `unwind-protect' for various sordid internal reasons documented in +;; the code. +;; +;; N.B. Each call to a generator function generates a *new* iterator, +;; and each iterator maintains its own internal state. +;; +;; This raw form of iteration is general, but a bit awkward to use, so +;; this library also provides soem convenience functions: +;; +;; `iter-do' is like `cl-do', except that instead of walking a list, +;; it walks an iterator. `cl-loop' is also extended with a new +;; keyword, `iter-by', that iterates over an iterator. +;; + +;;; Implementation: + +;; +;; The internal cps transformation code uses the cps- namespace. +;; Iteration functions use the `iter-' namespace. Generator functions +;; are somewhat less efficient than conventional elisp routines, +;; although we try to avoid CPS transformation on forms that do not +;; invoke `iter-yield'. +;; + +;;; Code: + +(require 'cl-lib) +(require 'pcase) + +(defvar *cps-bindings* nil) +(defvar *cps-states* nil) +(defvar *cps-value-symbol* nil) +(defvar *cps-state-symbol* nil) +(defvar *cps-cleanup-table-symbol* nil) +(defvar *cps-cleanup-function* nil) + +(defvar *cps-dynamic-wrappers* '(identity) + "List of transformer functions to apply to atomic forms we +evaluate in CPS context.") + +(defconst cps-standard-special-forms + '(setq setq-default throw interactive) + "List of special forms that we treat just like ordinary + function applications." ) + +(defun cps--trace-funcall (func &rest args) + (message "%S: args=%S" func args) + (let ((result (apply func args))) + (message "%S: result=%S" func result) + result)) + +(defun cps--trace (fmt &rest args) + (princ (apply #'format (concat fmt "\n") args))) + +(defun cps--special-form-p (definition) + "Non-nil if and only if DEFINITION is a special form." + ;; Copied from ad-special-form-p + (if (and (symbolp definition) (fboundp definition)) + (setf definition (indirect-function definition))) + (and (subrp definition) (eq (cdr (subr-arity definition)) 'unevalled))) + +(defmacro cps--define-unsupported (function) + `(defun ,(intern (format "cps--transform-%s" function)) + (error "%s not supported in generators" ,function))) + +(defmacro cps--with-value-wrapper (wrapper &rest body) + "Continue generating CPS code with an atomic-form wrapper +to the current stack of such wrappers. WRAPPER is a function that +takes a form and returns a wrapped form. + +Whenever we generate an atomic form (i.e., a form that can't +iter-yield), we first (before actually inserting that form in our +generated code) pass that form through all the transformer +functions. We use this facility to wrap forms that can transfer +control flow non-locally in goo that diverts this control flow to +the CPS state machinery. +" + (declare (indent 1)) + `(let ((*cps-dynamic-wrappers* + (cons + ,wrapper + *cps-dynamic-wrappers*))) + ,@body)) + +(defun cps--make-dynamic-binding-wrapper (dynamic-var static-var) + (cl-assert lexical-binding) + (lambda (form) + `(let ((,dynamic-var ,static-var)) + (unwind-protect ; Update the static shadow after evaluation is done + ,form + (setf ,static-var ,dynamic-var)) + ,form))) + +(defmacro cps--with-dynamic-binding (dynamic-var static-var &rest body) + "Evaluate BODY such that generated atomic evaluations run with +DYNAMIC-VAR bound to STATIC-VAR." + (declare (indent 2)) + `(cps--with-value-wrapper + (cps--make-dynamic-binding-wrapper ,dynamic-var ,static-var) + ,@body)) + +(defun cps--add-state (kind body) + "Create a new CPS state with body BODY and return the state's name." + (declare (indent 1)) + (let* ((state (cl-gensym (format "cps-state-%s-" kind)))) + (push (list state body *cps-cleanup-function*) *cps-states*) + (push state *cps-bindings*) + state)) + +(defun cps--add-binding (original-name) + (car (push (cl-gensym (format "cps-binding-%s-" original-name)) + *cps-bindings*))) + +(defun cps--find-special-form-handler (form) + (let* ((handler-name (format "cps--transform-%s" (car-safe form))) + (handler (intern-soft handler-name))) + (and (fboundp handler) handler))) + +(defvar cps-disable-atomic-optimization nil + "When t, always rewrite forms into cps even when they +don't yield.") + +(defvar cps--yield-seen) + +(defun cps--atomic-p (form) + "Return whether the given form never yields." + + (and (not cps-disable-atomic-optimization) + (let* ((cps--yield-seen)) + (ignore (macroexpand-all + `(cl-macrolet ((cps-internal-yield + (_val) + (setf cps--yield-seen t))) + ,form))) + (not cps--yield-seen)))) + +(defun cps--make-atomic-state (form next-state) + (let ((tform `(prog1 ,form (setf ,*cps-state-symbol* ,next-state)))) + (cl-loop for wrapper in *cps-dynamic-wrappers* + do (setf tform (funcall wrapper tform))) + ;; Bind *cps-cleanup-function* to nil here because the wrapper + ;; function mechanism is responsible for cleanup here, not the + ;; generic cleanup mechanism. If we didn't make this binding, + ;; we'd run cleanup handlers twice on anything that made it out + ;; to toplevel. + (let ((*cps-cleanup-function* nil)) + (cps--add-state "atom" + `(setf ,*cps-value-symbol* ,tform))))) + +(defun cps--transform-1 (form next-state) + (pcase form + + ;; If we're looking at an "atomic" form (i.e., one that does not + ;; iter-yield), just evaluate the form as a whole instead of rewriting + ;; it into CPS. + + ((guard (cps--atomic-p form)) + (cps--make-atomic-state form next-state)) + + ;; Process `and'. + + (`(and) ; (and) -> t + (cps--transform-1 t next-state)) + (`(and ,condition) ; (and CONDITION) -> CONDITION + (cps--transform-1 condition next-state)) + (`(and ,condition . ,rest) + ;; Evaluate CONDITION; if it's true, go on to evaluate the rest + ;; of the `and'. + (cps--transform-1 + condition + (cps--add-state "and" + `(setf ,*cps-state-symbol* + (if ,*cps-value-symbol* + ,(cps--transform-1 `(and ,@rest) + next-state) + ,next-state))))) + + ;; Process `catch'. + + (`(catch ,tag . ,body) + (let ((tag-binding (cps--add-binding "catch-tag"))) + (cps--transform-1 tag + (cps--add-state "cps-update-tag" + `(setf ,tag-binding ,*cps-value-symbol* + ,*cps-state-symbol* + ,(cps--with-value-wrapper + (cps--make-catch-wrapper + tag-binding next-state) + (cps--transform-1 `(progn ,@body) + next-state))))))) + + ;; Process `cond': transform into `if' or `or' depending on the + ;; precise kind of the condition we're looking at. + + (`(cond) ; (cond) -> nil + (cps--transform-1 nil next-state)) + (`(cond (,condition) . ,rest) + (cps--transform-1 `(or ,condition (cond ,@rest)) + next-state)) + (`(cond (,condition . ,body) . ,rest) + (cps--transform-1 `(if ,condition + (progn ,@body) + (cond ,@rest)) + next-state)) + + ;; Process `condition-case': do the heavy lifting in a helper + ;; function. + + (`(condition-case ,var ,bodyform . ,handlers) + (cps--with-value-wrapper + (cps--make-condition-wrapper var next-state handlers) + (cps--transform-1 bodyform + next-state))) + + ;; Process `if'. + + (`(if ,cond ,then . ,else) + (cps--transform-1 cond + (cps--add-state "if" + `(setf ,*cps-state-symbol* + (if ,*cps-value-symbol* + ,(cps--transform-1 then + next-state) + ,(cps--transform-1 `(progn ,@else) + next-state)))))) + + ;; Process `progn' and `inline': they are identical except for the + ;; name, which has some significance to the byte compiler. + + (`(inline) (cps--transform-1 nil next-state)) + (`(inline ,form) (cps--transform-1 form next-state)) + (`(inline ,form . ,rest) + (cps--transform-1 form + (cps--transform-1 `(inline ,@rest) + next-state))) + + (`(progn) (cps--transform-1 nil next-state)) + (`(progn ,form) (cps--transform-1 form next-state)) + (`(progn ,form . ,rest) + (cps--transform-1 form + (cps--transform-1 `(progn ,@rest) + next-state))) + + ;; Process `let' in a helper function that transforms it into a + ;; let* with temporaries. + + (`(let ,bindings . ,body) + (let* ((bindings (cl-loop for binding in bindings + collect (if (symbolp binding) + (list binding nil) + binding))) + (temps (cl-loop for (var value-form) in bindings + collect (cps--add-binding var)))) + (cps--transform-1 + `(let* ,(append + (cl-loop for (var value-form) in bindings + for temp in temps + collect (list temp value-form)) + (cl-loop for (var binding) in bindings + for temp in temps + collect (list var temp))) + ,@body) + next-state))) + + ;; Process `let*' binding: process one binding at a time. Flatten + ;; lexical bindings. + + (`(let* () . ,body) + (cps--transform-1 `(progn ,@body) next-state)) + + (`(let* (,binding . ,more-bindings) . ,body) + (let* ((var (if (symbolp binding) binding (car binding))) + (value-form (car (cdr-safe binding))) + (new-var (cps--add-binding var))) + + (cps--transform-1 + value-form + (cps--add-state "let*" + `(setf ,new-var ,*cps-value-symbol* + ,*cps-state-symbol* + ,(if (or (not lexical-binding) (special-variable-p var)) + (cps--with-dynamic-binding var new-var + (cps--transform-1 + `(let* ,more-bindings ,@body) + next-state)) + (cps--transform-1 + (cps--replace-variable-references + var new-var + `(let* ,more-bindings ,@body)) + next-state))))))) + + ;; Process `or'. + + (`(or) (cps--transform-1 nil next-state)) + (`(or ,condition) (cps--transform-1 condition next-state)) + (`(or ,condition . ,rest) + (cps--transform-1 + condition + (cps--add-state "or" + `(setf ,*cps-state-symbol* + (if ,*cps-value-symbol* + ,next-state + ,(cps--transform-1 + `(or ,@rest) next-state)))))) + + ;; Process `prog1'. + + (`(prog1 ,first) (cps--transform-1 first next-state)) + (`(prog1 ,first . ,body) + (cps--transform-1 + first + (let ((temp-var-symbol (cps--add-binding "prog1-temp"))) + (cps--add-state "prog1" + `(setf ,temp-var-symbol + ,*cps-value-symbol* + ,*cps-state-symbol* + ,(cps--transform-1 + `(progn ,@body) + (cps--add-state "prog1inner" + `(setf ,*cps-value-symbol* ,temp-var-symbol + ,*cps-state-symbol* ,next-state)))))))) + + ;; Process `prog2'. + + (`(prog2 ,form1 ,form2 . ,body) + (cps--transform-1 + `(progn ,form1 (prog1 ,form2 ,@body)) + next-state)) + + ;; Process `unwind-protect': If we're inside an unwind-protect, we + ;; have a block of code UNWINDFORMS which we would like to run + ;; whenever control flows away from the main piece of code, + ;; BODYFORM. We deal with the local control flow case by + ;; generating BODYFORM such that it yields to a continuation that + ;; executes UNWINDFORMS, which then yields to NEXT-STATE. + ;; + ;; Non-local control flow is trickier: we need to ensure that we + ;; execute UNWINDFORMS even when control bypasses our normal + ;; continuation. To make this guarantee, we wrap every external + ;; application (i.e., every piece of elisp that can transfer + ;; control non-locally) in an unwind-protect that runs UNWINDFORMS + ;; before allowing the non-local control transfer to proceed. + ;; + ;; Unfortunately, because elisp lacks a mechanism for generically + ;; capturing the reason for an arbitrary non-local control + ;; transfer and restarting the transfer at a later point, we + ;; cannot reify non-local transfers and cannot allow + ;; continuation-passing code inside UNWINDFORMS. + + (`(unwind-protect ,bodyform . ,unwindforms) + ;; Signal the evaluator-generator that it needs to generate code + ;; to handle cleanup forms. + (unless *cps-cleanup-table-symbol* + (setf *cps-cleanup-table-symbol* (cl-gensym "cps-cleanup-table-"))) + (let* ((unwind-state + (cps--add-state + "unwind" + ;; N.B. It's safe to just substitute unwindforms by + ;; sexp-splicing: we've already replaced all variable + ;; references inside it with lifted equivalents. + `(progn + ,@unwindforms + (setf ,*cps-state-symbol* ,next-state)))) + (old-cleanup *cps-cleanup-function*) + (*cps-cleanup-function* + (let ((*cps-cleanup-function* nil)) + (cps--add-state "cleanup" + `(progn + ,(when old-cleanup `(funcall ,old-cleanup)) + ,@unwindforms))))) + (cps--with-value-wrapper + (cps--make-unwind-wrapper unwindforms) + (cps--transform-1 bodyform unwind-state)))) + + ;; Process `while'. + + (`(while ,test . ,body) + ;; Open-code state addition instead of using cps--add-state: we + ;; need our states to be self-referential. (That's what makes the + ;; state a loop.) + (let* ((loop-state + (cl-gensym "cps-state-while-")) + (eval-loop-condition-state + (cps--transform-1 test loop-state)) + (loop-state-body + `(progn + (setf ,*cps-state-symbol* + (if ,*cps-value-symbol* + ,(cps--transform-1 + `(progn ,@body) + eval-loop-condition-state) + ,next-state))))) + (push (list loop-state loop-state-body *cps-cleanup-function*) + *cps-states*) + (push loop-state *cps-bindings*) + eval-loop-condition-state)) + + ;; Process various kinds of `quote'. + + (`(quote ,arg) (cps--add-state "quote" + `(setf ,*cps-value-symbol* (quote ,arg) + ,*cps-state-symbol* ,next-state))) + (`(function ,arg) (cps--add-state "function" + `(setf ,*cps-value-symbol* (function ,arg) + ,*cps-state-symbol* ,next-state))) + + ;; Deal with `iter-yield'. + + (`(cps-internal-yield ,value) + (cps--transform-1 + value + (cps--add-state "iter-yield" + `(progn + (setf ,*cps-state-symbol* + ,(if *cps-cleanup-function* + (cps--add-state "after-yield" + `(setf ,*cps-state-symbol* ,next-state)) + next-state)) + (throw 'cps--yield ,*cps-value-symbol*))))) + + ;; Catch any unhandled special forms. + + ((and `(,name . ,_) + (guard (cps--special-form-p name)) + (guard (not (memq name cps-standard-special-forms)))) + name ; Shut up byte compiler + (error "special form %S incorrect or not supported" form)) + + ;; Process regular function applications with nontrivial + ;; parameters, converting them to applications of trivial + ;; let-bound parameters. + + ((and `(,function . ,arguments) + (guard (not (cl-loop for argument in arguments + always (atom argument))))) + (let ((argument-symbols + (cl-loop for argument in arguments + collect (if (atom argument) + argument + (cl-gensym "cps-argument-"))))) + + (cps--transform-1 + `(let* ,(cl-loop for argument in arguments + for argument-symbol in argument-symbols + unless (eq argument argument-symbol) + collect (list argument-symbol argument)) + ,(cons function argument-symbols)) + next-state))) + + ;; Process everything else by just evaluating the form normally. + (t (cps--make-atomic-state form next-state)))) + +(defun cps--make-catch-wrapper (tag-binding next-state) + (lambda (form) + (let ((normal-exit-symbol + (cl-gensym "cps-normal-exit-from-catch-"))) + `(let (,normal-exit-symbol) + (prog1 + (catch ,tag-binding + (prog1 + ,form + (setf ,normal-exit-symbol t))) + (unless ,normal-exit-symbol + (setf ,*cps-state-symbol* ,next-state))))))) + +(defun cps--make-condition-wrapper (var next-state handlers) + ;; Each handler is both one of the transformers with which we wrap + ;; evaluated atomic forms and a state to which we jump when we + ;; encounter the given error. + + (let* ((error-symbol (cps--add-binding "condition-case-error")) + (lexical-error-symbol (cl-gensym "cps-lexical-error-")) + (processed-handlers + (cl-loop for (condition . body) in handlers + collect (cons condition + (cps--transform-1 + (cps--replace-variable-references + var error-symbol + `(progn ,@body)) + next-state))))) + + (lambda (form) + `(condition-case + ,lexical-error-symbol + ,form + ,@(cl-loop + for (condition . error-state) in processed-handlers + collect + `(,condition + (setf ,error-symbol + ,lexical-error-symbol + ,*cps-state-symbol* + ,error-state))))))) + +(defun cps--replace-variable-references (var new-var form) + "Replace all non-shadowed references to VAR with NEW-VAR in FORM. +This routine does not modify FORM. Instead, it returns a +modified copy." + (macroexpand-all + `(cl-symbol-macrolet ((,var ,new-var)) ,form))) + +(defun cps--make-unwind-wrapper (unwind-forms) + (cl-assert lexical-binding) + (lambda (form) + (let ((normal-exit-symbol + (cl-gensym "cps-normal-exit-from-unwind-"))) + `(let (,normal-exit-symbol) + (unwind-protect + (prog1 + ,form + (setf ,normal-exit-symbol t)) + (unless ,normal-exit-symbol + ,@unwind-forms)))))) + +(put 'iter-end-of-sequence 'error-conditions '(iter-end-of-sequence)) +(put 'iter-end-of-sequence 'error-message "iteration terminated") + +(defun cps--make-close-iterator-form (terminal-state) + (if *cps-cleanup-table-symbol* + `(let ((cleanup (cdr (assq ,*cps-state-symbol* ,*cps-cleanup-table-symbol*)))) + (setf ,*cps-state-symbol* ,terminal-state + ,*cps-value-symbol* nil) + (when cleanup (funcall cleanup))) + `(setf ,*cps-state-symbol* ,terminal-state + ,*cps-value-symbol* nil))) + +(defun cps-generate-evaluator (form) + (let* (*cps-states* + *cps-bindings* + *cps-cleanup-function* + (*cps-value-symbol* (cl-gensym "cps-current-value-")) + (*cps-state-symbol* (cl-gensym "cps-current-state-")) + ;; We make *cps-cleanup-table-symbol** non-nil when we notice + ;; that we have cleanup processing to perform. + (*cps-cleanup-table-symbol* nil) + (terminal-state (cps--add-state "terminal" + `(signal 'iter-end-of-sequence + ,*cps-value-symbol*))) + (initial-state (cps--transform-1 + (macroexpand-all form) + terminal-state)) + (finalizer-symbol + (when *cps-cleanup-table-symbol* + (when *cps-cleanup-table-symbol* + (cl-gensym "cps-iterator-finalizer-"))))) + `(let ,(append (list *cps-state-symbol* *cps-value-symbol*) + (when *cps-cleanup-table-symbol* + (list *cps-cleanup-table-symbol*)) + (when finalizer-symbol + (list finalizer-symbol)) + (nreverse *cps-bindings*)) + ;; Order state list so that cleanup states are always defined + ;; before they're referenced. + ,@(cl-loop for (state body cleanup) in (nreverse *cps-states*) + collect `(setf ,state (lambda () ,body)) + when cleanup + do (cl-assert *cps-cleanup-table-symbol*) + and collect `(push (cons ,state ,cleanup) ,*cps-cleanup-table-symbol*)) + (setf ,*cps-state-symbol* ,initial-state) + + (let ((iterator + (lambda (op value) + (cond + ,@(when finalizer-symbol + `(((eq op :stash-finalizer) + (setf ,finalizer-symbol value)) + ((eq op :get-finalizer) + ,finalizer-symbol))) + ((eq op :close) + ,(cps--make-close-iterator-form terminal-state)) + ((eq op :next) + (setf ,*cps-value-symbol* value) + (let ((yielded nil)) + (unwind-protect + (prog1 + (catch 'cps--yield + (while t + (funcall ,*cps-state-symbol*))) + (setf yielded t)) + (unless yielded + ;; If we're exiting non-locally (error, quit, + ;; etc.) close the iterator. + ,(cps--make-close-iterator-form terminal-state))))) + (t (error "unknown iterator operation %S" op)))))) + ,(when finalizer-symbol + `(funcall iterator + :stash-finalizer + (make-finalizer + (lambda () + (iter-close iterator))))) + iterator)))) + +(defun iter-yield (value) + "When used inside a generator, yield control to caller. +The caller of `iter-next' receives VALUE, and the next call to +`iter-next' resumes execution at the previous +`iter-yield' point." + (identity value) + (error "`iter-yield' used outside a generator")) + +(defmacro iter-yield-from (value) + "When used inside a generator function, delegate to a sub-iterator. +The values that the sub-iterator yields are passed directly to +the caller, and values supplied to `iter-next' are sent to the +sub-iterator. `iter-yield-from' evaluates to the value that the +sub-iterator function returns via `iter-end-of-sequence'." + (let ((errsym (cl-gensym "yield-from-result")) + (valsym (cl-gensym "yield-from-value"))) + `(let ((,valsym ,value)) + (unwind-protect + (condition-case ,errsym + (let ((vs nil)) + (while t + (setf vs (iter-yield (iter-next ,valsym vs))))) + (iter-end-of-sequence (cdr ,errsym))) + (iter-close ,valsym))))) + +(defmacro iter-defun (name arglist &rest body) + "Creates a generator NAME. +When called as a function, NAME returns an iterator value that +encapsulates the state of a computation that produces a sequence +of values. Callers can retrieve each value using `iter-next'." + (declare (indent defun)) + (cl-assert lexical-binding) + `(defun ,name ,arglist + ,(cps-generate-evaluator + `(cl-macrolet ((iter-yield (value) `(cps-internal-yield ,value))) + ,@body)))) + +(defmacro iter-lambda (arglist &rest body) + "Return a lambda generator. +`iter-lambda' is to `iter-defun' as `lambda' is to `defun'." + (declare (indent defun)) + (cl-assert lexical-binding) + `(lambda ,arglist + ,(cps-generate-evaluator + `(cl-macrolet ((iter-yield (value) `(cps-internal-yield ,value))) + ,@body)))) + +(defun iter-next (iterator &optional yield-result) + "Extract a value from an iterator. +YIELD-RESULT becomes the return value of `iter-yield` in the +context of the generator. + +This routine raises the `iter-end-of-sequence' condition if the +iterator cannot supply more values." + (funcall iterator :next yield-result)) + +(defun iter-close (iterator) + "Terminate an iterator early. +Run any unwind-protect handlers in scope at the point ITERATOR +is blocked." + (funcall iterator :close nil)) + +(cl-defmacro iter-do ((var iterator) &rest body) + "Loop over values from an iterator. +Evaluate BODY with VAR bound to each value from ITERATOR. +Return the value with which ITERATOR finished iteration." + (declare (indent 1)) + (let ((done-symbol (cl-gensym "iter-do-iterator-done")) + (condition-symbol (cl-gensym "iter-do-condition")) + (it-symbol (cl-gensym "iter-do-iterator")) + (result-symbol (cl-gensym "iter-do-result"))) + `(let (,var + ,result-symbol + (,done-symbol nil) + (,it-symbol ,iterator)) + (while (not ,done-symbol) + (condition-case ,condition-symbol + (setf ,var (iter-next ,it-symbol)) + (iter-end-of-sequence + (setf ,result-symbol (cdr ,condition-symbol)) + (setf ,done-symbol t))) + (unless ,done-symbol ,@body)) + ,result-symbol))) + +(defvar cl--loop-args) + +(defmacro cps--advance-for (conscell) + ;; See cps--handle-loop-for + `(condition-case nil + (progn + (setcar ,conscell (iter-next (cdr ,conscell))) + ,conscell) + (iter-end-of-sequence + nil))) + +(defmacro cps--initialize-for (iterator) + ;; See cps--handle-loop-for + (let ((cs (cl-gensym "cps--loop-temp"))) + `(let ((,cs (cons nil ,iterator))) + (cps--advance-for ,cs)))) + +(defun cps--handle-loop-for (var) + "Support `iter-by' in `loop'. " + ;; N.B. While the cl-loop-for-handler is a documented interface, + ;; there's no documented way for cl-loop-for-handler callbacks to do + ;; anything useful! Additionally, cl-loop currently lexbinds useful + ;; internal variables, so our only option is to modify + ;; cl--loop-args. If we substitute a general-purpose for-clause for + ;; our iterating clause, however, we can't preserve the + ;; parallel-versus-sequential `loop' semantics for for clauses --- + ;; we need a terminating condition as well, which requires us to use + ;; while, and inserting a while would break and-sequencing. + ;; + ;; To work around this problem, we actually use the "for var in LIST + ;; by FUNCTION" syntax, creating a new fake list each time through + ;; the loop, this "list" being a cons cell (val . it). + (let ((it-form (pop cl--loop-args))) + (setf cl--loop-args + (append + `(for ,var + in (cps--initialize-for ,it-form) + by 'cps--advance-for) + cl--loop-args)))) + +(put 'iter-by 'cl-loop-for-handler 'cps--handle-loop-for) + +(eval-after-load 'elisp-mode + (lambda () + (font-lock-add-keywords + 'emacs-lisp-mode + '(("(\\(iter-defun\\)\\_>\\s *\\(\\(?:\\sw\\|\\s_\\)+\\)?" + (1 font-lock-keyword-face nil t) + (2 font-lock-function-name-face nil t)) + ("(\\(iter-next\\)\\_>" + (1 font-lock-keyword-face nil t)) + ("(\\(iter-lambda\\)\\_>" + (1 font-lock-keyword-face nil t)) + ("(\\(iter-yield\\)\\_>" + (1 font-lock-keyword-face nil t)) + ("(\\(iter-yield-from\\)\\_>" + (1 font-lock-keyword-face nil t)))))) + +(provide 'generator) + +;;; generator.el ends here diff --git a/test/ChangeLog b/test/ChangeLog index 684e98f880e..64ad85198af 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,7 @@ 2015-03-02 Daniel Colascione + * automated/generator-tests.el: New tests + * automated/finalizer-tests.el (finalizer-basic) (finalizer-circular-reference, finalizer-cross-reference) (finalizer-error): New tests. diff --git a/test/automated/generator-tests.el b/test/automated/generator-tests.el new file mode 100644 index 00000000000..2c5de31b40b --- /dev/null +++ b/test/automated/generator-tests.el @@ -0,0 +1,288 @@ +;;; generator-tests.el --- Testing generators -*- lexical-binding: t -*- + +;; Copyright (C) 2015 Free Software Foundation, Inc. + +;; Author: Daniel Colascione +;; Keywords: + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +(require 'generator) +(require 'ert) +(require 'cl-lib) + +(defun generator-list-subrs () + (cl-loop for x being the symbols + when (and (fboundp x) + (cps--special-form-p (symbol-function x))) + collect x)) + +(defmacro cps-testcase (name &rest body) + "Perform a simple test of the continuation-transforming code. + +`cps-testcase' defines an ERT testcase called NAME that evaluates +BODY twice: once using ordinary `eval' and once using +lambda-generators. The test ensures that the two forms produce +identical output. +" + `(progn + (ert-deftest ,name () + (should + (equal + (funcall (lambda () ,@body)) + (iter-next + (funcall + (iter-lambda () (iter-yield (progn ,@body)))))))) + (ert-deftest ,(intern (format "%s-noopt" name)) () + (should + (equal + (funcall (lambda () ,@body)) + (iter-next + (funcall + (let ((cps-disable-atomic-optimization t)) + (iter-lambda () (iter-yield (progn ,@body))))))))))) + +(put 'cps-testcase 'lisp-indent-function 1) + +(defvar *cps-test-i* nil) +(defun cps-get-test-i () + *cps-test-i*) + +(cps-testcase cps-simple-1 (progn 1 2 3)) +(cps-testcase cps-empty-progn (progn)) +(cps-testcase cps-inline-not-progn (inline 1 2 3)) +(cps-testcase cps-prog1-a (prog1 1 2 3)) +(cps-testcase cps-prog1-b (prog1 1)) +(cps-testcase cps-prog1-c (prog2 1 2 3)) +(cps-testcase cps-quote (progn 'hello)) +(cps-testcase cps-function (progn #'hello)) + +(cps-testcase cps-and-fail (and 1 nil 2)) +(cps-testcase cps-and-succeed (and 1 2 3)) +(cps-testcase cps-and-empty (and)) + +(cps-testcase cps-or-fallthrough (or nil 1 2)) +(cps-testcase cps-or-alltrue (or 1 2 3)) +(cps-testcase cps-or-empty (or)) + +(cps-testcase cps-let* (let* ((i 10)) i)) +(cps-testcase cps-let*-shadow-empty (let* ((i 10)) (let (i) i))) +(cps-testcase cps-let (let ((i 10)) i)) +(cps-testcase cps-let-shadow-empty (let ((i 10)) (let (i) i))) +(cps-testcase cps-let-novars (let nil 42)) +(cps-testcase cps-let*-novars (let* nil 42)) + +(cps-testcase cps-let-parallel + (let ((a 5) (b 6)) (let ((a b) (b a)) (list a b)))) + +(cps-testcase cps-let*-parallel + (let* ((a 5) (b 6)) (let* ((a b) (b a)) (list a b)))) + +(cps-testcase cps-while-dynamic + (setq *cps-test-i* 0) + (while (< *cps-test-i* 10) + (setf *cps-test-i* (+ *cps-test-i* 1))) + *cps-test-i*) + +(cps-testcase cps-while-lexical + (let* ((i 0) (j 10)) + (while (< i 10) + (setf i (+ i 1)) + (setf j (+ j (* i 10)))) + j)) + +(cps-testcase cps-while-incf + (let* ((i 0) (j 10)) + (while (< i 10) + (incf i) + (setf j (+ j (* i 10)))) + j)) + +(cps-testcase cps-dynbind + (setf *cps-test-i* 0) + (let* ((*cps-test-i* 5)) + (cps-get-test-i))) + +(cps-testcase cps-nested-application + (+ (+ 3 5) 1)) + +(cps-testcase cps-unwind-protect + (setf *cps-test-i* 0) + (unwind-protect + (setf *cps-test-i* 1) + (setf *cps-test-i* 2)) + *cps-test-i*) + +(cps-testcase cps-catch-unused + (catch 'mytag 42)) + +(cps-testcase cps-catch-thrown + (1+ (catch 'mytag + (throw 'mytag (+ 2 2))))) + +(cps-testcase cps-loop + (cl-loop for x from 1 to 10 collect x)) + +(cps-testcase cps-loop-backquote + `(a b ,(cl-loop for x from 1 to 10 collect x) -1)) + +(cps-testcase cps-if-branch-a + (if t 'abc)) + +(cps-testcase cps-if-branch-b + (if t 'abc 'def)) + +(cps-testcase cps-if-condition-fail + (if nil 'abc 'def)) + +(cps-testcase cps-cond-empty + (cond)) + +(cps-testcase cps-cond-atomi + (cond (42))) + +(cps-testcase cps-cond-complex + (cond (nil 22) ((1+ 1) 42) (t 'bad))) + +(put 'cps-test-error 'error-conditions '(cps-test-condition)) + +(cps-testcase cps-condition-case + (condition-case + condvar + (signal 'cps-test-error 'test-data) + (cps-test-condition condvar))) + +(cps-testcase cps-condition-case-no-error + (condition-case + condvar + 42 + (cps-test-condition condvar))) + +(ert-deftest cps-generator-basic () + (let* ((gen (iter-lambda () + (iter-yield 1) + (iter-yield 2) + (iter-yield 3) + 4)) + (gen-inst (funcall gen))) + (should (eql (iter-next gen-inst) 1)) + (should (eql (iter-next gen-inst) 2)) + (should (eql (iter-next gen-inst) 3)) + + ;; should-error doesn't catch the generator-end condition (which + ;; isn't an error), so we write our own. + (let (errored) + (condition-case x + (iter-next gen-inst) + (iter-end-of-sequence + (setf errored (cdr x)))) + (should (eql errored 4))))) + +(iter-defun mygenerator (i) + (iter-yield 1) + (iter-yield i) + (iter-yield 2)) + +(ert-deftest cps-test-iter-do () + (let (mylist) + (iter-do (x (mygenerator 4)) + (push x mylist)) + + (assert (equal mylist '(2 4 1))))) + +(iter-defun gen-using-yield-value () + (let (f) + (setf f (iter-yield 42)) + (iter-yield f) + -8)) + +(ert-deftest cps-yield-value () + (let ((it (gen-using-yield-value))) + (should (eql (iter-next it -1) 42)) + (should (eql (iter-next it -1) -1)))) + +(ert-deftest cps-loop () + (should + (equal (cl-loop for x iter-by (mygenerator 42) + collect x) + '(1 42 2)))) + +(iter-defun gen-using-yield-from () + (let ((sub-iter (gen-using-yield-value))) + (iter-yield (1+ (iter-yield-from sub-iter))))) + +(ert-deftest cps-test-yield-from-works () + (let ((it (gen-using-yield-from))) + (should (eql (iter-next it -1) 42)) + (should (eql (iter-next it -1) -1)) + (should (eql (iter-next it -1) -7)))) + +(defvar cps-test-closed-flag nil) + +(ert-deftest cps-test-iter-close () + (garbage-collect) + (let ((cps-test-closed-flag nil)) + (let ((iter (funcall + (iter-lambda () + (unwind-protect (iter-yield 1) + (setf cps-test-closed-flag t)))))) + (should (equal (iter-next iter) 1)) + (should (not cps-test-closed-flag)) + (iter-close iter) + (should cps-test-closed-flag)))) + +(ert-deftest cps-test-iter-close-idempotent () + (garbage-collect) + (let ((cps-test-closed-flag nil)) + (let ((iter (funcall + (iter-lambda () + (unwind-protect (iter-yield 1) + (setf cps-test-closed-flag t)))))) + (should (equal (iter-next iter) 1)) + (should (not cps-test-closed-flag)) + (iter-close iter) + (should cps-test-closed-flag) + (setf cps-test-closed-flag nil) + (iter-close iter) + (should (not cps-test-closed-flag))))) + +(ert-deftest cps-test-iter-close-finalizer () + (skip-unless gc-precise-p) + (garbage-collect) + (let ((cps-test-closed-flag nil)) + (let ((iter (funcall + (iter-lambda () + (unwind-protect (iter-yield 1) + (setf cps-test-closed-flag t)))))) + (should (equal (iter-next iter) 1)) + (should (not cps-test-closed-flag)) + (setf iter nil) + (garbage-collect) + (should cps-test-closed-flag)))) + +(ert-deftest cps-test-iter-cleanup-once-only () + (let* ((nr-unwound 0) + (iter + (funcall (iter-lambda () + (unwind-protect + (progn + (iter-yield 1) + (error "test") + (iter-yield 2)) + (incf nr-unwound)))))) + (should (equal (iter-next iter) 1)) + (should-error (iter-next iter)) + (should (equal nr-unwound 1)))) From 8f0f8c166c2c76789acfa0cf3d42eafbbfa95973 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Mon, 2 Mar 2015 16:11:51 -0800 Subject: [PATCH 203/457] Fix docstrings, declarations in iter-defun * lisp/emacs-lisp/generator.el (iter-defun): Correctly propagate docstrings and declarations to underlying function. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/generator.el | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4ab4406dba1..5018ca4b9de 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-03 Daniel Colascione + + * emacs-lisp/generator.el (iter-defun): Correctly propagate + docstrings and declarations to underlying function. + 2015-03-02 Daniel Colascione * emacs-lisp/generator.el: New file. diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el index 4e21e792406..bb9fcff1408 100644 --- a/lisp/emacs-lisp/generator.el +++ b/lisp/emacs-lisp/generator.el @@ -674,10 +674,16 @@ encapsulates the state of a computation that produces a sequence of values. Callers can retrieve each value using `iter-next'." (declare (indent defun)) (cl-assert lexical-binding) - `(defun ,name ,arglist - ,(cps-generate-evaluator - `(cl-macrolet ((iter-yield (value) `(cps-internal-yield ,value))) - ,@body)))) + (let (preamble) + (when (stringp (car body)) + (push (pop body) preamble)) + (when (eq (car-safe (car body)) 'declare) + (push (pop body) preamble)) + `(defun ,name ,arglist + ,@(nreverse preamble) + ,(cps-generate-evaluator + `(cl-macrolet ((iter-yield (value) `(cps-internal-yield ,value))) + ,@body))))) (defmacro iter-lambda (arglist &rest body) "Return a lambda generator. From 8af3e1848cbdc570b6c173480c2988a552f3f74d Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Mon, 2 Mar 2015 16:41:59 -0800 Subject: [PATCH 204/457] Add cl-iter-defun * lisp/emacs-lisp/cl-macs.el (cl-iter-defun): Add cl-iter-defun. --- doc/misc/cl.texi | 7 +++++++ lisp/ChangeLog | 2 ++ lisp/emacs-lisp/cl-macs.el | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 052ca6bd786..c6076babacd 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -296,6 +296,13 @@ list. Also, the function body is enclosed in an implicit block called @var{name}; @pxref{Blocks and Exits}. @end defmac +@defmac cl-iter-defun name arglist body@dots{} +This form is identical to the regular @code{iter-defun} form, except +that @var{arglist} is allowed to be a full Common Lisp argument +list. Also, the function body is enclosed in an implicit block +called @var{name}; @pxref{Blocks and Exits}. +@end defmac + @defmac cl-defsubst name arglist body@dots{} This is just like @code{cl-defun}, except that the function that is defined is automatically proclaimed @code{inline}, i.e., diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5018ca4b9de..aae09fda38f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2015-03-03 Daniel Colascione + * emacs-lisp/cl-macs.el (cl-iter-defun): Add cl-iter-defun. + * emacs-lisp/generator.el (iter-defun): Correctly propagate docstrings and declarations to underlying function. diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index c3da091fb00..36f263cd20a 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -301,6 +301,27 @@ and BODY is implicitly surrounded by (cl-block NAME ...). (form `(defun ,name ,@(cdr res)))) (if (car res) `(progn ,(car res) ,form) form))) +;;;###autoload +(defmacro cl-iter-defun (name args &rest body) + "Define NAME as a generator function. +Like normal `iter-defun', except ARGLIST allows full Common Lisp conventions, +and BODY is implicitly surrounded by (cl-block NAME ...). + +\(fn NAME ARGLIST [DOCSTRING] BODY...)" + (declare (debug + ;; Same as iter-defun but use cl-lambda-list. + (&define [&or name ("setf" :name setf name)] + cl-lambda-list + cl-declarations-or-string + [&optional ("interactive" interactive)] + def-body)) + (doc-string 3) + (indent 2)) + (require 'generator) + (let* ((res (cl--transform-lambda (cons args body) name)) + (form `(iter-defun ,name ,@(cdr res)))) + (if (car res) `(progn ,(car res) ,form) form))) + ;; The lambda list for macros is different from that of normal lambdas. ;; Note that &environment is only allowed as first or last items in the ;; top level list. From 2cc23f170f920cbfc9df4c28bce6ca9d82c4e6cd Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Mon, 2 Mar 2015 19:08:06 -0800 Subject: [PATCH 205/457] Finalizer documentation, minor improvements * doc/lispref/objects.texi (Finalizer Type): New section (Type Predicates): Mention finalizers in `type-of' documentation. * doc/lispref/elisp.texi (Top): Link to finalizer type. * src/data.c (Ftype_of): Make `type-of' work with finalizers. (syms_of_data): Register Qfinalizer. * src/print.c (print_object): Print whether a finalizer has been called. * test/automated/finalizer-tests.el (finalizer-object-type): Test that `type-of' works correctly for finalizers. --- doc/lispref/ChangeLog | 6 +++++ doc/lispref/elisp.texi | 1 + doc/lispref/objects.texi | 37 ++++++++++++++++++++++++++----- src/ChangeLog | 8 +++++++ src/data.c | 5 ++++- src/print.c | 5 ++++- test/ChangeLog | 5 +++++ test/automated/finalizer-tests.el | 3 +++ 8 files changed, 63 insertions(+), 7 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index e7d79d55c7e..c27805b3d6e 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2015-03-03 Daniel Colascione + + * objects.texi (Finalizer Type): New section for finalizer objects. + (Type Predicates): Mention finalizers in `type-of' documentation. + * elisp.texi (Top): Link to finalizer type. + 2015-03-02 Daniel Colascione * control.texi (Generators): New section diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 3802e49ec3d..fc552be161b 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -316,6 +316,7 @@ Programming Types * Byte-Code Type:: A function written in Lisp, then compiled. * Autoload Type:: A type used for automatically loading seldom-used functions. +* Finalizer Type:: Runs code when no longer reachable. Character Type diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index ba28b63f0de..b28b3b00898 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -156,6 +156,8 @@ latter are unique to Emacs Lisp. * Byte-Code Type:: A function written in Lisp, then compiled. * Autoload Type:: A type used for automatically loading seldom-used functions. +* Finalizer Type:: Runs code when no longer reachable. + @end menu @node Integer Type @@ -1361,6 +1363,31 @@ in the loaded file. @code{autoload}, which stores the object in the function cell of a symbol. @xref{Autoload}, for more details. +@node Finalizer Type +@subsection Finalizer Type + + A @dfn{finalizer object} helps Lisp code clean up after objects that +are no longer needed. A finalizer holds a Lisp function object. +When a finalizer object becomes unreachable after a garbage collection +pass, Emacs calls the finalizer's associated function object. +When deciding whether a finalizer is reachable, Emacs does not count +references from finalizer objects themselves, allowing you to use +finalizers without having to worry about accidentally capturing +references to finalized objects themselves. + +Errors in finalizers are printed to @code{*Messages*}. Emacs runs +a given finalizer object's associated function exactly once, even +if that function fails. + +@defun make-finalizer function +Make a finalizer that will run @var{function}. @var{function} will be +called after garbage collection when the returned finalizer object +becomes unreachable. If the finalizer object is reachable only +through references from finalizer objects, it does not count as +reachable for the purpose of deciding whether to run @var{function}. +@var{function} will be run once per finalizer object. +@end defun + @node Editing Types @section Editing Types @cindex editing types @@ -1907,11 +1934,11 @@ types. In most cases, it is more convenient to use type predicates than This function returns a symbol naming the primitive type of @var{object}. The value is one of the symbols @code{bool-vector}, @code{buffer}, @code{char-table}, @code{compiled-function}, -@code{cons}, @code{float}, @code{font-entity}, @code{font-object}, -@code{font-spec}, @code{frame}, @code{hash-table}, @code{integer}, -@code{marker}, @code{overlay}, @code{process}, @code{string}, -@code{subr}, @code{symbol}, @code{vector}, @code{window}, or -@code{window-configuration}. +@code{cons}, @code{finalizer}, @code{float}, @code{font-entity}, +@code{font-object}, @code{font-spec}, @code{frame}, @code{hash-table}, +@code{integer}, @code{marker}, @code{overlay}, @code{process}, +@code{string}, @code{subr}, @code{symbol}, @code{vector}, +@code{window}, or @code{window-configuration}. @example (type-of 1) diff --git a/src/ChangeLog b/src/ChangeLog index 2f04d0b040a..930a33b277a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2015-03-03 Daniel Colascione + + * print.c (print_object): Print whether a finalizer has + been called. + + * data.c (Ftype_of): Make `type-of' work with finalizers. + (syms_of_data): Register Qfinalizer. + 2015-03-02 Daniel Colascione * print.c (print_object): Print finalizers. diff --git a/src/data.c b/src/data.c index 47706584f5e..c96841aebbf 100644 --- a/src/data.c +++ b/src/data.c @@ -223,7 +223,9 @@ for example, (type-of 1) returns `integer'. */) case Lisp_Misc_Overlay: return Qoverlay; case Lisp_Misc_Float: - return Qfloat; + return Qfloat; + case Lisp_Misc_Finalizer: + return Qfinalizer; } emacs_abort (); @@ -3547,6 +3549,7 @@ syms_of_data (void) DEFSYM (Qcons, "cons"); DEFSYM (Qmarker, "marker"); DEFSYM (Qoverlay, "overlay"); + DEFSYM (Qfinalizer, "finalizer"); DEFSYM (Qfloat, "float"); DEFSYM (Qwindow_configuration, "window-configuration"); DEFSYM (Qprocess, "process"); diff --git a/src/print.c b/src/print.c index d391fd5f7a3..838d03666d4 100644 --- a/src/print.c +++ b/src/print.c @@ -2046,7 +2046,10 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) break; case Lisp_Misc_Finalizer: - strout ("#", -1, -1, printcharfun); + strout ("#function)) + strout (" used", -1, -1, printcharfun); + strout (">", -1, -1, printcharfun); break; /* Remaining cases shouldn't happen in normal usage, but let's diff --git a/test/ChangeLog b/test/ChangeLog index 64ad85198af..3a311e97aa5 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-03-03 Daniel Colascione + + * automated/finalizer-tests.el (finalizer-object-type): Test that + `type-of' works correctly for finalizers. + 2015-03-02 Daniel Colascione * automated/generator-tests.el: New tests diff --git a/test/automated/finalizer-tests.el b/test/automated/finalizer-tests.el index 5308f01085b..4746dbea9b7 100644 --- a/test/automated/finalizer-tests.el +++ b/test/automated/finalizer-tests.el @@ -76,3 +76,6 @@ (should (equal (buffer-substring (point) (point-at-eol)) "finalizer failed: (error \"ABCDEF\")"))))) + +(ert-deftest finalizer-object-type () + (should (equal (type-of (make-finalizer nil)) 'finalizer))) From 1903e25c17a0dce03710143659c0fa9e9c6d6494 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 3 Mar 2015 11:32:19 +0100 Subject: [PATCH 206/457] Fix calculation of total window sizes after font size changes (Bug#19972). * frame.c (adjust_frame_size): If the pixel sizes remain unchanged but the number of lines or columns of the frame changes, run `window--pixel-to-total' (Bug#19972). (Qwindow_pixel_to_total): DEFSYM it. * window.el (window--dump-frame): For pixel height return total number of frame's lines. --- lisp/ChangeLog | 5 +++++ lisp/window.el | 2 +- src/ChangeLog | 7 +++++++ src/frame.c | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aae09fda38f..16206e2b6e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-03 Martin Rudalics + + * window.el (window--dump-frame): For pixel height return total + number of frame's lines. + 2015-03-03 Daniel Colascione * emacs-lisp/cl-macs.el (cl-iter-defun): Add cl-iter-defun. diff --git a/lisp/window.el b/lisp/window.el index abc60063ab9..cc8a7fc402f 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1160,7 +1160,7 @@ dumping to it." (insert (format "frame pixel: %s x %s cols/lines: %s x %s units: %s x %s\n" (frame-pixel-width frame) (frame-pixel-height frame) - (frame-total-cols frame) (frame-text-lines frame) ; (frame-total-lines frame) + (frame-total-cols frame) (frame-total-lines frame) (frame-char-width frame) (frame-char-height frame)) (format "frame text pixel: %s x %s cols/lines: %s x %s\n" (frame-text-width frame) (frame-text-height frame) diff --git a/src/ChangeLog b/src/ChangeLog index 930a33b277a..f1bdd150905 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-03-03 Martin Rudalics + + * frame.c (adjust_frame_size): If the pixel sizes remain + unchanged but the number of lines or columns of the frame + changes, run `window--pixel-to-total' (Bug#19972). + (Qwindow_pixel_to_total): DEFSYM it. + 2015-03-03 Daniel Colascione * print.c (print_object): Print whether a finalizer has diff --git a/src/frame.c b/src/frame.c index 4a526e228f9..bac2b246ad9 100644 --- a/src/frame.c +++ b/src/frame.c @@ -537,6 +537,8 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit, } #endif } + else if (new_cols != old_cols) + call2 (Qwindow_pixel_to_total, frame, Qt); if (new_windows_height != old_windows_height /* When the top margin has changed we have to recalculate the top @@ -551,6 +553,8 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit, if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f)) FrameRows (FRAME_TTY (f)) = new_lines + FRAME_TOP_MARGIN (f); } + else if (new_lines != old_lines) + call2 (Qwindow_pixel_to_total, frame, Qnil); frame_size_history_add (f, Qadjust_frame_size_3, new_text_width, new_text_height, @@ -4831,6 +4835,7 @@ syms_of_frame (void) DEFSYM (Qframep, "framep"); DEFSYM (Qframe_live_p, "frame-live-p"); DEFSYM (Qframe_windows_min_size, "frame-windows-min-size"); + DEFSYM (Qwindow_pixel_to_total, "window--pixel-to-total"); DEFSYM (Qexplicit_name, "explicit-name"); DEFSYM (Qheight, "height"); DEFSYM (Qicon, "icon"); From e28ec9a43039dd28dc01cff7f4fe87a84610029a Mon Sep 17 00:00:00 2001 From: Agustin Martin Domingo Date: Tue, 24 Feb 2015 19:36:30 +0100 Subject: [PATCH 207/457] ispell.el: Extend to aspell current hunspell handling of aliases names for standard dicts. Extend `ispell-hunspell-dictionary-equivs-alist' use to aspell, once renamed to a more general `ispell-dicts-name2locale-equivs-alist' name. Originally reported as http://bugs.debian.org/745613 * textmodes/ispell.el (ispell-dicts-name2locale-equivs-alist) (ispell-hunspell-fill-dictionary-entry) (ispell-find-hunspell-dictionaries) (ispell-set-spellchecker-params): New generic name for `ispell-hunspell-dictionary-equivs-alist'. (ispell-aspell-add-aliases): Also use `ispell-dicts-name2locale-equivs-alist' to get aspell aliases for standard dict names. --- lisp/ChangeLog | 11 +++++++++++ lisp/textmodes/ispell.el | 25 ++++++++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a5603941ad1..027664c229b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2015-03-03 Agustín Martín Domingo + + * textmodes/ispell.el (ispell-dicts-name2locale-equivs-alist) + (ispell-hunspell-fill-dictionary-entry) + (ispell-find-hunspell-dictionaries) + (ispell-set-spellchecker-params): New generic name for + `ispell-hunspell-dictionary-equivs-alist'. + (ispell-aspell-add-aliases): Also use + `ispell-dicts-name2locale-equivs-alist' to get aspell aliases for + standard dict names. + 2015-02-24 Glenn Morris * net/browse-url.el (browse-url-firefox-startup-arguments): diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 81d8078df40..d8fca822f71 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -775,7 +775,7 @@ here just for backwards compatibility.") (make-obsolete-variable 'ispell-aspell-supports-utf8 'ispell-encoding8-command "23.1") -(defvar ispell-hunspell-dictionary-equivs-alist +(defvar ispell-dicts-name2locale-equivs-alist '(("american" "en_US") ("brasileiro" "pt_BR") ("british" "en_GB") @@ -807,7 +807,7 @@ here just for backwards compatibility.") ("slovenian" "sl_SI") ("svenska" "sv_SE") ("hebrew" "he_IL")) - "Alist with matching hunspell dict names for standard dict names in + "Alist with known matching locales for standard dict names in `ispell-dictionary-base-alist'.") (defvar ispell-emacs-alpha-regexp @@ -1130,6 +1130,13 @@ Return the new dictionary alist." (realdict (assoc realname alist))) (when (and realdict (not already-exists-p)) (push (cons aliasname (cdr realdict)) alist)))))) + ;; Add entries for standard dict-names with found locale-matching entry + (dolist (dict-map-entry ispell-dicts-name2locale-equivs-alist) + (let ((name (car dict-map-entry)) + (locale (cadr dict-map-entry))) + (unless (assoc name alist) ;; skip if already present + (if (assoc locale alist) + (push (cons name (cdr (assoc locale alist))) alist))))) alist)) ;; Make ispell.el work better with hunspell. @@ -1153,12 +1160,12 @@ all uninitialized dicts using that affix file." (if (cadr (assoc dict ispell-dictionary-alist)) (message "ispell-hfde: Non void entry for %s. Skipping.\n" dict) (let ((dict-alias - (cadr (assoc dict ispell-hunspell-dictionary-equivs-alist))) + (cadr (assoc dict ispell-dicts-name2locale-equivs-alist))) (use-for-dicts (list dict)) (dict-args-cdr (cdr (ispell-parse-hunspell-affix-file dict))) newlist) ;; Get a list of uninitialized dicts using the same affix file. - (dolist (dict-equiv-alist-entry ispell-hunspell-dictionary-equivs-alist) + (dolist (dict-equiv-alist-entry ispell-dicts-name2locale-equivs-alist) (let ((dict-equiv-key (car dict-equiv-alist-entry)) (dict-equiv-value (cadr dict-equiv-alist-entry))) (if (or (member dict dict-equiv-alist-entry) @@ -1223,7 +1230,7 @@ Return a list in `ispell-dictionary-alist' format." "Look for installed hunspell dictionaries. Will initialize `ispell-hunspell-dictionary-alist' and `ispell-hunspell-dictionary-alist' after values found -and remove `ispell-hunspell-dictionary-equivs-alist' +and remove `ispell-dicts-name2locale-equivs-alist' entries if a specific dict was found." (let ((hunspell-found-dicts (split-string @@ -1262,15 +1269,15 @@ entries if a specific dict was found." "-- ispell-fhd: Skipping entry: %s\n" dict))))) ;; Remove entry from aliases alist if explicit dict was found. (let (newlist) - (dolist (dict ispell-hunspell-dictionary-equivs-alist) + (dolist (dict ispell-dicts-name2locale-equivs-alist) (if (assoc (car dict) ispell-hunspell-dict-paths-alist) (ispell-print-if-debug "-- ispell-fhd: Excluding %s alias. Standalone dict found.\n" (car dict)) (add-to-list 'newlist dict))) - (setq ispell-hunspell-dictionary-equivs-alist newlist)) + (setq ispell-dicts-name2locale-equivs-alist newlist)) ;; Add known hunspell aliases - (dolist (dict-equiv ispell-hunspell-dictionary-equivs-alist) + (dolist (dict-equiv ispell-dicts-name2locale-equivs-alist) (let ((dict-equiv-key (car dict-equiv)) (dict-equiv-value (cadr dict-equiv)) (exclude-aliases (list ;; Exclude TeX aliases @@ -1367,7 +1374,7 @@ aspell is used along with Emacs).") (let* ((dict-name (nth 0 adict)) (dict-equiv (cadr (assoc dict-name - ispell-hunspell-dictionary-equivs-alist))) + ispell-dicts-name2locale-equivs-alist))) (ispell-args (nth 5 adict)) (ispell-args-has-d (member "-d" ispell-args)) skip-dict) From c4ade119ccd1904795b2e8d76cd93aedc86d1b09 Mon Sep 17 00:00:00 2001 From: Agustin Martin Domingo Date: Tue, 3 Mar 2015 13:12:38 +0100 Subject: [PATCH 208/457] textmodes/ispell.el: Look for aspell .dat files also under dict-dir, as aspell does. Originally reported as http://bugs.debian.org/765349. Noticed when aspell has different data-dir and dict-dir. * textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure .dat files for aspell dicts are also searched for in location described by `ispell-aspell-dict-dir', matching aspell's dict-dir variable. --- lisp/ChangeLog | 7 +++++++ lisp/textmodes/ispell.el | 42 ++++++++++++++++++++++++---------------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 027664c229b..11c0271a564 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-03-03 Agustín Martín Domingo + + * textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure + .dat files for aspell dicts are also searched for in location + described by `ispell-aspell-dict-dir', matching aspell's dict-dir + variable. + 2015-03-03 Agustín Martín Domingo * textmodes/ispell.el (ispell-dicts-name2locale-equivs-alist) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index d8fca822f71..a981b523931 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1058,27 +1058,35 @@ Assumes that value contains no whitespace." "For aspell dictionary DICT-NAME, return a list of parameters if an associated data file is found or nil otherwise. List format is that of `ispell-dictionary-base-alist' elements." + + ;; Make sure `ispell-aspell-dict-dir' is defined + (or ispell-aspell-dict-dir + (setq ispell-aspell-dict-dir + (ispell-get-aspell-config-value "dict-dir"))) + ;; Make sure `ispell-aspell-data-dir' is defined (or ispell-aspell-data-dir (setq ispell-aspell-data-dir (ispell-get-aspell-config-value "data-dir"))) - ;; Try finding associated datafile - (let* ((datafile1 - (concat ispell-aspell-data-dir "/" - ;; Strip out variant, country code, etc. - (and (string-match "^[[:alpha:]]+" dict-name) - (match-string 0 dict-name)) ".dat")) - (datafile2 - (concat ispell-aspell-data-dir "/" - ;; Strip out anything but xx_YY. - (and (string-match "^[[:alpha:]_]+" dict-name) - (match-string 0 dict-name)) ".dat")) - (data-file - (if (file-readable-p datafile1) - datafile1 - (if (file-readable-p datafile2) - datafile2))) - otherchars) + + ;; Try finding associated datafile. aspell will look for master .dat + ;; file in `dict-dir' and `data-dir'. Associated .dat files must be + ;; in the same directory as master file. + (let ((data-file + (catch 'datafile + (dolist ( tmp-path (list ispell-aspell-dict-dir + ispell-aspell-data-dir )) + ;; Try xx.dat first, strip out variant, country code, etc, + ;; then try xx_YY.dat (without stripping country code). + (dolist (tmp-regexp (list "^[[:alpha:]]+" + "^[[:alpha:]_]+")) + (let ((fullpath + (concat tmp-path "/" + (and (string-match tmp-regexp dict-name) + (match-string 0 dict-name)) ".dat"))) + (if (file-readable-p fullpath) + (throw 'datafile fullpath))))))) + otherchars) (if data-file (with-temp-buffer From bfbcec128a64c8d7d480140874c7bfa50ae803f7 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Tue, 3 Mar 2015 15:15:26 +0000 Subject: [PATCH 209/457] emacs-lisp/package.el (package-autoremove): Fix if logic. --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/package.el | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 16206e2b6e1..af7d0d81323 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-03 Artur Malabarba + + * emacs-lisp/package.el (package-autoremove): Fix if logic. + 2015-03-03 Martin Rudalics * window.el (window--dump-frame): For pixel height return total diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index de1158d96a7..885fb00ce75 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1611,8 +1611,8 @@ will be deleted." (mapconcat #'symbol-name removable ", "))) (mapc (lambda (p) (package-delete (cadr (assq p package-alist)) t)) - removable) - (message "Nothing to autoremove")))))) + removable)) + (message "Nothing to autoremove"))))) (defun package-archive-base (desc) "Return the archive containing the package NAME." From a0b78cb64f295f52c67916362ec1eaf75b1259c4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 3 Mar 2015 08:56:24 -0800 Subject: [PATCH 210/457] # Standardize copyright and license notices for recently added files --- lisp/emacs-lisp/generator.el | 2 +- test/automated/finalizer-tests.el | 8 +++++--- test/automated/generator-tests.el | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el index bb9fcff1408..a3759a27fdd 100644 --- a/lisp/emacs-lisp/generator.el +++ b/lisp/emacs-lisp/generator.el @@ -6,7 +6,7 @@ ;; Keywords: extensions, elisp ;; Package: emacs -;; Copyright (C) Daniel Colascione +;; This file is part of GNU Emacs. ;; 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 diff --git a/test/automated/finalizer-tests.el b/test/automated/finalizer-tests.el index 4746dbea9b7..4bf8bb1a318 100644 --- a/test/automated/finalizer-tests.el +++ b/test/automated/finalizer-tests.el @@ -5,18 +5,20 @@ ;; Author: Daniel Colascione ;; Keywords: -;; This program is free software; you can redistribute it and/or modify +;; This file is part of GNU Emacs. + +;; 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 ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . +;; along with GNU Emacs. If not, see . ;;; Commentary: diff --git a/test/automated/generator-tests.el b/test/automated/generator-tests.el index 2c5de31b40b..875255ff11a 100644 --- a/test/automated/generator-tests.el +++ b/test/automated/generator-tests.el @@ -5,18 +5,20 @@ ;; Author: Daniel Colascione ;; Keywords: -;; This program is free software; you can redistribute it and/or modify +;; This file is part of GNU Emacs. + +;; 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 ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . +;; along with GNU Emacs. If not, see . ;;; Commentary: From 27c02b02fe598ee3ceee988865b3df6b370d34a5 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 3 Mar 2015 09:00:12 -0800 Subject: [PATCH 211/457] Fix some errors in recently added tests * test/automated/generator-tests.el (cps-while-incf): Replace undefined incf with cl-incf. (cps-test-iter-do): Use should not undefined assert. --- test/ChangeLog | 6 ++++++ test/automated/generator-tests.el | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 3a311e97aa5..d8d3fc80f06 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-03-03 Glenn Morris + + * automated/generator-tests.el (cps-while-incf): + Replace undefined incf with cl-incf. + (cps-test-iter-do): Use should not undefined assert. + 2015-03-03 Daniel Colascione * automated/finalizer-tests.el (finalizer-object-type): Test that diff --git a/test/automated/generator-tests.el b/test/automated/generator-tests.el index 875255ff11a..0721009d70b 100644 --- a/test/automated/generator-tests.el +++ b/test/automated/generator-tests.el @@ -109,7 +109,7 @@ identical output. (cps-testcase cps-while-incf (let* ((i 0) (j 10)) (while (< i 10) - (incf i) + (cl-incf i) (setf j (+ j (* i 10)))) j)) @@ -202,8 +202,7 @@ identical output. (let (mylist) (iter-do (x (mygenerator 4)) (push x mylist)) - - (assert (equal mylist '(2 4 1))))) + (should (equal mylist '(2 4 1))))) (iter-defun gen-using-yield-value () (let (f) From a6fb5e2de55b936761274f5d0895de178640ec68 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 3 Mar 2015 09:10:01 -0800 Subject: [PATCH 212/457] * alloc.c (run_finalizers): Omit unused local. Also, redo newly-added code as per usual Emacs style. --- src/ChangeLog | 5 +++++ src/alloc.c | 61 ++++++++++++++++++++++++--------------------------- src/lisp.h | 14 ++++++------ 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f1bdd150905..185769fd33f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-03 Paul Eggert + + * alloc.c (run_finalizers): Omit unused local. + Also, redo newly-added code as per usual Emacs style. + 2015-03-03 Martin Rudalics * frame.c (adjust_frame_size): If the pixel sizes remain diff --git a/src/alloc.c b/src/alloc.c index eec53e7d844..ff93bf57c26 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -3714,7 +3714,7 @@ init_finalizer_list (struct Lisp_Finalizer *head) static void finalizer_insert (struct Lisp_Finalizer *element, - struct Lisp_Finalizer* finalizer) + struct Lisp_Finalizer *finalizer) { eassert (finalizer->prev == NULL); eassert (finalizer->next == NULL); @@ -3727,12 +3727,13 @@ finalizer_insert (struct Lisp_Finalizer *element, static void unchain_finalizer (struct Lisp_Finalizer *finalizer) { - if (finalizer->prev != NULL) { - eassert (finalizer->next != NULL); - finalizer->prev->next = finalizer->next; - finalizer->next->prev = finalizer->prev; - finalizer->prev = finalizer->next = NULL; - } + if (finalizer->prev != NULL) + { + eassert (finalizer->next != NULL); + finalizer->prev->next = finalizer->next; + finalizer->next->prev = finalizer->prev; + finalizer->prev = finalizer->next = NULL; + } } static void @@ -3742,21 +3743,20 @@ mark_finalizer_list (struct Lisp_Finalizer *head) finalizer != head; finalizer = finalizer->next) { - finalizer->base.gcmarkbit = 1; + finalizer->base.gcmarkbit = true; mark_object (finalizer->function); } } -/* Move doomed finalizers in list SRC onto list DEST. A doomed +/* Move doomed finalizers to list DEST from list SRC. A doomed finalizer is one that is not GC-reachable and whose - finalizer->function is non-nil. (We reset finalizer->function to - before attempting to run it.) */ + finalizer->function is non-nil. */ static void queue_doomed_finalizers (struct Lisp_Finalizer *dest, struct Lisp_Finalizer *src) { - struct Lisp_Finalizer* finalizer = src->next; + struct Lisp_Finalizer *finalizer = src->next; while (finalizer != src) { struct Lisp_Finalizer *next = finalizer->next; @@ -3791,23 +3791,23 @@ run_finalizer_function (Lisp_Object function) } static void -run_finalizers (struct Lisp_Finalizer* finalizers) +run_finalizers (struct Lisp_Finalizer *finalizers) { - struct Lisp_Finalizer* finalizer; + struct Lisp_Finalizer *finalizer; Lisp_Object function; - struct gcpro gcpro1; - while (finalizers->next != finalizers) { - finalizer = finalizers->next; - eassert (finalizer->base.type == Lisp_Misc_Finalizer); - unchain_finalizer (finalizer); - function = finalizer->function; - if (!NILP (function)) - { - finalizer->function = Qnil; - run_finalizer_function (function); - } - } + while (finalizers->next != finalizers) + { + finalizer = finalizers->next; + eassert (finalizer->base.type == Lisp_Misc_Finalizer); + unchain_finalizer (finalizer); + function = finalizer->function; + if (!NILP (function)) + { + finalizer->function = Qnil; + run_finalizer_function (function); + } + } } DEFUN ("make-finalizer", Fmake_finalizer, Smake_finalizer, 1, 1, 0, @@ -3819,11 +3819,8 @@ count as reachable for the purpose of deciding whether to run FUNCTION. FUNCTION will be run once per finalizer object. */) (Lisp_Object function) { - Lisp_Object val; - struct Lisp_Finalizer *finalizer; - - val = allocate_misc (Lisp_Misc_Finalizer); - finalizer = XFINALIZER (val); + Lisp_Object val = allocate_misc (Lisp_Misc_Finalizer); + struct Lisp_Finalizer *finalizer = XFINALIZER (val); finalizer->function = function; finalizer->prev = finalizer->next = NULL; finalizer_insert (&finalizers, finalizer); @@ -6514,7 +6511,7 @@ mark_object (Lisp_Object arg) break; case Lisp_Misc_Finalizer: - XMISCANY (obj)->gcmarkbit = 1; + XMISCANY (obj)->gcmarkbit = true; mark_object (XFINALIZER (obj)->function); break; diff --git a/src/lisp.h b/src/lisp.h index 37f3b28242b..b730619726b 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2186,18 +2186,18 @@ XSAVE_OBJECT (Lisp_Object obj, int n) return XSAVE_VALUE (obj)->data[n].object; } -/* A finalizer sentinel. We run FUNCTION when this value becomes - unreachable. We treat these values specially in the GC to ensure - that we still run the finalizer even if FUNCTION contains a - reference to the finalizer; i.e., we run a finalizer's function - when FUNCTION is reachable _only_ through finalizers. */ +/* A finalizer sentinel. */ struct Lisp_Finalizer { struct Lisp_Misc_Any base; - /* Circular list of all active weak references */ + + /* Circular list of all active weak references. */ struct Lisp_Finalizer *prev; struct Lisp_Finalizer *next; - /* Called when this object becomes unreachable */ + + /* Call FUNCTION when the finalizer becomes unreachable, even if + FUNCTION contains a reference to the finalizer; i.e., call + FUNCTION when it is reachable _only_ through finalizers. */ Lisp_Object function; }; From 15ddf7a6f211545b34f22bbab286df91e391b5aa Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Tue, 3 Mar 2015 09:59:23 -0800 Subject: [PATCH 213/457] Rename gc-precise-p to gc-precise 2015-03-03 Daniel Colascione * alloc.c (syms_of_alloc): Rename `gc-precise-p' to `gc-precise'. 2015-03-03 Daniel Colascione * automated/finalizer-tests.el (finalizer-basic) (finalizer-circular-reference, finalizer-cross-reference) (finalizer-error): Rename `gc-precise-p' to `gc-precise'. * automated/generator-tests.el (cps-test-iter-close-finalizer): Rename `gc-precise-p' to `gc-precise'. --- src/ChangeLog | 4 ++++ src/alloc.c | 5 +++-- test/ChangeLog | 9 +++++++++ test/automated/finalizer-tests.el | 8 ++++---- test/automated/generator-tests.el | 2 +- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 185769fd33f..0bc5d650caf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-03-03 Daniel Colascione + + * alloc.c (syms_of_alloc): Rename `gc-precise-p' to `gc-precise'. + 2015-03-03 Paul Eggert * alloc.c (run_finalizers): Omit unused local. diff --git a/src/alloc.c b/src/alloc.c index ff93bf57c26..022782504f1 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -7266,7 +7266,7 @@ init_alloc_once (void) { /* Even though Qt's contents are not set up, its address is known. */ Vpurify_flag = Qt; - gc_precise_p = (GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE); + gc_precise = (GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE); purebeg = PUREBEG; pure_size = PURESIZE; @@ -7410,9 +7410,10 @@ The time is in seconds as a floating point value. */); DEFVAR_INT ("gcs-done", gcs_done, doc: /* Accumulated number of garbage collections done. */); - DEFVAR_BOOL ("gc-precise-p", gc_precise_p, + DEFVAR_BOOL ("gc-precise", gc_precise, doc: /* Non-nil means GC stack marking is precise. Useful mainly for automated GC tests. Build time constant.*/); + XSYMBOL (intern_c_string ("gc-precise"))->constant = 1; defsubr (&Scons); defsubr (&Slist); diff --git a/test/ChangeLog b/test/ChangeLog index d8d3fc80f06..6ff35afa66b 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,12 @@ +2015-03-03 Daniel Colascione + + * automated/finalizer-tests.el (finalizer-basic) + (finalizer-circular-reference, finalizer-cross-reference) + (finalizer-error): Rename `gc-precise-p' to `gc-precise'. + + * automated/generator-tests.el (cps-test-iter-close-finalizer): + Rename `gc-precise-p' to `gc-precise'. + 2015-03-03 Glenn Morris * automated/generator-tests.el (cps-while-incf): diff --git a/test/automated/finalizer-tests.el b/test/automated/finalizer-tests.el index 4bf8bb1a318..142152e3fb0 100644 --- a/test/automated/finalizer-tests.el +++ b/test/automated/finalizer-tests.el @@ -31,7 +31,7 @@ (ert-deftest finalizer-basic () "Test that finalizers run at all." - (skip-unless gc-precise-p) + (skip-unless gc-precise) (let* ((finalized nil) (finalizer (make-finalizer (lambda () (setf finalized t))))) (garbage-collect) @@ -42,7 +42,7 @@ (ert-deftest finalizer-circular-reference () "Test references from a callback to a finalizer." - (skip-unless gc-precise-p) + (skip-unless gc-precise) (let ((finalized nil)) (let* ((value nil) (finalizer (make-finalizer (lambda () (setf finalized value))))) @@ -53,7 +53,7 @@ (ert-deftest finalizer-cross-reference () "Test that between-finalizer references do not prevent collection." - (skip-unless gc-precise-p) + (skip-unless gc-precise) (let ((d nil) (fc 0)) (let* ((f1-data (cons nil nil)) (f2-data (cons nil nil)) @@ -68,7 +68,7 @@ (ert-deftest finalizer-error () "Test that finalizer errors are suppressed" - (skip-unless gc-precise-p) + (skip-unless gc-precise) (make-finalizer (lambda () (error "ABCDEF"))) (garbage-collect) (with-current-buffer "*Messages*" diff --git a/test/automated/generator-tests.el b/test/automated/generator-tests.el index 0721009d70b..a8607f9274d 100644 --- a/test/automated/generator-tests.el +++ b/test/automated/generator-tests.el @@ -261,7 +261,7 @@ identical output. (should (not cps-test-closed-flag))))) (ert-deftest cps-test-iter-close-finalizer () - (skip-unless gc-precise-p) + (skip-unless gc-precise) (garbage-collect) (let ((cps-test-closed-flag nil)) (let ((iter (funcall From 88f8a9d7d827b3780ae25e99b67e01d897fd5959 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 3 Mar 2015 13:27:21 -0500 Subject: [PATCH 214/457] generator-tests.el: make cps-test-iter-cleanup-once-only work * test/automated/generator-tests.el (cps-test-iter-cleanup-once-only): Replace undefined incf with cl-incf. --- test/ChangeLog | 4 ++-- test/automated/generator-tests.el | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 6ff35afa66b..ea2e0eef179 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -9,8 +9,8 @@ 2015-03-03 Glenn Morris - * automated/generator-tests.el (cps-while-incf): - Replace undefined incf with cl-incf. + * automated/generator-tests.el (cps-while-incf) + (cps-test-iter-cleanup-once-only): Replace undefined incf with cl-incf. (cps-test-iter-do): Use should not undefined assert. 2015-03-03 Daniel Colascione diff --git a/test/automated/generator-tests.el b/test/automated/generator-tests.el index a8607f9274d..893c0d2e724 100644 --- a/test/automated/generator-tests.el +++ b/test/automated/generator-tests.el @@ -283,7 +283,7 @@ identical output. (iter-yield 1) (error "test") (iter-yield 2)) - (incf nr-unwound)))))) + (cl-incf nr-unwound)))))) (should (equal (iter-next iter) 1)) (should-error (iter-next iter)) (should (equal nr-unwound 1)))) From 02eb227e8163c6212e814b5b7e191b4d34306872 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Tue, 3 Mar 2015 10:32:21 -0800 Subject: [PATCH 215/457] Rename globals in generator.el * lisp/emacs-lisp/generator.el: Make globals conform to elisp style throughout. --- lisp/ChangeLog | 5 ++ lisp/emacs-lisp/generator.el | 154 +++++++++++++++++------------------ 2 files changed, 82 insertions(+), 77 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index af7d0d81323..e08263d4ab7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-03 Daniel Colascione + + * emacs-lisp/generator.el: Make globals conform to elisp + style throughout. + 2015-03-03 Artur Malabarba * emacs-lisp/package.el (package-autoremove): Fix if logic. diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el index a3759a27fdd..d41f13e29ca 100644 --- a/lisp/emacs-lisp/generator.el +++ b/lisp/emacs-lisp/generator.el @@ -79,14 +79,14 @@ (require 'cl-lib) (require 'pcase) -(defvar *cps-bindings* nil) -(defvar *cps-states* nil) -(defvar *cps-value-symbol* nil) -(defvar *cps-state-symbol* nil) -(defvar *cps-cleanup-table-symbol* nil) -(defvar *cps-cleanup-function* nil) +(defvar cps--bindings nil) +(defvar cps--states nil) +(defvar cps--value-symbol nil) +(defvar cps--state-symbol nil) +(defvar cps--cleanup-table-symbol nil) +(defvar cps--cleanup-function nil) -(defvar *cps-dynamic-wrappers* '(identity) +(defvar cps--dynamic-wrappers '(identity) "List of transformer functions to apply to atomic forms we evaluate in CPS context.") @@ -128,10 +128,10 @@ control flow non-locally in goo that diverts this control flow to the CPS state machinery. " (declare (indent 1)) - `(let ((*cps-dynamic-wrappers* + `(let ((cps--dynamic-wrappers (cons ,wrapper - *cps-dynamic-wrappers*))) + cps--dynamic-wrappers))) ,@body)) (defun cps--make-dynamic-binding-wrapper (dynamic-var static-var) @@ -155,13 +155,13 @@ DYNAMIC-VAR bound to STATIC-VAR." "Create a new CPS state with body BODY and return the state's name." (declare (indent 1)) (let* ((state (cl-gensym (format "cps-state-%s-" kind)))) - (push (list state body *cps-cleanup-function*) *cps-states*) - (push state *cps-bindings*) + (push (list state body cps--cleanup-function) cps--states) + (push state cps--bindings) state)) (defun cps--add-binding (original-name) (car (push (cl-gensym (format "cps-binding-%s-" original-name)) - *cps-bindings*))) + cps--bindings))) (defun cps--find-special-form-handler (form) (let* ((handler-name (format "cps--transform-%s" (car-safe form))) @@ -187,17 +187,17 @@ don't yield.") (not cps--yield-seen)))) (defun cps--make-atomic-state (form next-state) - (let ((tform `(prog1 ,form (setf ,*cps-state-symbol* ,next-state)))) - (cl-loop for wrapper in *cps-dynamic-wrappers* + (let ((tform `(prog1 ,form (setf ,cps--state-symbol ,next-state)))) + (cl-loop for wrapper in cps--dynamic-wrappers do (setf tform (funcall wrapper tform))) - ;; Bind *cps-cleanup-function* to nil here because the wrapper + ;; Bind cps--cleanup-function to nil here because the wrapper ;; function mechanism is responsible for cleanup here, not the ;; generic cleanup mechanism. If we didn't make this binding, ;; we'd run cleanup handlers twice on anything that made it out ;; to toplevel. - (let ((*cps-cleanup-function* nil)) + (let ((cps--cleanup-function nil)) (cps--add-state "atom" - `(setf ,*cps-value-symbol* ,tform))))) + `(setf ,cps--value-symbol ,tform))))) (defun cps--transform-1 (form next-state) (pcase form @@ -221,8 +221,8 @@ don't yield.") (cps--transform-1 condition (cps--add-state "and" - `(setf ,*cps-state-symbol* - (if ,*cps-value-symbol* + `(setf ,cps--state-symbol + (if ,cps--value-symbol ,(cps--transform-1 `(and ,@rest) next-state) ,next-state))))) @@ -233,8 +233,8 @@ don't yield.") (let ((tag-binding (cps--add-binding "catch-tag"))) (cps--transform-1 tag (cps--add-state "cps-update-tag" - `(setf ,tag-binding ,*cps-value-symbol* - ,*cps-state-symbol* + `(setf ,tag-binding ,cps--value-symbol + ,cps--state-symbol ,(cps--with-value-wrapper (cps--make-catch-wrapper tag-binding next-state) @@ -269,8 +269,8 @@ don't yield.") (`(if ,cond ,then . ,else) (cps--transform-1 cond (cps--add-state "if" - `(setf ,*cps-state-symbol* - (if ,*cps-value-symbol* + `(setf ,cps--state-symbol + (if ,cps--value-symbol ,(cps--transform-1 then next-state) ,(cps--transform-1 `(progn ,@else) @@ -328,8 +328,8 @@ don't yield.") (cps--transform-1 value-form (cps--add-state "let*" - `(setf ,new-var ,*cps-value-symbol* - ,*cps-state-symbol* + `(setf ,new-var ,cps--value-symbol + ,cps--state-symbol ,(if (or (not lexical-binding) (special-variable-p var)) (cps--with-dynamic-binding var new-var (cps--transform-1 @@ -349,8 +349,8 @@ don't yield.") (cps--transform-1 condition (cps--add-state "or" - `(setf ,*cps-state-symbol* - (if ,*cps-value-symbol* + `(setf ,cps--state-symbol + (if ,cps--value-symbol ,next-state ,(cps--transform-1 `(or ,@rest) next-state)))))) @@ -364,13 +364,13 @@ don't yield.") (let ((temp-var-symbol (cps--add-binding "prog1-temp"))) (cps--add-state "prog1" `(setf ,temp-var-symbol - ,*cps-value-symbol* - ,*cps-state-symbol* + ,cps--value-symbol + ,cps--state-symbol ,(cps--transform-1 `(progn ,@body) (cps--add-state "prog1inner" - `(setf ,*cps-value-symbol* ,temp-var-symbol - ,*cps-state-symbol* ,next-state)))))))) + `(setf ,cps--value-symbol ,temp-var-symbol + ,cps--state-symbol ,next-state)))))))) ;; Process `prog2'. @@ -402,8 +402,8 @@ don't yield.") (`(unwind-protect ,bodyform . ,unwindforms) ;; Signal the evaluator-generator that it needs to generate code ;; to handle cleanup forms. - (unless *cps-cleanup-table-symbol* - (setf *cps-cleanup-table-symbol* (cl-gensym "cps-cleanup-table-"))) + (unless cps--cleanup-table-symbol + (setf cps--cleanup-table-symbol (cl-gensym "cps-cleanup-table-"))) (let* ((unwind-state (cps--add-state "unwind" @@ -412,10 +412,10 @@ don't yield.") ;; references inside it with lifted equivalents. `(progn ,@unwindforms - (setf ,*cps-state-symbol* ,next-state)))) - (old-cleanup *cps-cleanup-function*) - (*cps-cleanup-function* - (let ((*cps-cleanup-function* nil)) + (setf ,cps--state-symbol ,next-state)))) + (old-cleanup cps--cleanup-function) + (cps--cleanup-function + (let ((cps--cleanup-function nil)) (cps--add-state "cleanup" `(progn ,(when old-cleanup `(funcall ,old-cleanup)) @@ -436,25 +436,25 @@ don't yield.") (cps--transform-1 test loop-state)) (loop-state-body `(progn - (setf ,*cps-state-symbol* - (if ,*cps-value-symbol* + (setf ,cps--state-symbol + (if ,cps--value-symbol ,(cps--transform-1 `(progn ,@body) eval-loop-condition-state) ,next-state))))) - (push (list loop-state loop-state-body *cps-cleanup-function*) - *cps-states*) - (push loop-state *cps-bindings*) + (push (list loop-state loop-state-body cps--cleanup-function) + cps--states) + (push loop-state cps--bindings) eval-loop-condition-state)) ;; Process various kinds of `quote'. (`(quote ,arg) (cps--add-state "quote" - `(setf ,*cps-value-symbol* (quote ,arg) - ,*cps-state-symbol* ,next-state))) + `(setf ,cps--value-symbol (quote ,arg) + ,cps--state-symbol ,next-state))) (`(function ,arg) (cps--add-state "function" - `(setf ,*cps-value-symbol* (function ,arg) - ,*cps-state-symbol* ,next-state))) + `(setf ,cps--value-symbol (function ,arg) + ,cps--state-symbol ,next-state))) ;; Deal with `iter-yield'. @@ -463,12 +463,12 @@ don't yield.") value (cps--add-state "iter-yield" `(progn - (setf ,*cps-state-symbol* - ,(if *cps-cleanup-function* + (setf ,cps--state-symbol + ,(if cps--cleanup-function (cps--add-state "after-yield" - `(setf ,*cps-state-symbol* ,next-state)) + `(setf ,cps--state-symbol ,next-state)) next-state)) - (throw 'cps--yield ,*cps-value-symbol*))))) + (throw 'cps--yield ,cps--value-symbol))))) ;; Catch any unhandled special forms. @@ -513,7 +513,7 @@ don't yield.") ,form (setf ,normal-exit-symbol t))) (unless ,normal-exit-symbol - (setf ,*cps-state-symbol* ,next-state))))))) + (setf ,cps--state-symbol ,next-state))))))) (defun cps--make-condition-wrapper (var next-state handlers) ;; Each handler is both one of the transformers with which we wrap @@ -541,7 +541,7 @@ don't yield.") `(,condition (setf ,error-symbol ,lexical-error-symbol - ,*cps-state-symbol* + ,cps--state-symbol ,error-state))))))) (defun cps--replace-variable-references (var new-var form) @@ -568,47 +568,47 @@ modified copy." (put 'iter-end-of-sequence 'error-message "iteration terminated") (defun cps--make-close-iterator-form (terminal-state) - (if *cps-cleanup-table-symbol* - `(let ((cleanup (cdr (assq ,*cps-state-symbol* ,*cps-cleanup-table-symbol*)))) - (setf ,*cps-state-symbol* ,terminal-state - ,*cps-value-symbol* nil) + (if cps--cleanup-table-symbol + `(let ((cleanup (cdr (assq ,cps--state-symbol ,cps--cleanup-table-symbol)))) + (setf ,cps--state-symbol ,terminal-state + ,cps--value-symbol nil) (when cleanup (funcall cleanup))) - `(setf ,*cps-state-symbol* ,terminal-state - ,*cps-value-symbol* nil))) + `(setf ,cps--state-symbol ,terminal-state + ,cps--value-symbol nil))) (defun cps-generate-evaluator (form) - (let* (*cps-states* - *cps-bindings* - *cps-cleanup-function* - (*cps-value-symbol* (cl-gensym "cps-current-value-")) - (*cps-state-symbol* (cl-gensym "cps-current-state-")) + (let* (cps--states + cps--bindings + cps--cleanup-function + (cps--value-symbol (cl-gensym "cps-current-value-")) + (cps--state-symbol (cl-gensym "cps-current-state-")) ;; We make *cps-cleanup-table-symbol** non-nil when we notice ;; that we have cleanup processing to perform. - (*cps-cleanup-table-symbol* nil) + (cps--cleanup-table-symbol nil) (terminal-state (cps--add-state "terminal" `(signal 'iter-end-of-sequence - ,*cps-value-symbol*))) + ,cps--value-symbol))) (initial-state (cps--transform-1 (macroexpand-all form) terminal-state)) (finalizer-symbol - (when *cps-cleanup-table-symbol* - (when *cps-cleanup-table-symbol* + (when cps--cleanup-table-symbol + (when cps--cleanup-table-symbol (cl-gensym "cps-iterator-finalizer-"))))) - `(let ,(append (list *cps-state-symbol* *cps-value-symbol*) - (when *cps-cleanup-table-symbol* - (list *cps-cleanup-table-symbol*)) + `(let ,(append (list cps--state-symbol cps--value-symbol) + (when cps--cleanup-table-symbol + (list cps--cleanup-table-symbol)) (when finalizer-symbol (list finalizer-symbol)) - (nreverse *cps-bindings*)) + (nreverse cps--bindings)) ;; Order state list so that cleanup states are always defined ;; before they're referenced. - ,@(cl-loop for (state body cleanup) in (nreverse *cps-states*) + ,@(cl-loop for (state body cleanup) in (nreverse cps--states) collect `(setf ,state (lambda () ,body)) when cleanup - do (cl-assert *cps-cleanup-table-symbol*) - and collect `(push (cons ,state ,cleanup) ,*cps-cleanup-table-symbol*)) - (setf ,*cps-state-symbol* ,initial-state) + do (cl-assert cps--cleanup-table-symbol) + and collect `(push (cons ,state ,cleanup) ,cps--cleanup-table-symbol)) + (setf ,cps--state-symbol ,initial-state) (let ((iterator (lambda (op value) @@ -621,13 +621,13 @@ modified copy." ((eq op :close) ,(cps--make-close-iterator-form terminal-state)) ((eq op :next) - (setf ,*cps-value-symbol* value) + (setf ,cps--value-symbol value) (let ((yielded nil)) (unwind-protect (prog1 (catch 'cps--yield (while t - (funcall ,*cps-state-symbol*))) + (funcall ,cps--state-symbol))) (setf yielded t)) (unless yielded ;; If we're exiting non-locally (error, quit, From cecf4afebb394351a78c48d05e81a1e55af6da32 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Tue, 3 Mar 2015 10:56:24 -0800 Subject: [PATCH 216/457] Address generator feedback * doc/lispref/control.texi (Generators): Correct missing word. Clarify which forms are legal in which parts of `unwind-protect'. Fix orphaned close parenthesis. * lisp/emacs-lisp/generator.el: Make globals conform to elisp style throughout. Use more efficient font-lock patterns. (cps-inhibit-atomic-optimization): Rename from `cps-disable-atomic-optimization'. (cps--gensym): New macro; replaces `cl-gensym' throughout. (cps-generate-evaluator): Move the `iter-yield' local macro definition here (iter-defun, iter-lambda): from here. * test/automated/generator-tests.el (cps-test-iter-close-finalizer): Rename `gc-precise-p' to `gc-precise'. * test/automated/generator-tests.el (cps-testcase): Use `cps-inhibit-atomic-optimization' instead of `cps-disable-atomic-optimization'. --- doc/lispref/ChangeLog | 4 ++ doc/lispref/control.texi | 14 +++--- lisp/ChangeLog | 8 +++- lisp/emacs-lisp/generator.el | 77 ++++++++++++++++--------------- test/ChangeLog | 4 ++ test/automated/generator-tests.el | 2 +- 6 files changed, 64 insertions(+), 45 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index c27805b3d6e..f96cb26a5e1 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,9 @@ 2015-03-03 Daniel Colascione + * control.texi (Generators): Correct missing word. Clarify which + forms are legal in which parts of `unwind-protect'. Fix orphaned + close parenthesis. + * objects.texi (Finalizer Type): New section for finalizer objects. (Type Predicates): Mention finalizers in `type-of' documentation. * elisp.texi (Top): Link to finalizer type. diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index bec2bc92ac4..f512ad990bd 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -661,7 +661,7 @@ indicates that the current iterator should pause and return @code{iter-yield-from} yields all the values that @var{iterator} produces and evaluates to the value that @var{iterator}'s generator function returns normally. While it has control, @var{iterator} -receives sent to the iterator using @code{iter-next}. +receives values sent to the iterator using @code{iter-next}. @end defmac To use a generator function, first call it normally, producing a @@ -693,9 +693,11 @@ evaluating any @code{iter-yield} form. @end defun @defun iter-close iterator -If @var{iterator} is suspended inside a @code{unwind-protect} and -becomes unreachable, Emacs will eventually run unwind handlers after a -garbage collection pass. To ensure that these handlers are run before +If @var{iterator} is suspended inside an @code{unwind-protect}'s +@code{bodyform} and becomes unreachable, Emacs will eventually run +unwind handlers after a garbage collection pass. (Note that +@code{iter-yield} is illegal inside an @code{unwind-protect}'s +@code{unwindforms}.) To ensure that these handlers are run before then, use @code{iter-close}. @end defun @@ -716,8 +718,8 @@ working with iterators. @example (iter-defun my-iter (x) (iter-yield (1+ (iter-yield (1+ x)))) - -1 ;; Return normally - ) + ;; Return normally + -1) (let* ((iter (my-iter 5)) (iter2 (my-iter 0))) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e08263d4ab7..63071734cf8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,13 @@ 2015-03-03 Daniel Colascione * emacs-lisp/generator.el: Make globals conform to elisp - style throughout. + style throughout. Use more efficient font-lock patterns. + (cps-inhibit-atomic-optimization): Rename from + `cps-disable-atomic-optimization'. + (cps--gensym): New macro; replaces `cl-gensym' throughout. + (cps-generate-evaluator): Move the `iter-yield' local macro + definition here + (iter-defun, iter-lambda): from here. 2015-03-03 Artur Malabarba diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el index d41f13e29ca..77b1fab9b09 100644 --- a/lisp/emacs-lisp/generator.el +++ b/lisp/emacs-lisp/generator.el @@ -86,6 +86,12 @@ (defvar cps--cleanup-table-symbol nil) (defvar cps--cleanup-function nil) +(defmacro cps--gensym (fmt &rest args) + ;; Change this function to use `cl-gensym' if you want the generated + ;; code to be easier to read and debug. + ;; (cl-gensym (apply #'format fmt args)) + `(make-symbol ,fmt)) + (defvar cps--dynamic-wrappers '(identity) "List of transformer functions to apply to atomic forms we evaluate in CPS context.") @@ -154,13 +160,13 @@ DYNAMIC-VAR bound to STATIC-VAR." (defun cps--add-state (kind body) "Create a new CPS state with body BODY and return the state's name." (declare (indent 1)) - (let* ((state (cl-gensym (format "cps-state-%s-" kind)))) + (let* ((state (cps--gensym "cps-state-%s-" kind))) (push (list state body cps--cleanup-function) cps--states) (push state cps--bindings) state)) (defun cps--add-binding (original-name) - (car (push (cl-gensym (format "cps-binding-%s-" original-name)) + (car (push (cps--gensym (format "cps-binding-%s-" original-name)) cps--bindings))) (defun cps--find-special-form-handler (form) @@ -168,7 +174,7 @@ DYNAMIC-VAR bound to STATIC-VAR." (handler (intern-soft handler-name))) (and (fboundp handler) handler))) -(defvar cps-disable-atomic-optimization nil +(defvar cps-inhibit-atomic-optimization nil "When t, always rewrite forms into cps even when they don't yield.") @@ -177,13 +183,14 @@ don't yield.") (defun cps--atomic-p (form) "Return whether the given form never yields." - (and (not cps-disable-atomic-optimization) + (and (not cps-inhibit-atomic-optimization) (let* ((cps--yield-seen)) (ignore (macroexpand-all `(cl-macrolet ((cps-internal-yield (_val) (setf cps--yield-seen t))) - ,form))) + ,form) + macroexpand-all-environment)) (not cps--yield-seen)))) (defun cps--make-atomic-state (form next-state) @@ -403,7 +410,7 @@ don't yield.") ;; Signal the evaluator-generator that it needs to generate code ;; to handle cleanup forms. (unless cps--cleanup-table-symbol - (setf cps--cleanup-table-symbol (cl-gensym "cps-cleanup-table-"))) + (setf cps--cleanup-table-symbol (cps--gensym "cps-cleanup-table-"))) (let* ((unwind-state (cps--add-state "unwind" @@ -431,7 +438,7 @@ don't yield.") ;; need our states to be self-referential. (That's what makes the ;; state a loop.) (let* ((loop-state - (cl-gensym "cps-state-while-")) + (cps--gensym "cps-state-while-")) (eval-loop-condition-state (cps--transform-1 test loop-state)) (loop-state-body @@ -489,7 +496,7 @@ don't yield.") (cl-loop for argument in arguments collect (if (atom argument) argument - (cl-gensym "cps-argument-"))))) + (cps--gensym "cps-argument-"))))) (cps--transform-1 `(let* ,(cl-loop for argument in arguments @@ -505,7 +512,7 @@ don't yield.") (defun cps--make-catch-wrapper (tag-binding next-state) (lambda (form) (let ((normal-exit-symbol - (cl-gensym "cps-normal-exit-from-catch-"))) + (cps--gensym "cps-normal-exit-from-catch-"))) `(let (,normal-exit-symbol) (prog1 (catch ,tag-binding @@ -521,7 +528,7 @@ don't yield.") ;; encounter the given error. (let* ((error-symbol (cps--add-binding "condition-case-error")) - (lexical-error-symbol (cl-gensym "cps-lexical-error-")) + (lexical-error-symbol (cps--gensym "cps-lexical-error-")) (processed-handlers (cl-loop for (condition . body) in handlers collect (cons condition @@ -549,13 +556,14 @@ don't yield.") This routine does not modify FORM. Instead, it returns a modified copy." (macroexpand-all - `(cl-symbol-macrolet ((,var ,new-var)) ,form))) + `(cl-symbol-macrolet ((,var ,new-var)) ,form) + macroexpand-all-environment)) (defun cps--make-unwind-wrapper (unwind-forms) (cl-assert lexical-binding) (lambda (form) (let ((normal-exit-symbol - (cl-gensym "cps-normal-exit-from-unwind-"))) + (cps--gensym "cps-normal-exit-from-unwind-"))) `(let (,normal-exit-symbol) (unwind-protect (prog1 @@ -576,12 +584,12 @@ modified copy." `(setf ,cps--state-symbol ,terminal-state ,cps--value-symbol nil))) -(defun cps-generate-evaluator (form) +(defun cps-generate-evaluator (body) (let* (cps--states cps--bindings cps--cleanup-function - (cps--value-symbol (cl-gensym "cps-current-value-")) - (cps--state-symbol (cl-gensym "cps-current-state-")) + (cps--value-symbol (cps--gensym "cps-current-value-")) + (cps--state-symbol (cps--gensym "cps-current-state-")) ;; We make *cps-cleanup-table-symbol** non-nil when we notice ;; that we have cleanup processing to perform. (cps--cleanup-table-symbol nil) @@ -589,12 +597,17 @@ modified copy." `(signal 'iter-end-of-sequence ,cps--value-symbol))) (initial-state (cps--transform-1 - (macroexpand-all form) + (macroexpand-all + `(cl-macrolet + ((iter-yield (value) + `(cps-internal-yield ,value))) + ,@body) + macroexpand-all-environment) terminal-state)) (finalizer-symbol (when cps--cleanup-table-symbol (when cps--cleanup-table-symbol - (cl-gensym "cps-iterator-finalizer-"))))) + (cps--gensym "cps-iterator-finalizer-"))))) `(let ,(append (list cps--state-symbol cps--value-symbol) (when cps--cleanup-table-symbol (list cps--cleanup-table-symbol)) @@ -656,8 +669,8 @@ The values that the sub-iterator yields are passed directly to the caller, and values supplied to `iter-next' are sent to the sub-iterator. `iter-yield-from' evaluates to the value that the sub-iterator function returns via `iter-end-of-sequence'." - (let ((errsym (cl-gensym "yield-from-result")) - (valsym (cl-gensym "yield-from-value"))) + (let ((errsym (cps--gensym "yield-from-result")) + (valsym (cps--gensym "yield-from-value"))) `(let ((,valsym ,value)) (unwind-protect (condition-case ,errsym @@ -681,9 +694,7 @@ of values. Callers can retrieve each value using `iter-next'." (push (pop body) preamble)) `(defun ,name ,arglist ,@(nreverse preamble) - ,(cps-generate-evaluator - `(cl-macrolet ((iter-yield (value) `(cps-internal-yield ,value))) - ,@body))))) + ,(cps-generate-evaluator body)))) (defmacro iter-lambda (arglist &rest body) "Return a lambda generator. @@ -691,9 +702,7 @@ of values. Callers can retrieve each value using `iter-next'." (declare (indent defun)) (cl-assert lexical-binding) `(lambda ,arglist - ,(cps-generate-evaluator - `(cl-macrolet ((iter-yield (value) `(cps-internal-yield ,value))) - ,@body)))) + ,(cps-generate-evaluator body))) (defun iter-next (iterator &optional yield-result) "Extract a value from an iterator. @@ -715,10 +724,10 @@ is blocked." Evaluate BODY with VAR bound to each value from ITERATOR. Return the value with which ITERATOR finished iteration." (declare (indent 1)) - (let ((done-symbol (cl-gensym "iter-do-iterator-done")) - (condition-symbol (cl-gensym "iter-do-condition")) - (it-symbol (cl-gensym "iter-do-iterator")) - (result-symbol (cl-gensym "iter-do-result"))) + (let ((done-symbol (cps--gensym "iter-do-iterator-done")) + (condition-symbol (cps--gensym "iter-do-condition")) + (it-symbol (cps--gensym "iter-do-iterator")) + (result-symbol (cps--gensym "iter-do-result"))) `(let (,var ,result-symbol (,done-symbol nil) @@ -745,7 +754,7 @@ Return the value with which ITERATOR finished iteration." (defmacro cps--initialize-for (iterator) ;; See cps--handle-loop-for - (let ((cs (cl-gensym "cps--loop-temp"))) + (let ((cs (cps--gensym "cps--loop-temp"))) `(let ((,cs (cons nil ,iterator))) (cps--advance-for ,cs)))) @@ -781,13 +790,7 @@ Return the value with which ITERATOR finished iteration." '(("(\\(iter-defun\\)\\_>\\s *\\(\\(?:\\sw\\|\\s_\\)+\\)?" (1 font-lock-keyword-face nil t) (2 font-lock-function-name-face nil t)) - ("(\\(iter-next\\)\\_>" - (1 font-lock-keyword-face nil t)) - ("(\\(iter-lambda\\)\\_>" - (1 font-lock-keyword-face nil t)) - ("(\\(iter-yield\\)\\_>" - (1 font-lock-keyword-face nil t)) - ("(\\(iter-yield-from\\)\\_>" + ("(\\(iter-\\(?:next\\|lambda\\|yield\\|yield-from\\)\\)\\_>" (1 font-lock-keyword-face nil t)))))) (provide 'generator) diff --git a/test/ChangeLog b/test/ChangeLog index ea2e0eef179..55f8c6c8eb8 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,9 @@ 2015-03-03 Daniel Colascione + * automated/generator-tests.el (cps-testcase): Use + `cps-inhibit-atomic-optimization' instead of + `cps-disable-atomic-optimization'. + * automated/finalizer-tests.el (finalizer-basic) (finalizer-circular-reference, finalizer-cross-reference) (finalizer-error): Rename `gc-precise-p' to `gc-precise'. diff --git a/test/automated/generator-tests.el b/test/automated/generator-tests.el index 893c0d2e724..3ee65105597 100644 --- a/test/automated/generator-tests.el +++ b/test/automated/generator-tests.el @@ -54,7 +54,7 @@ identical output. (funcall (lambda () ,@body)) (iter-next (funcall - (let ((cps-disable-atomic-optimization t)) + (let ((cps-inhibit-atomic-optimization t)) (iter-lambda () (iter-yield (progn ,@body))))))))))) (put 'cps-testcase 'lisp-indent-function 1) From 7133f262bbd818509825a3317c91e91e62bd56fb Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 3 Mar 2015 14:23:49 -0500 Subject: [PATCH 217/457] * lisp/progmodes/gud.el: Use lexical-binding. Fixes: debbugs:19966 * lisp/emacs-lisp/gv.el (gv-ref): Warn about likely problematic cases. --- lisp/ChangeLog | 10 ++++++++-- lisp/emacs-lisp/gv.el | 17 ++++++++++++++--- lisp/progmodes/gud.el | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63071734cf8..0cfe8eed02a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-03 Stefan Monnier + + * progmodes/gud.el: Use lexical-binding (bug#19966). + + * emacs-lisp/gv.el (gv-ref): Warn about likely problematic cases. + 2015-03-03 Daniel Colascione * emacs-lisp/generator.el: Make globals conform to elisp @@ -6,8 +12,8 @@ `cps-disable-atomic-optimization'. (cps--gensym): New macro; replaces `cl-gensym' throughout. (cps-generate-evaluator): Move the `iter-yield' local macro - definition here - (iter-defun, iter-lambda): from here. + definition here... + (iter-defun, iter-lambda): ...from here. 2015-03-03 Artur Malabarba diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 5d6e6e1b372..fae3bcb86f6 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -493,9 +493,20 @@ This is like the `&' operator of the C language. Note: this only works reliably with lexical binding mode, except for very simple PLACEs such as (function-symbol 'foo) which will also work in dynamic binding mode." - (gv-letplace (getter setter) place - `(cons (lambda () ,getter) - (lambda (gv--val) ,(funcall setter 'gv--val))))) + (let ((code + (gv-letplace (getter setter) place + `(cons (lambda () ,getter) + (lambda (gv--val) ,(funcall setter 'gv--val)))))) + (if (or lexical-binding + ;; If `code' still starts with `cons' then presumably gv-letplace + ;; did not add any new let-bindings, so the `lambda's don't capture + ;; any new variables. As a consequence, the code probably works in + ;; dynamic binding mode as well. + (eq (car-safe code) 'cons)) + code + (macroexp--warn-and-return + "Use of gv-ref probably requires lexical-binding" + code)))) (defsubst gv-deref (ref) "Dereference REF, returning the referenced value. diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 42c5b20a7b8..29a6dc63a68 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1,4 +1,4 @@ -;;; gud.el --- Grand Unified Debugger mode for running GDB and other debuggers +;;; gud.el --- Grand Unified Debugger mode for running GDB and other debuggers -*- lexical-binding:t -*- ;; Copyright (C) 1992-1996, 1998, 2000-2015 Free Software Foundation, ;; Inc. From 8b38d30e1b02809c34cfba9c7f15ca46f9d45f80 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Tue, 3 Mar 2015 13:18:00 -0800 Subject: [PATCH 218/457] Use `macroexp-parse-body' * lisp/emacs-lisp/generator.el: (iter-defun): Use `macroexp-parse-body'. * test/automated/generator-tests.el (cps-testcase): Use (cps-test-declarations-preserved): New test. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/emacs-lisp/generator.el | 12 +++++------- test/ChangeLog | 1 + test/automated/generator-tests.el | 9 +++++++++ 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0cfe8eed02a..3bc9b8c85ce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2015-03-03 Daniel Colascione + + * emacs-lisp/generator.el: Make globals conform to elisp + style throughout. Use more efficient font-lock patterns. + (cps-inhibit-atomic-optimization): Rename from + `cps-disable-atomic-optimization'. + (cps--gensym): New macro; replaces `cl-gensym' throughout. + (cps-generate-evaluator): Move the `iter-yield' local macro + definition here + (iter-defun, iter-lambda): from here. + + (iter-defun): Use `macroexp-parse-body'. + +2015-03-03 Daniel Colascione + 2015-03-03 Stefan Monnier * progmodes/gud.el: Use lexical-binding (bug#19966). diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el index 77b1fab9b09..284de410580 100644 --- a/lisp/emacs-lisp/generator.el +++ b/lisp/emacs-lisp/generator.el @@ -687,14 +687,12 @@ encapsulates the state of a computation that produces a sequence of values. Callers can retrieve each value using `iter-next'." (declare (indent defun)) (cl-assert lexical-binding) - (let (preamble) - (when (stringp (car body)) - (push (pop body) preamble)) - (when (eq (car-safe (car body)) 'declare) - (push (pop body) preamble)) + (let* ((parsed-body (macroexp-parse-body body)) + (declarations (car parsed-body)) + (exps (cdr parsed-body))) `(defun ,name ,arglist - ,@(nreverse preamble) - ,(cps-generate-evaluator body)))) + ,@declarations + ,(cps-generate-evaluator exps)))) (defmacro iter-lambda (arglist &rest body) "Return a lambda generator. diff --git a/test/ChangeLog b/test/ChangeLog index 55f8c6c8eb8..4488aab701f 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -3,6 +3,7 @@ * automated/generator-tests.el (cps-testcase): Use `cps-inhibit-atomic-optimization' instead of `cps-disable-atomic-optimization'. + (cps-test-declarations-preserved): New test. * automated/finalizer-tests.el (finalizer-basic) (finalizer-circular-reference, finalizer-cross-reference) diff --git a/test/automated/generator-tests.el b/test/automated/generator-tests.el index 3ee65105597..d9c81b59a23 100644 --- a/test/automated/generator-tests.el +++ b/test/automated/generator-tests.el @@ -287,3 +287,12 @@ identical output. (should (equal (iter-next iter) 1)) (should-error (iter-next iter)) (should (equal nr-unwound 1)))) + +(iter-defun generator-with-docstring () + "Documentation!" + (declare (indent 5)) + nil) + +(ert-deftest cps-test-declarations-preserved () + (should (equal (documentation 'generator-with-docstring) "Documentation!")) + (should (equal (get 'generator-with-docstring 'lisp-indent-function) 5))) From 5d9b1e100aa4ddb79471f7ec2347fdb65d6a9a70 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 3 Mar 2015 15:10:05 -0800 Subject: [PATCH 219/457] Spelling fixes --- lisp/emacs-lisp/check-declare.el | 2 +- lisp/emacs-lisp/generator.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el index c2639729fa9..8fc299d7e93 100644 --- a/lisp/emacs-lisp/check-declare.el +++ b/lisp/emacs-lisp/check-declare.el @@ -130,7 +130,7 @@ With optional argument FULL, sums the number of elements in each element." :group 'tools) (defcustom check-declare-ext-errors nil - "When non-nil, warn abount functions not found in :ext." + "When non-nil, warn about functions not found in :ext." :type 'boolean) (defun check-declare-verify (fnfile fnlist) diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el index 284de410580..8251682590e 100644 --- a/lisp/emacs-lisp/generator.el +++ b/lisp/emacs-lisp/generator.el @@ -25,7 +25,7 @@ ;; This package implements generators for Emacs Lisp through a ;; continuation-passing transformation. It provides essentially the -;; same generator API and iterator facilties that Python and +;; same generator API and iterator facilities that Python and ;; JavaScript ES6 provide. ;; ;; `iter-lambda' and `iter-defun' work like `lambda' and `defun', @@ -57,7 +57,7 @@ ;; and each iterator maintains its own internal state. ;; ;; This raw form of iteration is general, but a bit awkward to use, so -;; this library also provides soem convenience functions: +;; this library also provides some convenience functions: ;; ;; `iter-do' is like `cl-do', except that instead of walking a list, ;; it walks an iterator. `cl-loop' is also extended with a new From 8ac08792a71e07bce0e62d93bed80553fbe95a40 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 4 Mar 2015 11:02:36 +0100 Subject: [PATCH 220/457] Sync with Tramp upstream. * net/tramp-cache.el (tramp-dump-connection-properties): Use `with-temp-file'. * net/tramp-sh.el (tramp-perl-file-attributes) (tramp-perl-directory-files-and-attributes): Escape apostrophs in file names. (tramp-do-file-attributes-with-stat): Quote file name. (tramp-sh-handle-directory-files-and-attributes): Fall back to `tramp-handle-directory-files-and-attributes' in case of problems. (tramp-do-directory-files-and-attributes-with-stat) (tramp-sh-handle-file-name-all-completions) (tramp-sh-handle-delete-directory) (tramp-sh-handle-expand-file-name, tramp-sh-handle-process-file): Normalize use of "cd". (tramp-do-directory-files-and-attributes-with-stat): Use the `quoting-style' arg of `ls' if possible. Make it also working for file names with apostrophs. (tramp-sh-handle-file-name-all-completions): Use arguments of `ls' in proper order. (tramp-do-copy-or-rename-file-via-buffer) (tramp-sh-handle-file-local-copy): Use `with-temp-file'. (tramp-get-remote-locale): Accept also \r in output. (tramp-get-ls-command-with-quoting-style): New defun. (tramp-get-inline-coding): Set `default-directory' to a local directory. Sporadically, `call-process-region' does not handle a remote default directory properly. * net/tramp.el (tramp): Add :link property. (tramp-login-prompt-regexp): Allow also "user", as required by Fritz!Box telnet. (tramp-autoload-file-name-handler): Use "/". (tramp-handle-unhandled-file-name-directory): Return nil when required by the spec. * net/trampver.el: Update release number. --- lisp/ChangeLog | 38 +++++++++ lisp/net/tramp-cache.el | 6 +- lisp/net/tramp-sh.el | 182 ++++++++++++++++++++++------------------ lisp/net/tramp.el | 14 ++-- lisp/net/trampver.el | 4 +- 5 files changed, 150 insertions(+), 94 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 60e2b50e5c4..8d7360f899c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,41 @@ +2015-03-04 Michael Albinus + + * net/tramp.el (tramp): Add :link property. + (tramp-login-prompt-regexp): Allow also "user", as required by + Fritz!Box telnet. + (tramp-autoload-file-name-handler): Use "/". + (tramp-handle-unhandled-file-name-directory): Return nil when + required by the spec. + + * net/tramp-cache.el (tramp-dump-connection-properties): + Use `with-temp-file'. + + * net/tramp-sh.el (tramp-perl-file-attributes) + (tramp-perl-directory-files-and-attributes): Escape apostrophs in + file names. + (tramp-do-file-attributes-with-stat): Quote file name. + (tramp-sh-handle-directory-files-and-attributes): Fall back to + `tramp-handle-directory-files-and-attributes' in case of problems. + (tramp-do-directory-files-and-attributes-with-stat) + (tramp-sh-handle-file-name-all-completions) + (tramp-sh-handle-delete-directory) + (tramp-sh-handle-expand-file-name, tramp-sh-handle-process-file): + Normalize use of "cd". + (tramp-do-directory-files-and-attributes-with-stat): Use the + `quoting-style' arg of `ls' if possible. Make it also working for + file names with apostrophs. + (tramp-sh-handle-file-name-all-completions): Use arguments of `ls' + in proper order. + (tramp-do-copy-or-rename-file-via-buffer) + (tramp-sh-handle-file-local-copy): Use `with-temp-file'. + (tramp-get-remote-locale): Accept also \r in output. + (tramp-get-ls-command-with-quoting-style): New defun. + (tramp-get-inline-coding): Set `default-directory' to a local + directory. Sporadically, `call-process-region' does not handle a + remote default directory properly. + + * net/trampver.el: Update release number. + 2015-03-03 Agustín Martín Domingo * textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index fb9d5e84c94..1e24ea53f43 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -362,7 +362,7 @@ KEY identifies the connection, it is either a process or a vector." (remhash key cache))) cache) ;; Dump it. - (with-temp-buffer + (with-temp-file tramp-persistency-file-name (insert ";; -*- emacs-lisp -*-" ;; `time-stamp-string' might not exist in all (X)Emacs flavors. @@ -376,9 +376,7 @@ KEY identifies the connection, it is either a process or a vector." ";; Tramp connection history. Don't change this file.\n" ";; You can delete it, forcing Tramp to reapply the checks.\n\n" (with-output-to-string - (pp (read (format "(%s)" (tramp-cache-print cache)))))) - (write-region - (point-min) (point-max) tramp-persistency-file-name)))))) + (pp (read (format "(%s)" (tramp-cache-print cache))))))))))) (unless noninteractive (add-hook 'kill-emacs-hook 'tramp-dump-connection-properties)) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index f3fdb63bb9e..580c5d08ecd 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -631,6 +631,7 @@ if (!@stat) { if (($stat[2] & 0170000) == 0120000) { $type = readlink($ARGV[0]); + $type =~ s/\"/\\\\\"/g; $type = \"\\\"$type\\\"\"; } elsif (($stat[2] & 0170000) == 040000) @@ -680,6 +681,7 @@ for($i = 0; $i < $n; $i++) if (($stat[2] & 0170000) == 0120000) { $type = readlink($filename); + $type =~ s/\"/\\\\\"/g; $type = \"\\\"$type\\\"\"; } elsif (($stat[2] & 0170000) == 040000) @@ -692,6 +694,7 @@ for($i = 0; $i < $n; $i++) }; $uid = ($ARGV[1] eq \"integer\") ? $stat[4] : \"\\\"\" . getpwuid($stat[4]) . \"\\\"\"; $gid = ($ARGV[1] eq \"integer\") ? $stat[5] : \"\\\"\" . getgrgid($stat[5]) . \"\\\"\"; + $filename =~ s/\"/\\\\\"/g; printf( \"(\\\"%%s\\\" %%s %%u %%s %%s (%%u %%u) (%%u %%u) (%%u %%u) %%u.0 %%u t (%%u . %%u) (%%u . %%u))\\n\", $filename, @@ -1250,7 +1253,7 @@ target of the symlink differ." (format ;; On Opsware, pdksh (which is the true name of ksh there) doesn't ;; parse correctly the sequence "((". Therefore, we add a space. - "( (%s %s || %s -h %s) && %s -c '((\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)' %s || echo nil)" + "( (%s %s || %s -h %s) && %s -c '((\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)' \"%s\" || echo nil)" (tramp-get-file-exists-command vec) (tramp-shell-quote-argument localname) (tramp-get-test-command vec) @@ -1626,45 +1629,44 @@ be non-negative integers." (defun tramp-sh-handle-directory-files-and-attributes (directory &optional full match nosort id-format) "Like `directory-files-and-attributes' for Tramp files." - (if (with-parsed-tramp-file-name directory nil - (not (or (tramp-get-remote-stat v) (tramp-get-remote-perl v)))) - (tramp-handle-directory-files-and-attributes - directory full match nosort id-format) + (unless id-format (setq id-format 'integer)) + (when (file-directory-p directory) + (setq directory (expand-file-name directory)) + (let* ((temp + (copy-tree + (with-parsed-tramp-file-name directory nil + (with-tramp-file-property + v localname + (format "directory-files-and-attributes-%s" id-format) + (save-excursion + (mapcar + (lambda (x) + (cons (car x) + (tramp-convert-file-attributes v (cdr x)))) + (or + (cond + ((tramp-get-remote-stat v) + (tramp-do-directory-files-and-attributes-with-stat + v localname id-format)) + ((tramp-get-remote-perl v) + (tramp-do-directory-files-and-attributes-with-perl + v localname id-format)) + (t nil))))))))) + result item) - ;; Do it directly. - (unless id-format (setq id-format 'integer)) - (when (file-directory-p directory) - (setq directory (expand-file-name directory)) - (let* ((temp - (copy-tree - (with-parsed-tramp-file-name directory nil - (with-tramp-file-property - v localname - (format "directory-files-and-attributes-%s" id-format) - (save-excursion - (mapcar - (lambda (x) - (cons (car x) - (tramp-convert-file-attributes v (cdr x)))) - (cond - ((tramp-get-remote-stat v) - (tramp-do-directory-files-and-attributes-with-stat - v localname id-format)) - ((tramp-get-remote-perl v) - (tramp-do-directory-files-and-attributes-with-perl - v localname id-format))))))))) - result item) + (while temp + (setq item (pop temp)) + (when (or (null match) (string-match match (car item))) + (when full + (setcar item (expand-file-name (car item) directory))) + (push item result))) - (while temp - (setq item (pop temp)) - (when (or (null match) (string-match match (car item))) - (when full - (setcar item (expand-file-name (car item) directory))) - (push item result))) - - (if nosort - result - (sort result (lambda (x y) (string< (car x) (car y))))))))) + (or (if nosort + result + (sort result (lambda (x y) (string< (car x) (car y))))) + ;; The scripts could fail, for example with huge file size. + (tramp-handle-directory-files-and-attributes + directory full match nosort id-format))))) (defun tramp-do-directory-files-and-attributes-with-perl (vec localname &optional id-format) @@ -1692,16 +1694,22 @@ be non-negative integers." ;; We must care about file names with spaces, or starting with ;; "-"; this would confuse xargs. "ls -aQ" might be a solution, ;; but it does not work on all remote systems. Therefore, we - ;; quote the file names via sed. - "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | " + ;; use \000 as file separator. + ;; Apostrophs in the stat output are masked as \037 character, in + ;; order to make a proper shell escape of them in file names. + "cd %s && echo \"(\"; (%s %s -a | " "xargs %s -c " - "'(\"%%n\" (\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)'" - " 2>/dev/null); echo \")\"") + "'(\037%%n\037 (\037%%N\037) %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \037%%A\037 t %%ie0 -1)'" + " -- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/\037/\"/g'); echo \")\"") (tramp-shell-quote-argument localname) (tramp-get-ls-command vec) + ;; On systems which have no quotings style, file names with + ;; special characters could fail. + (if (tramp-get-ls-command-with-quoting-style vec) + "--quoting-style=shell" "") (tramp-get-remote-stat vec) - (if (eq id-format 'integer) "%ue0" "\"%U\"") - (if (eq id-format 'integer) "%ge0" "\"%G\"")))) + (if (eq id-format 'integer) "%ue0" "\037%U\037") + (if (eq id-format 'integer) "%ge0" "\037%G\037")))) ;; This function should return "foo/" for directories and "bar" for ;; files. @@ -1772,7 +1780,7 @@ be non-negative integers." 1 0))) (format (concat - "(\\cd %s 2>&1 && (%s %s -a 2>/dev/null" + "(cd %s 2>&1 && (%s -a %s 2>/dev/null" ;; `ls' with wildcard might fail with `Argument ;; list too long' error in some corner cases; if ;; `ls' fails after `cd' succeeded, chances are @@ -1796,7 +1804,7 @@ be non-negative integers." ;; sub-directories. (if (zerop (length filename)) "." - (concat (tramp-shell-quote-argument filename) "* -d")) + (format "-d %s*" (tramp-shell-quote-argument filename))) (tramp-get-ls-command v) (tramp-get-test-command v)))) @@ -2078,23 +2086,20 @@ file names." First arg OP is either `copy' or `rename' and indicates the operation. FILENAME is the source file, NEWNAME the target file. KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME." - (with-temp-buffer - ;; We must disable multibyte, because binary data shall not be - ;; converted. We remove `tramp-file-name-handler' from - ;; `inhibit-file-name-handlers'; otherwise the file name handler - ;; for `insert-file-contents' might be deactivated in some corner - ;; cases. - (set-buffer-multibyte nil) - (let ((coding-system-for-read 'binary) - (jka-compr-inhibit t) - (inhibit-file-name-handlers - (remq 'tramp-file-name-handler inhibit-file-name-handlers))) - (insert-file-contents-literally filename)) - ;; We don't want the target file to be compressed, so we let-bind - ;; `jka-compr-inhibit' to t. - (let ((coding-system-for-write 'binary) - (jka-compr-inhibit t)) - (write-region (point-min) (point-max) newname nil 'no-message))) + ;; We must disable multibyte, because binary data shall not be + ;; converted. We don't want the target file to be compressed, so we + ;; let-bind `jka-compr-inhibit' to t. + ;; We remove `tramp-file-name-handler' from + ;; `inhibit-file-name-handlers'; otherwise the file name handler for + ;; `insert-file-contents' might be deactivated in some corner cases. + (let ((coding-system-for-read 'binary) + (coding-system-for-write 'binary) + (jka-compr-inhibit t) + (inhibit-file-name-handlers + (remq 'tramp-file-name-handler inhibit-file-name-handlers))) + (with-temp-file newname + (set-buffer-multibyte nil) + (insert-file-contents-literally filename))) ;; KEEP-DATE handling. (when keep-date (set-file-times newname (nth 5 (file-attributes filename)))) ;; Set the mode. @@ -2541,7 +2546,7 @@ The method used must be an out-of-band method." (tramp-flush-file-property v (file-name-directory localname)) (tramp-flush-directory-property v localname) (tramp-barf-unless-okay - v (format "%s %s" + v (format "cd / && %s %s" (if recursive "rm -rf" "rmdir") (tramp-shell-quote-argument localname)) "Couldn't delete %s" directory))) @@ -2799,7 +2804,7 @@ the result will be a local, non-Tramp, file name." (setq uname (with-tramp-connection-property v uname (tramp-send-command - v (format "cd %s; pwd" (tramp-shell-quote-argument uname))) + v (format "cd %s && pwd" (tramp-shell-quote-argument uname))) (with-current-buffer (tramp-get-buffer v) (goto-char (point-min)) (buffer-substring (point) (point-at-eol))))) @@ -3037,7 +3042,7 @@ the result will be a local, non-Tramp, file name." (unwind-protect (setq ret (if (tramp-send-command-and-check - v (format "\\cd %s; %s" + v (format "cd %s && %s" (tramp-shell-quote-argument localname) command) t t) @@ -3116,17 +3121,14 @@ the result will be a local, non-Tramp, file name." ;; If local decoding is a function, we call it. ;; We must disable multibyte, because ;; `uudecode-decode-region' doesn't handle it - ;; correctly. - (with-temp-buffer - (set-buffer-multibyte nil) - (insert-buffer-substring (tramp-get-buffer v)) - (funcall loc-dec (point-min) (point-max)) - ;; Unset `file-name-handler-alist'. Otherwise, - ;; epa-file gets confused. - (let (file-name-handler-alist - (coding-system-for-write 'binary)) - (write-region - (point-min) (point-max) tmpfile nil 'no-message))) + ;; correctly. Unset `file-name-handler-alist'. + ;; Otherwise, epa-file gets confused. + (let (file-name-handler-alist + (coding-system-for-write 'binary)) + (with-temp-file tmpfile + (set-buffer-multibyte nil) + (insert-buffer-substring (tramp-get-buffer v)) + (funcall loc-dec (point-min) (point-max)))) ;; If tramp-decoding-function is not defined for this ;; method, we invoke tramp-decoding-command instead. @@ -3708,8 +3710,8 @@ Only send the definition if it has not already been done." (tramp-error vec 'file-error "No Perl available on remote host")) (tramp-barf-unless-okay vec - (format "%s () {\n%s\n}" name - (format script (tramp-get-remote-perl vec))) + (format "%s () {\n%s\n}" + name (format script (tramp-get-remote-perl vec))) "Script %s sending failed" name) (tramp-set-connection-property (tramp-get-connection-process vec) "scripts" (cons name scripts)))))) @@ -5157,7 +5159,8 @@ Return ATTR." (with-current-buffer (tramp-get-connection-buffer vec) (while candidates (goto-char (point-min)) - (if (string-match (concat "^" (car candidates) "$") (buffer-string)) + (if (string-match (format "^%s\r?$" (regexp-quote (car candidates))) + (buffer-string)) (setq locale (car candidates) candidates nil) (setq candidates (cdr candidates))))) @@ -5199,6 +5202,17 @@ Return ATTR." (tramp-send-command-and-check vec (format "%s --dired -al /dev/null" (tramp-get-ls-command vec)))))) +(defun tramp-get-ls-command-with-quoting-style (vec) + (save-match-data + (with-tramp-connection-property vec "ls-quoting-style" + (tramp-message vec 5 "Checking, whether `ls --quoting-style=shell' works") + ;; Some "ls" versions are sensible wrt the order of arguments, + ;; they fail when "-al" is after the "--dired" argument (for + ;; example on FreeBSD). + (tramp-send-command-and-check + vec (format "%s --quoting-style=shell -al /dev/null" + (tramp-get-ls-command vec)))))) + (defun tramp-get-test-command (vec) (with-tramp-connection-property vec "test" (tramp-message vec 5 "Finding a suitable `test' command") @@ -5486,14 +5500,18 @@ function cell is returned to be applied on a buffer." `(lambda (beg end) (,coding beg end) (let ((coding-system-for-write 'binary) - (coding-system-for-read 'binary)) + (coding-system-for-read 'binary) + (default-directory + (tramp-compat-temporary-file-directory))) (apply 'call-process-region (point-min) (point-max) (car (split-string ,compress)) t t nil (cdr (split-string ,compress))))) `(lambda (beg end) (let ((coding-system-for-write 'binary) - (coding-system-for-read 'binary)) + (coding-system-for-read 'binary) + (default-directory + (tramp-compat-temporary-file-directory))) (apply 'call-process-region beg end (car (split-string ,compress)) t t nil diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a03affa5eeb..953525f37e4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -73,6 +73,7 @@ "Edit remote files with a combination of ssh, scp, etc." :group 'files :group 'comm + :link '(custom-manual "(tramp)Top") :version "22.1") ;; Maybe we need once a real Tramp mode, with key bindings etc. @@ -557,7 +558,7 @@ if you need to change this." :type 'string) (defcustom tramp-login-prompt-regexp - ".*ogin\\( .*\\)?: *" + ".*\\(user\\|login\\)\\( .*\\)?: *" "Regexp matching login-like prompts. The regexp should match at end of buffer. @@ -2263,7 +2264,7 @@ Falls back to normal file name handler if no Tramp file name handler exists." "Load Tramp file name handler, and perform OPERATION." ;; Avoid recursive loading of tramp.el. `temporary-file-directory' ;; does not exist in XEmacs, so we must use something else. - (let ((default-directory (or (symbol-value 'temporary-file-directory) "/"))) + (let ((default-directory "/")) (load "tramp" nil t)) (apply operation args))) @@ -3352,10 +3353,11 @@ User is always nil." (defun tramp-handle-unhandled-file-name-directory (_filename) "Like `unhandled-file-name-directory' for Tramp files." - ;; With Emacs 23, we could simply return `nil'. But we must keep it - ;; for backward compatibility. "~/" cannot be returned, because - ;; there might be machines without a HOME directory (like hydra). - "/") + ;; Starting with Emacs 23, we must simply return `nil'. But we must + ;; keep backward compatibility, also with XEmacs. "~/" cannot be + ;; returned, because there might be machines without a HOME + ;; directory (like hydra). + (and (< emacs-major-version 23) "/")) (defun tramp-handle-set-visited-file-modtime (&optional time-list) "Like `set-visited-file-modtime' for Tramp files." diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 70092d21207..226ec9f194a 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.11-24.5" +(defconst tramp-version "2.2.12-pre" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.11-24.5 is not fit for %s" + (format "Tramp 2.2.12-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) From b9d09d80d2bf98e5df65316c4e85b448380f7ca7 Mon Sep 17 00:00:00 2001 From: Zhongwei Yao Date: Wed, 4 Mar 2015 11:13:19 +0100 Subject: [PATCH 221/457] Support port numbers in tramp-adb * net/tramp-adb.el (tramp-adb-connect-if-not-connected): New user option. (tramp-adb-ls-toolbox-regexp): Fix regexp in order to support file names starting with a space. (tramp-methods): Add `tramp-default-port' for "adb". (tramp-adb-parse-device-names): Add traces. Return device names with port, if present. (tramp-adb-handle-directory-files-and-attributes): Quote all remote file names. (tramp-adb-get-device): New defun. (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection): Use it. (tramp-adb-maybe-open-connection): Set `tramp-current-*' variables. Remove checks for listed devices. --- lisp/ChangeLog | 17 ++++++++ lisp/net/tramp-adb.el | 95 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 95 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d7360f899c..69c9e3cbea7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2015-03-04 Zhongwei Yao + + * net/tramp-adb.el (tramp-adb-connect-if-not-connected): + New user option. + (tramp-adb-ls-toolbox-regexp): Fix regexp in order to support file + names starting with a space. + (tramp-methods): Add `tramp-default-port' for "adb". + (tramp-adb-parse-device-names): Add traces. Return device names + with port, if present. + (tramp-adb-handle-directory-files-and-attributes): Quote all + remote file names. + (tramp-adb-get-device): New defun. + (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection): + Use it. + (tramp-adb-maybe-open-connection): Set `tramp-current-*' + variables. Remove checks for listed devices. + 2015-03-04 Michael Albinus * net/tramp.el (tramp): Add :link property. diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index f5e201985f9..fae54520102 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -44,6 +44,13 @@ :version "24.4" :type 'string) +(defcustom tramp-adb-connect-if-not-connected nil + "Try to run `adb connect' if provided device is not connected currently. +It is used for TCP/IP devices." + :group 'tramp + :version "25.1" + :type 'boolean) + ;;;###tramp-autoload (defconst tramp-adb-method "adb" "*When this method name is used, forward all calls to Android Debug Bridge.") @@ -65,12 +72,13 @@ "[[:space:]]+\\([^[:space:]]+\\)" ; \3 group "[[:space:]]+\\([[:digit:]]+\\)" ; \4 size "[[:space:]]+\\([-[:digit:]]+[[:space:]][:[:digit:]]+\\)" ; \5 date - "[[:space:]]+\\(.*\\)$")) ; \6 filename + "[[:space:]]\\(.*\\)$")) ; \6 filename ;;;###tramp-autoload (add-to-list 'tramp-methods `(,tramp-adb-method - (tramp-tmpdir "/data/local/tmp"))) + (tramp-tmpdir "/data/local/tmp") + (tramp-default-port 5555))) ;;;###tramp-autoload (add-to-list 'tramp-default-host-alist `(,tramp-adb-method nil "")) @@ -182,14 +190,27 @@ pass to the OPERATION." ;; That's why we use `start-process'. (let ((p (start-process tramp-adb-program (current-buffer) tramp-adb-program "devices")) + (v (vector tramp-adb-method tramp-current-user + tramp-current-host nil nil)) result) + (tramp-message v 6 "%s" (mapconcat 'identity (process-command p) " ")) (tramp-compat-set-process-query-on-exit-flag p nil) (while (eq 'run (process-status p)) (accept-process-output p 0.1)) (accept-process-output p 0.1) + (tramp-message v 6 "\n%s" (buffer-string)) (goto-char (point-min)) (while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t) (add-to-list 'result (list nil (match-string 1)))) + + ;; Replace ":" by "#". + (mapc + (lambda (elt) + (setcar + (cdr elt) + (replace-regexp-in-string + ":" tramp-prefix-port-format (car (cdr elt))))) + result) result)))) (defun tramp-adb-handle-expand-file-name (name &optional dir) @@ -383,8 +404,10 @@ pass to the OPERATION." (tramp-adb-send-command v (format "%s -d -a -l %s %s" (tramp-adb-get-ls-command v) - (concat (file-name-as-directory localname) ".") - (concat (file-name-as-directory localname) ".."))) + (tramp-shell-quote-argument + (concat (file-name-as-directory localname) ".")) + (tramp-shell-quote-argument + (concat (file-name-as-directory localname) "..")))) (widen)) (tramp-adb-sh-fix-ls-output) (let ((result (tramp-do-parse-file-attributes-with-ls @@ -989,12 +1012,51 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (tramp-set-connection-property v "process-name" nil) (tramp-set-connection-property v "process-buffer" nil)))))) -;; Helper functions. +(defun tramp-adb-get-device (vec) + "Return full host name from VEC to be used in shell exceution. +E.g. a host name \"192.168.1.1#5555\" returns \"192.168.1.1:5555\" + a host name \"R38273882DE\" returns \"R38273882DE\"." + ;; Sometimes this is called before there is a connection process + ;; yet. In order to work with the connection cache, we flush all + ;; unwanted entries first. + (tramp-flush-connection-property nil) + (with-tramp-connection-property (tramp-get-connection-process vec) "device" + (let* ((method (tramp-file-name-method vec)) + (host (tramp-file-name-host vec)) + (port (tramp-file-name-port vec)) + (devices (mapcar 'cadr (tramp-adb-parse-device-names nil)))) + (replace-regexp-in-string + tramp-prefix-port-format ":" + (cond ((member host devices) host) + ;; This is the case when the host is connected to the default port. + ((member (format "%s%s%d" host tramp-prefix-port-format port) + devices) + (format "%s:%d" host port)) + ;; An empty host name shall be mapped as well, when there + ;; is exactly one entry in `devices'. + ((and (zerop (length host)) (= (length devices) 1)) + (car devices)) + ;; Try to connect device. + ((and tramp-adb-connect-if-not-connected + (not (zerop (length host))) + (not (tramp-adb-execute-adb-command + vec "connect" + (replace-regexp-in-string + tramp-prefix-port-format ":" host)))) + ;; When new device connected, running other adb command (e.g. + ;; adb shell) immediately will fail. To get around this + ;; problem, add sleep 0.1 second here. + (sleep-for 0.1) + host) + (t (tramp-error + vec 'file-error "Could not find device %s" host))))))) (defun tramp-adb-execute-adb-command (vec &rest args) "Returns nil on success error-output on failure." - (when (> (length (tramp-file-name-host vec)) 0) - (setq args (append (list "-s" (tramp-file-name-host vec)) args))) + (when (and (> (length (tramp-file-name-host vec)) 0) + ;; The -s switch is only available for ADB device commands. + (not (member (car args) (list "connect" "disconnect")))) + (setq args (append (list "-s" (tramp-adb-get-device vec)) args))) (with-temp-buffer (prog1 (unless @@ -1097,7 +1159,12 @@ connection if a previous connection has died for some reason." (p (get-buffer-process buf)) (host (tramp-file-name-host vec)) (user (tramp-file-name-user vec)) - devices) + (device (tramp-adb-get-device vec))) + + ;; Set variables for proper tracing in `tramp-adb-parse-device-names'. + (setq tramp-current-method (tramp-file-name-method vec) + tramp-current-user (tramp-file-name-user vec) + tramp-current-host (tramp-file-name-host vec)) ;; Maybe we know already that "su" is not supported. We cannot ;; use a connection property, because we have not checked yet @@ -1109,20 +1176,13 @@ connection if a previous connection has died for some reason." (and p (processp p) (memq (process-status p) '(run open))) (save-match-data (when (and p (processp p)) (delete-process p)) - (setq devices (mapcar 'cadr (tramp-adb-parse-device-names nil))) - (if (not devices) - (tramp-error vec 'file-error "No device connected")) - (if (and (> (length host) 0) (not (member host devices))) + (if (zerop (length device)) (tramp-error vec 'file-error "Device %s not connected" host)) - (if (and (> (length devices) 1) (zerop (length host))) - (tramp-error - vec 'file-error - "Multiple Devices connected: No Host/Device specified")) (with-tramp-progress-reporter vec 3 "Opening adb shell connection" (let* ((coding-system-for-read 'utf-8-dos) ;is this correct? (process-connection-type tramp-process-connection-type) (args (if (> (length host) 0) - (list "-s" host "shell") + (list "-s" device "shell") (list "shell"))) (p (let ((default-directory (tramp-compat-temporary-file-directory))) @@ -1187,4 +1247,5 @@ connection if a previous connection has died for some reason." (unload-feature 'tramp-adb 'force))) (provide 'tramp-adb) + ;;; tramp-adb.el ends here From 44a7c1f93a35c5a1ef374788a184b286cb2a058f Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 4 Mar 2015 11:46:06 +0100 Subject: [PATCH 222/457] Sync with Tramp upstream * automated/tramp-tests.el (top): Declare `tramp-get-remote-stat' and `tramp-get-remote-perl'. (tramp-test06-directory-file-name): Fix docstring and last test. (tramp-test08-file-local-copy): Extend test. (tramp-test13-make-directory): Test also PARENTS arg. (tramp-test17-insert-directory): Do not expect any order in directory listing. (tramp--test-adb-p): New defun. (tramp--test-check-files): Fix doxstring. Extend tests. (tramp--test-special-characters): New defun. Use body from `tramp-test30-special-characters'. Adapt check for tramp-adb.el. (tramp-test30-special-characters): Use it. (tramp--test-utf8): New defun. Use body from `tramp-test31-utf8'. Add test string. (tramp-test31-utf8): Use it. (tramp-test30-special-characters-with-stat) (tramp-test30-special-characters-with-perl) (tramp-test30-special-characters-with-ls): (tramp-test31-utf8-with-stat, tramp-test31-utf8-with-perl) (tramp-test31-utf8-with-ls): New tests. --- test/ChangeLog | 23 ++++ test/automated/tramp-tests.el | 252 +++++++++++++++++++++++++++++----- 2 files changed, 243 insertions(+), 32 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 4488aab701f..a9c20f6fbfa 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,26 @@ +2015-03-04 Michael Albinus + + * automated/tramp-tests.el (top): Declare `tramp-get-remote-stat' + and `tramp-get-remote-perl'. + (tramp-test06-directory-file-name): Fix docstring and last test. + (tramp-test08-file-local-copy): Extend test. + (tramp-test13-make-directory): Test also PARENTS arg. + (tramp-test17-insert-directory): Do not expect any order in + directory listing. + (tramp--test-adb-p): New defun. + (tramp--test-check-files): Fix doxstring. Extend tests. + (tramp--test-special-characters): New defun. Use body from + `tramp-test30-special-characters'. Adapt check for tramp-adb.el. + (tramp-test30-special-characters): Use it. + (tramp--test-utf8): New defun. Use body from + `tramp-test31-utf8'. Add test string. + (tramp-test31-utf8): Use it. + (tramp-test30-special-characters-with-stat) + (tramp-test30-special-characters-with-perl) + (tramp-test30-special-characters-with-ls): + (tramp-test31-utf8-with-stat, tramp-test31-utf8-with-perl) + (tramp-test31-utf8-with-ls): New tests. + 2015-03-03 Daniel Colascione * automated/generator-tests.el (cps-testcase): Use diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 3b72da8955a..020f31f4e6f 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -46,6 +46,8 @@ (declare-function tramp-find-executable "tramp-sh") (declare-function tramp-get-remote-path "tramp-sh") +(declare-function tramp-get-remote-stat "tramp-sh") +(declare-function tramp-get-remote-perl "tramp-sh") (defvar tramp-copy-size-limit) (defvar tramp-remote-process-environment) @@ -558,8 +560,8 @@ shall not contain a timeout." (ert-deftest tramp-test06-directory-file-name () "Check `directory-file-name'. -This checks also `file-name-as-directory', `file-name-directory' -and `file-name-nondirectory'." +This checks also `file-name-as-directory', `file-name-directory', +`file-name-nondirectory' and `unhandled-file-name-directory'." (should (string-equal (directory-file-name "/method:host:/path/to/file") @@ -589,8 +591,7 @@ and `file-name-nondirectory'." (should (string-equal (file-name-nondirectory "/method:host:/path/to/file/") "")) (should-not - (file-remote-p - (unhandled-file-name-directory "/method:host:/path/to/file")))) + (unhandled-file-name-directory "/method:host:/path/to/file"))) (ert-deftest tramp-test07-file-exists-p () "Check `file-exist-p', `write-region' and `delete-file'." @@ -615,7 +616,13 @@ and `file-name-nondirectory'." (should (setq tmp-name2 (file-local-copy tmp-name1))) (with-temp-buffer (insert-file-contents tmp-name2) - (should (string-equal (buffer-string) "foo")))) + (should (string-equal (buffer-string) "foo"))) + ;; Check also that a file transfer with compression works. + (let ((default-directory tramp-test-temporary-file-directory) + (tramp-copy-size-limit 4) + (tramp-inline-compress-start-size 2)) + (delete-file tmp-name2) + (should (setq tmp-name2 (file-local-copy tmp-name1))))) (ignore-errors (delete-file tmp-name1) (delete-file tmp-name2))))) @@ -840,7 +847,14 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." (progn (make-directory tmp-name) (should (file-directory-p tmp-name)) - (should (file-accessible-directory-p tmp-name))) + (should (file-accessible-directory-p tmp-name)) + (should-error + (make-directory (expand-file-name "foo/bar" tmp-name)) + :type 'file-error) + (make-directory (expand-file-name "foo/bar" tmp-name) 'parents) + (should (file-directory-p (expand-file-name "foo/bar" tmp-name))) + (should + (file-accessible-directory-p (expand-file-name "foo/bar" tmp-name)))) (ignore-errors (delete-directory tmp-name))))) (ert-deftest tramp-test14-delete-directory () @@ -959,9 +973,8 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." (concat ;; There might be a summary line. "\\(total.+[[:digit:]]+\n\\)?" - ;; We don't know in which order "." and ".." appear. - "\\(.+ \\.?\\.\n\\)\\{2\\}" - ".+ foo$"))))) + ;; We don't know in which order ".", ".." and "foo" appear. + "\\(.+ \\(\\.?\\.\\|foo\\)\n\\)\\{3\\}"))))) (ignore-errors (delete-directory tmp-name1 'recursive))))) (ert-deftest tramp-test18-file-attributes () @@ -1490,38 +1503,68 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ignore-errors (delete-directory tmp-name1 'recursive))))) +(defun tramp--test-adb-p () + "Check, whether the remote host runs Android. +This requires restrictions of file name syntax." + (eq (tramp-find-foreign-file-name-handler + tramp-test-temporary-file-directory) + 'tramp-adb-file-name-handler)) + (defun tramp--test-smb-or-windows-nt-p () "Check, whether the locale or remote host runs MS Windows. This requires restrictions of file name syntax." (or (eq system-type 'windows-nt) (eq (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) - 'tramp-smb-file-name-handler))) + 'tramp-smb-file-name-handler))) (defun tramp--test-check-files (&rest files) - "Runs a simple but comprehensive test over every file in FILES." + "Run a simple but comprehensive test over every file in FILES." (let ((tmp-name1 (tramp--test-make-temp-name)) - (tmp-name2 (tramp--test-make-temp-name 'local))) + (tmp-name2 (tramp--test-make-temp-name 'local)) + (files (delq nil files))) (unwind-protect (progn (make-directory tmp-name1) (make-directory tmp-name2) - (dolist (elt (delq nil files)) - (let ((file1 (expand-file-name elt tmp-name1)) - (file2 (expand-file-name elt tmp-name2))) + (dolist (elt files) + (let* ((file1 (expand-file-name elt tmp-name1)) + (file2 (expand-file-name elt tmp-name2)) + (file3 (concat file1 "foo"))) (write-region elt nil file1) (should (file-exists-p file1)) + ;; Check file contents. (with-temp-buffer (insert-file-contents file1) (should (string-equal (buffer-string) elt))) + ;; Copy file both directions. (copy-file file1 tmp-name2) (should (file-exists-p file2)) (delete-file file1) (should-not (file-exists-p file1)) (copy-file file2 tmp-name1) - (should (file-exists-p file1)))) + (should (file-exists-p file1)) + + ;; Method "smb" supports `make-symbolic-link' only if the + ;; remote host has CIFS capabilities. tramp-adb.el and + ;; tramp-gvfs.el do not support symbolic links at all. + (condition-case err + (progn + (make-symbolic-link file1 file3) + (should (file-symlink-p file3)) + (should + (string-equal + (expand-file-name file1) (file-truename file3))) + ;; Check file contents. + (with-temp-buffer + (insert-file-contents file3) + (should (string-equal (buffer-string) elt))) + (delete-file file3)) + (file-error + (should (string-equal (error-message-string err) + "make-symbolic-link not supported")))))) ;; Check file names. (should (equal (directory-files @@ -1548,26 +1591,44 @@ This requires restrictions of file name syntax." (should (equal (directory-files tmp-name1 nil directory-files-no-dot-files-regexp) (directory-files - tmp-name2 nil directory-files-no-dot-files-regexp)))) + tmp-name2 nil directory-files-no-dot-files-regexp))) + + ;; Check directory creation. We use a subdirectory "foo" + ;; in order to avoid conflicts with previous file name tests. + (dolist (elt files) + (let* ((file1 (expand-file-name (concat "foo/" elt) tmp-name1)) + (file2 (expand-file-name elt file1))) + (make-directory file1 'parents) + (should (file-directory-p file1)) + (write-region elt nil file2) + (should (file-exists-p file2)) + (should + (equal + (directory-files file1 nil directory-files-no-dot-files-regexp) + `(,elt))) + (should + (equal + (caar (directory-files-and-attributes + file1 nil directory-files-no-dot-files-regexp)) + elt)) + (delete-file file2) + (should-not (file-exists-p file2)) + (delete-directory file1) + (should-not (file-exists-p file1))))) (ignore-errors (delete-directory tmp-name1 'recursive)) (ignore-errors (delete-directory tmp-name2 'recursive))))) -;; This test is inspired by Bug#17238. -(ert-deftest tramp-test30-special-characters () - "Check special characters in file names." - (skip-unless (tramp--test-enabled)) - (skip-unless - (not - (memq - (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) - '(tramp-adb-file-name-handler - tramp-gvfs-file-name-handler)))) - +(defun tramp--test-special-characters () + "Perform the test in `tramp-test30-special-characters*'." ;; Newlines, slashes and backslashes in file names are not supported. ;; So we don't test. (tramp--test-check-files - (if (tramp--test-smb-or-windows-nt-p) "foo bar baz" " foo\tbar baz\t") + (if (tramp--test-smb-or-windows-nt-p) + "foo bar baz" + (if (tramp--test-adb-p) + " foo bar baz " + " foo\tbar baz\t")) "$foo$bar$$baz$" "-foo-bar-baz-" "%foo%bar%baz%" @@ -1583,18 +1644,145 @@ This requires restrictions of file name syntax." "[foo]bar[baz]" "{foo}bar{baz}")) -(ert-deftest tramp-test31-utf8 () - "Check UTF8 encoding in file names and file contents." +;; These tests are inspired by Bug#17238. +(ert-deftest tramp-test30-special-characters () + "Check special characters in file names." (skip-unless (tramp--test-enabled)) + (tramp--test-special-characters)) + +(ert-deftest tramp-test30-special-characters-with-stat () + "Check special characters in file names. +Use the `stat' command." + (skip-unless (tramp--test-enabled)) + (skip-unless + (eq + (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) + 'tramp-sh-file-name-handler)) + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (skip-unless (tramp-get-remote-stat v))) + + (unwind-protect + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "perl" nil) + (tramp--test-special-characters)) + ;; Reset suppressed properties. + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "perl" 'undef)))) + +(ert-deftest tramp-test30-special-characters-with-perl () + "Check special characters in file names. +Use the `perl' command." + (skip-unless (tramp--test-enabled)) + (skip-unless + (eq + (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) + 'tramp-sh-file-name-handler)) + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (skip-unless (tramp-get-remote-perl v))) + + (unwind-protect + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "stat" nil) + (tramp--test-special-characters)) + ;; Reset suppressed properties. + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "stat" 'undef)))) + +(ert-deftest tramp-test30-special-characters-with-ls () + "Check special characters in file names. +Use the `ls' command." + (skip-unless (tramp--test-enabled)) + (skip-unless + (eq + (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) + 'tramp-sh-file-name-handler)) + + (unwind-protect + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "stat" nil) + (tramp-set-connection-property v "perl" nil) + (tramp--test-special-characters)) + ;; Reset suppressed properties. + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "stat" 'undef) + (tramp-set-connection-property v "perl" 'undef)))) + +(defun tramp--test-utf8 () + "Perform the test in `tramp-test31-utf8*'." (let ((coding-system-for-read 'utf-8) (coding-system-for-write 'utf-8) (file-name-coding-system 'utf-8)) (tramp--test-check-files + "Γυρίστε το Γαλαξία με Ώτο Στοπ" "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت" "银河系漫游指南系列" "Автостопом по гала́ктике"))) +(ert-deftest tramp-test31-utf8 () + "Check UTF8 encoding in file names and file contents." + (skip-unless (tramp--test-enabled)) + (skip-unless (not (tramp--test-adb-p))) + + (tramp--test-utf8)) + +(ert-deftest tramp-test31-utf8-with-stat () + "Check UTF8 encoding in file names and file contents. +Use the `stat' command." + (skip-unless (tramp--test-enabled)) + (skip-unless + (eq + (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) + 'tramp-sh-file-name-handler)) + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (skip-unless (tramp-get-remote-stat v))) + + (unwind-protect + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "perl" nil) + (tramp--test-utf8)) + ;; Reset suppressed properties. + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "perl" 'undef)))) + +(ert-deftest tramp-test31-utf8-with-perl () + "Check UTF8 encoding in file names and file contents. +Use the `perl' command." + (skip-unless (tramp--test-enabled)) + (skip-unless + (eq + (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) + 'tramp-sh-file-name-handler)) + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (skip-unless (tramp-get-remote-perl v))) + + (unwind-protect + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "stat" nil) + (tramp--test-utf8)) + ;; Reset suppressed properties. + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "stat" 'undef)))) + +(ert-deftest tramp-test31-utf8-with-ls () + "Check UTF8 encoding in file names and file contents. +Use the `ls' command." + (skip-unless (tramp--test-enabled)) + (skip-unless + (eq + (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) + 'tramp-sh-file-name-handler)) + + (unwind-protect + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "stat" nil) + (tramp-set-connection-property v "perl" nil) + (tramp--test-utf8)) + ;; Reset suppressed properties. + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (tramp-set-connection-property v "stat" 'undef) + (tramp-set-connection-property v "perl" 'undef)))) + ;; This test is inspired by Bug#16928. (ert-deftest tramp-test32-asynchronous-requests () "Check parallel asynchronous requests. @@ -1758,7 +1946,7 @@ Since it unloads Tramp, it shall be the last test to run." ;; doesn't work well when an interactive password must be provided. ;; * Fix `tramp-test27-start-file-process' for `nc' and on MS ;; Windows (`process-send-eof'?). -;; * Fix `tramp-test30-special-characters' for `adb' and `nc'. +;; * Fix `tramp-test30-special-characters' for `nc'. ;; * Fix `tramp-test31-utf8' for `nc'/`telnet' (when target is a dumb ;; busybox). Seems to be in `directory-files'. ;; * Fix Bug#16928. Set expected error of `tramp-test32-asynchronous-requests'. From b209a4bf1b3686a892b04c66713a345d6c932ffc Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 4 Mar 2015 12:35:36 +0100 Subject: [PATCH 223/457] Sync with Tramp upstream * tramp.texi (External methods) : Explain, when Tramp connects to devices. Mention port numbers. (GVFS based methods, File name completion): Add index. (Multi-hops, Remote Programs, File name completion, Ad-hoc multi-hops): Improve wording. * trampver.texi: Update release number. --- doc/misc/ChangeLog | 10 +++++++++ doc/misc/tramp.texi | 51 +++++++++++++++++++++++++----------------- doc/misc/trampver.texi | 2 +- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c721b250112..fc85bd97f73 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,13 @@ +2015-03-04 Michael Albinus + + * tramp.texi (External methods) : Explain, when Tramp + connects to devices. Mention port numbers. + (GVFS based methods, File name completion): Add index. + (Multi-hops, Remote Programs, File name completion, Ad-hoc multi-hops): + Improve wording. + + * trampver.texi: Update release number. + 2015-03-03 Kelvin White * erc.texi (Advanced Usage, Options): Add descriptions and examples diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index bc7f9331874..5d02d909791 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -1005,12 +1005,13 @@ can be installed as part of the Android SDK. If the @command{adb} program is not found via the @env{PATH} environment variable, the variable @var{tramp-adb-program} must point to its absolute path. -Tramp does not connect Android devices to @command{adb}. This must be -performed outside @value{emacsname}. If there is exactly one Android -device connected to @command{adb}, a host name is not needed in the -remote file name. The default @value{tramp} name to be used is -@file{@trampfn{adb, , ,}} therefore. Otherwise, one could find -potential host names with the command @command{adb devices}. +@value{tramp} does not connect Android devices to @command{adb}, +unless the customer option @option{tramp-adb-connect-if-not-connected} +is non-@code{nil}. If there is exactly one Android device connected +to @command{adb}, a host name is not needed in the remote file name. +The default @value{tramp} name to be used is @file{@trampfn{adb, , ,}}, +therefore. Otherwise, one could find potential host names with the +command @command{adb devices}. Usually, the @command{adb} method does not need any user name. It runs under the permissions of the @command{adbd} process on the @@ -1019,6 +1020,11 @@ Android device. If a user name is specified, @value{tramp} applies an devices, especially with unrooted ones. In that case, an error message is displayed. +If a device shall be connected via TCP/IP, it is possible to declare +the port number to be used like @file{device#42}. Without a port +number, the default value as declared in @command{adb} will be used. +Port numbers are not applicable to Android devices connected via USB. + @end table @@ -1081,6 +1087,7 @@ FUSE, it also needs the SYNCE-GVFS plugin. @end table +@vindex tramp-gvfs-methods @defopt tramp-gvfs-methods This customer option, a list, defines the external methods which shall be used with GVFS@. Per default, these are @option{dav}, @@ -1355,8 +1362,8 @@ bastion host. @vindex tramp-default-proxies-alist @defopt tramp-default-proxies-alist In order to specify multiple hops, it is possible to define a proxy -host to pass through, via the variable -@code{tramp-default-proxies-alist}. This variable keeps a list of +host to pass through, via the customer option +@option{tramp-default-proxies-alist}. This variable keeps a list of triples (@var{host} @var{user} @var{proxy}). The first matching item specifies the proxy host to be passed for a @@ -1470,9 +1477,9 @@ Sometimes they offer limited features only, like running @command{rbash} @vindex tramp-restricted-shell-hosts-alist @defopt tramp-restricted-shell-hosts-alist -This variable keeps a list of regular expressions, which denote hosts -running a registered shell like "rbash". Those hosts can be used as -proxies only. +This customer option keeps a list of regular expressions, which denote +hosts running a registered shell like @command{rbash}. Those hosts +can be used as proxies only. If the bastion host from the example above runs a restricted shell, you shall apply @@ -1788,8 +1795,9 @@ remote file access. @vindex tramp-own-remote-path @defopt tramp-remote-path When @value{tramp} connects to the remote host, it searches for the -programs that it can use. The variable @code{tramp-remote-path} -controls the directories searched on the remote host. +programs that it can use. The customer option +@option{tramp-remote-path} controls the directories searched on the +remote host. By default, this is set to a reasonable set of defaults for most hosts. The symbol @code{tramp-default-remote-path} is a place @@ -1798,7 +1806,7 @@ command @command{getconf PATH} on your remote host. For example, on Debian GNU/Linux this is @file{/bin:/usr/bin}, whereas on Solaris this is @file{/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin}. It is recommended to apply this symbol on top of -@code{tramp-remote-path}. +@option{tramp-remote-path}. It is possible, however, that your local (or remote ;) system administrator has put the tools you want in some obscure local @@ -2088,6 +2096,7 @@ parameter, you could overwrite the syntax with the following form: @noindent with @samp{192.168.0.1} being the IP address of your remote host (@pxref{Predefined connection information}). + @end table @@ -2591,11 +2600,12 @@ files by other processes. Therefore, during file name completion, the remote directory contents are reread regularly in order to detect such changes, which would be invisible otherwise (@pxref{Connection caching}). +@vindex tramp-completion-reread-directory-timeout @defopt tramp-completion-reread-directory-timeout -This variable defines the number of seconds since last remote command -before rereading a directory contents. A value of 0 would require an -immediate reread during file name completion, @code{nil} means to use -always cached values for the directory contents. +This customer option defines the number of seconds since last remote +command before rereading a directory contents. A value of 0 would +require an immediate reread during file name completion, @code{nil} +means to use always cached values for the directory contents. @end defopt @@ -2634,8 +2644,9 @@ remotehost, /path}} would be sufficient from now on. @vindex tramp-save-ad-hoc-proxies @defopt tramp-save-ad-hoc-proxies This customer option controls whether ad-hoc definitions are kept -persistently in @code{tramp-default-proxies-alist}. That means, those -definitions are available also for future @value{emacsname} sessions. +persistently in @option{tramp-default-proxies-alist}. That means, +those definitions are available also for future @value{emacsname} +sessions. @end defopt diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index a9e7f3733e7..119adbd245e 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -8,7 +8,7 @@ @c In the Tramp GIT, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.2.11 +@set trampver 2.2.12-pre @c Other flags from configuration @set instprefix /usr/local From 6c0a602fb8f0ac54d05e8aa13fdb1d478370c123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Wed, 4 Mar 2015 12:34:48 +0100 Subject: [PATCH 224/457] eww: Fix some docstrings/error message. * net/eww.el (eww-search-prefix, eww-open-file, eww-search-words) (eww-same-page-p,eww-set-character-encoding): Fix docstring. (eww): Do not end error messages with a period. --- lisp/ChangeLog | 6 ++++++ lisp/net/eww.el | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 69c9e3cbea7..5c04663f9e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-04 Rüdiger Sonderfeld + + * net/eww.el (eww-search-prefix, eww-open-file, eww-search-words) + (eww-same-page-p,eww-set-character-encoding): Fix docstring. + (eww): Do not end error messages with a period. + 2015-03-04 Zhongwei Yao * net/tramp-adb.el (tramp-adb-connect-if-not-connected): diff --git a/lisp/net/eww.el b/lisp/net/eww.el index b7ee0650d70..577cd41e30a 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -49,7 +49,7 @@ :type 'string) (defcustom eww-search-prefix "https://duckduckgo.com/html/?q=" - "Prefix URL to search engine" + "Prefix URL to search engine." :version "24.4" :group 'eww :type 'string) @@ -254,7 +254,7 @@ word(s) will be searched for via `eww-search-prefix'." (cond ((string-match-p "\\`file:/" url)) ;; Don't mangle file: URLs at all. ((string-match-p "\\`ftp://" url) - (user-error "FTP is not supported.")) + (user-error "FTP is not supported")) (t ;; Anything that starts with something that vaguely looks ;; like a protocol designator is interpreted as a full URL. @@ -292,7 +292,7 @@ word(s) will be searched for via `eww-search-prefix'." ;;;###autoload (defun eww-open-file (file) - "Render a file using EWW." + "Render FILE using EWW." (interactive "fFile: ") (eww (concat "file://" (and (memq system-type '(windows-nt ms-dos)) @@ -301,7 +301,7 @@ word(s) will be searched for via `eww-search-prefix'." ;;;###autoload (defun eww-search-words (&optional beg end) - "Search the web for the text between the point and marker. + "Search the web for the text between BEG and END. See the `eww-search-prefix' variable for the search engine used." (interactive "r") (eww (buffer-substring beg end))) @@ -1363,7 +1363,7 @@ If EXTERNAL is double prefix, browse in new buffer." (eww-browse-url url external))))) (defun eww-same-page-p (url1 url2) - "Return non-nil if both URLs represent the same page. + "Return non-nil if URL1 and URL2 represent the same page. Differences in #targets are ignored." (let ((obj1 (url-generic-parse-url url1)) (obj2 (url-generic-parse-url url2))) @@ -1413,7 +1413,8 @@ Differences in #targets are ignored." (expand-file-name file directory))) (defun eww-set-character-encoding (charset) - "Set character encoding." + "Set character encoding to CHARSET. +If CHARSET is nil then use UTF-8." (interactive "zUse character set (default utf-8): ") (if (null charset) (eww-reload nil 'utf-8) From 5599661ead86228d7fea5e8dbf3d3a4e59f3d4fd Mon Sep 17 00:00:00 2001 From: Filipp Gunbin Date: Wed, 4 Mar 2015 19:35:42 +0300 Subject: [PATCH 225/457] * autorevert.el (auto-revert-notify-add-watch): fix handler installation Fixes: bug#20000 --- lisp/ChangeLog | 6 +++++ lisp/autorevert.el | 57 +++++++++++++++++++++++----------------------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5c04663f9e8..08dcca2fbe8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-04 Filipp Gunbin + + * autorevert.el (auto-revert-notify-add-watch): fix handler + installation + Fixes: bug#20000 + 2015-03-04 Rüdiger Sonderfeld * net/eww.el (eww-search-prefix, eww-open-file, eww-search-words) diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 6489a3e04c2..357916c6b4d 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -503,36 +503,37 @@ will use an up-to-date value of `auto-revert-interval'" "Enable file notification for current buffer's associated file." ;; We can assume that `buffer-file-name' and ;; `auto-revert-use-notify' are non-nil. - (when (or (string-match auto-revert-notify-exclude-dir-regexp - (expand-file-name default-directory)) - (file-symlink-p (or buffer-file-name default-directory))) - ;; Fallback to file checks. - (set (make-local-variable 'auto-revert-use-notify) nil)) + (if (or (string-match auto-revert-notify-exclude-dir-regexp + (expand-file-name default-directory)) + (file-symlink-p (or buffer-file-name default-directory))) - (when (not auto-revert-notify-watch-descriptor) - (setq auto-revert-notify-watch-descriptor - (ignore-errors - (if buffer-file-name - (file-notify-add-watch - (expand-file-name buffer-file-name default-directory) - '(change attribute-change) - 'auto-revert-notify-handler) - (file-notify-add-watch - (expand-file-name default-directory) - '(change) - 'auto-revert-notify-handler)))) - (if auto-revert-notify-watch-descriptor - (progn - (puthash - auto-revert-notify-watch-descriptor - (cons (current-buffer) - (gethash auto-revert-notify-watch-descriptor - auto-revert-notify-watch-descriptor-hash-list)) - auto-revert-notify-watch-descriptor-hash-list) - (add-hook (make-local-variable 'kill-buffer-hook) - 'auto-revert-notify-rm-watch)) ;; Fallback to file checks. - (set (make-local-variable 'auto-revert-use-notify) nil)))) + (set (make-local-variable 'auto-revert-use-notify) nil) + + (when (not auto-revert-notify-watch-descriptor) + (setq auto-revert-notify-watch-descriptor + (ignore-errors + (if buffer-file-name + (file-notify-add-watch + (expand-file-name buffer-file-name default-directory) + '(change attribute-change) + 'auto-revert-notify-handler) + (file-notify-add-watch + (expand-file-name default-directory) + '(change) + 'auto-revert-notify-handler)))) + (if auto-revert-notify-watch-descriptor + (progn + (puthash + auto-revert-notify-watch-descriptor + (cons (current-buffer) + (gethash auto-revert-notify-watch-descriptor + auto-revert-notify-watch-descriptor-hash-list)) + auto-revert-notify-watch-descriptor-hash-list) + (add-hook (make-local-variable 'kill-buffer-hook) + 'auto-revert-notify-rm-watch)) + ;; Fallback to file checks. + (set (make-local-variable 'auto-revert-use-notify) nil))))) ;; If we have file notifications, we want to update the auto-revert buffers ;; immediately when a notification occurs. Since file updates can happen very From 0ec2600a49a1794dff490266519dd6265a4a3cb7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 4 Mar 2015 09:02:44 -0800 Subject: [PATCH 226/457] # Changelog fixes --- lisp/ChangeLog | 79 ++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 08dcca2fbe8..cdd4bf8557f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,7 @@ -2015-03-04 Filipp Gunbin +2015-03-04 Filipp Gunbin - * autorevert.el (auto-revert-notify-add-watch): fix handler - installation - Fixes: bug#20000 + * autorevert.el (auto-revert-notify-add-watch): + Fix handler installation. (Bug#20000) 2015-03-04 Rüdiger Sonderfeld @@ -65,14 +64,14 @@ * net/trampver.el: Update release number. -2015-03-03 Agustín Martín Domingo +2015-03-03 Agustín Martín Domingo * textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure .dat files for aspell dicts are also searched for in location described by `ispell-aspell-dict-dir', matching aspell's dict-dir variable. -2015-03-03 Agustín Martín Domingo +2015-03-03 Agustín Martín Domingo * textmodes/ispell.el (ispell-dicts-name2locale-equivs-alist) (ispell-hunspell-fill-dictionary-entry) @@ -123,7 +122,7 @@ * simple.el (transient-mark-mode): Doc fix. (Bug#19841) -2015-03-03 Agustín Martín Domingo +2015-03-03 Agustín Martín Domingo Improve string search in `flyspell-word-search-*`. (Bug#16800) * flyspell.el (flyspell-duplicate-distance): Limit default search @@ -203,11 +202,9 @@ 2015-03-03 Alan Mackenzie - CC Mode: Stop Font Lock forcing fontification from BOL. Fixes - debbugs#19669. - - * progmodes/cc-mode.el (c-font-lock-init): Setq - font-lock-extend-region-functions to nil. + CC Mode: Stop Font Lock forcing fontification from BOL. (Bug#19669) + * progmodes/cc-mode.el (c-font-lock-init): + Set font-lock-extend-region-functions to nil. 2015-03-03 Daniel Colascione @@ -342,7 +339,6 @@ 2015-02-26 Fabián Ezequiel Gallina python.el: Handle tabs in python-indent-dedent-line. - * progmodes/python.el (python-indent-dedent-line): Fixes for indentation with tabs. Thanks to (Bug#19730). @@ -457,9 +453,8 @@ 2015-02-23 Paul Eggert - Fix the desired binding for comment-line * bindings.el (ctl-x-map): Use [?\C-\;] to get the desired binding. - Fixes: bug#19826 + (Bug#19826) 2015-02-23 Stefan Monnier @@ -483,8 +478,7 @@ * bindings.el (ctl-x-map): There is no 'C-;'. For now, make do with 'M-;'; this allows 'make bootstrap' to work. - Perhaps some other binding should be chosen. - Fixes: bug#19826 + Perhaps some other binding should be chosen. (Bug#19826) 2015-02-21 Artur Malabarba @@ -762,7 +756,7 @@ (package-install-button-action, package-reinstall) (package-menu-execute): Account for the change. -2015-02-11 Nicolas Petton +2015-02-11 Nicolas Petton * emacs-lisp/seq.el (seq-reverse): Add a backward-compatible version of seq-reverse that works on sequences in Emacs 24. @@ -847,7 +841,7 @@ (python-shell-font-lock-turn-off): Fix typo. (python-util-text-properties-replace-name): Delete function. -2015-02-09 Nicolas Petton +2015-02-09 Nicolas Petton * emacs-lisp/seq.el (seq-group-by): Improves seq-group-by to return sequence elements in correct order. @@ -911,7 +905,7 @@ 2015-02-08 Oleh Krehel * outline.el (outline-show-entry): Fix one invisible char for the - file's last outline. Fixes Bug#19493. + file's last outline. (Bug#19493) 2015-02-08 Stefan Monnier @@ -947,7 +941,6 @@ 2015-02-07 Fabián Ezequiel Gallina python.el: Keep eldoc visible while typing args. (Bug#19637) - * progmodes/python.el (python-eldoc--get-symbol-at-point): New function based on Carlos Pita patch. (python-eldoc--get-doc-at-point, python-eldoc-at-point): Use it. @@ -955,7 +948,6 @@ 2015-02-07 Fabián Ezequiel Gallina Fix hideshow integration. (Bug#19761) - * progmodes/python.el (python-hideshow-forward-sexp-function): New function based on Carlos Pita patch. @@ -981,11 +973,13 @@ * vc/vc-cvs.el (vc-cvs-dir-status-files): Don't pass DIR to `vc-cvs-command' (bug#19732). -2015-02-06 Nicolas Petton +2015-02-06 Nicolas Petton - * emacs-lisp/seq.el (seq-mapcat, seq-partition, seq-group-by): New functions. + * emacs-lisp/seq.el (seq-mapcat, seq-partition, seq-group-by): + New functions. * emacs-lisp/seq.el (seq-drop-while, seq-take-while, seq-count) - (seq--drop-list, seq--take-list, seq--take-while-list): Better docstring. + (seq--drop-list, seq--take-list, seq--take-while-list): + Better docstring. 2015-02-06 Artur Malabarba @@ -1032,7 +1026,7 @@ * json.el (json-end-of-file): New error (bug#19768). (json-pop, json-read): Use it. -2015-02-05 Kelly Dean +2015-02-05 Kelly Dean * help-mode.el (help-xref-interned): Pass BUFFER and FRAME to `describe-variable'. @@ -1402,8 +1396,8 @@ 2015-01-28 Paul Eggert - Fix dired quoting bug with "Hit`N`Hide". Fixes Bug#19498. - * files.el (shell-quote-wildcard-pattern): Also quote "`". + Fix dired quoting bug with "Hit`N`Hide". + * files.el (shell-quote-wildcard-pattern): Also quote "`". (Bug#19498) 2015-01-28 Stefan Monnier @@ -3140,7 +3134,7 @@ * emacs-lisp/package.el (package--list-loaded-files): Don't call file-truename on load-history elements (bug#19390). -2014-12-16 Nicolas Petton +2014-12-16 Nicolas Petton * emacs-lisp/seq.el: New file. @@ -3786,7 +3780,7 @@ Pass correct status to `newsticker--sentinel-work'. (newsticker--sentinel-work): Use "newsticker--download-error" as guid in order to prevent multiple "Could not download..." - messages. Fixes bug#19166. + messages. (Bug#19166) 2014-12-01 Ivan Shmakov @@ -4197,15 +4191,13 @@ 2014-11-22 Alan Mackenzie Fix error with `mark-defun' and "protected:" in C++ Mode. - Fixes: debbugs:19134. - * progmodes/cc-cmds.el (c-where-wrt-brace-construct): Handle a - return code of (label) from c-beginning-of-decl-1. + return code of (label) from c-beginning-of-decl-1. (Bug#19134) 2014-11-22 Ulf Jasper * net/newst-backend.el (newsticker--sentinel-work): - Tell `libxml-parse-xml-region' to discard comments. Fixes bug#18787. + Tell `libxml-parse-xml-region' to discard comments. (Bug#18787) 2014-11-22 Michael Albinus @@ -4543,7 +4535,7 @@ (python-shell-calculate-process-environment): Use it. (python-shell-calculate-exec-path): Add comment. -2014-11-16 Thierry Banel (tiny change) +2014-11-16 Thierry Banel (tiny change) * calc/calc-arith.el (math-max-list, math-min-list): Fix bug for date handling. @@ -4568,7 +4560,7 @@ * mail/emacsbug.el (report-emacs-bug): Make a better guess at envelope-from when reporting through sendmail (bug#19054). -2014-11-16 Oscar Fuentes +2014-11-16 Oscar Fuentes Add faces for the VC modeline state indicator. * vc/vc-hooks.el: @@ -4795,11 +4787,11 @@ 2014-11-08 Alan Mackenzie - Fix wrong bound to c-font-lock-declarators. Fixes bug #18948. + Fix wrong bound to c-font-lock-declarators. * progmodes/cc-fonts.el (c-font-lock-declarations): Pass "(point-max)" as bound to c-font-lock-declarators, not "limit", as the buffer is sometimes narrowed to less than "limit" (e.g., in - the presence of macros). + the presence of macros). (Bug#18948) 2014-11-08 Michael Albinus @@ -5024,20 +5016,20 @@ correct buffer. (eww-view-source): Use it. -2014-11-02 Ivan Shmakov +2014-11-02 Ivan Shmakov * net/eww.el (eww): Recognize colon-delimited IPv6 addresses. (Bug#18603). -2014-11-02 Brian McKenna (tiny change) +2014-11-02 Brian McKenna (tiny change) * net/eww.el (eww-submit): Encode empty form values as "". (Bug#17785). -2014-11-02 Ivan Shmakov +2014-11-02 Ivan Shmakov * net/eww.el (eww): Allow "file:/file/name" URLs. (Bug#18825). -2014-11-02 Ivan Shmakov +2014-11-02 Ivan Shmakov * net/eww.el (eww-mode-map): Remove mentions of `eww-quit'. (Bug#18834). @@ -5613,9 +5605,8 @@ 2014-10-18 Alan Mackenzie Check that a "macro" found near point-min isn't a ## operator. - Fixes bug #18749. * progmodes/cc-engine.el (c-macro-is-genuine-p): New function. - (c-beginning-of-macro): Use the above new function. + (c-beginning-of-macro): Use the above new function. (Bug#18749) 2014-10-18 Teodor Zlatanov From 69204d5a8ad8c3ea8f99880fdfb634b6109a59fb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 4 Mar 2015 09:04:54 -0800 Subject: [PATCH 227/457] # Changelog fixes (no need to merge to trunk) --- lisp/ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 11c0271a564..a1cf2a07dbe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,11 +1,11 @@ -2015-03-03 Agustín Martín Domingo +2015-03-03 Agustín Martín Domingo * textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure .dat files for aspell dicts are also searched for in location described by `ispell-aspell-dict-dir', matching aspell's dict-dir variable. -2015-03-03 Agustín Martín Domingo +2015-03-03 Agustín Martín Domingo * textmodes/ispell.el (ispell-dicts-name2locale-equivs-alist) (ispell-hunspell-fill-dictionary-entry) @@ -56,7 +56,7 @@ * simple.el (transient-mark-mode): Doc fix. (Bug#19841) -2015-02-12 Agustín Martín Domingo +2015-02-12 Agustín Martín Domingo Improve string search in `flyspell-word-search-*`. (Bug#16800) * flyspell.el (flyspell-duplicate-distance): Limit default search From 53a3f3ab17abd97f305c93416095fecac2e3f2e1 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Wed, 4 Mar 2015 18:52:08 +0100 Subject: [PATCH 228/457] Handle tool bar size changes after x_set_font. * frame.c (x_set_font): Try to keep frame height and width unchanged if tool bar size changes with new font. --- src/ChangeLog | 7 ++++++- src/frame.c | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8acca6cca3f..e8fa72caea0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,14 @@ +2015-03-04 Martin Rudalics + + * frame.c (x_set_font): Try to keep frame height and width + unchanged if tool bar size changes with new font. + 2015-03-03 Eli Zaretskii * search.c (find_newline): Avoid assertion violations in CHAR_TO_BYTE when a portion of the buffer was deleted and we look for newlines near the end of the buffer. This happens in Rmail - hen JIT font-lock fontifies a newly displayed portion of the + when JIT font-lock fontifies a newly displayed portion of the buffer. 2015-03-03 Eli Zaretskii diff --git a/src/frame.c b/src/frame.c index bac2b246ad9..aa07219d152 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3626,6 +3626,7 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) #endif /* Recalculate toolbar height. */ f->n_tool_bar_rows = 0; + f->tool_bar_redisplayed_once = false; /* Ensure we redraw it. */ clear_current_matrices (f); From 9f1f6c8b56343ce8b8a8d1003eae7c8eac4806b1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 4 Mar 2015 19:57:38 +0200 Subject: [PATCH 229/457] src/ChangeLog: Fix bad formatting. --- src/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ChangeLog b/src/ChangeLog index e8fa72caea0..cfef5c46d1a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -69,6 +69,7 @@ 2015-03-03 Eli Zaretskii * dispextern.h (FACE_FOR_CHAR): Fix the commentary. + 2015-03-03 Daniel Colascione * alloc.c (syms_of_alloc): Rename `gc-precise-p' to `gc-precise'. From 21c547863d5950a9d623d62ab743e92c0e1fd95f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 4 Mar 2015 20:04:57 -0500 Subject: [PATCH 230/457] Replace *-function vars with generic functions in cl-generic. * lisp/emacs-lisp/cl-generic.el (cl--generic-generalizer): New struct. (cl-generic-tagcode-function, cl-generic-tag-types-function): Remove. (cl--generic-t-generalizer): New const. (cl--generic-make-method): Rename from `cl--generic-method-make'. (cl--generic-make): Change calling convention. (cl--generic): Add `options' field. (cl-generic-function-options): New function. (cl-defgeneric): Rewrite handling of options. Add support for :method options and allow the use of a default body. (cl-generic-define): Save options in the corresponding new field. (cl-defmethod): Fix ordering of qualifiers. (cl-generic-define-method): Use cl-generic-generalizers. (cl--generic-get-dispatcher): Change calling convention, and change calling convention of the returned function as well so as to take the list of methods separately from the generic function object, so that it can receive the original generic function object. (cl--generic-make-next-function): New function, extracted from cl--generic-make-function. (cl--generic-make-function): Use it. (cl-generic-method-combination-function): Remove. (cl--generic-cyclic-definition): New error. (cl-generic-call-method): Take a generic function object rather than its name. (cl-method-qualifiers): New alias. (cl--generic-build-combined-method): Use cl-generic-combine-methods, don't segregate by qualifiers here any more. (cl--generic-standard-method-combination): Segregate by qualifiers here instead. Add support for the `:extra' qualifier. (cl--generic-cache-miss): Move earlier, adjust to new calling convention. (cl-generic-generalizers, cl-generic-combine-methods): New generic functions. (cl-no-next-method, cl-no-applicable-method, cl-no-primary-method): Use the new "default method in defgeneric" functionality, change calling convention to receive a generic function object. (cl--generic-head-used): New var. (cl--generic-head-generalizer, cl--generic-eql-generalizer) (cl--generic-struct-generalizer, cl--generic-typeof-generalizer): New consts. * lisp/emacs-lisp/eieio-core.el (eieio--generic-generalizer) (eieio--generic-subclass-generalizer): New consts. (cl-generic-generalizers): New methods. * lisp/emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-generalizer) (eieio--generic-static-object-generalizer): New consts. (cl-generic-generalizers) <(head eieio--static)>: New method. * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Unfold closures like lambdas. --- lisp/ChangeLog | 74 +++- lisp/emacs-lisp/byte-opt.el | 2 +- lisp/emacs-lisp/cl-generic.el | 623 +++++++++++++++++++------------- lisp/emacs-lisp/eieio-compat.el | 54 +-- lisp/emacs-lisp/eieio-core.el | 54 +-- 5 files changed, 502 insertions(+), 305 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cdd4bf8557f..d4bc0af3eff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,53 @@ +2015-03-05 Stefan Monnier + + Replace *-function vars with generic functions in cl-generic. + * emacs-lisp/cl-generic.el (cl--generic-generalizer): New struct. + (cl-generic-tagcode-function, cl-generic-tag-types-function): Remove. + (cl--generic-t-generalizer): New const. + (cl--generic-make-method): Rename from `cl--generic-method-make'. + (cl--generic-make): Change calling convention. + (cl--generic): Add `options' field. + (cl-generic-function-options): New function. + (cl-defgeneric): Rewrite handling of options. Add support for :method + options and allow the use of a default body. + (cl-generic-define): Save options in the corresponding new field. + (cl-defmethod): Fix ordering of qualifiers. + (cl-generic-define-method): Use cl-generic-generalizers. + (cl--generic-get-dispatcher): Change calling convention, and change + calling convention of the returned function as well so as to take the + list of methods separately from the generic function object, so that it + can receive the original generic function object. + (cl--generic-make-next-function): New function, extracted from + cl--generic-make-function. + (cl--generic-make-function): Use it. + (cl-generic-method-combination-function): Remove. + (cl--generic-cyclic-definition): New error. + (cl-generic-call-method): Take a generic function object rather than + its name. + (cl-method-qualifiers): New alias. + (cl--generic-build-combined-method): Use cl-generic-combine-methods, + don't segregate by qualifiers here any more. + (cl--generic-standard-method-combination): Segregate by qualifiers + here instead. Add support for the `:extra' qualifier. + (cl--generic-cache-miss): Move earlier, adjust to new calling convention. + (cl-generic-generalizers, cl-generic-combine-methods): + New generic functions. + (cl-no-next-method, cl-no-applicable-method, cl-no-primary-method): + Use the new "default method in defgeneric" functionality, change + calling convention to receive a generic function object. + (cl--generic-head-used): New var. + (cl--generic-head-generalizer, cl--generic-eql-generalizer) + (cl--generic-struct-generalizer, cl--generic-typeof-generalizer): + New consts. + * emacs-lisp/eieio-core.el (eieio--generic-generalizer) + (eieio--generic-subclass-generalizer): New consts. + (cl-generic-generalizers): New methods. + * emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-generalizer) + (eieio--generic-static-object-generalizer): New consts. + (cl-generic-generalizers) <(head eieio--static)>: New method. + * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): + Unfold closures like lambdas. + 2015-03-04 Filipp Gunbin * autorevert.el (auto-revert-notify-add-watch): @@ -142,8 +192,8 @@ 2015-03-03 Eli Zaretskii * frame.el (frame-notice-user-settings): Refresh the value of - frame parameters after calling tty-handle-reverse-video. Call - face-set-after-frame-default with the actual parameters, to avoid + frame parameters after calling tty-handle-reverse-video. + Call face-set-after-frame-default with the actual parameters, to avoid resetting colors back to unspecified. (set-background-color, set-foreground-color): Pass the foreground and background colors to face-set-after-frame-default. (Bug#19802) @@ -176,8 +226,8 @@ 2015-03-03 Eli Zaretskii - * textmodes/artist.el (artist-ellipse-compute-fill-info): Use - mapcar, not mapc, to create the other half of fill-info. + * textmodes/artist.el (artist-ellipse-compute-fill-info): + Use mapcar, not mapc, to create the other half of fill-info. (Bug#19763) 2015-03-03 Nicolas Petton @@ -323,8 +373,8 @@ Handle "#" operator properly inside macro. Fix coding bug. - * progmodes/cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): On - finding a "#" which looks like the start of a macro, check it + * progmodes/cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): + On finding a "#" which looks like the start of a macro, check it isn't already inside a macro. * progmodes/cc-engine.el (c-state-safe-place): Don't record a new @@ -364,15 +414,15 @@ 2015-02-25 Oleh Krehel - * emacs-lisp/check-declare.el (check-declare-warn): Use - compilation-style warnings. + * emacs-lisp/check-declare.el (check-declare-warn): + Use compilation-style warnings. (check-declare-files): Make sure that `check-declare-warning-buffer' is in `compilation-mode'. 2015-02-25 Oleh Krehel - * emacs-lisp/check-declare.el (check-declare-ext-errors): New - defcustom. + * emacs-lisp/check-declare.el (check-declare-ext-errors): + New defcustom. (check-declare): New defgroup. (check-declare-verify): When `check-declare-ext-errors' is non-nil, warn about an unfound function, instead of saying @@ -380,8 +430,8 @@ 2015-02-25 Tassilo Horn - * textmodes/reftex-vars.el (reftex-include-file-commands): Call - reftex-set-dirty on changes. + * textmodes/reftex-vars.el (reftex-include-file-commands): + Call reftex-set-dirty on changes. 2015-02-25 Stefan Monnier diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 149c4723199..e149f80db8e 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -390,7 +390,7 @@ (and (nth 1 form) (not for-effect) form)) - ((eq 'lambda (car-safe fn)) + ((memq (car-safe fn) '(lambda closure)) (let ((newform (byte-compile-unfold-lambda form))) (if (eq newform form) ;; Some error occurred, avoid infinite recursion diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 99924ba288f..a8483ea1355 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -31,37 +31,51 @@ ;; from a significant problem: the method-combination code returns a sexp ;; that needs to be `eval'uated or compiled. IOW it requires run-time ;; code generation. Given how rarely method-combinations are used, -;; I just provided a cl-generic-method-combination-function, which -;; people can use if they are really desperate for such functionality. +;; I just provided a cl-generic-combine-methods generic function, to which +;; people can add methods if they are really desperate for such functionality. ;; - In defgeneric we don't support the options: -;; declare, :method-combination, :generic-function-class, :method-class, -;; :method. +;; declare, :method-combination, :generic-function-class, :method-class. ;; Added elements: ;; - We support aliases to generic functions. -;; - The kind of thing on which to dispatch can be extended. -;; There is support in this file for dispatch on: +;; - cl-generic-generalizers. This generic function lets you extend the kind +;; of thing on which to dispatch. There is support in this file for +;; dispatch on: ;; - (eql ) +;; - (head ) which checks that the arg is a cons with as its head. ;; - plain old types ;; - type of CL structs ;; eieio-core adds dispatch on: ;; - class of eieio objects ;; - actual class argument, using the syntax (subclass ). -;; - cl-generic-method-combination-function (i.s.o define-method-combination). +;; - cl-generic-combine-methods (i.s.o define-method-combination and +;; compute-effective-method). ;; - cl-generic-call-method (which replaces make-method and call-method). +;; - The standard method combination supports ":extra STRING" qualifiers +;; which simply allows adding more methods for the same +;; specializers&qualifiers. ;; Efficiency considerations: overall, I've made an effort to make this fairly ;; efficient for the expected case (e.g. no constant redefinition of methods). ;; - Generic functions which do not dispatch on any argument are implemented ;; optimally (just as efficient as plain old functions). ;; - Generic functions which only dispatch on one argument are fairly efficient -;; (not a lot of room for improvement, I think). +;; (not a lot of room for improvement without changes to the byte-compiler, +;; I think). ;; - Multiple dispatch is implemented rather naively. There's an extra `apply' ;; function call for every dispatch; we don't optimize each dispatch ;; based on the set of candidate methods remaining; we don't optimize the -;; order in which we performs the dispatches either; If/when this -;; becomes a problem, we can try and optimize it. +;; order in which we performs the dispatches either; +;; If/when this becomes a problem, we can try and optimize it. ;; - call-next-method could be made more efficient, but isn't too terrible. +;; TODO: +;; +;; - A generic "filter" generalizer (e.g. could be used to cleanly adds methods +;; to cl-generic-combine-methods with a specializer that says it applies only +;; when some particular qualifier is used). +;; - A way to dispatch on the context (e.g. the major-mode, some global +;; variable, you name it). + ;;; Code: ;; Note: For generic functions that dispatch on several arguments (i.e. those @@ -70,40 +84,24 @@ ;; often suboptimal since after one dispatch, the remaining dispatches can ;; usually be simplified, or even completely skipped. -;; TODO/FIXME: -;; - WIBNI we could use something like -;; (add-function :before (cl-method-function (cl-find-method ...)) ...) - (eval-when-compile (require 'cl-lib)) (eval-when-compile (require 'pcase)) -(defvar cl-generic-tagcode-function - (lambda (type _name) - (if (eq type t) '(0 . 'cl--generic-type) - (error "Unknown specializer %S" type))) - "Function to get the Elisp code to extract the tag on which we dispatch. -Takes a \"parameter-specializer-name\" and a variable name, and returns -a pair (PRIORITY . CODE) where CODE is an Elisp expression that should be -used to extract the \"tag\" (from the object held in the named variable) -that should uniquely determine if we have a match -\(i.e. the \"tag\" is the value that will be used to dispatch to the proper -method(s)). -Such \"tagcodes\" will be or'd together. -PRIORITY is an integer from 0 to 100 which is used to sort the tagcodes -in the `or'. The higher the priority, the more specific the tag should be. -More specifically, if PRIORITY is N and we have two objects X and Y -whose tag (according to TAGCODE) is `eql', then it should be the case -that for all other (PRIORITY . TAGCODE) where PRIORITY ≤ N, then -\(eval TAGCODE) for X is `eql' to (eval TAGCODE) for Y.") +(cl-defstruct (cl--generic-generalizer + (:constructor nil) + (:constructor cl-generic-make-generalizer + (priority tagcode-function specializers-function))) + (priority nil :type integer) + tagcode-function + specializers-function) -(defvar cl-generic-tag-types-function - (lambda (tag) (if (eq tag 'cl--generic-type) '(t))) - "Function to get the list of types that a given \"tag\" matches. -They should be sorted from most specific to least specific.") +(defconst cl--generic-t-generalizer + (cl-generic-make-generalizer + 0 (lambda (_name) nil) (lambda (_tag) '(t)))) (cl-defstruct (cl--generic-method (:constructor nil) - (:constructor cl--generic-method-make + (:constructor cl--generic-make-method (specializers qualifiers uses-cnm function)) (:predicate nil)) (specializers nil :read-only t :type list) @@ -115,8 +113,7 @@ They should be sorted from most specific to least specific.") (cl-defstruct (cl--generic (:constructor nil) - (:constructor cl--generic-make - (name &optional dispatches method-table)) + (:constructor cl--generic-make (name)) (:predicate nil)) (name nil :type symbol :read-only t) ;Pointer back to the symbol. ;; `dispatches' holds a list of (ARGNUM . TAGCODES) where ARGNUM is the index @@ -125,8 +122,13 @@ They should be sorted from most specific to least specific.") ;; on which to dispatch and PRIORITY is the priority of each expression to ;; decide in which order to sort them. ;; The most important dispatch is last in the list (and the least is first). - (dispatches nil :type (list-of (cons natnum (list-of tagcode)))) - (method-table nil :type (list-of cl--generic-method))) + (dispatches nil :type (list-of (cons natnum (list-of generalizers)))) + (method-table nil :type (list-of cl--generic-method)) + (options nil :type list)) + +(defun cl-generic-function-options (generic) + "Return the options of the generic function GENERIC." + (cl--generic-options generic)) (defmacro cl--generic (name) `(get ,name 'cl--generic)) @@ -170,20 +172,34 @@ is appropriate to use. Specific methods are defined with `cl-defmethod'. With this implementation the ARGS are currently ignored. OPTIONS-AND-METHODS currently understands: - (:documentation DOCSTRING) -- (declare DECLARATIONS)" +- (declare DECLARATIONS) +- (:argument-precedence-order &rest ARGS) +- (:method [QUALIFIERS...] ARGS &rest BODY) +BODY, if present, is used as the body of a default method. + +\(fn NAME ARGS [DOC-STRING] [OPTIONS-AND-METHODS...] &rest BODY)" (declare (indent 2) (doc-string 3)) - (let* ((docprop (assq :documentation options-and-methods)) - (doc (cond ((stringp (car-safe options-and-methods)) - (pop options-and-methods)) - (docprop - (prog1 - (cadr docprop) - (setq options-and-methods - (delq docprop options-and-methods)))))) - (declarations (assq 'declare options-and-methods))) - (when declarations - (setq options-and-methods - (delq declarations options-and-methods))) + (let* ((doc (if (stringp (car-safe options-and-methods)) + (pop options-and-methods))) + (declarations nil) + (methods ()) + (options ()) + next-head) + (while (progn (setq next-head (car-safe (car options-and-methods))) + (or (keywordp next-head) + (eq next-head 'declare))) + (pcase next-head + (`:documentation + (when doc (error "Multiple doc strings for %S" name)) + (setq doc (cadr (pop options-and-methods)))) + (`declare + (when declarations (error "Multiple `declare' for %S" name)) + (setq declarations (pop options-and-methods))) + (`:method (push (cdr (pop options-and-methods)) methods)) + (_ (push (pop options-and-methods) options)))) + (when options-and-methods + ;; Anything remaining is assumed to be a default method body. + (push `(,args ,@options-and-methods) methods)) `(progn ,(when (eq 'setf (car-safe name)) (pcase-let ((`(,setter . ,code) (cl--generic-setf-rewrite @@ -200,8 +216,10 @@ OPTIONS-AND-METHODS currently understands: nil)))) (cdr declarations)) (defalias ',name - (cl-generic-define ',name ',args ',options-and-methods) - ,(help-add-fundoc-usage doc args))))) + (cl-generic-define ',name ',args ',(nreverse options)) + ,(help-add-fundoc-usage doc args)) + ,@(mapcar (lambda (method) `(cl-defmethod ,name ,@method)) + (nreverse methods))))) (defun cl--generic-mandatory-args (args) (let ((res ())) @@ -210,10 +228,10 @@ OPTIONS-AND-METHODS currently understands: (nreverse res))) ;;;###autoload -(defun cl-generic-define (name args options-and-methods) +(defun cl-generic-define (name args options) (let ((generic (cl-generic-ensure-function name)) (mandatory (cl--generic-mandatory-args args)) - (apo (assq :argument-precedence-order options-and-methods))) + (apo (assq :argument-precedence-order options))) (setf (cl--generic-dispatches generic) nil) (when apo (dolist (arg (cdr apo)) @@ -222,6 +240,7 @@ OPTIONS-AND-METHODS currently understands: (push (list (- (length mandatory) (length pos))) (cl--generic-dispatches generic))))) (setf (cl--generic-method-table generic) nil) + (setf (cl--generic-options generic) options) (cl--generic-make-function generic))) (defmacro cl-generic-current-method-specializers () @@ -341,7 +360,7 @@ which case this method will be invoked when the argument is `eql' to VAL. ;; But in practice, it's common to use `cl-defmethod' ;; without a previous `cl-defgeneric'. (declare-function ,name "") - (cl-generic-define-method ',name ',qualifiers ',args + (cl-generic-define-method ',name ',(nreverse qualifiers) ',args ,uses-cnm ,fun))))) (defun cl--generic-member-method (specializers qualifiers methods) @@ -359,28 +378,33 @@ which case this method will be invoked when the argument is `eql' to VAL. (mandatory (cl--generic-mandatory-args args)) (specializers (mapcar (lambda (arg) (if (consp arg) (cadr arg) t)) mandatory)) - (method (cl--generic-method-make + (method (cl--generic-make-method specializers qualifiers uses-cnm function)) (mt (cl--generic-method-table generic)) (me (cl--generic-member-method specializers qualifiers mt)) (dispatches (cl--generic-dispatches generic)) (i 0)) (dolist (specializer specializers) - (let* ((tagcode (funcall cl-generic-tagcode-function specializer 'arg)) + (let* ((generalizers (cl-generic-generalizers specializer)) (x (assq i dispatches))) (unless x - (setq x (list i (funcall cl-generic-tagcode-function t 'arg))) + (setq x (cons i (cl-generic-generalizers t))) (setf (cl--generic-dispatches generic) (setq dispatches (cons x dispatches)))) - (unless (member tagcode (cdr x)) - (setf (cdr x) - (nreverse (sort (cons tagcode (cdr x)) - #'car-less-than-car)))) + (dolist (generalizer generalizers) + (unless (member generalizer (cdr x)) + (setf (cdr x) + (sort (cons generalizer (cdr x)) + (lambda (x y) + (> (cl--generic-generalizer-priority x) + (cl--generic-generalizer-priority y))))))) (setq i (1+ i)))) (if me (setcar me method) (setf (cl--generic-method-table generic) (cons method mt))) (cl-pushnew `(cl-defmethod . (,(cl--generic-name generic) . ,specializers)) current-load-list :test #'equal) + ;; FIXME: Try to avoid re-constructing a new function if the old one + ;; is still valid (e.g. still empty method cache)? (let ((gfun (cl--generic-make-function generic)) ;; Prevent `defalias' from recording this as the definition site of ;; the generic function. @@ -399,62 +423,73 @@ which case this method will be invoked when the argument is `eql' to VAL. (defvar cl--generic-dispatchers (make-hash-table :test #'equal)) -(defun cl--generic-get-dispatcher (tagcodes dispatch-arg) +(defun cl--generic-get-dispatcher (dispatch) (cl--generic-with-memoization - (gethash (cons dispatch-arg tagcodes) cl--generic-dispatchers) - (let ((lexical-binding t) - (tag-exp `(or ,@(mapcar #'cdr - ;; Minor optimization: since this tag-exp is - ;; only used to lookup the method-cache, it - ;; doesn't matter if the default value is some - ;; constant or nil. - (if (macroexp-const-p (car (last tagcodes))) - (butlast tagcodes) - tagcodes)))) - (extraargs ())) + (gethash dispatch cl--generic-dispatchers) + (let* ((dispatch-arg (car dispatch)) + (generalizers (cdr dispatch)) + (lexical-binding t) + (tagcodes + (mapcar (lambda (generalizer) + (funcall (cl--generic-generalizer-tagcode-function + generalizer) + 'arg)) + generalizers)) + (typescodes + (mapcar (lambda (generalizer) + `(funcall ',(cl--generic-generalizer-specializers-function + generalizer) + ,(funcall (cl--generic-generalizer-tagcode-function + generalizer) + 'arg))) + generalizers)) + (tag-exp + ;; Minor optimization: since this tag-exp is + ;; only used to lookup the method-cache, it + ;; doesn't matter if the default value is some + ;; constant or nil. + `(or ,@(if (macroexp-const-p (car (last tagcodes))) + (butlast tagcodes) + tagcodes))) + (extraargs ())) (dotimes (_ dispatch-arg) (push (make-symbol "arg") extraargs)) + ;; FIXME: For generic functions with a single method (or with 2 methods, + ;; one of which always matches), using a tagcode + hash-table is + ;; overkill: better just use a `cl-typep' test. (byte-compile - `(lambda (generic dispatches-left) + `(lambda (generic dispatches-left methods) (let ((method-cache (make-hash-table :test #'eql))) (lambda (,@extraargs arg &rest args) (apply (cl--generic-with-memoization (gethash ,tag-exp method-cache) (cl--generic-cache-miss - generic ',dispatch-arg dispatches-left - (list ,@(mapcar #'cdr tagcodes)))) + generic ',dispatch-arg dispatches-left methods + ,(if (cdr typescodes) + `(append ,@typescodes) (car typescodes)))) ,@extraargs arg args)))))))) (defun cl--generic-make-function (generic) - (let* ((dispatches (cl--generic-dispatches generic)) - (dispatch + (cl--generic-make-next-function generic + (cl--generic-dispatches generic) + (cl--generic-method-table generic))) + +(defun cl--generic-make-next-function (generic dispatches methods) + (let* ((dispatch (progn (while (and dispatches - (member (cdar dispatches) - '(nil ((0 . 'cl--generic-type))))) + (let ((x (nth 1 (car dispatches)))) + ;; No need to dispatch for `t' specializers. + (or (null x) (equal x cl--generic-t-generalizer)))) (setq dispatches (cdr dispatches))) (pop dispatches)))) - (if (null dispatch) - (cl--generic-build-combined-method - (cl--generic-name generic) - (cl--generic-method-table generic)) - (let ((dispatcher (cl--generic-get-dispatcher - (cdr dispatch) (car dispatch)))) - (funcall dispatcher generic dispatches))))) - -(defvar cl-generic-method-combination-function - #'cl--generic-standard-method-combination - "Function to build the effective method. -Called with 2 arguments: NAME and METHOD-ALIST. -It should return an effective method, i.e. a function that expects the same -arguments as the methods, and calls those methods in some appropriate order. -NAME is the name (a symbol) of the corresponding generic function. -METHOD-ALIST is a list of elements (QUALIFIERS . METHODS) where -QUALIFIERS is a list of qualifiers, and METHODS is a list of the selected -methods for that qualifier list. -The METHODS lists are sorted from most generic first to most specific last. -The function can use `cl-generic-call-method' to create functions that call those -methods.") + (if (not (and dispatch + ;; If there's no method left, there's no point checking + ;; further arguments. + methods)) + (cl--generic-build-combined-method generic methods) + (let ((dispatcher (cl--generic-get-dispatcher dispatch))) + (funcall dispatcher generic dispatches methods))))) (defvar cl--generic-combined-method-memoization (make-hash-table :test #'equal :weakness 'value) @@ -463,27 +498,37 @@ This is particularly useful when many different tags select the same set of methods, since this table then allows us to share a single combined-method for all those different tags in the method-cache.") -(defun cl--generic-build-combined-method (generic-name methods) - (cl--generic-with-memoization - (gethash (cons generic-name methods) - cl--generic-combined-method-memoization) - (let ((mets-by-qual ())) - (dolist (method methods) - (let* ((qualifiers (cl--generic-method-qualifiers method)) - (x (assoc qualifiers mets-by-qual))) - ;; FIXME: sadly, alist-get only uses `assq' and we need `assoc'. - ;;(push (cdr qm) (alist-get qualifiers mets-by-qual))) - (if x - (push method (cdr x)) - (push (list qualifiers method) mets-by-qual)))) - (funcall cl-generic-method-combination-function - generic-name mets-by-qual)))) +(define-error 'cl--generic-cyclic-definition "Cyclic definition: %S") + +(defun cl--generic-build-combined-method (generic methods) + (if (null methods) + ;; Special case needed to fix a circularity during bootstrap. + (cl--generic-standard-method-combination generic methods) + (let ((f + (cl--generic-with-memoization + ;; FIXME: Since the fields of `generic' are modified, this + ;; hash-table won't work right, because the hashes will change! + ;; It's not terribly serious, but reduces the effectiveness of + ;; the table. + (gethash (cons generic methods) + cl--generic-combined-method-memoization) + (puthash (cons generic methods) :cl--generic--under-construction + cl--generic-combined-method-memoization) + (condition-case nil + (cl-generic-combine-methods generic methods) + ;; Special case needed to fix a circularity during bootstrap. + (cl--generic-cyclic-definition + (cl--generic-standard-method-combination generic methods)))))) + (if (eq f :cl--generic--under-construction) + (signal 'cl--generic-cyclic-definition + (list (cl--generic-name generic))) + f)))) (defun cl--generic-no-next-method-function (generic method) (lambda (&rest args) (apply #'cl-no-next-method generic method args))) -(defun cl-generic-call-method (generic-name method &optional fun) +(defun cl-generic-call-method (generic method &optional fun) "Return a function that calls METHOD. FUN is the function that should be called when METHOD calls `call-next-method'." @@ -491,7 +536,7 @@ FUN is the function that should be called when METHOD calls (cl--generic-method-function method) (let ((met-fun (cl--generic-method-function method)) (next (or fun (cl--generic-no-next-method-function - generic-name method)))) + generic method)))) (lambda (&rest args) (apply met-fun ;; FIXME: This sucks: passing just `next' would @@ -503,42 +548,122 @@ FUN is the function that should be called when METHOD calls (apply next (or cnm-args args))) args))))) -(defun cl--generic-standard-method-combination (generic-name mets-by-qual) - (dolist (x mets-by-qual) - (unless (member (car x) '(() (:after) (:before) (:around))) - (error "Unsupported qualifiers in function %S: %S" generic-name (car x)))) - (cond - ((null mets-by-qual) - (lambda (&rest args) - (apply #'cl-no-applicable-method generic-name args))) - ((null (alist-get nil mets-by-qual)) - (lambda (&rest args) - (apply #'cl-no-primary-method generic-name args))) - (t - (let* ((fun nil) - (ab-call (lambda (m) (cl-generic-call-method generic-name m))) - (before - (mapcar ab-call (reverse (cdr (assoc '(:before) mets-by-qual))))) - (after (mapcar ab-call (cdr (assoc '(:after) mets-by-qual))))) - (dolist (method (cdr (assoc nil mets-by-qual))) - (setq fun (cl-generic-call-method generic-name method fun))) - (when (or after before) - (let ((next fun)) - (setq fun (lambda (&rest args) - (dolist (bf before) - (apply bf args)) - (prog1 - (apply next args) - (dolist (af after) - (apply af args))))))) - (dolist (method (cdr (assoc '(:around) mets-by-qual))) - (setq fun (cl-generic-call-method generic-name method fun))) - fun)))) +;; Standard CLOS name. +(defalias 'cl-method-qualifiers #'cl--generic-method-qualifiers) + +(defun cl--generic-standard-method-combination (generic methods) + (let ((mets-by-qual ())) + (dolist (method methods) + (let ((qualifiers (cl-method-qualifiers method))) + (if (eq (car qualifiers) :extra) (setq qualifiers (cddr qualifiers))) + (unless (member qualifiers '(() (:after) (:before) (:around))) + (error "Unsupported qualifiers in function %S: %S" + (cl--generic-name generic) qualifiers)) + (push method (alist-get (car qualifiers) mets-by-qual)))) + (cond + ((null mets-by-qual) + (lambda (&rest args) + (apply #'cl-no-applicable-method generic args))) + ((null (alist-get nil mets-by-qual)) + (lambda (&rest args) + (apply #'cl-no-primary-method generic args))) + (t + (let* ((fun nil) + (ab-call (lambda (m) (cl-generic-call-method generic m))) + (before + (mapcar ab-call (reverse (cdr (assoc :before mets-by-qual))))) + (after (mapcar ab-call (cdr (assoc :after mets-by-qual))))) + (dolist (method (cdr (assoc nil mets-by-qual))) + (setq fun (cl-generic-call-method generic method fun))) + (when (or after before) + (let ((next fun)) + (setq fun (lambda (&rest args) + (dolist (bf before) + (apply bf args)) + (prog1 + (apply next args) + (dolist (af after) + (apply af args))))))) + (dolist (method (cdr (assoc :around mets-by-qual))) + (setq fun (cl-generic-call-method generic method fun))) + fun))))) + +(defun cl--generic-cache-miss (generic + dispatch-arg dispatches-left methods-left types) + (let ((methods '())) + (dolist (method methods-left) + (let* ((specializer (or (nth dispatch-arg + (cl--generic-method-specializers method)) + t)) + (m (member specializer types))) + (when m + (push (cons (length m) method) methods)))) + ;; Sort the methods, most specific first. + ;; It would be tempting to sort them once and for all in the method-table + ;; rather than here, but the order might depend on the actual argument + ;; (e.g. for multiple inheritance with defclass). + (setq methods (nreverse (mapcar #'cdr (sort methods #'car-less-than-car)))) + (cl--generic-make-next-function generic dispatches-left methods))) + +(cl-defgeneric cl-generic-generalizers (specializer) + "Return a list of generalizers for a given SPECIALIZER. +To each kind of `specializer', corresponds a `generalizer' which describes +how to extract a \"tag\" from an object which will then let us check if this +object matches the specializer. A typical example of a \"tag\" would be the +type of an object. It's called a `generalizer' because it +takes a specific object and returns a more general approximation, +denoting a set of objects to which it belongs. +A generalizer gives us the chunk of code which the +dispatch function needs to use to extract the \"tag\" of an object, as well +as a function which turns this tag into an ordered list of +`specializers' that this object matches. +The code which extracts the tag should be as fast as possible. +The tags should be chosen according to the following rules: +- The tags should not be too specific: similar objects which match the + same list of specializers should ideally use the same (`eql') tag. + This insures that the cached computation of the applicable + methods for one object can be reused for other objects. +- Corollary: objects which don't match any of the relevant specializers + should ideally all use the same tag (typically nil). + This insures that this cache does not grow unnecessarily large. +- Two different generalizers G1 and G2 should not use the same tag + unless they use it for the same set of objects. IOW, if G1.tag(X1) = + G2.tag(X2) then G1.tag(X1) = G2.tag(X1) = G1.tag(X2) = G2.tag(X2). +- If G1.priority > G2.priority and G1.tag(X1) = G1.tag(X2) and this tag is + non-nil, then you have to make sure that the G2.tag(X1) = G2.tag(X2). + This is because the method-cache is only indexed with the first non-nil + tag (by order of decreasing priority).") + + +(cl-defgeneric cl-generic-combine-methods (generic methods) + "Build the effective method made of METHODS. +It should return a function that expects the same arguments as the methods, and + calls those methods in some appropriate order. +GENERIC is the generic function (mostly used for its name). +METHODS is the list of the selected methods. +The METHODS list is sorted from most specific first to most generic last. +The function can use `cl-generic-call-method' to create functions that call those +methods.") + +;; Temporary definition to let the next defmethod succeed. +(fset 'cl-generic-generalizers + (lambda (_specializer) (list cl--generic-t-generalizer))) +(fset 'cl-generic-combine-methods + #'cl--generic-standard-method-combination) + +(cl-defmethod cl-generic-generalizers (specializer) + "Support for the catch-all `t' specializer." + (if (eq specializer t) (list cl--generic-t-generalizer) + (error "Unknown specializer %S" specializer))) + +(cl-defmethod cl-generic-combine-methods (generic methods) + "Standard support for :after, :before, :around, and `:extra NAME' qualifiers." + (cl--generic-standard-method-combination generic methods)) (defconst cl--generic-nnm-sample (cl--generic-no-next-method-function t t)) (defconst cl--generic-cnm-sample (funcall (cl--generic-build-combined-method - nil (list (cl--generic-method-make () () t #'identity))))) + nil (list (cl--generic-make-method () () t #'identity))))) (defun cl--generic-isnot-nnm-p (cnm) "Return non-nil if CNM is the function that calls `cl-no-next-method'." @@ -566,24 +691,6 @@ FUN is the function that should be called when METHOD calls (setq cnm-env (cdr cnm-env))))) (error "Haven't found no-next-method-sample in cnm-sample"))) -(defun cl--generic-cache-miss (generic dispatch-arg dispatches-left tags) - (let ((types (apply #'append (mapcar cl-generic-tag-types-function tags))) - (methods '())) - (dolist (method (cl--generic-method-table generic)) - (let* ((specializer (or (nth dispatch-arg - (cl--generic-method-specializers method)) - t)) - (m (member specializer types))) - (when m - (push (cons (length m) method) methods)))) - ;; Sort the methods, most specific first. - ;; It would be tempting to sort them once and for all in the method-table - ;; rather than here, but the order might depend on the actual argument - ;; (e.g. for multiple inheritance with defclass). - (setq methods (nreverse (mapcar #'cdr (sort methods #'car-less-than-car)))) - (cl--generic-make-function (cl--generic-make (cl--generic-name generic) - dispatches-left methods)))) - ;;; Define some pre-defined generic functions, used internally. (define-error 'cl-no-method "No method for %S") @@ -593,19 +700,16 @@ FUN is the function that should be called when METHOD calls 'cl-no-method) (cl-defgeneric cl-no-next-method (generic method &rest args) - "Function called when `cl-call-next-method' finds no next method.") -(cl-defmethod cl-no-next-method (generic method &rest args) - (signal 'cl-no-next-method `(,generic ,method ,@args))) + "Function called when `cl-call-next-method' finds no next method." + (signal 'cl-no-next-method `(,(cl--generic-name generic) ,method ,@args))) (cl-defgeneric cl-no-applicable-method (generic &rest args) - "Function called when a method call finds no applicable method.") -(cl-defmethod cl-no-applicable-method (generic &rest args) - (signal 'cl-no-applicable-method `(,generic ,@args))) + "Function called when a method call finds no applicable method." + (signal 'cl-no-applicable-method `(,(cl--generic-name generic) ,@args))) (cl-defgeneric cl-no-primary-method (generic &rest args) - "Function called when a method call finds no primary method.") -(cl-defmethod cl-no-primary-method (generic &rest args) - (signal 'cl-no-primary-method `(,generic ,@args))) + "Function called when a method call finds no primary method." + (signal 'cl-no-primary-method `(,(cl--generic-name generic) ,@args))) (defun cl-call-next-method (&rest _args) "Function to call the next applicable method. @@ -700,27 +804,57 @@ Can only be used from within the lexical body of a primary or around method." (insert "'.\n"))) (insert "\n" (or (nth 2 info) "Undocumented") "\n\n"))))))) +;;; Support for (head ) specializers. + +;; For both the `eql' and the `head' specializers, the dispatch +;; is unsatisfactory. Basically, in the "common&fast case", we end up doing +;; +;; (let ((tag (gethash value ))) +;; (funcall (gethash tag ))) +;; +;; whereas we'd like to just do +;; +;; (funcall (gethash value ))) +;; +;; but the problem is that the method-cache is normally "open ended", so +;; a nil means "not computed yet" and if we bump into it, we dutifully fill the +;; corresponding entry, whereas we'd want to just fallback on some default +;; effective method (so as not to fill the cache with lots of redundant +;; entries). + +(defvar cl--generic-head-used (make-hash-table :test #'eql)) + +(defconst cl--generic-head-generalizer + (cl-generic-make-generalizer + 80 (lambda (name) `(gethash (car-safe ,name) cl--generic-head-used)) + (lambda (tag) (if (eq (car-safe tag) 'head) (list tag))))) + +(cl-defmethod cl-generic-generalizers :extra "head" (specializer) + "Support for the `(head VAL)' specializers." + ;; We have to implement `head' here using the :extra qualifier, + ;; since we can't use the `head' specializer to implement itself. + (if (not (eq (car-safe specializer) 'head)) + (cl-call-next-method) + (cl--generic-with-memoization + (gethash (cadr specializer) cl--generic-head-used) specializer) + (list cl--generic-head-generalizer))) + ;;; Support for (eql ) specializers. (defvar cl--generic-eql-used (make-hash-table :test #'eql)) -(add-function :before-until cl-generic-tagcode-function - #'cl--generic-eql-tagcode) -(defun cl--generic-eql-tagcode (type name) - (when (eq (car-safe type) 'eql) - (puthash (cadr type) type cl--generic-eql-used) - `(100 . (gethash ,name cl--generic-eql-used)))) +(defconst cl--generic-eql-generalizer + (cl-generic-make-generalizer + 100 (lambda (name) `(gethash ,name cl--generic-eql-used)) + (lambda (tag) (if (eq (car-safe tag) 'eql) (list tag))))) -(add-function :before-until cl-generic-tag-types-function - #'cl--generic-eql-tag-types) -(defun cl--generic-eql-tag-types (tag) - (if (eq (car-safe tag) 'eql) (list tag))) +(cl-defmethod cl-generic-generalizers ((specializer (head eql))) + "Support for the `(eql VAL)' specializers." + (puthash (cadr specializer) specializer cl--generic-eql-used) + (list cl--generic-eql-generalizer)) ;;; Support for cl-defstructs specializers. -(add-function :before-until cl-generic-tagcode-function - #'cl--generic-struct-tagcode) - (defun cl--generic-struct-tag (name) `(and (vectorp ,name) (> (length ,name) 0) @@ -728,41 +862,46 @@ Can only be used from within the lexical body of a primary or around method." (if (eq (symbol-function tag) :quick-object-witness-check) tag)))) -(defun cl--generic-struct-tagcode (type name) - (and (symbolp type) - (get type 'cl-struct-type) - (or (null (car (get type 'cl-struct-type))) - (error "Can't dispatch on cl-struct %S: type is %S" - type (car (get type 'cl-struct-type)))) - (or (equal '(cl-tag-slot) (car (get type 'cl-struct-slots))) - (error "Can't dispatch on cl-struct %S: no tag in slot 0" - type)) - ;; It's tempting to use (and (vectorp ,name) (aref ,name 0)) - ;; but that would suffer from some problems: - ;; - the vector may have size 0. - ;; - when called on an actual vector (rather than an object), we'd - ;; end up returning an arbitrary value, possibly colliding with - ;; other tagcode's values. - ;; - it can also result in returning all kinds of irrelevant - ;; values which would end up filling up the method-cache with - ;; lots of irrelevant/redundant entries. - ;; FIXME: We could speed this up by introducing a dedicated - ;; vector type at the C level, so we could do something like - ;; (and (vector-objectp ,name) (aref ,name 0)) - `(50 . ,(cl--generic-struct-tag name)))) - -(add-function :before-until cl-generic-tag-types-function - #'cl--generic-struct-tag-types) -(defun cl--generic-struct-tag-types (tag) - ;; FIXME: cl-defstruct doesn't make it easy for us. +(defun cl--generic-struct-specializers (tag) (and (symbolp tag) ;; A method call shouldn't itself mess with the match-data. (string-match-p "\\`cl-struct-\\(.*\\)" (symbol-name tag)) (let ((types (list (intern (substring (symbol-name tag) 10))))) - (while (get (car types) 'cl-struct-include) - (push (get (car types) 'cl-struct-include) types)) - (push 'cl-structure-object types) ;The "parent type" of all cl-structs. - (nreverse types)))) + (while (get (car types) 'cl-struct-include) + (push (get (car types) 'cl-struct-include) types)) + (push 'cl-structure-object types) ;The "parent type" of all cl-structs. + (nreverse types)))) + +(defconst cl--generic-struct-generalizer + (cl-generic-make-generalizer + 50 #'cl--generic-struct-tag + #'cl--generic-struct-specializers)) + +(cl-defmethod cl-generic-generalizers :extra "cl-struct" (type) + "Support for dispatch on cl-struct types." + (or + (and (symbolp type) + (get type 'cl-struct-type) + (or (null (car (get type 'cl-struct-type))) + (error "Can't dispatch on cl-struct %S: type is %S" + type (car (get type 'cl-struct-type)))) + (or (equal '(cl-tag-slot) (car (get type 'cl-struct-slots))) + (error "Can't dispatch on cl-struct %S: no tag in slot 0" + type)) + ;; It's tempting to use (and (vectorp ,name) (aref ,name 0)) + ;; but that would suffer from some problems: + ;; - the vector may have size 0. + ;; - when called on an actual vector (rather than an object), we'd + ;; end up returning an arbitrary value, possibly colliding with + ;; other tagcode's values. + ;; - it can also result in returning all kinds of irrelevant + ;; values which would end up filling up the method-cache with + ;; lots of irrelevant/redundant entries. + ;; FIXME: We could speed this up by introducing a dedicated + ;; vector type at the C level, so we could do something like + ;; (and (vector-objectp ,name) (aref ,name 0)) + (list cl--generic-struct-generalizer)) + (cl-call-next-method))) ;;; Dispatch on "system types". @@ -784,23 +923,23 @@ Can only be used from within the lexical body of a primary or around method." (sequence) (number))) -(add-function :before-until cl-generic-tagcode-function - #'cl--generic-typeof-tagcode) -(defun cl--generic-typeof-tagcode (type name) +(defconst cl--generic-typeof-generalizer + (cl-generic-make-generalizer + ;; FIXME: We could also change `type-of' to return `null' for nil. + 10 (lambda (name) `(if ,name (type-of ,name) 'null)) + (lambda (tag) (and (symbolp tag) (assq tag cl--generic-typeof-types))))) + +(cl-defmethod cl-generic-generalizers :extra "typeof" (type) + "Support for dispatch on builtin types." ;; FIXME: Add support for other types accepted by `cl-typep' such ;; as `character', `atom', `face', `function', ... - (and (assq type cl--generic-typeof-types) - (progn - (if (memq type '(vector array sequence)) - (message "`%S' also matches CL structs and EIEIO classes" type)) - ;; FIXME: We could also change `type-of' to return `null' for nil. - `(10 . (if ,name (type-of ,name) 'null))))) - -(add-function :before-until cl-generic-tag-types-function - #'cl--generic-typeof-types) -(defun cl--generic-typeof-types (tag) - (and (symbolp tag) - (assq tag cl--generic-typeof-types))) + (or + (and (assq type cl--generic-typeof-types) + (progn + (if (memq type '(vector array sequence)) + (message "`%S' also matches CL structs and EIEIO classes" type)) + (list cl--generic-typeof-generalizer))) + (cl-call-next-method))) ;;; Just for kicks: dispatch on major-mode ;; @@ -814,7 +953,7 @@ Can only be used from within the lexical body of a primary or around method." ;; (defvar cl--generic-major-modes (make-hash-table :test #'eq)) ;; -;; (add-function :before-until cl-generic-tagcode-function +;; (add-function :before-until cl-generic-generalizer-function ;; #'cl--generic-major-mode-tagcode) ;; (defun cl--generic-major-mode-tagcode (type name) ;; (if (eq 'major-mode (car-safe type)) diff --git a/lisp/emacs-lisp/eieio-compat.el b/lisp/emacs-lisp/eieio-compat.el index 7468c040e10..ee8e731b043 100644 --- a/lisp/emacs-lisp/eieio-compat.el +++ b/lisp/emacs-lisp/eieio-compat.el @@ -124,30 +124,38 @@ Summary: (defgeneric ,method ,args) (eieio--defmethod ',method ',key ',class #',code)))) -(add-function :before-until cl-generic-tagcode-function - #'eieio--generic-static-tagcode) -(defun eieio--generic-static-tagcode (type name) - (and (eq 'eieio--static (car-safe type)) - `(40 . (cond - ((symbolp ,name) (eieio--class-v ,name)) - ((vectorp ,name) (aref ,name 0)))))) +(defconst eieio--generic-static-symbol-generalizer + (cl-generic-make-generalizer + ;; Give it a slightly higher priority than `subclass' so that the + ;; interleaved list comes before subclass's non-interleaved list. + 61 (lambda (name) `(and (symbolp ,name) (eieio--class-v ,name))) + (lambda (tag) + (when (eieio--class-p tag) + (let ((superclasses (eieio--generic-subclass-specializers tag)) + (specializers ())) + (dolist (superclass superclasses) + (push superclass specializers) + (push `(eieio--static ,(cadr superclass)) specializers)) + (nreverse specializers)))))) +(defconst eieio--generic-static-object-generalizer + (cl-generic-make-generalizer + ;; Give it a slightly higher priority than `class' so that the + ;; interleaved list comes before the class's non-interleaved list. + 51 #'cl--generic-struct-tag + (lambda (tag) + (and (symbolp tag) (boundp tag) (setq tag (symbol-value tag)) + (eieio--class-p tag) + (let ((superclasses (eieio--class-precedence-list tag)) + (specializers ())) + (dolist (superclass superclasses) + (setq superclass (eieio--class-symbol superclass)) + (push superclass specializers) + (push `(eieio--static ,superclass) specializers)) + (nreverse specializers)))))) -(add-function :around cl-generic-tag-types-function - #'eieio--generic-static-tag-types) -(defun eieio--generic-static-tag-types (orig-fun tag) - (cond - ((or (eieio--class-p tag) - (and (symbolp tag) (boundp tag) (eieio--class-p (symbol-value tag)))) - (let ((superclasses (funcall orig-fun tag)) - (types ())) - ;; Interleave: (subclass ) (eieio--static ) ) .. - (dolist (superclass superclasses) - (push superclass types) - (push `(eieio--static - ,(if (consp superclass) (cadr superclass) superclass)) - types)) - (nreverse types))) - (t (funcall orig-fun tag)))) +(cl-defmethod cl-generic-generalizers ((_specializer (head eieio--static))) + (list eieio--generic-static-symbol-generalizer + eieio--generic-static-object-generalizer)) ;;;###autoload (defun eieio--defgeneric-init-form (method doc-string) diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 408922a2daa..1e226c154e2 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -1203,25 +1203,26 @@ method invocation orders of the involved classes." ;;;; General support to dispatch based on the type of the argument. -(add-function :before-until cl-generic-tagcode-function - #'eieio--generic-tagcode) -(defun eieio--generic-tagcode (type name) +(defconst eieio--generic-generalizer + (cl-generic-make-generalizer + ;; Use the exact same tagcode as for cl-struct, so that methods + ;; that dispatch on both kinds of objects get to share this + ;; part of the dispatch code. + 50 #'cl--generic-struct-tag + (lambda (tag) + (and (symbolp tag) (boundp tag) (eieio--class-p (symbol-value tag)) + (mapcar #'eieio--class-symbol + (eieio--class-precedence-list (symbol-value tag))))))) + +(cl-defmethod cl-generic-generalizers :extra "class" (specializer) ;; CLHS says: ;; A class must be defined before it can be used as a parameter ;; specializer in a defmethod form. ;; So we can ignore types that are not known to denote classes. - (and (eieio--class-p (eieio--class-object type)) - ;; Use the exact same code as for cl-struct, so that methods - ;; that dispatch on both kinds of objects get to share this - ;; part of the dispatch code. - `(50 . ,(cl--generic-struct-tag name)))) - -(add-function :before-until cl-generic-tag-types-function - #'eieio--generic-tag-types) -(defun eieio--generic-tag-types (tag) - (and (symbolp tag) (boundp tag) (eieio--class-p (symbol-value tag)) - (mapcar #'eieio--class-symbol - (eieio--class-precedence-list (symbol-value tag))))) + (or + (and (eieio--class-p (eieio--class-object specializer)) + (list eieio--generic-generalizer)) + (cl-call-next-method))) ;;;; Dispatch for arguments which are classes. @@ -1231,23 +1232,22 @@ method invocation orders of the involved classes." ;; would not make much sense (e.g. to which argument should it apply?). ;; Instead, we add a new "subclass" specializer. -(add-function :before-until cl-generic-tagcode-function - #'eieio--generic-subclass-tagcode) -(defun eieio--generic-subclass-tagcode (type name) - (when (eq 'subclass (car-safe type)) - `(60 . (and (symbolp ,name) (eieio--class-v ,name))))) - -(add-function :before-until cl-generic-tag-types-function - #'eieio--generic-subclass-tag-types) -(defun eieio--generic-subclass-tag-types (tag) +(defun eieio--generic-subclass-specializers (tag) (when (eieio--class-p tag) (mapcar (lambda (class) - `(subclass - ,(if (symbolp class) class (eieio--class-symbol class)))) + `(subclass ,(eieio--class-symbol class))) (eieio--class-precedence-list tag)))) +(defconst eieio--generic-subclass-generalizer + (cl-generic-make-generalizer + 60 (lambda (name) `(and (symbolp ,name) (eieio--class-v ,name))) + #'eieio--generic-subclass-specializers)) + +(cl-defmethod cl-generic-generalizers ((_specializer (head subclass))) + (list eieio--generic-subclass-generalizer)) + -;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "5b04c9a8fff2bd3f3d3ac54aba0f65b7") +;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "25a66814a400e7dea16bf0f3bfe245ed") ;;; Generated autoloads from eieio-compat.el (autoload 'eieio--defalias "eieio-compat" "\ From 77ab7f84550993b44550879e10cd917b7bf02d04 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Thu, 5 Mar 2015 04:33:36 +0200 Subject: [PATCH 231/457] Teach js-mode about ES6 template strings * lisp/progmodes/js.el (js-mode-syntax-table): Add an entry for `. --- lisp/ChangeLog | 4 ++++ lisp/progmodes/js.el | 1 + test/indent/js.js | 3 +++ 3 files changed, 8 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d4bc0af3eff..3486c3806fd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-05 Dmitry Gutov + + * progmodes/js.el (js-mode-syntax-table): Add an entry for `. + 2015-03-05 Stefan Monnier Replace *-function vars with generic functions in cl-generic. diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index c25e52cdc6a..d7712e4c49e 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -534,6 +534,7 @@ getting timeout messages." (let ((table (make-syntax-table))) (c-populate-syntax-table table) (modify-syntax-entry ?$ "_" table) + (modify-syntax-entry ?` "\"" table) table) "Syntax table for `js-mode'.") diff --git a/test/indent/js.js b/test/indent/js.js index 2d458e1b769..d330fa06d5b 100644 --- a/test/indent/js.js +++ b/test/indent/js.js @@ -60,3 +60,6 @@ var evens = [e for each (e in range(0, 21)) a++ b += c + +baz(`http://foo.bar/${tee}`) + .qux(); From 17ecfea3b904c4676a52dd9d2ea33c8c3e13b870 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Thu, 5 Mar 2015 13:25:53 +0000 Subject: [PATCH 232/457] package.el (package-refresh-contents): Update doc. --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/package.el | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3486c3806fd..1f54617b4d4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-05 Artur Malabarba + + * emacs-lisp/package.el (package-refresh-contents): Update doc. + 2015-03-05 Dmitry Gutov * progmodes/js.el (js-mode-syntax-table): Add an entry for `. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 885fb00ce75..00608f3d2c7 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1695,9 +1695,10 @@ similar to an entry in `package-alist'. Save the cached copy to ;;;###autoload (defun package-refresh-contents () - "Download the ELPA archive description if needed. -This informs Emacs about the latest versions of all packages, and -makes them available for download." + "Download the description of all configured ELPAs. +For each archive configured in the variable `package-archives', +this informs Emacs about the latest versions of all packages it +offers, and makes them available for download." (interactive) ;; FIXME: Do it asynchronously. (unless (file-exists-p package-user-dir) From 6065fbe0d212857ecfa58e8a64fc4af3913c24e9 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Thu, 5 Mar 2015 13:37:23 +0000 Subject: [PATCH 233/457] desktop.el (desktop-buffer-info): Write docstring. --- lisp/ChangeLog | 2 ++ lisp/desktop.el | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f54617b4d4..d810ee8ce59 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2015-03-05 Artur Malabarba + * desktop.el (desktop-buffer-info): Write docstring. + * emacs-lisp/package.el (package-refresh-contents): Update doc. 2015-03-05 Dmitry Gutov diff --git a/lisp/desktop.el b/lisp/desktop.el index b85d8b257a5..8d151a74698 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -756,6 +756,24 @@ is nil, ask the user where to save the desktop." ;; ---------------------------------------------------------------------------- (defun desktop-buffer-info (buffer) + "Return information describing BUFFER. +This function is not pure, as BUFFER is made current with +`set-buffer'. + +Returns a list of all the necessary information to recreate the +buffer, which is (in order): + + `uniquify-buffer-base-name'; + `buffer-file-name'; + `buffer-name'; + `major-mode'; + list of minor-modes,; + `point'; + `mark'; + `buffer-read-only'; + auxiliary information given by `desktop-save-buffer'; + local variables; + auxiliary information given by `desktop-var-serdes-funs'." (set-buffer buffer) (list ;; base name of the buffer; replaces the buffer name if managed by uniquify From 61e06b6cb23a719ad77ab3924beb3a0c21e9c2e9 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Thu, 5 Mar 2015 13:43:27 +0000 Subject: [PATCH 234/457] desktop.el (desktop-buffer-info): Use `pushnew'. --- lisp/ChangeLog | 2 ++ lisp/desktop.el | 17 +++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d810ee8ce59..ef010d46093 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,8 @@ 2015-03-05 Artur Malabarba * desktop.el (desktop-buffer-info): Write docstring. + (desktop-buffer-info): Use `pushnew' instead of `add-to-list' and + unquote lamda. * emacs-lisp/package.el (package-refresh-contents): Update doc. diff --git a/lisp/desktop.el b/lisp/desktop.el index 8d151a74698..3eca5a6a774 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -784,16 +784,13 @@ buffer, which is (in order): major-mode ;; minor modes (let (ret) - (mapc - #'(lambda (minor-mode) - (and (boundp minor-mode) - (symbol-value minor-mode) - (let* ((special (assq minor-mode desktop-minor-mode-table)) - (value (cond (special (cadr special)) - ((functionp minor-mode) minor-mode)))) - (when value (add-to-list 'ret value))))) - (mapcar #'car minor-mode-alist)) - ret) + (dolist (minor-mode (mapcar #'car minor-mode-alist) ret) + (and (boundp minor-mode) + (symbol-value minor-mode) + (let* ((special (assq minor-mode desktop-minor-mode-table)) + (value (cond (special (cadr special)) + ((functionp minor-mode) minor-mode)))) + (when value (cl-pushnew value ret)))))) ;; point and mark, and read-only status (point) (list (mark t) mark-active) From 1be3bd0ad86644e091ba655a6b8d592c395701ad Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 5 Mar 2015 18:56:43 +0200 Subject: [PATCH 235/457] Fix region extension when scroll bar is on the right src/keyboard.c (make_lispy_position): When the click is on the right-side vertical scroll bar, pass the rightmost X coordinate to buffer_posn_from_coords, so that the returned text position reflects the closest point to the click. Fixes region extension when mouse moves outside the Emacs frame that has scroll bars on the right. --- src/ChangeLog | 9 +++++++++ src/keyboard.c | 15 +++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index cfef5c46d1a..ae827cb4416 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2015-03-05 Eli Zaretskii + + * keyboard.c (make_lispy_position): When the click is on the + right-side vertical scroll bar, pass the rightmost X coordinate to + buffer_posn_from_coords, so that the returned text position + reflects the closest point to the click. Fixes region extension + when mouse moves outside the Emacs frame that has scroll bars on + the right. + 2015-03-04 Martin Rudalics * frame.c (x_set_font): Try to keep frame height and width diff --git a/src/keyboard.c b/src/keyboard.c index e1c5691324d..bf65df1584c 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -5360,9 +5360,9 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y, dy = yret = wy; } - /* For clicks in the text area, fringes, or margins, call - buffer_posn_from_coords to extract TEXTPOS, the buffer - position nearest to the click. */ + /* For clicks in the text area, fringes, margins, or vertical + scroll bar, call buffer_posn_from_coords to extract TEXTPOS, + the buffer position nearest to the click. */ if (!textpos) { Lisp_Object string2, object2 = Qnil; @@ -5370,11 +5370,14 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y, int dx2, dy2; int width2, height2; /* The pixel X coordinate passed to buffer_posn_from_coords - is the X coordinate relative to the text area for - text-area and right-margin clicks, zero otherwise. */ + is the X coordinate relative to the text area for clicks + in text-area, right-margin/fringe and right-side vertical + scroll bar, zero otherwise. */ int x2 = (part == ON_TEXT) ? xret - : (part == ON_RIGHT_FRINGE || part == ON_RIGHT_MARGIN) + : (part == ON_RIGHT_FRINGE || part == ON_RIGHT_MARGIN + || (part == ON_VERTICAL_SCROLL_BAR + && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))) ? (XINT (x) - window_box_left (w, TEXT_AREA)) : 0; int y2 = wy; From cbc9d8d4269f2cca7950060b5e37747b27dac1de Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 5 Mar 2015 11:58:56 -0800 Subject: [PATCH 236/457] Work around x86 glibc backtrace bug * sysdep.c (emacs_backtrace): Don't dump core on x86. Fixes: bug#19959 --- src/ChangeLog | 6 ++++++ src/sysdep.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index ae827cb4416..6b658f51671 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-03-05 Paul Eggert + + Work around x86 glibc backtrace bug + * sysdep.c (emacs_backtrace): Don't dump core on x86. + Fixes: bug#19959 + 2015-03-05 Eli Zaretskii * keyboard.c (make_lispy_position): When the click is on the diff --git a/src/sysdep.c b/src/sysdep.c index cb361ec2dc5..0a0b0ac01d0 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2174,6 +2174,14 @@ emacs_backtrace (int backtrace_limit) else { buffer = main_backtrace_buffer; + + /* Work around 'backtrace' bug; see Bug#19959 and glibc bug#18084. */ + if (bounded_limit < 0) + { + backtrace (buffer, 1); + return; + } + npointers = backtrace (buffer, bounded_limit + 1); } From b08f8bb06a012b46cb932762b002a48c6efe5396 Mon Sep 17 00:00:00 2001 From: Ivan Shmakov Date: Thu, 5 Mar 2015 23:26:34 +0100 Subject: [PATCH 237/457] Render application/xhtml+xml as HTML Fixes: debbugs:20009 * lisp/net/eww.el (eww-html-p): New function. (eww-render): Use it. --- lisp/ChangeLog | 5 +++++ lisp/net/eww.el | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef010d46093..0f905e65711 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-05 Ivan Shmakov + + * net/eww.el (eww-html-p): New function (bug#20009). + (eww-render): Use it. + 2015-03-05 Artur Malabarba * desktop.el (desktop-buffer-info): Write docstring. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 577cd41e30a..a128ffb9d06 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -306,6 +306,12 @@ See the `eww-search-prefix' variable for the search engine used." (interactive "r") (eww (buffer-substring beg end))) +(defun eww-html-p (content-type) + "Return non-nil if CONTENT-TYPE designates an HTML content type. +Currently this means either text/html or application/xhtml+xml." + (member content-type '("text/html" + "application/xhtml+xml"))) + (defun eww-render (status url &optional point buffer encode) (let ((redirect (plist-get status :redirect))) (when redirect @@ -318,8 +324,7 @@ See the `eww-search-prefix' variable for the search engine used." (charset (intern (downcase (or (cdr (assq 'charset (cdr content-type))) - (eww-detect-charset (equal (car content-type) - "text/html")) + (eww-detect-charset (eww-html-p (car content-type))) "utf-8")))) (data-buffer (current-buffer))) ;; Save the https peer status. @@ -332,7 +337,7 @@ See the `eww-search-prefix' variable for the search engine used." (string-match-p eww-use-external-browser-for-content-type (car content-type))) (eww-browse-with-external-browser url)) - ((equal (car content-type) "text/html") + ((eww-html-p (car content-type)) (eww-display-html charset url nil point buffer encode)) ((equal (car content-type) "application/pdf") (eww-display-pdf)) From bfebebbc72c6a6ea375c6e8ed7f8641b25439770 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Thu, 5 Mar 2015 21:53:37 -0500 Subject: [PATCH 238/457] Fix EUDC LDAP duplicate mail handling Fixes: debbugs:17720 * net/eudcb-ldap.el (eudc-ldap-cleanup-record-simple): Mark as obsolete. (eudc-ldap-cleanup-record-filtering-addresses): Add docstring. Don't clean up postal addresses if ldap-ignore-attribute-codings is set. Combine mail addresses into one field. (Bug#17720) (eudc-ldap-simple-query-internal): Call eudc-ldap-cleanup-record-filtering-addresses instead of eudc-ldap-cleanup-record-simple. (eudc-ldap-get-field-list): Likewise. --- lisp/ChangeLog | 12 ++++++++++ lisp/net/eudcb-ldap.el | 53 ++++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f905e65711..edea71cda52 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2015-03-06 Thomas Fitzsimmons + + * net/eudcb-ldap.el (eudc-ldap-cleanup-record-simple): Mark as + obsolete. + (eudc-ldap-cleanup-record-filtering-addresses): Add docstring. + Don't clean up postal addresses if ldap-ignore-attribute-codings + is set. Combine mail addresses into one field. (Bug#17720) + (eudc-ldap-simple-query-internal): Call + eudc-ldap-cleanup-record-filtering-addresses instead of + eudc-ldap-cleanup-record-simple. + (eudc-ldap-get-field-list): Likewise. + 2015-03-05 Ivan Shmakov * net/eww.el (eww-html-p): New function (bug#20009). diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index 1d426a7b7b0..d22dff615ee 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el @@ -74,13 +74,10 @@ (defun eudc-ldap-cleanup-record-simple (record) "Do some cleanup in a RECORD to make it suitable for EUDC." + (declare (obsolete eudc-ldap-cleanup-record-filtering-addresses "25.1")) (mapcar (function (lambda (field) - ;; Some servers return case-sensitive names (e.g. givenName - ;; instead of givenname); downcase the field's name so that it - ;; can be matched against - ;; eudc-ldap-attributes-translation-alist. (cons (intern (downcase (car field))) (if (cdr (cdr field)) (cdr field) @@ -90,22 +87,36 @@ (defun eudc-filter-$ (string) (mapconcat 'identity (split-string string "\\$") "\n")) -;; Cleanup a LDAP record to make it suitable for EUDC: -;; Make the record a cons-cell instead of a list if it is single-valued -;; Filter the $ character in addresses into \n if not done by the LDAP lib (defun eudc-ldap-cleanup-record-filtering-addresses (record) - (mapcar - (function - (lambda (field) + "Clean up RECORD to make it suitable for EUDC. +Make the record a cons-cell instead of a list if it is +single-valued. Change the `$' character in postal addresses to a +newline. Combine separate mail fields into one mail field with +multiple addresses." + (let ((clean-up-addresses (or (not (boundp 'ldap-ignore-attribute-codings)) + (not ldap-ignore-attribute-codings))) + result mail-addresses) + (dolist (field record) + ;; Some servers return case-sensitive names (e.g. givenName + ;; instead of givenname); downcase the field's name so that it + ;; can be matched against + ;; eudc-ldap-attributes-translation-alist. (let ((name (intern (downcase (car field)))) (value (cdr field))) - (if (memq name '(postaladdress registeredaddress)) - (setq value (mapcar 'eudc-filter-$ value))) - (cons name - (if (cdr value) - value - (car value)))))) - record)) + (when (and clean-up-addresses + (memq name '(postaladdress registeredaddress))) + (setq value (mapcar 'eudc-filter-$ value))) + (if (eq name 'mail) + (setq mail-addresses (append mail-addresses value)) + (push (cons name (if (cdr value) + value + (car value))) + result)))) + (push (cons 'mail (if (cdr mail-addresses) + mail-addresses + (car mail-addresses))) + result) + (nreverse result))) (defun eudc-ldap-simple-query-internal (query &optional return-attrs) "Query the LDAP server with QUERY. @@ -118,11 +129,7 @@ RETURN-ATTRS is a list of attributes to return, defaulting to (if (listp return-attrs) (mapcar 'symbol-name return-attrs)))) final-result) - (if (or (not (boundp 'ldap-ignore-attribute-codings)) - ldap-ignore-attribute-codings) - (setq result - (mapcar 'eudc-ldap-cleanup-record-filtering-addresses result)) - (setq result (mapcar 'eudc-ldap-cleanup-record-simple result))) + (setq result (mapcar 'eudc-ldap-cleanup-record-filtering-addresses result)) (if (and eudc-strict-return-matches return-attrs @@ -148,7 +155,7 @@ attribute names are returned. Default to `person'" (let ((ldap-host-parameters-alist (list (cons eudc-server '(scope subtree sizelimit 1))))) - (mapcar 'eudc-ldap-cleanup-record-simple + (mapcar 'eudc-ldap-cleanup-record-filtering-addresses (ldap-search (eudc-ldap-format-query-as-rfc1558 (list (cons "objectclass" From 20c6b227ea69b9cd47f92d1a7e0935312e8ce83c Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Fri, 6 Mar 2015 17:18:45 +0100 Subject: [PATCH 239/457] browse-url-firefox: removed MS-Windows limitations net/browse-url.el (browse-url-firefox): Removed outdated MS-Windows limitations. --- lisp/ChangeLog | 5 +++++ lisp/net/browse-url.el | 17 +++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index edea71cda52..c81ab9b6d22 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-06 Oscar Fuentes + + * net/browse-url.el (browse-url-firefox): Removed outdated + MS-Windows limitations. + 2015-03-06 Thomas Fitzsimmons * net/eudcb-ldap.el (eudc-ldap-cleanup-record-simple): Mark as diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 4c8ebf01588..5e61c094c2e 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -1117,11 +1117,7 @@ whenever a document would otherwise be loaded in a new window, it is loaded in a new tab in an existing window instead. Non-interactively, this uses the optional second argument NEW-WINDOW -instead of `browse-url-new-window-flag'. - -On MS Windows, this ignores `browse-url-new-window-flag' and -`browse-url-firefox-new-window-is-tab', as well as the NEW-WINDOW argument. -It always uses a new window." +instead of `browse-url-new-window-flag'." (interactive (browse-url-interactive-arg "URL: ")) (setq url (browse-url-encode-url url)) (let* ((process-environment (browse-url-process-environment))) @@ -1130,13 +1126,10 @@ It always uses a new window." browse-url-firefox-program (append browse-url-firefox-arguments - ;; FIXME someone should check if this limitation - ;; still applies. - (unless (memq system-type '(windows-nt ms-dos)) - (if (browse-url-maybe-new-window new-window) - (if browse-url-firefox-new-window-is-tab - '("-new-tab") - '("-new-window")))) + (if (browse-url-maybe-new-window new-window) + (if browse-url-firefox-new-window-is-tab + '("-new-tab") + '("-new-window"))) (list url))))) ;;;###autoload From e1acc3c7efb805d659f9edf345fc18a4647df538 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 6 Mar 2015 15:41:09 -0800 Subject: [PATCH 240/457] Random minor fixes for movemail * movemail.c: Include and . (waitpid) [WINDOWSNT]: New macro. (wait) [WINDOWSNT]: Remove. (main, popmail, pop_retr, mbx_write, mbx_delimit_begin) (mbx_delimit_end): Use bool for boolean. (main): Simplify #if usage a bit. (main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't possibly unlink lockname twice, as that's a race condition. Set SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork failure. Use waitpid, not wait, to avoid a race condition in the unlikely case where we start up with a child. (NOTOK, OK): Remove, in favor of plain boolean. (popmail, pop_retr): Don't get confused about errno, e.g., ferror need not set errno. (popmail): Use fclose (mbf), not close (fileno (mbf)), to also detect any stream-related errors (e.g., memory exhaustion). (pop_retr): Report pop errors separately, since caller now does errno reporting. (mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not == EOF, as it's a bit faster and (in theory) pickier. --- lib-src/ChangeLog | 24 ++++++ lib-src/movemail.c | 197 +++++++++++++++++++++------------------------ 2 files changed, 117 insertions(+), 104 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 83855afa675..97868094bda 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,27 @@ +2015-03-06 Paul Eggert + + Random minor fixes for movemail + * movemail.c: Include and . + (waitpid) [WINDOWSNT]: New macro. + (wait) [WINDOWSNT]: Remove. + (main, popmail, pop_retr, mbx_write, mbx_delimit_begin) + (mbx_delimit_end): Use bool for boolean. + (main): Simplify #if usage a bit. + (main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't + possibly unlink lockname twice, as that's a race condition. Set + SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork + failure. Use waitpid, not wait, to avoid a race condition in the + unlikely case where we start up with a child. + (NOTOK, OK): Remove, in favor of plain boolean. + (popmail, pop_retr): Don't get confused about errno, e.g., ferror + need not set errno. + (popmail): Use fclose (mbf), not close (fileno (mbf)), to also + detect any stream-related errors (e.g., memory exhaustion). + (pop_retr): Report pop errors separately, since caller now does + errno reporting. + (mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not == + EOF, as it's a bit faster and (in theory) pickier. + 2015-02-27 Mark Laws Support daemon mode on MS-Windows (bug#19688) diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 5008c9b15f7..1618a6980e9 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -59,6 +59,7 @@ along with GNU Emacs. If not, see . */ #include #include #include +#include #include #include #include @@ -66,6 +67,7 @@ along with GNU Emacs. If not, see . */ #include #include #include +#include #include #include "syswait.h" #ifdef MAIL_USE_POP @@ -81,7 +83,7 @@ along with GNU Emacs. If not, see . */ #undef access #undef unlink #define fork() 0 -#define wait(var) (*(var) = 0) +#define waitpid(child, var, flags) (*(var) = 0) /* Unfortunately, Samba doesn't seem to properly lock Unix files even though the locking call succeeds (and indeed blocks local access from other NT programs). If you have direct file access using an NFS @@ -134,11 +136,11 @@ static void error (const char *s1, const char *s2, const char *s3); static _Noreturn void pfatal_with_name (char *name); static _Noreturn void pfatal_and_delete (char *name); #ifdef MAIL_USE_POP -static int popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse_order); -static int pop_retr (popserver server, int msgno, FILE *arg); -static int mbx_write (char *line, int len, FILE *mbf); -static int mbx_delimit_begin (FILE *mbf); -static int mbx_delimit_end (FILE *mbf); +static int popmail (char *, char *, bool, char *, bool); +static bool pop_retr (popserver, int, FILE *); +static bool mbx_write (char *, int, FILE *); +static bool mbx_delimit_begin (FILE *); +static bool mbx_delimit_end (FILE *); #endif #if (defined MAIL_USE_MAILLOCK \ @@ -166,23 +168,21 @@ main (int argc, char **argv) int indesc, outdesc; ssize_t nread; int wait_status; - int c, preserve_mail = 0; + int c; + bool preserve_mail = false; #ifndef MAIL_USE_SYSTEM_LOCK struct stat st; int tem; - char *lockname; char *tempname; size_t inname_len, inname_dirlen; int desc; #endif /* not MAIL_USE_SYSTEM_LOCK */ -#ifdef MAIL_USE_MAILLOCK - char *spool_name; -#endif + char *spool_name = 0; #ifdef MAIL_USE_POP - int pop_reverse_order = 0; + bool pop_reverse_order = false; # define ARGSTR "pr" #else /* ! MAIL_USE_POP */ # define ARGSTR "p" @@ -193,19 +193,19 @@ main (int argc, char **argv) delete_lockname = 0; - while ((c = getopt (argc, argv, ARGSTR)) != EOF) + while (0 <= (c = getopt (argc, argv, ARGSTR))) { switch (c) { #ifdef MAIL_USE_POP case 'r': - pop_reverse_order = 1; + pop_reverse_order = true; break; #endif case 'p': - preserve_mail++; + preserve_mail = true; break; default: - exit (EXIT_FAILURE); + return EXIT_FAILURE; } } @@ -223,7 +223,7 @@ main (int argc, char **argv) #else fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n", ""); #endif - exit (EXIT_FAILURE); + return EXIT_FAILURE; } inname = argv[optind]; @@ -244,7 +244,7 @@ main (int argc, char **argv) status = popmail (inname + 3, outname, preserve_mail, (argc - optind == 3) ? argv[optind+2] : NULL, pop_reverse_order); - exit (status); + return status; } if (setuid (getuid ()) < 0) @@ -253,18 +253,15 @@ main (int argc, char **argv) #endif /* MAIL_USE_POP */ #ifndef DISABLE_DIRECT_ACCESS + + char *lockname = 0; + #ifndef MAIL_USE_MMDF #ifndef MAIL_USE_SYSTEM_LOCK #ifdef MAIL_USE_MAILLOCK spool_name = mail_spool_name (inname); - if (spool_name) - { -#ifdef lint - lockname = 0; -#endif - } - else #endif + if (! spool_name) { /* Use a lock file named after our first argument with .lock appended: If it exists, the mail file is locked. */ @@ -292,7 +289,7 @@ main (int argc, char **argv) continue; tempname = xmalloc (inname_dirlen + sizeof "EXXXXXX"); - while (1) + while (true) { /* Create the lock file, but not under the lock file name. */ /* Give up if cannot do that. */ @@ -328,7 +325,10 @@ main (int argc, char **argv) { time_t now = time (0); if (st.st_ctime < now - 300) - unlink (lockname); + { + unlink (lockname); + lockname = 0; + } } } @@ -337,15 +337,20 @@ main (int argc, char **argv) #endif /* not MAIL_USE_SYSTEM_LOCK */ #endif /* not MAIL_USE_MMDF */ - if (fork () == 0) +#ifdef SIGCHLD + signal (SIGCHLD, SIG_DFL); +#endif + + pid_t child = fork (); + if (child < 0) + fatal ("Error in fork; %s", strerror (errno), 0); + + if (child == 0) { int lockcount = 0; int status = 0; #if defined (MAIL_USE_MAILLOCK) && defined (HAVE_TOUCHLOCK) - time_t touched_lock; -# ifdef lint - touched_lock = 0; -# endif + time_t touched_lock IF_LINT (= 0); #endif if (setuid (getuid ()) < 0 || setregid (-1, real_gid) < 0) @@ -382,9 +387,9 @@ main (int argc, char **argv) #ifdef MAIL_USE_MAILLOCK if (spool_name) { - /* The "0 - " is to make it a negative number if maillock returns + /* The "-" is to make it a negative number if maillock returns non-zero. */ - status = 0 - maillock (spool_name, 1); + status = - maillock (spool_name, 1); #ifdef HAVE_TOUCHLOCK touched_lock = time (0); #endif @@ -422,7 +427,7 @@ main (int argc, char **argv) { char buf[1024]; - while (1) + while (true) { nread = read (indesc, buf, sizeof buf); if (nread < 0) @@ -464,7 +469,7 @@ main (int argc, char **argv) #ifdef MAIL_USE_SYSTEM_LOCK if (! preserve_mail) { - if (ftruncate (indesc, 0L) != 0) + if (ftruncate (indesc, 0) != 0) pfatal_with_name (inname); } #endif /* MAIL_USE_SYSTEM_LOCK */ @@ -499,21 +504,18 @@ main (int argc, char **argv) if (spool_name) mailunlock (); #endif - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } - wait (&wait_status); + if (waitpid (child, &wait_status, 0) < 0) + fatal ("Error in waitpid; %s", strerror (errno), 0); if (!WIFEXITED (wait_status)) - exit (EXIT_FAILURE); + return EXIT_FAILURE; else if (WEXITSTATUS (wait_status) != 0) - exit (WEXITSTATUS (wait_status)); + return WEXITSTATUS (wait_status); -#if !defined (MAIL_USE_MMDF) && !defined (MAIL_USE_SYSTEM_LOCK) -#ifdef MAIL_USE_MAILLOCK - if (! spool_name) -#endif /* MAIL_USE_MAILLOCK */ + if (lockname) unlink (lockname); -#endif /* not MAIL_USE_MMDF and not MAIL_USE_SYSTEM_LOCK */ #endif /* ! DISABLE_DIRECT_ACCESS */ @@ -616,12 +618,6 @@ pfatal_and_delete (char *name) #include #include -#define NOTOK (-1) -#define OK 0 - -static char Errmsg[200]; /* POP errors, at least, can exceed - the original length of 80. */ - /* * The full valid syntax for a POP mailbox specification for movemail * is "po:username:hostname". The ":hostname" is optional; if it is @@ -637,10 +633,11 @@ static char Errmsg[200]; /* POP errors, at least, can exceed */ static int -popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse_order) +popmail (char *mailbox, char *outfile, bool preserve, char *password, + bool reverse_order) { int nmsgs, nbytes; - register int i; + int i; int mbfi; FILE *mbf; popserver server; @@ -690,7 +687,8 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse } } - if ((mbf = fdopen (mbfi, "wb")) == NULL) + mbf = fdopen (mbfi, "wb"); + if (!mbf) { pop_close (server); error ("Error in fdopen: %s", strerror (errno), 0); @@ -713,35 +711,28 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse } for (i = start; i * increment <= end * increment; i += increment) - { - if (mbx_delimit_begin (mbf) != OK - || pop_retr (server, i, mbf) != OK) - { - error ("%s", Errmsg, 0); - close (mbfi); - return EXIT_FAILURE; - } - mbx_delimit_end (mbf); - fflush (mbf); - if (ferror (mbf)) - { - error ("Error in fflush: %s", strerror (errno), 0); - pop_close (server); - close (mbfi); - return EXIT_FAILURE; - } - } + if (! (mbx_delimit_begin (mbf) + && pop_retr (server, i, mbf) + && mbx_delimit_end (mbf) + && fflush (mbf) == 0)) + { + if (errno) + error ("Error in POP retrieving: %s", strerror (errno), 0); + pop_close (server); + fclose (mbf); + return EXIT_FAILURE; + } if (fsync (mbfi) != 0 && errno != EINVAL) { error ("Error in fsync: %s", strerror (errno), 0); - close (mbfi); + fclose (mbf); return EXIT_FAILURE; } - if (close (mbfi) != 0) + if (fclose (mbf) != 0) { - error ("Error in close: %s", strerror (errno), 0); + error ("Error in fclose: %s", strerror (errno), 0); return EXIT_FAILURE; } @@ -765,7 +756,7 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse return EXIT_SUCCESS; } -static int +static bool pop_retr (popserver server, int msgno, FILE *arg) { char *line; @@ -773,8 +764,9 @@ pop_retr (popserver server, int msgno, FILE *arg) if (pop_retrieve_first (server, msgno, &line)) { - snprintf (Errmsg, sizeof Errmsg, "Error from POP server: %s", pop_error); - return (NOTOK); + error ("Error from POP server: %s", pop_error, 0); + errno = 0; + return false; } while ((ret = pop_retrieve_next (server, &line)) >= 0) @@ -782,24 +774,26 @@ pop_retr (popserver server, int msgno, FILE *arg) if (! line) break; - if (mbx_write (line, ret, arg) != OK) + if (! mbx_write (line, ret, arg)) { - strcpy (Errmsg, strerror (errno)); + int write_errno = errno; pop_close (server); - return (NOTOK); + errno = write_errno; + return false; } } if (ret) { - snprintf (Errmsg, sizeof Errmsg, "Error from POP server: %s", pop_error); - return (NOTOK); + error ("Error from POP server: %s", pop_error, 0); + errno = 0; + return false; } - return (OK); + return true; } -static int +static bool mbx_write (char *line, int len, FILE *mbf) { #ifdef MOVEMAIL_QUOTE_POP_FROM_LINES @@ -811,47 +805,42 @@ mbx_write (char *line, int len, FILE *mbf) && (a[4] == ' ')) if (IS_FROM_LINE (line)) { - if (fputc ('>', mbf) == EOF) - return (NOTOK); + if (fputc ('>', mbf) < 0) + return false; } #endif if (line[0] == '\037') { - if (fputs ("^_", mbf) == EOF) - return (NOTOK); + if (fputs ("^_", mbf) < 0) + return false; line++; len--; } - if (fwrite (line, 1, len, mbf) != len) - return (NOTOK); - if (fputc (0x0a, mbf) == EOF) - return (NOTOK); - return (OK); + return fwrite (line, 1, len, mbf) == len && 0 <= fputc ('\n', mbf); } -static int +static bool mbx_delimit_begin (FILE *mbf) { time_t now = time (NULL); struct tm *ltime = localtime (&now); if (!ltime) - return NOTOK; + return false; char fromline[100]; if (! strftime (fromline, sizeof fromline, "From movemail %a %b %e %T %Y\n", ltime)) - return NOTOK; - if (fputs (fromline, mbf) == EOF) - return (NOTOK); - return (OK); + { + errno = EOVERFLOW; + return false; + } + return 0 <= fputs (fromline, mbf); } -static int +static bool mbx_delimit_end (FILE *mbf) { - if (putc ('\n', mbf) == EOF) - return (NOTOK); - return (OK); + return 0 <= putc ('\n', mbf); } #endif /* MAIL_USE_POP */ From 25058c3ab82cff0105c31de0c1934da6602c6bee Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 6 Mar 2015 23:35:04 -0500 Subject: [PATCH 241/457] * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Don't try to unfold `closure's since byte-compile-unfold-lambda doesn't know how to do it. --- lisp/ChangeLog | 6 ++ lisp/emacs-lisp/byte-opt.el | 117 ++++++++++++++++++------------------ 2 files changed, 65 insertions(+), 58 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c81ab9b6d22..1bd45c07c3e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-07 Stefan Monnier + + * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Don't try to + unfold `closure's since byte-compile-unfold-lambda doesn't know how to + do it. + 2015-03-06 Oscar Fuentes * net/browse-url.el (browse-url-firefox): Removed outdated diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index e149f80db8e..06a11063025 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -302,65 +302,65 @@ ;; doesn't matter here, because function's behavior is underspecified so it ;; can safely be turned into a `let', even though the reverse is not true. (or name (setq name "anonymous lambda")) - (let ((lambda (car form)) - (values (cdr form))) - (let ((arglist (nth 1 lambda)) - (body (cdr (cdr lambda))) - optionalp restp - bindings) - (if (and (stringp (car body)) (cdr body)) - (setq body (cdr body))) - (if (and (consp (car body)) (eq 'interactive (car (car body)))) - (setq body (cdr body))) - ;; FIXME: The checks below do not belong in an optimization phase. - (while arglist - (cond ((eq (car arglist) '&optional) - ;; ok, I'll let this slide because funcall_lambda() does... - ;; (if optionalp (error "multiple &optional keywords in %s" name)) - (if restp (error "&optional found after &rest in %s" name)) - (if (null (cdr arglist)) - (error "nothing after &optional in %s" name)) - (setq optionalp t)) - ((eq (car arglist) '&rest) - ;; ...but it is by no stretch of the imagination a reasonable - ;; thing that funcall_lambda() allows (&rest x y) and - ;; (&rest x &optional y) in arglists. - (if (null (cdr arglist)) - (error "nothing after &rest in %s" name)) - (if (cdr (cdr arglist)) - (error "multiple vars after &rest in %s" name)) - (setq restp t)) - (restp - (setq bindings (cons (list (car arglist) - (and values (cons 'list values))) - bindings) - values nil)) - ((and (not optionalp) (null values)) - (byte-compile-warn "attempt to open-code `%s' with too few arguments" name) - (setq arglist nil values 'too-few)) - (t - (setq bindings (cons (list (car arglist) (car values)) - bindings) - values (cdr values)))) - (setq arglist (cdr arglist))) - (if values - (progn - (or (eq values 'too-few) - (byte-compile-warn - "attempt to open-code `%s' with too many arguments" name)) - form) + (let* ((lambda (car form)) + (values (cdr form)) + (arglist (nth 1 lambda)) + (body (cdr (cdr lambda))) + optionalp restp + bindings) + (if (and (stringp (car body)) (cdr body)) + (setq body (cdr body))) + (if (and (consp (car body)) (eq 'interactive (car (car body)))) + (setq body (cdr body))) + ;; FIXME: The checks below do not belong in an optimization phase. + (while arglist + (cond ((eq (car arglist) '&optional) + ;; ok, I'll let this slide because funcall_lambda() does... + ;; (if optionalp (error "multiple &optional keywords in %s" name)) + (if restp (error "&optional found after &rest in %s" name)) + (if (null (cdr arglist)) + (error "nothing after &optional in %s" name)) + (setq optionalp t)) + ((eq (car arglist) '&rest) + ;; ...but it is by no stretch of the imagination a reasonable + ;; thing that funcall_lambda() allows (&rest x y) and + ;; (&rest x &optional y) in arglists. + (if (null (cdr arglist)) + (error "nothing after &rest in %s" name)) + (if (cdr (cdr arglist)) + (error "multiple vars after &rest in %s" name)) + (setq restp t)) + (restp + (setq bindings (cons (list (car arglist) + (and values (cons 'list values))) + bindings) + values nil)) + ((and (not optionalp) (null values)) + (byte-compile-warn "attempt to open-code `%s' with too few arguments" name) + (setq arglist nil values 'too-few)) + (t + (setq bindings (cons (list (car arglist) (car values)) + bindings) + values (cdr values)))) + (setq arglist (cdr arglist))) + (if values + (progn + (or (eq values 'too-few) + (byte-compile-warn + "attempt to open-code `%s' with too many arguments" name)) + form) - ;; The following leads to infinite recursion when loading a - ;; file containing `(defsubst f () (f))', and then trying to - ;; byte-compile that file. - ;(setq body (mapcar 'byte-optimize-form body))) + ;; The following leads to infinite recursion when loading a + ;; file containing `(defsubst f () (f))', and then trying to + ;; byte-compile that file. + ;(setq body (mapcar 'byte-optimize-form body))) - (let ((newform - (if bindings - (cons 'let (cons (nreverse bindings) body)) - (cons 'progn body)))) - (byte-compile-log " %s\t==>\t%s" form newform) - newform))))) + (let ((newform + (if bindings + (cons 'let (cons (nreverse bindings) body)) + (cons 'progn body)))) + (byte-compile-log " %s\t==>\t%s" form newform) + newform)))) ;;; implementing source-level optimizers @@ -390,12 +390,13 @@ (and (nth 1 form) (not for-effect) form)) - ((memq (car-safe fn) '(lambda closure)) + ((eq (car-safe fn) 'lambda) (let ((newform (byte-compile-unfold-lambda form))) (if (eq newform form) ;; Some error occurred, avoid infinite recursion form (byte-optimize-form-code-walker newform for-effect)))) + ((eq (car-safe fn) 'closure) form) ((memq fn '(let let*)) ;; recursively enter the optimizer for the bindings and body ;; of a let or let*. This for depth-firstness: forms that From 0ea68311a5597f0a74c902519ae7a5f1920ed2e9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 6 Mar 2015 23:42:10 -0500 Subject: [PATCH 242/457] * lisp/battery.el: Make it work on my MSI Wind * lisp/battery.el (battery-echo-area-format): Simplify default. (battery-linux-sysfs): Standardize on energy&power. Accept ADP1 for AC adapter. --- lisp/ChangeLog | 10 +++-- lisp/battery.el | 103 ++++++++++++++++++++++++------------------------ 2 files changed, 59 insertions(+), 54 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1bd45c07c3e..0b277c7c518 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,12 +1,16 @@ 2015-03-07 Stefan Monnier + * battery.el (battery-echo-area-format): Simplify default. + (battery-linux-sysfs): Standardize on energy&power. Accept ADP1 + for AC adapter. + * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Don't try to unfold `closure's since byte-compile-unfold-lambda doesn't know how to do it. 2015-03-06 Oscar Fuentes - * net/browse-url.el (browse-url-firefox): Removed outdated + * net/browse-url.el (browse-url-firefox): Remove outdated MS-Windows limitations. 2015-03-06 Thomas Fitzsimmons @@ -16,8 +20,8 @@ (eudc-ldap-cleanup-record-filtering-addresses): Add docstring. Don't clean up postal addresses if ldap-ignore-attribute-codings is set. Combine mail addresses into one field. (Bug#17720) - (eudc-ldap-simple-query-internal): Call - eudc-ldap-cleanup-record-filtering-addresses instead of + (eudc-ldap-simple-query-internal): + Call eudc-ldap-cleanup-record-filtering-addresses instead of eudc-ldap-cleanup-record-simple. (eudc-ldap-get-field-list): Likewise. diff --git a/lisp/battery.el b/lisp/battery.el index 41e5979f1f2..b9ce5b49093 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -44,27 +44,27 @@ (defcustom battery-status-function (cond ((and (eq system-type 'gnu/linux) (file-readable-p "/proc/apm")) - 'battery-linux-proc-apm) + #'battery-linux-proc-apm) ((and (eq system-type 'gnu/linux) (file-directory-p "/proc/acpi/battery")) - 'battery-linux-proc-acpi) + #'battery-linux-proc-acpi) ((and (eq system-type 'gnu/linux) (file-directory-p "/sys/class/power_supply/") (directory-files "/sys/class/power_supply/" nil battery--linux-sysfs-regexp)) - 'battery-linux-sysfs) + #'battery-linux-sysfs) ((and (eq system-type 'berkeley-unix) (file-executable-p "/usr/sbin/apm")) - 'battery-bsd-apm) + #'battery-bsd-apm) ((and (eq system-type 'darwin) (condition-case nil (with-temp-buffer (and (eq (call-process "pmset" nil t nil "-g" "ps") 0) (> (buffer-size) 0))) (error nil))) - 'battery-pmset) + #'battery-pmset) ((fboundp 'w32-battery-status) - 'w32-battery-status)) + #'w32-battery-status)) "Function for getting battery status information. The function has to return an alist of conversion definitions. Its cons cells are of the form @@ -77,14 +77,7 @@ introduced by a `%' character in a control string." :group 'battery) (defcustom battery-echo-area-format - (cond ((eq battery-status-function 'battery-linux-proc-acpi) - "Power %L, battery %B at %r (%p%% load, remaining time %t)") - ((eq battery-status-function 'battery-linux-sysfs) - "Power %L, battery %B (%p%% load, remaining time %t)") - ((eq battery-status-function 'battery-pmset) - "%L power, battery %B (%p%% load, remaining time %t)") - (battery-status-function - "Power %L, battery %B (%p%% load, remaining time %t)")) + "Power %L, battery %B (%p%% load, remaining time %t)" "Control string formatting the string to display in the echo area. Ordinary characters in the control string are printed as-is, while conversion specifications introduced by a `%' character in the control @@ -436,11 +429,15 @@ The following %-sequences are provided: %m Remaining time (to charge or discharge) in minutes %h Remaining time (to charge or discharge) in hours %t Remaining time (to charge or discharge) in the form `h:min'" - (let (charging-state rate temperature hours - (charge-full 0.0) - (charge-now 0.0) + (let (charging-state temperature hours + ;; Some batteries report charges and current, other energy and power. + ;; In order to reliably be able to combine those data, we convert them + ;; all to energy/power (since we can't combine different charges if + ;; they're not at the same voltage). (energy-full 0.0) - (energy-now 0.0)) + (energy-now 0.0) + (power-now 0.0) + (voltage-now 10.8)) ;Arbitrary default, in case the info is missing. ;; SysFS provides information about each battery present in the ;; system in a separate subdirectory. We are going to merge the ;; available information together. @@ -452,6 +449,11 @@ The following %-sequences are provided: (erase-buffer) (ignore-errors (insert-file-contents (expand-file-name "uevent" dir))) + (goto-char (point-min)) + (when (re-search-forward + "POWER_SUPPLY_VOLTAGE_NOW=\\([0-9]*\\)$" nil t) + (setq voltage-now (/ (string-to-number (match-string 1)) 1000000.0))) + (goto-char (point-min)) (when (re-search-forward "POWER_SUPPLY_PRESENT=1$" nil t) (goto-char (point-min)) (and (re-search-forward "POWER_SUPPLY_STATUS=\\(.*\\)$" nil t) @@ -461,7 +463,10 @@ The following %-sequences are provided: (when (re-search-forward "POWER_SUPPLY_\\(CURRENT\\|POWER\\)_NOW=\\([0-9]*\\)$" nil t) - (setq rate (float (string-to-number (match-string 2))))) + (cl-incf power-now + (* (float (string-to-number (match-string 2))) + (if (eq (char-after (match-beginning 1)) ?C) + voltage-now 1.0)))) (goto-char (point-min)) (when (re-search-forward "POWER_SUPPLY_TEMP=\\([0-9]*\\)$" nil t) (setq temperature (match-string 1))) @@ -475,10 +480,10 @@ The following %-sequences are provided: (re-search-forward "POWER_SUPPLY_CHARGE_NOW=\\([0-9]*\\)$" nil t) (setq now-string (match-string 1))) - (setq charge-full (+ charge-full - (string-to-number full-string)) - charge-now (+ charge-now - (string-to-number now-string)))) + (cl-incf energy-full (* (string-to-number full-string) + voltage-now)) + (cl-incf energy-now (* (string-to-number now-string) + voltage-now))) ((and (progn (goto-char (point-min)) t) (re-search-forward "POWER_SUPPLY_ENERGY_FULL=\\([0-9]*\\)$" nil t) @@ -486,27 +491,20 @@ The following %-sequences are provided: (re-search-forward "POWER_SUPPLY_ENERGY_NOW=\\([0-9]*\\)$" nil t) (setq now-string (match-string 1))) - (setq energy-full (+ energy-full - (string-to-number full-string)) - energy-now (+ energy-now - (string-to-number now-string)))))) + (cl-incf energy-full (string-to-number full-string)) + (cl-incf energy-now (string-to-number now-string))))) (goto-char (point-min)) - (when (and energy-now rate (not (zerop rate)) - (re-search-forward - "POWER_SUPPLY_VOLTAGE_NOW=\\([0-9]*\\)$" nil t)) + (unless (zerop power-now) (let ((remaining (if (string= charging-state "Discharging") energy-now (- energy-full energy-now)))) - (setq hours (/ (/ (* remaining (string-to-number - (match-string 1))) - rate) - 10000000.0))))))) - (list (cons ?c (cond ((or (> charge-full 0) (> charge-now 0)) - (number-to-string charge-now)) - ((or (> energy-full 0) (> energy-now 0)) - (number-to-string energy-now)) + (setq hours (/ remaining power-now))))))) + (list (cons ?c (cond ((or (> energy-full 0) (> energy-now 0)) + (number-to-string (/ energy-now voltage-now))) (t "N/A"))) - (cons ?r (if rate (format "%.1f" (/ rate 1000000.0)) "N/A")) + (cons ?r (if (> power-now 0.0) + (format "%.1f" (/ power-now 1000000.0)) + "N/A")) (cons ?m (if hours (format "%d" (* hours 60)) "N/A")) (cons ?h (if hours (format "%d" hours) "N/A")) (cons ?t (if hours @@ -514,21 +512,24 @@ The following %-sequences are provided: "N/A")) (cons ?d (or temperature "N/A")) (cons ?B (or charging-state "N/A")) - (cons ?p (cond ((and (> charge-full 0) (> charge-now 0)) - (format "%.1f" - (/ (* 100 charge-now) charge-full))) - ((> energy-full 0) + (cons ?p (cond ((and (> energy-full 0) (> energy-now 0)) (format "%.1f" (/ (* 100 energy-now) energy-full))) (t "N/A"))) - (cons ?L (if (file-readable-p "/sys/class/power_supply/AC/online") - (if (battery-search-for-one-match-in-files - (list "/sys/class/power_supply/AC/online" - "/sys/class/power_supply/ACAD/online") - "1" 0) - "AC" - "BAT") - "N/A"))))) + (cons ?L (cond + ((battery-search-for-one-match-in-files + (list "/sys/class/power_supply/AC/online" + "/sys/class/power_supply/ACAD/online" + "/sys/class/power_supply/ADP1/online") + "1" 0) + "AC") + ((battery-search-for-one-match-in-files + (list "/sys/class/power_supply/AC/online" + "/sys/class/power_supply/ACAD/online" + "/sys/class/power_supply/ADP1/online") + "0" 0) + "BAT") + (t "N/A")))))) ;;; `apm' interface for BSD. From 35e2b6ab4d28547ec079de18cf1cf65623e6909a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 6 Mar 2015 23:50:32 -0500 Subject: [PATCH 243/457] * lisp/gnus/*registry.el: Use slot names rather than initarg names * lisp/gnus/registry.el (registry-lookup-breaks-before-lexbind) (registry-search, registry-delete, registry-size, registry-insert) (registry-reindex, registry-collect-prune-candidates, registry-lookup): * lisp/gnus/gnus-registry.el (gnus-registry-fixup-registry) (gnus-registry-remove-extra-data): Use slot names rather than initarg names in `oref' and `oset'. --- lisp/gnus/ChangeLog | 9 +++++++++ lisp/gnus/gnus-registry.el | 14 +++++++------- lisp/gnus/registry.el | 28 ++++++++++++++-------------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index af49782a035..5d699e0be27 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +2015-03-07 Stefan Monnier + + * registry.el (registry-lookup-breaks-before-lexbind, registry-lookup) + (registry-search, registry-delete, registry-size, registry-insert) + (registry-reindex, registry-collect-prune-candidates): + * gnus-registry.el (gnus-registry-fixup-registry) + (gnus-registry-remove-extra-data): Use slot names rather than initarg + names in `oref' and `oset'. + 2015-02-26 Katsumi Yamaoka * gnus-art.el (gnus-mime-inline-part, gnus-mm-display-part): diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index 2017ea2f826..ac903a250ec 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -276,20 +276,20 @@ This can slow pruning down. Set to nil to perform no sorting." (defun gnus-registry-fixup-registry (db) (when db - (let ((old (oref db :tracked))) - (oset db :precious + (let ((old (oref db tracked))) + (oset db precious (append gnus-registry-extra-entries-precious '())) - (oset db :max-size + (oset db max-size (or gnus-registry-max-entries most-positive-fixnum)) - (oset db :prune-factor + (oset db prune-factor (or gnus-registry-prune-factor 0.1)) - (oset db :tracked + (oset db tracked (append gnus-registry-track-extra '(mark group keyword))) - (when (not (equal old (oref db :tracked))) + (when (not (equal old (oref db tracked))) (gnus-message 9 "Reindexing the Gnus registry (tracked change)") (registry-reindex db)))) db) @@ -1242,7 +1242,7 @@ from your existing entries." (when extra (let ((db gnus-registry-db)) (registry-reindex db) - (loop for k being the hash-keys of (oref db :data) + (loop for k being the hash-keys of (oref db data) using (hash-value v) do (let ((newv (delq nil (mapcar #'(lambda (entry) (unless (member (car entry) extra) diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 55b83a8e889..881eb9f5a65 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -155,7 +155,7 @@ (defmethod registry-lookup ((db registry-db) keys) "Search for KEYS in the registry-db THIS. Returns an alist of the key followed by the entry in a list, not a cons cell." - (let ((data (oref db :data))) + (let ((data (oref db data))) (delq nil (mapcar (lambda (k) @@ -166,7 +166,7 @@ Returns an alist of the key followed by the entry in a list, not a cons cell." (defmethod registry-lookup-breaks-before-lexbind ((db registry-db) keys) "Search for KEYS in the registry-db THIS. Returns an alist of the key followed by the entry in a list, not a cons cell." - (let ((data (oref db :data))) + (let ((data (oref db data))) (delq nil (loop for key in keys when (gethash key data) @@ -227,7 +227,7 @@ The test order is to check :all first, then :member, then :regex." (let ((all (plist-get spec :all)) (member (plist-get spec :member)) (regex (plist-get spec :regex))) - (loop for k being the hash-keys of (oref db :data) + (loop for k being the hash-keys of (oref db data) using (hash-values v) when (or ;; :all non-nil returns all @@ -243,10 +243,10 @@ The test order is to check :all first, then :member, then :regex." If KEYS is nil, use SPEC to do a search. Updates the secondary ('tracked') indices as well. With assert non-nil, errors out if the key does not exist already." - (let* ((data (oref db :data)) + (let* ((data (oref db data)) (keys (or keys (apply 'registry-search db spec))) - (tracked (oref db :tracked))) + (tracked (oref db tracked))) (dolist (key keys) (let ((entry (gethash key data))) @@ -273,8 +273,8 @@ With assert non-nil, errors out if the key does not exist already." (defmethod registry-size ((db registry-db)) "Returns the size of the registry-db object THIS. -This is the key count of the :data slot." - (hash-table-count (oref db :data))) +This is the key count of the `data' slot." + (hash-table-count (oref db data))) (defmethod registry-full ((db registry-db)) "Checks if registry-db THIS is full." @@ -286,7 +286,7 @@ This is the key count of the :data slot." Updates the secondary ('tracked') indices as well. Errors out if the key exists already." - (assert (not (gethash key (oref db :data))) nil + (assert (not (gethash key (oref db data))) nil "Key already exists in database") (assert (not (registry-full db)) @@ -294,10 +294,10 @@ Errors out if the key exists already." "registry max-size limit reached") ;; store the entry - (puthash key entry (oref db :data)) + (puthash key entry (oref db data)) ;; store the secondary indices - (dolist (tr (oref db :tracked)) + (dolist (tr (oref db tracked)) ;; for every value in the entry under that key... (dolist (val (cdr-safe (assq tr entry))) (let* ((value-keys (registry-lookup-secondary-value db tr val))) @@ -308,8 +308,8 @@ Errors out if the key exists already." (defmethod registry-reindex ((db registry-db)) "Rebuild the secondary indices of registry-db THIS." (let ((count 0) - (expected (* (length (oref db :tracked)) (registry-size db)))) - (dolist (tr (oref db :tracked)) + (expected (* (length (oref db tracked)) (registry-size db)))) + (dolist (tr (oref db tracked)) (let (values) (maphash (lambda (key v) @@ -322,7 +322,7 @@ Errors out if the key exists already." (let* ((value-keys (registry-lookup-secondary-value db tr val))) (push key value-keys) (registry-lookup-secondary-value db tr val value-keys)))) - (oref db :data)))))) + (oref db data)))))) (defmethod registry-prune ((db registry-db) &optional sortfunc) "Prunes the registry-db object DB. @@ -359,7 +359,7 @@ entries first and return candidates from beginning of list." (let* ((precious (oref db :precious)) (precious-p (lambda (entry-key) (cdr (memq (car entry-key) precious)))) - (data (oref db :data)) + (data (oref db data)) (candidates (cl-loop for k being the hash-keys of data using (hash-values v) when (notany precious-p v) From eb62887e97a3be6f4fc8769479a30827163ea775 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 7 Mar 2015 11:55:58 +0200 Subject: [PATCH 244/457] lisp/dired.el (dired-delete-file): Doc fix. (Bug#20021) --- lisp/ChangeLog | 4 ++++ lisp/dired.el | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1cf2a07dbe..0e4e463e200 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-07 Eli Zaretskii + + * dired.el (dired-delete-file): Doc fix. (Bug#20021) + 2015-03-03 Agustín Martín Domingo * textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure diff --git a/lisp/dired.el b/lisp/dired.el index 211f9242e80..1d5a75a2202 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2850,11 +2850,16 @@ Any other value means to ask for each directory." ;; to e.g. recursive-delete-file and put it somewhere else. (defun dired-delete-file (file &optional recursive trash) "\ Delete FILE or directory (possibly recursively if optional RECURSIVE is true.) -RECURSIVE determines what to do with a non-empty directory. If RECURSIVE is: -nil, do not delete. -`always', delete recursively without asking. -`top', ask for each directory at top level. -Anything else, ask for each sub-directory." +RECURSIVE determines what to do with a non-empty directory. The effect of +its possible values is: + + nil -- do not delete. + `always' -- delete recursively without asking. + `top' -- ask for each directory at top level. + Anything else -- ask for each sub-directory. + +TRASH non-nil means to trash the file instead of deleting, provided +`delete-by-moving-to-trash' (which see) is non-nil." ;; This test is equivalent to ;; (and (file-directory-p fn) (not (file-symlink-p fn))) ;; but more efficient From e851da3540d29122fd3b53ae26d766237c85b989 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 7 Mar 2015 12:49:54 +0200 Subject: [PATCH 245/457] Partially revert the fix for bug #11732 src/w32fns.c : Fix typedefs to be consistent with the corresponding w32 API signatures. (w32_wnd_proc) : Don't invoke DefWindowProc if we successfully handled the message, as doing so causes problems in displaying selection dialogs. --- src/ChangeLog | 9 +++++++++ src/w32fns.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6b658f51671..fc776188f05 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2015-03-07 Eli Zaretskii + + * w32fns.c : + Fix typedefs to be consistent with the corresponding w32 API + signatures. + (w32_wnd_proc) : Don't invoke + DefWindowProc if we successfully handled the message, as doing so + causes problems in displaying selection dialogs. (Bug#11732) + 2015-03-05 Paul Eggert Work around x86 glibc backtrace bug diff --git a/src/w32fns.c b/src/w32fns.c index 64532ae6629..6abb433fd2f 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -157,8 +157,8 @@ typedef BOOL (WINAPI * TrackMouseEvent_Proc) typedef LONG (WINAPI * ImmGetCompositionString_Proc) (IN HIMC context, IN DWORD index, OUT LPVOID buffer, IN DWORD bufLen); typedef HIMC (WINAPI * ImmGetContext_Proc) (IN HWND window); -typedef HWND (WINAPI * ImmReleaseContext_Proc) (IN HWND wnd, IN HIMC context); -typedef HWND (WINAPI * ImmSetCompositionWindow_Proc) (IN HIMC context, +typedef BOOL (WINAPI * ImmReleaseContext_Proc) (IN HWND wnd, IN HIMC context); +typedef BOOL (WINAPI * ImmSetCompositionWindow_Proc) (IN HIMC context, IN COMPOSITIONFORM *form); typedef HMONITOR (WINAPI * MonitorFromPoint_Proc) (IN POINT pt, IN DWORD flags); typedef BOOL (WINAPI * GetMonitorInfo_Proc) @@ -3324,9 +3324,13 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) set_ime_composition_window_fn (context, &form); release_ime_context_fn (hwnd, context); } - /* Pass WM_IME_STARTCOMPOSITION to DefWindowProc, so that the - composition window will actually be displayed. */ - goto dflt; + /* We should "goto dflt" here to pass WM_IME_STARTCOMPOSITION to + DefWindowProc, so that the composition window will actually + be displayed. But doing so causes trouble with displaying + dialog boxes, such as the file selection dialog or font + selection dialog. So something else is needed to fix the + former without breaking the latter. See bug#11732. */ + break; case WM_IME_ENDCOMPOSITION: ignore_ime_char = 0; From 344c6adab932fd329c11d76d7a0fff12d250bba2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 7 Mar 2015 15:12:57 +0200 Subject: [PATCH 246/457] Improve MS-Windows build instructions (Bug#19989) nt/INSTALL: Add some more installation instructions for mingw-get users. --- nt/ChangeLog | 5 +++++ nt/INSTALL | 23 ++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 861cb18f0b2..e11a923c23c 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2015-03-07 Eli Zaretskii + + * INSTALL: Add some more installation instructions for mingw-get + users. (Bug#19989) + 2015-02-10 Noam Postavsky * nt/cmdproxy.c (batch_file_p): New function. diff --git a/nt/INSTALL b/nt/INSTALL index c4e190f6f34..f615b1e5c35 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -108,12 +108,33 @@ Windows 9X as well). . msys-base . mingw-developer-toolkit + When the installation ends, perform the post-installation steps + described on this page of the MinGW site: + + http://www.mingw.org/wiki/Getting_Started + + in the "After Installing You Should ..." section. These steps are + important for making your installation complete, and in particular + will produce a desktop shortcut for running the MSYS Bash shell, + from which you will configure and build Emacs. Once you've made the + shortcut, double-click on it to open the MSYS Bash shell window, + where you will proceed with the rest of these instructions. + + In addition, we suggest to modify your system-wide Path variable to + include the 'bin' subdirectory of your top-level MinGW installation + directory, the one you specified to mingw-get ("C:\MinGW" by + default). This will allow you to invoke the MinGW development + tools, like GCC, from the Windows cmd.exe shell windows or from + other Windows programs (including Emacs, after you build and install + it). + (We recommend that you refrain from installing the MSYS Texinfo package, which is part of msys-base, because it might produce mixed EOL format when installing Info files. Instead, install the MinGW port of Texinfo, see the ezwinports URL below. To uninstall the MSYS Texinfo, after installing it as part of msys-base, invoke the - command "mingw-get remove msys-texinfo".) + command "mingw-get remove msys-texinfo", or mark "msys-texinfo" for + removal in the mingw-get GUI, then select Installation->Apply Changes.) At this point, you should be ready to configure and build Emacs in its basic configuration. Skip to the "Generating the configure From 5ab767b8dcea50b4d02c3910d19c223a5402f99d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 7 Mar 2015 20:57:32 +0100 Subject: [PATCH 247/457] Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master. Fixes: debbugs:20015 * net/tramp.el (tramp-ssh-controlmaster-options): Make it a defcustom. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp.el | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b277c7c518..9556dfdbc42 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-07 Michael Albinus + + * net/tramp.el (tramp-ssh-controlmaster-options): Make it a + defcustom. (Bug#20015) + 2015-03-07 Stefan Monnier * battery.el (battery-echo-area-format): Simplify default. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 953525f37e4..7661a4ca19c 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -308,7 +308,7 @@ started on the local host. You should specify a remote host useful only in combination with `tramp-default-proxies-alist'.") ;;;###tramp-autoload -(defconst tramp-ssh-controlmaster-options +(defcustom tramp-ssh-controlmaster-options (let ((result "") (case-fold-search t)) (ignore-errors @@ -334,7 +334,10 @@ useful only in combination with `tramp-default-proxies-alist'.") (setq result (concat result " -o ControlPersist=no"))))))) result) "Call ssh to detect whether it supports the Control* arguments. -Return a string to be used in `tramp-methods'.") +Return a string to be used in `tramp-methods'." + :group 'tramp + :version "24.5" + :type 'string) ;;;###tramp-autoload (defcustom tramp-use-ssh-controlmaster-options From 81822823191a8b7dc5f016780c6b667e7b68228c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 7 Mar 2015 21:01:01 +0100 Subject: [PATCH 248/457] Revert "Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master." This reverts commit 5ab767b8dcea50b4d02c3910d19c223a5402f99d. --- lisp/ChangeLog | 5 ----- lisp/net/tramp.el | 7 ++----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9556dfdbc42..0b277c7c518 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,3 @@ -2015-03-07 Michael Albinus - - * net/tramp.el (tramp-ssh-controlmaster-options): Make it a - defcustom. (Bug#20015) - 2015-03-07 Stefan Monnier * battery.el (battery-echo-area-format): Simplify default. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 7661a4ca19c..953525f37e4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -308,7 +308,7 @@ started on the local host. You should specify a remote host useful only in combination with `tramp-default-proxies-alist'.") ;;;###tramp-autoload -(defcustom tramp-ssh-controlmaster-options +(defconst tramp-ssh-controlmaster-options (let ((result "") (case-fold-search t)) (ignore-errors @@ -334,10 +334,7 @@ useful only in combination with `tramp-default-proxies-alist'.") (setq result (concat result " -o ControlPersist=no"))))))) result) "Call ssh to detect whether it supports the Control* arguments. -Return a string to be used in `tramp-methods'." - :group 'tramp - :version "24.5" - :type 'string) +Return a string to be used in `tramp-methods'.") ;;;###tramp-autoload (defcustom tramp-use-ssh-controlmaster-options From 9869d6f612e94437ac4a998454ad2d4f833a6ad8 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 7 Mar 2015 21:02:04 +0100 Subject: [PATCH 249/457] Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master. Fixes: debbugs:20015 * net/tramp.el (tramp-ssh-controlmaster-options): Make it a defcustom. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp.el | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e4e463e200..96a052d2465 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-07 Michael Albinus + + * net/tramp.el (tramp-ssh-controlmaster-options): Make it a + defcustom. (Bug#20015) + 2015-03-07 Eli Zaretskii * dired.el (dired-delete-file): Doc fix. (Bug#20021) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 2e1fe69460a..dddf501fecc 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -307,7 +307,7 @@ started on the local host. You should specify a remote host useful only in combination with `tramp-default-proxies-alist'.") ;;;###tramp-autoload -(defconst tramp-ssh-controlmaster-options +(defcustom tramp-ssh-controlmaster-options (let ((result "") (case-fold-search t)) (ignore-errors @@ -333,7 +333,10 @@ useful only in combination with `tramp-default-proxies-alist'.") (setq result (concat result " -o ControlPersist=no"))))))) result) "Call ssh to detect whether it supports the Control* arguments. -Return a string to be used in `tramp-methods'.") +Return a string to be used in `tramp-methods'." + :group 'tramp + :version "24.5" + :type 'string) ;;;###tramp-autoload (defcustom tramp-use-ssh-controlmaster-options From 0f2fd5603a06982ef057f0a8bc12e76bc8e026a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Sj=C3=B8gren?= Date: Sun, 8 Mar 2015 10:06:51 +0000 Subject: [PATCH 250/457] lisp/gnus/message.el (message-insert-formatted-citation-line): Change %F to fall back to email address if no first name could be determined --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/message.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5d699e0be27..2ee0c56c7f5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-03-08 Adam Sjøgren + + * message.el (message-insert-formatted-citation-line): Change %F to + fall back to email address if no first name could be determined. + 2015-03-07 Stefan Monnier * registry.el (registry-lookup-breaks-before-lexbind, registry-lookup) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index a06de2a6414..112f0ba127c 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -989,7 +989,8 @@ are replaced: %n The mail address, e.g. \"john.doe@example.invalid\". %N The real name if present, e.g.: \"John Doe\", else fall back to the mail address. - %F The first name if present, e.g.: \"John\". + %F The first name if present, e.g.: \"John\", else fall + back to the mail address. %L The last name if present, e.g.: \"Doe\". %Z, %z The time zone in the numeric form, e.g.:\"+0000\". @@ -4039,7 +4040,7 @@ See `message-citation-line-format'." (setq fname lname lname newlname))))) ;; The following letters are not used in `format-time-string': (push ?E lst) (push "" lst) - (push ?F lst) (push fname lst) + (push ?F lst) (push (or fname name-or-net) lst) ;; We might want to use "" instead of "" later. (push ?J lst) (push "" lst) (push ?K lst) (push "" lst) From 08534cef42568878d03ba116288b9ccbc43984b4 Mon Sep 17 00:00:00 2001 From: Rasmus Pank Roulund Date: Sun, 8 Mar 2015 10:10:37 +0000 Subject: [PATCH 251/457] lisp/gnus/gnus-notifications: Raise frame when clicking Read; Add mark as read --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/gnus-notifications.el | 21 ++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2ee0c56c7f5..763267c3413 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2015-03-08 Rasmus Pank Roulund + + * gnus-notifications.el (gnus-notifications-action): Raise window + frame. + (gnus-notifications-action): Allow mark as read. + (gnus-notifications-notify): Show uption to mark as read. + 2015-03-08 Adam Sjøgren * message.el (message-insert-formatted-citation-line): Change %F to diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el index 2941cc46e4a..22dba3570a3 100644 --- a/lisp/gnus/gnus-notifications.el +++ b/lisp/gnus/gnus-notifications.el @@ -75,12 +75,19 @@ not get notifications." "Map notifications ids to messages.") (defun gnus-notifications-action (id key) - (when (string= key "read") - (let ((group-article (assoc id gnus-notifications-id-to-msg))) - (when group-article - (let ((group (cadr group-article)) - (article (nth 2 group-article))) - (gnus-fetch-group group (list article))))))) + (let ((group-article (assoc id gnus-notifications-id-to-msg))) + (when group-article + (let ((group (cadr group-article)) + (article (nth 2 group-article))) + (cond ((string= key "read") + (gnus-fetch-group group (list article)) + (when (and window-system (fboundp 'x-focus-frame)) (x-focus-frame (selected-frame)))) + ((string= key "mark-read") + (gnus-update-read-articles + group + (delq article (gnus-list-of-unread-articles group))) + ;; gnus-group-refresh-group + (gnus-group-update-group group))))))) (defun gnus-notifications-notify (from subject photo-file) "Send a notification about a new mail. @@ -90,7 +97,7 @@ Return a notification id if any, or t on success." 'notifications-notify :title from :body subject - :actions '("read" "Read") + :actions '("read" "Read" "mark-read" "Mark As Read") :on-action 'gnus-notifications-action :app-icon (gnus-funcall-no-warning 'image-search-load-path "gnus/gnus.png") From 126cd1461a6a6d2a9b5363b2f2628c15fe063f57 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 8 Mar 2015 06:23:06 -0400 Subject: [PATCH 252/457] # Auto-commit of loaddefs files. --- lisp/mail/rmail.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 1b8dd063db4..7d50ecea744 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4713,7 +4713,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads nil "rmailmm" "rmailmm.el" "43e0b9f680c4d2581640b286bd4b3107") +;;;### (autoloads nil "rmailmm" "rmailmm.el" "a17df5ef8968113c8f6a78cf85c82da4") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ From 51c0c8dc70a0a8491e698241c88378ed5780a9c9 Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Sun, 8 Mar 2015 15:39:59 +0100 Subject: [PATCH 253/457] * lisp/ChangeLog: Fix a changelog entry --- lisp/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96a052d2465..763a8eecfbd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -68,8 +68,8 @@ 2015-02-12 Agustín Martín Domingo Improve string search in `flyspell-word-search-*`. (Bug#16800) - * flyspell.el (flyspell-duplicate-distance): Limit default search - distance for duplicated words to 40000. + * textmodes/flyspell.el (flyspell-duplicate-distance): Limit + default search distance for duplicated words to 40000. (flyspell-word-search-backward, flyspell-word-search-forward): Search as full word with defined casechars, not as substring. From 113fcc3b739d6a024e41a5727aeddca7aaf1cb81 Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Sun, 8 Mar 2015 15:40:45 +0100 Subject: [PATCH 254/457] * etc/AUTHORS: Update the AUTHORS file --- etc/AUTHORS | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/etc/AUTHORS b/etc/AUTHORS index 798866bda8c..b79396be31d 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -576,7 +576,7 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el and changed simple.el display.texi xdisp.c files.el frames.texi cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c startup.el package.el misc.texi emacs.texi modes.texi mouse.el - custom.texi image.c window.el and 948 other files + custom.texi image.c window.el and 949 other files Chris Chase: co-wrote idlw-shell.el idlwave.el @@ -1172,7 +1172,7 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c] and changed xdisp.c msdos.c w32.c w32fns.c fileio.c files.el simple.el display.texi dispnew.c w32proc.c sed1v2.inp src/makefile.w32-in config.bat emacs.c msdos.h dispextern.h term.c process.c - src/Makefile.in info.el mainmake.v2 and 799 other files + src/Makefile.in info.el mainmake.v2 and 801 other files Elias Oltmanns: changed tls.el gnus-agent.el gnus-cite.el gnus-int.el gnus-srvr.el gnus.el nnimap.el @@ -1251,7 +1251,7 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el cedet.el ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm - sb-tag-type.xpm and 29 other files + sb-tag-type.xpm and 30 other files Eric Marsden: changed gnus-cache.el url-util.el @@ -1517,7 +1517,7 @@ and changed configure.ac src/Makefile.in Makefile.in calendar.el diary-lib.el files.el lisp/Makefile.in rmail.el progmodes/f90.el bytecomp.el emacs.texi simple.el make-dist misc/Makefile.in ack.texi cal-menu.el display.texi startup.el appt.el cal-hebrew.el calendar.texi - and 1537 other files + and 1538 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -2205,8 +2205,8 @@ Juri Linkov: wrote files-x.el misearch.el occur-tests.el and changed isearch.el info.el replace.el simple.el dired-aux.el progmodes/grep.el dired.el progmodes/compile.el startup.el faces.el files.el menu-bar.el display.texi descr-text.el desktop.el bindings.el - image-mode.el cus-edit.el ispell.el comint.el man.el - and 353 other files + comint.el image-mode.el cus-edit.el ispell.el man.el + and 354 other files Justin Bogner: changed fortune.el @@ -2218,7 +2218,7 @@ Justus Piater: changed org-agenda.el smtpmail.el Jérémie Courrèges-Anglas: changed org.texi ox-latex.el -Jérémy Compostella: changed battery.el keyboard.c tramp-sh.el windmove.el +Jérémy Compostella: changed tramp-sh.el battery.el keyboard.c windmove.el window.el xdisp.c Jérôme Marant: changed make-dist Makefile.in bindings.el configure.ac @@ -2242,7 +2242,7 @@ and co-wrote longlines.el tramp-sh.el tramp.el and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL - Makefile.in crisp.el fileio.c and 44 other files + Makefile.in crisp.el fileio.c and 45 other files Kai Tetzlaff: changed org-publish.el url-http.el @@ -2328,6 +2328,7 @@ Keith Packard: changed font.c Kelly Dean: changed simple.el fileio.c help-macro.el Kelvin White: changed erc.el erc-backend.el erc-ring.el erc-stamp.el + erc.texi Ken Brown: changed configure.ac gmalloc.c sheap.c cygwin.h browse-url.el emacs.c emacs.rc conf_post.h dispextern.h frame.c src/Makefile.in @@ -2581,7 +2582,7 @@ Luc Teirlinck: wrote help-at-pt.el and changed files.el autorevert.el cus-edit.el subr.el simple.el frames.texi startup.el display.texi files.texi dired.el comint.el modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi - variables.texi buffers.texi commands.texi and 214 other files + variables.texi buffers.texi commands.texi and 215 other files Luca Capello: changed mm-encode.el @@ -2933,7 +2934,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el erc-list.el erc-compat.el erc-identd.el erc.texi ERC-NEWS erc-bbdb.el erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el - erc-button.el and 62 other files + erc-button.el and 63 other files Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el @@ -3179,6 +3180,8 @@ and changed rsz-mini.el comint.el emacs-buffer.gdb files.el Makefile Noah Lavine: changed tramp.el +Noam Postavsky: changed cmdproxy.c + Nobuyoshi Nakada: co-wrote ruby-mode.el Nobuyuki Hikichi: changed news-risc.h @@ -3597,7 +3600,7 @@ Robert Marshall: changed mule-cmds.el Robert P. Goldman: changed org.texi ob-exp.el org.el ox-latex.el -Robert Pluim: changed gnus-demon.el org-agenda.el +Robert Pluim: changed gnus-demon.el org-agenda.el todo-mode.el Robert Thorpe: changed cus-start.el indent.el @@ -3925,9 +3928,9 @@ Stephen A. Wood: changed fortran.el Stephen Berman: co-wrote todo-mode.el and changed todo-mode.texi diary-lib.el minibuffer.el info.el - otodo-mode.el allout.el dframe.el dired-aux.el dired.el doc-view.el + otodo-mode.el allout.el dframe.el dir dired-aux.el dired.el doc-view.el elpa files.el find-dired.el frame.c gamegrid.el gnus-group.el gomoku.el - gtkutil.c misc/Makefile.in newcomment.el outline.el and 8 other files + gtkutil.c misc/Makefile.in newcomment.el and 9 other files Stephen C. Gilardi: changed configure.ac @@ -4084,7 +4087,7 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-sync.el and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el cfengine.el gnutls.c auth.texi gnus-util.el netrc.el gnus-start.el message.el spam-stat.el encrypt.el gnutls.h nnir.el nnmail.el imap.el - mail-source.el nnmairix.el nntp.el and 109 other files + mail-source.el nnmairix.el nntp.el and 110 other files Terje Rosten: changed xfns.c version.el xterm.c xterm.h @@ -4431,9 +4434,9 @@ Wolfgang Glas: changed unexsgi.c Wolfgang Jenkner: wrote man-tests.el and changed gnus-agent.el image-mode.el man.el ansi-color.el gnus-spec.el - gnus-sum.el gnus-util.el calc-tests.el calc-units.el conf-mode.el - functions.texi gnus-group.el gnus-picon.el gnus-salt.el gnus-start.el - gnus.texi intro.texi lread.c network-stream.el nntp.el pcvs.el + gnus-sum.el gnus-util.el network-stream.el calc-tests.el calc-units.el + conf-mode.el functions.texi gnus-group.el gnus-picon.el gnus-salt.el + gnus-start.el gnus.texi intro.texi lread.c nntp.el pcvs.el and 6 other files Wolfgang Lux: changed nsterm.m keyboard.c From b21a56ac91e39e75051ad07bb608c39af057adee Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Sun, 8 Mar 2015 15:42:28 +0100 Subject: [PATCH 255/457] Bump version to 24.4.91 --- README | 2 +- configure.ac | 2 +- doc/emacs/emacsver.texi | 2 +- doc/man/emacs.1 | 2 +- lisp/ldefs-boot.el | 2270 ++++++++++++++++++++------------------- msdos/sed2v2.inp | 2 +- nt/config.nt | 2 +- nt/emacs.rc | 8 +- nt/emacsclient.rc | 8 +- nt/makefile.w32-in | 2 +- 10 files changed, 1154 insertions(+), 1146 deletions(-) diff --git a/README b/README index 3331ec4075a..c4ef77b9729 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2015 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 24.4.90 of GNU Emacs, the extensible, +This directory tree holds version 24.4.91 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure.ac b/configure.ac index 776b7a02931..209bae9eef9 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) -AC_INIT(emacs, 24.4.90) +AC_INIT(emacs, 24.4.91) dnl We get MINGW64 with MSYS2 if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64" diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index 310565d1ec6..824c213acc4 100644 --- a/doc/emacs/emacsver.texi +++ b/doc/emacs/emacsver.texi @@ -1,4 +1,4 @@ @c It would be nicer to generate this using configure and @version@. @c However, that would mean emacsver.texi would always be newer @c then the info files in release tarfiles. -@set EMACSVER 24.4.90 +@set EMACSVER 24.4.91 diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 78d9e82bb5f..36f5e49504a 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 24.4.90" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.4.91" . . .SH NAME diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 449fbacddc5..f85dbc4e12e 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3,7 +3,7 @@ ;;; Code: -;;;### (autoloads nil "5x5" "play/5x5.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "5x5" "play/5x5.el" (21710 25465 294934 381000)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -65,8 +65,8 @@ should return a grid vector array that is the new solution. ;;;*** -;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21710 25547 +;;;;;; 169569 365000)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -85,8 +85,8 @@ Ada mode is the major mode for editing Ada code. ;;;*** -;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21710 25465 +;;;;;; 300934 355000)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload 'ada-header "ada-stmt" "\ @@ -96,8 +96,8 @@ Insert a descriptive header at the top of the file. ;;;*** -;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21710 25547 +;;;;;; 169569 365000)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -108,8 +108,8 @@ Completion is available. ;;;*** -;;;### (autoloads nil "add-log" "vc/add-log.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (21710 25547 218569 +;;;;;; 146000)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -238,8 +238,8 @@ old-style time formats for entries are supported. ;;;*** -;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21710 25465 +;;;;;; 124935 139000)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -374,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) ;;;*** -;;;### (autoloads nil "align" "align.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "align" "align.el" (21710 25465 76935 353000)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -477,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** -;;;### (autoloads nil "allout" "allout.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "allout" "allout.el" (21710 25465 78935 344000)) ;;; Generated autoloads from allout.el (push (purecopy '(allout 2 3)) package--builtin-versions) @@ -837,8 +837,8 @@ for details on preparing Emacs for automatic allout activation. ;;;*** -;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21710 +;;;;;; 25547 51569 891000)) ;;; Generated autoloads from allout-widgets.el (push (purecopy '(allout-widgets 1 0)) package--builtin-versions) @@ -896,8 +896,8 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** -;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21710 25547 141569 +;;;;;; 489000)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -918,8 +918,8 @@ directory, so that Emacs will know its current contents. ;;;*** -;;;### (autoloads nil "animate" "play/animate.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "animate" "play/animate.el" (21710 25465 294934 +;;;;;; 381000)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -951,8 +951,8 @@ the buffer *Birthday-Present-for-Name*. ;;;*** -;;;### (autoloads nil "ansi-color" "ansi-color.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21710 25465 78935 +;;;;;; 344000)) ;;; Generated autoloads from ansi-color.el (push (purecopy '(ansi-color 3 4 2)) package--builtin-versions) @@ -978,8 +978,8 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** -;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21710 +;;;;;; 25465 301934 350000)) ;;; Generated autoloads from progmodes/antlr-mode.el (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions) @@ -1015,8 +1015,8 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;*** -;;;### (autoloads nil "appt" "calendar/appt.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "appt" "calendar/appt.el" (21710 25547 57569 +;;;;;; 864000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1037,8 +1037,7 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "apropos" "apropos.el" (21710 25547 52569 886000)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1153,8 +1152,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads nil "arc-mode" "arc-mode.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "arc-mode" "arc-mode.el" (21710 25547 52569 +;;;;;; 886000)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1174,7 +1173,7 @@ archive. ;;;*** -;;;### (autoloads nil "array" "array.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "array" "array.el" (21710 25465 79935 340000)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1245,8 +1244,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads nil "artist" "textmodes/artist.el" (21715 24393 -;;;;;; 407468 552000)) +;;;### (autoloads nil "artist" "textmodes/artist.el" (21732 22059 +;;;;;; 431321 591000)) ;;; Generated autoloads from textmodes/artist.el (push (purecopy '(artist 1 2 6)) package--builtin-versions) @@ -1452,8 +1451,8 @@ Keymap summary ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21710 25465 +;;;;;; 301934 350000)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1480,8 +1479,8 @@ Special commands: ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21710 +;;;;;; 25547 99569 677000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1493,8 +1492,7 @@ let-binding.") ;;;*** -;;;### (autoloads nil "autoarg" "autoarg.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "autoarg" "autoarg.el" (21710 25465 79935 340000)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1554,8 +1552,8 @@ This is similar to `autoarg-mode' but rebinds the keypad keys ;;;*** -;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21710 25465 +;;;;;; 301934 350000)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1565,8 +1563,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21710 25547 52569 +;;;;;; 886000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1604,8 +1602,8 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21710 +;;;;;; 25547 75569 784000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1654,8 +1652,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "autorevert" "autorevert.el" (21710 25465 79935 +;;;;;; 340000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1743,7 +1741,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "avoid" "avoid.el" (21710 25465 80935 335000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1781,8 +1779,8 @@ definition of \"random distance\".) ;;;*** -;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21710 25465 +;;;;;; 301934 350000)) ;;; Generated autoloads from progmodes/bat-mode.el (add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode)) @@ -1800,8 +1798,7 @@ Run script using `bat-run' and `bat-run-args'. ;;;*** -;;;### (autoloads nil "battery" "battery.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "battery" "battery.el" (21710 25465 80935 335000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1836,8 +1833,8 @@ seconds. ;;;*** -;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21710 +;;;;;; 25465 124935 139000)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1873,8 +1870,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21710 25547 +;;;;;; 208569 191000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1966,7 +1963,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'. ;;;*** ;;;### (autoloads nil "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25465 348934 141000)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1976,8 +1973,8 @@ Major mode for editing BibTeX style files. ;;;*** -;;;### (autoloads nil "binhex" "mail/binhex.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "binhex" "mail/binhex.el" (21710 25465 224934 +;;;;;; 693000)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -2001,8 +1998,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads nil "blackbox" "play/blackbox.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "blackbox" "play/blackbox.el" (21710 25465 +;;;;;; 294934 381000)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2121,8 +2118,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "bookmark" "bookmark.el" (21710 25547 53569 +;;;;;; 882000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2314,8 +2311,8 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (21741 514 -;;;;;; 655319 165000)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (21756 23917 +;;;;;; 638125 443000)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2624,7 +2621,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "bs" "bs.el" (21710 25547 53569 882000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2665,8 +2662,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21710 25547 165569 +;;;;;; 382000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2688,7 +2685,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 301934 350000)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2708,8 +2705,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21710 +;;;;;; 25547 77569 775000)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2829,8 +2826,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21710 +;;;;;; 25547 57569 864000)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2839,8 +2836,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21710 25547 +;;;;;; 58569 859000)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2851,8 +2848,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21710 +;;;;;; 25547 58569 859000)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2866,7 +2863,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "calc" "calc/calc.el" (21710 25547 57569 864000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2950,8 +2947,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21710 25465 +;;;;;; 87935 304000)) ;;; Generated autoloads from calc/calc-undo.el (autoload 'calc-undo "calc-undo" "\ @@ -2961,8 +2958,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "calculator" "calculator.el" (21710 25547 57569 +;;;;;; 864000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2973,8 +2970,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21710 25547 +;;;;;; 59569 855000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3017,8 +3014,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "canlock" "gnus/canlock.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "canlock" "gnus/canlock.el" (21710 25465 166934 +;;;;;; 952000)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -3035,8 +3032,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21710 +;;;;;; 25547 170569 360000)) ;;; Generated autoloads from progmodes/cap-words.el (autoload 'capitalized-words-mode "cap-words" "\ @@ -3076,7 +3073,7 @@ Obsoletes `c-forward-into-nomenclature'. ;;;*** ;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21710 -;;;;;; 6472 78891 397000)) +;;;;;; 25547 173569 347000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3086,8 +3083,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21710 25547 +;;;;;; 174569 342000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3185,8 +3182,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21711 27340 -;;;;;; 416042 87000)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21713 24233 +;;;;;; 279494 843000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3343,8 +3340,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21710 +;;;;;; 25547 175569 338000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3395,8 +3392,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21710 25547 +;;;;;; 176569 334000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3404,8 +3401,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "ccl" "international/ccl.el" (21710 25547 123569 +;;;;;; 570000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3665,8 +3662,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21710 25547 +;;;;;; 77569 775000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3685,15 +3682,15 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cedet" "cedet/cedet.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "cedet" "cedet/cedet.el" (21710 25465 97935 +;;;;;; 260000)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21710 25547 +;;;;;; 176569 334000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 3)) package--builtin-versions) @@ -3723,15 +3720,15 @@ on the buffer contents ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21710 25547 +;;;;;; 77569 775000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25465 126935 130000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3748,8 +3745,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21710 +;;;;;; 25465 126935 130000)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (push (purecopy '(checkdoc 0 6 2)) package--builtin-versions) (put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp) @@ -3949,8 +3946,8 @@ checking of documentation strings. ;;;*** -;;;### (autoloads nil "china-util" "language/china-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "china-util" "language/china-util.el" (21710 +;;;;;; 25465 206934 774000)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -3987,8 +3984,8 @@ Encode the text in the current buffer to HZ. ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "chistory" "chistory.el" (21710 25465 115935 +;;;;;; 179000)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -4027,8 +4024,8 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21710 +;;;;;; 25547 78569 770000)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4106,8 +4103,8 @@ For example, the function `case' has an indent property ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21710 25547 +;;;;;; 78569 770000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) @@ -4137,8 +4134,8 @@ a future Emacs interpreter will be able to use it.") ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21710 25465 +;;;;;; 307934 323000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4158,8 +4155,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21710 25465 115935 +;;;;;; 179000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4179,7 +4176,7 @@ is run). ;;;*** -;;;### (autoloads nil "color" "color.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "color" "color.el" (21710 25465 115935 179000)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4198,7 +4195,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21735 9668 456748 276000)) +;;;### (autoloads nil "comint" "comint.el" (21756 23917 629125 513000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4297,8 +4294,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21710 25547 +;;;;;; 218569 146000)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4331,8 +4328,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21710 25547 +;;;;;; 177569 329000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4513,8 +4510,8 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** -;;;### (autoloads nil "completion" "completion.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "completion" "completion.el" (21710 25547 71569 +;;;;;; 802000)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4536,8 +4533,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21710 +;;;;;; 25547 208569 191000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4692,8 +4689,8 @@ For details see `conf-mode'. Example: ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "cookie1" "play/cookie1.el" (21710 25465 294934 +;;;;;; 381000)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4721,8 +4718,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21710 +;;;;;; 25465 128935 122000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4760,8 +4757,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21710 +;;;;;; 25547 178569 324000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4959,8 +4956,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21710 25465 310934 +;;;;;; 310000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4978,8 +4975,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21710 25465 128935 +;;;;;; 122000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -5005,8 +5002,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21710 25547 +;;;;;; 208569 191000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5016,8 +5013,8 @@ Major mode to edit Cascading Style Sheets. ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21710 25547 +;;;;;; 86569 735000)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5062,8 +5059,8 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;*** -;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21710 25465 +;;;;;; 138935 77000)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -5074,8 +5071,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21710 25547 72569 +;;;;;; 797000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5387,8 +5384,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21710 25465 118935 +;;;;;; 166000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5421,8 +5418,8 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** -;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21710 25465 +;;;;;; 366934 60000)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5432,8 +5429,8 @@ Mode used for cvs status output. ;;;*** -;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21710 25547 178569 +;;;;;; 324000)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) @@ -5477,8 +5474,8 @@ See `cwarn-mode' for more information on Cwarn mode. ;;;*** -;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21710 +;;;;;; 25465 206934 774000)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5506,8 +5503,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (21710 25465 118935 +;;;;;; 166000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5553,8 +5550,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21710 25465 +;;;;;; 97935 260000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5564,7 +5561,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21710 25547 142569 485000)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5577,8 +5574,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21710 25465 +;;;;;; 310934 310000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5704,8 +5701,8 @@ There is some minimal font-lock support (see vars ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21710 25465 +;;;;;; 129935 117000)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5748,8 +5745,8 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** -;;;### (autoloads nil "decipher" "play/decipher.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "decipher" "play/decipher.el" (21710 25465 +;;;;;; 294934 381000)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5777,8 +5774,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "delim-col" "delim-col.el" (21710 25465 118935 +;;;;;; 166000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5803,7 +5800,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "delsel" "delsel.el" (21710 25465 118935 166000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5831,8 +5828,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21710 25547 +;;;;;; 79569 766000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5898,8 +5895,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "descr-text" "descr-text.el" (21710 25547 72569 +;;;;;; 797000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5933,8 +5930,7 @@ relevant to POS. ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "desktop" "desktop.el" (21710 25547 73569 793000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6139,8 +6135,8 @@ Revert to the last loaded desktop. ;;;*** -;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21710 25465 +;;;;;; 166934 952000)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -6172,8 +6168,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21710 +;;;;;; 25547 60569 851000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6215,7 +6211,7 @@ Major mode for editing the diary file. ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "diff" "vc/diff.el" (21710 25465 367934 56000)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6263,8 +6259,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21710 25547 +;;;;;; 218569 146000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6296,7 +6292,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "dig" "net/dig.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "dig" "net/dig.el" (21710 25465 242934 613000)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6307,7 +6303,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21670 36217 665624 229000)) +;;;### (autoloads nil "dired" "dired.el" (21756 23917 629125 513000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6427,8 +6423,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (21710 25465 121935 +;;;;;; 153000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6458,8 +6454,8 @@ from `default-directory'. ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21710 25465 +;;;;;; 129935 117000)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6473,8 +6469,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "disp-table" "disp-table.el" (21710 25465 121935 +;;;;;; 153000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6595,8 +6591,8 @@ in `.emacs'. ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (21710 25465 +;;;;;; 294934 381000)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6612,7 +6608,7 @@ Default is 2. ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "dnd" "dnd.el" (21710 25547 74569 788000)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\ @@ -6632,8 +6628,8 @@ if some action was made, or nil if the URL is ignored.") ;;;*** -;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21710 25465 +;;;;;; 350934 132000)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6656,8 +6652,8 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads nil "doc-view" "doc-view.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "doc-view" "doc-view.el" (21710 25547 75569 +;;;;;; 784000)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6703,8 +6699,8 @@ See the command `doc-view-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "doctor" "play/doctor.el" (21710 25465 295934 +;;;;;; 377000)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6714,7 +6710,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "double" "double.el" (21710 25465 122935 148000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6730,8 +6726,8 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21710 25547 166569 +;;;;;; 378000)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) @@ -6742,8 +6738,8 @@ Switch to *dungeon* buffer and start game. ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21710 +;;;;;; 25547 79569 766000)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6882,8 +6878,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21710 +;;;;;; 25465 129935 117000)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7021,8 +7017,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21710 25465 +;;;;;; 312934 301000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7287,8 +7283,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21710 25465 +;;;;;; 313934 297000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7436,8 +7432,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21710 25465 122935 +;;;;;; 148000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7469,8 +7465,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "echistory" "echistory.el" (21710 25465 122935 +;;;;;; 148000)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7481,8 +7477,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21710 25465 +;;;;;; 166934 952000)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7492,7 +7488,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "ede" "cedet/ede.el" (21710 25547 62569 842000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7518,8 +7514,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21710 25547 +;;;;;; 80569 762000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7583,7 +7579,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (21710 25465 369934 47000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -7855,8 +7851,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21710 25465 +;;;;;; 367934 56000)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7866,8 +7862,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21710 25465 +;;;;;; 368934 51000)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7879,8 +7875,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21710 25547 +;;;;;; 219569 142000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7899,8 +7895,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "edmacro" "edmacro.el" (21710 25465 122935 +;;;;;; 148000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -7949,8 +7945,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "edt" "emulation/edt.el" (21710 25547 86569 +;;;;;; 735000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -7967,7 +7963,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21710 25465 122935 148000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8003,15 +7999,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21670 36216 -;;;;;; 665623 730000)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21710 25547 +;;;;;; 82569 753000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21710 +;;;;;; 25547 81569 757000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8027,8 +8023,8 @@ It creates an autoload function for CNAME's constructor. ;;;*** -;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21710 25547 +;;;;;; 82569 753000)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -8071,8 +8067,8 @@ Emacs Lisp mode) that support ElDoc.") ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "elec-pair" "elec-pair.el" (21710 25465 122935 +;;;;;; 148000)) ;;; Generated autoloads from elec-pair.el (defvar electric-pair-text-pairs '((34 . 34)) "\ @@ -8107,8 +8103,8 @@ closing parenthesis. (Likewise for brackets, etc.). ;;;*** -;;;### (autoloads nil "elide-head" "elide-head.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "elide-head" "elide-head.el" (21710 25465 123935 +;;;;;; 144000)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -8123,8 +8119,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21710 25465 +;;;;;; 132935 104000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8159,8 +8155,8 @@ optional prefix argument REINIT is non-nil. ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21710 25465 132935 +;;;;;; 104000)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8194,8 +8190,8 @@ displayed. ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21710 25465 138935 +;;;;;; 77000)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8222,8 +8218,8 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21710 25547 +;;;;;; 134569 521000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8236,8 +8232,8 @@ Prompts for bug subject. Leaves you in a mail buffer. ;;;*** -;;;### (autoloads nil "emerge" "vc/emerge.el" (21607 56059 804396 -;;;;;; 982000)) +;;;### (autoloads nil "emerge" "vc/emerge.el" (21710 25547 220569 +;;;;;; 137000)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -8297,8 +8293,8 @@ Emerge two RCS revisions of a file, with another revision as ancestor. ;;;*** -;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21710 25547 +;;;;;; 208569 191000)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -8333,7 +8329,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "epa" "epa.el" (21710 25547 86569 735000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8511,8 +8507,8 @@ Insert selected KEYS after the point. ;;;*** -;;;### (autoloads nil "epa-dired" "epa-dired.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "epa-dired" "epa-dired.el" (21710 25465 142935 +;;;;;; 59000)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8537,8 +8533,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "epa-file" "epa-file.el" (21710 25547 86569 +;;;;;; 735000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8558,8 +8554,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-mail" "epa-mail.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "epa-mail" "epa-mail.el" (21710 25547 86569 +;;;;;; 735000)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8636,7 +8632,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "epg" "epg.el" (21710 25547 87569 730000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8647,8 +8643,8 @@ Return a context object. ;;;*** -;;;### (autoloads nil "epg-config" "epg-config.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "epg-config" "epg-config.el" (21710 25465 142935 +;;;;;; 59000)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8668,7 +8664,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21732 33477 285319 343000)) +;;;### (autoloads nil "erc" "erc/erc.el" (21732 22059 427321 614000)) ;;; Generated autoloads from erc/erc.el (push (purecopy '(erc 5 3)) package--builtin-versions) @@ -8717,36 +8713,36 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21710 +;;;;;; 25465 145935 46000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21710 25465 +;;;;;; 145935 46000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21710 25465 +;;;;;; 145935 46000)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21710 25465 +;;;;;; 145935 46000)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21710 25547 87569 +;;;;;; 730000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8776,14 +8772,14 @@ that subcommand. ;;;*** ;;;### (autoloads nil "erc-desktop-notifications" "erc/erc-desktop-notifications.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25547 87569 730000)) ;;; Generated autoloads from erc/erc-desktop-notifications.el (autoload 'erc-notifications-mode "erc-desktop-notifications" "" t) ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21710 +;;;;;; 25465 146935 41000)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8845,8 +8841,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8858,8 +8854,8 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'. ;;;*** -;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21710 25465 +;;;;;; 146935 41000)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8880,8 +8876,8 @@ system. ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21710 25465 +;;;;;; 146935 41000)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8891,22 +8887,22 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8935,8 +8931,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21710 25465 +;;;;;; 146935 41000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -8982,15 +8978,15 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21710 25465 146935 +;;;;;; 41000)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21710 +;;;;;; 25465 146935 41000)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9001,8 +8997,8 @@ Show who's gone. ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -9019,8 +9015,8 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9038,36 +9034,36 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21710 25465 147935 +;;;;;; 37000)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21710 25465 147935 +;;;;;; 37000)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9084,15 +9080,15 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9103,22 +9099,22 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21710 +;;;;;; 25465 147935 37000)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21710 25465 +;;;;;; 147935 37000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9143,8 +9139,8 @@ keybindings will not do anything useful. ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21710 +;;;;;; 25465 148935 32000)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9163,8 +9159,8 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21710 25465 148935 +;;;;;; 32000)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9175,8 +9171,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21710 25547 82569 +;;;;;; 753000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9241,8 +9237,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** -;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21710 25465 +;;;;;; 132935 104000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9254,8 +9250,8 @@ Kill all test buffers that are still live. ;;;*** -;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21710 25465 +;;;;;; 151935 19000)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9265,8 +9261,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (21710 25547 88569 +;;;;;; 726000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9301,8 +9297,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (21710 25547 179569 +;;;;;; 320000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9610,8 +9606,8 @@ for \\[find-tag] (which see). ;;;*** -;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21710 +;;;;;; 25465 206934 774000)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9779,7 +9775,7 @@ With ARG, insert that many delimiters. ;;;*** -;;;### (autoloads nil "eudc" "net/eudc.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "eudc" "net/eudc.el" (21710 25547 142569 485000)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9833,8 +9829,8 @@ This does nothing except loading eudc by autoload side-effect. ;;;*** -;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21710 25547 142569 +;;;;;; 485000)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -9869,8 +9865,8 @@ Display a button for the JPEG DATA. ;;;*** -;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21710 25547 +;;;;;; 142569 485000)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9886,8 +9882,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** -;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21710 +;;;;;; 25547 142569 485000)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9897,8 +9893,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21710 25465 133935 +;;;;;; 99000)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -9924,7 +9920,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "eww" "net/eww.el" (21710 25547 143569 481000)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -9947,8 +9943,8 @@ Render a file using EWW. ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (21710 +;;;;;; 25465 313934 297000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -9989,7 +9985,7 @@ file modes. ;;;*** -;;;### (autoloads nil "expand" "expand.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "expand" "expand.el" (21710 25465 152935 14000)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -10038,8 +10034,8 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads nil "f90" "progmodes/f90.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "f90" "progmodes/f90.el" (21710 25547 179569 +;;;;;; 320000)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10106,8 +10102,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "face-remap" "face-remap.el" (21710 25465 152935 +;;;;;; 14000)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10266,8 +10262,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;*** -;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21710 25465 +;;;;;; 225934 689000)) ;;; Generated autoloads from mail/feedmail.el (push (purecopy '(feedmail 11)) package--builtin-versions) @@ -10321,7 +10317,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "ffap" "ffap.el" (21710 25547 89569 721000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10384,8 +10380,8 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "filecache" "filecache.el" (21710 25465 153935 +;;;;;; 10000)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -10442,8 +10438,8 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads nil "filenotify" "filenotify.el" (21686 24133 544625 -;;;;;; 151000)) +;;;### (autoloads nil "filenotify" "filenotify.el" (21710 25465 153935 +;;;;;; 10000)) ;;; Generated autoloads from filenotify.el (autoload 'file-notify-handle-event "filenotify" "\ @@ -10458,8 +10454,8 @@ Otherwise, signal a `file-notify-error'. ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "files-x" "files-x.el" (21710 25465 153935 +;;;;;; 10000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10524,8 +10520,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "filesets" "filesets.el" (21710 25465 155935 +;;;;;; 1000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10536,8 +10532,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (21710 25547 90569 +;;;;;; 717000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10557,8 +10553,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "find-dired" "find-dired.el" (21710 25465 155935 +;;;;;; 1000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10598,8 +10594,8 @@ use in place of \"-ls\" as the final argument. ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "find-file" "find-file.el" (21710 25465 156934 +;;;;;; 997000)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\ @@ -10689,8 +10685,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21710 +;;;;;; 25547 82569 753000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10848,8 +10844,8 @@ Define some key bindings for the find-function family of functions. ;;;*** -;;;### (autoloads nil "find-lisp" "find-lisp.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "find-lisp" "find-lisp.el" (21710 25465 156934 +;;;;;; 997000)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10869,7 +10865,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "finder" "finder.el" (21710 25465 156934 997000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -10891,8 +10887,8 @@ Find packages matching a given keyword. ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21710 25465 156934 +;;;;;; 997000)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -10913,8 +10909,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21710 25465 +;;;;;; 166934 952000)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -10929,8 +10925,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21710 25465 +;;;;;; 314934 292000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -10960,8 +10956,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21726 16215 -;;;;;; 785464 581000)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21732 22059 +;;;;;; 431321 591000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11031,14 +11027,14 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "foldout" "foldout.el" (21710 25465 156934 +;;;;;; 997000)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "follow" "follow.el" (21710 25465 156934 997000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11106,8 +11102,8 @@ selected if the original window is the first one in the frame. ;;;*** -;;;### (autoloads nil "footnote" "mail/footnote.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "footnote" "mail/footnote.el" (21710 25465 +;;;;;; 225934 689000)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) @@ -11126,7 +11122,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (21669 40236 816336 299000)) +;;;### (autoloads nil "forms" "forms.el" (21710 25465 158934 988000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11162,8 +11158,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21710 25465 +;;;;;; 315934 288000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11240,8 +11236,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "fortune" "play/fortune.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "fortune" "play/fortune.el" (21710 25465 295934 +;;;;;; 377000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11289,8 +11285,8 @@ and choose the directory as the fortune-file. ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "frameset" "frameset.el" (21710 25547 92569 +;;;;;; 708000)) ;;; Generated autoloads from frameset.el (defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\ @@ -11470,15 +11466,15 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21710 25547 +;;;;;; 166569 378000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21710 25465 +;;;;;; 315934 288000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11555,8 +11551,8 @@ detailed description of this mode. ;;;*** -;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21710 25465 +;;;;;; 133935 99000)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11636,8 +11632,8 @@ regular expression that can be used as an element of ;;;*** -;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21710 25465 +;;;;;; 315934 288000)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11651,8 +11647,8 @@ add virtual separators (like underscores) at places they belong to. ;;;*** -;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21710 25547 +;;;;;; 99569 677000)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11706,7 +11702,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (21710 25547 110569 628000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11756,8 +11752,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21710 25465 +;;;;;; 167934 948000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11847,8 +11843,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21710 25547 +;;;;;; 100569 672000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11858,8 +11854,8 @@ Make the current buffer look like a nice article. ;;;*** -;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21710 +;;;;;; 25547 101569 668000)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -11882,8 +11878,8 @@ deletion, or > if it is flagged for displaying. ;;;*** -;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21710 25547 +;;;;;; 101569 668000)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -11924,8 +11920,8 @@ supported. ;;;*** -;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21710 25547 +;;;;;; 102569 663000)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11960,8 +11956,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21710 25465 +;;;;;; 170934 934000)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -11976,8 +11972,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21710 25465 +;;;;;; 170934 934000)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -11987,8 +11983,8 @@ Convenience method to turn on gnus-dired-mode. ;;;*** -;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21710 25465 +;;;;;; 170934 934000)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -11998,8 +11994,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21710 25547 +;;;;;; 102569 663000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus-random-x-face "gnus-fun" "\ @@ -12043,8 +12039,8 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to ;;;*** -;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21710 +;;;;;; 25465 171934 930000)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -12061,8 +12057,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21710 25547 +;;;;;; 102569 663000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12079,8 +12075,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21710 25547 +;;;;;; 103569 659000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12095,8 +12091,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21710 25465 +;;;;;; 172934 925000)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12109,8 +12105,8 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;*** -;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21710 25465 172934 +;;;;;; 925000)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -12133,8 +12129,8 @@ Minor mode for providing mailing-list commands. ;;;*** -;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21710 25547 +;;;;;; 103569 659000)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -12234,8 +12230,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21710 25547 +;;;;;; 103569 659000)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12262,7 +12258,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads nil "gnus-notifications" "gnus/gnus-notifications.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25547 103569 659000)) ;;; Generated autoloads from gnus/gnus-notifications.el (autoload 'gnus-notifications "gnus-notifications" "\ @@ -12278,8 +12274,8 @@ This is typically a function to add in ;;;*** -;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21710 25547 +;;;;;; 104569 654000)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12302,8 +12298,8 @@ If picons are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21710 25465 +;;;;;; 173934 921000)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12370,8 +12366,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21710 +;;;;;; 25547 104569 654000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12386,8 +12382,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21710 25465 +;;;;;; 174934 916000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12414,8 +12410,8 @@ See the documentation for these variables and functions for details. ;;;*** -;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21710 25547 +;;;;;; 104569 654000)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12425,8 +12421,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21710 25547 +;;;;;; 106569 646000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12436,8 +12432,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21710 25547 +;;;;;; 109569 632000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12448,8 +12444,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21710 25465 +;;;;;; 179934 894000)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12464,8 +12460,8 @@ Install the sync hooks. ;;;*** -;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21710 25465 +;;;;;; 180934 890000)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12475,8 +12471,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (21710 25547 143569 +;;;;;; 481000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12492,8 +12488,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21710 25465 296934 +;;;;;; 372000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12519,8 +12515,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21710 25465 +;;;;;; 243934 609000)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12561,8 +12557,8 @@ Like `goto-address-mode', but only for comments and strings. ;;;*** -;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21710 25547 +;;;;;; 110569 628000)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -12578,8 +12574,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "grep" "progmodes/grep.el" (21710 25547 180569 +;;;;;; 316000)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12743,7 +12739,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'. ;;;*** -;;;### (autoloads nil "gs" "gs.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "gs" "gs.el" (21710 25465 192934 836000)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12756,8 +12752,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "gud" "progmodes/gud.el" (21710 25547 180569 +;;;;;; 316000)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12845,8 +12841,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21710 25547 83569 +;;;;;; 748000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -12948,8 +12944,8 @@ binding mode. ;;;*** -;;;### (autoloads nil "handwrite" "play/handwrite.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "handwrite" "play/handwrite.el" (21710 25465 +;;;;;; 296934 372000)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -12966,8 +12962,8 @@ Variables: `handwrite-linespace' (default 12) ;;;*** -;;;### (autoloads nil "hanoi" "play/hanoi.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "hanoi" "play/hanoi.el" (21710 25465 296934 +;;;;;; 372000)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -12994,8 +12990,8 @@ to be updated. ;;;*** -;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21710 25547 +;;;;;; 134569 521000)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -13037,8 +13033,8 @@ Prefix arg sets default accept amount temporarily. ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21710 25465 192934 +;;;;;; 836000)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -13165,8 +13161,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "help-fns" "help-fns.el" (21710 25547 118569 +;;;;;; 592000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13245,8 +13241,8 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file. ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "help-macro" "help-macro.el" (21710 25465 192934 +;;;;;; 836000)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13260,8 +13256,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "help-mode" "help-mode.el" (21710 25547 118569 +;;;;;; 592000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13360,8 +13356,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21710 25465 +;;;;;; 133935 99000)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13376,7 +13372,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "hexl" "hexl.el" (21710 25547 119569 588000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13470,8 +13466,8 @@ This discards the buffer's undo information. ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "hi-lock" "hi-lock.el" (21710 25547 119569 +;;;;;; 588000)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13638,8 +13634,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21710 25547 +;;;;;; 180569 316000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13682,8 +13678,8 @@ Several variables affect how the hiding is done: ;;;*** -;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21710 25547 +;;;;;; 181569 311000)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13745,8 +13741,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21710 25465 194934 +;;;;;; 827000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13877,8 +13873,8 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21710 25547 119569 +;;;;;; 588000)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -13910,8 +13906,8 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "hl-line" "hl-line.el" (21710 25465 194934 +;;;;;; 827000)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -13960,8 +13956,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (21710 25547 +;;;;;; 60569 851000)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -14109,8 +14105,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (21710 25465 +;;;;;; 181934 885000)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14120,8 +14116,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21670 36217 -;;;;;; 165621 979000)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21710 25547 +;;;;;; 119569 588000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14154,8 +14150,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'. ;;;*** -;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21710 25547 120569 +;;;;;; 583000)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14243,8 +14239,8 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21670 36217 165621 -;;;;;; 979000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21710 25547 120569 +;;;;;; 583000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14283,8 +14279,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21710 +;;;;;; 25547 61569 846000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14337,8 +14333,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "icomplete" "icomplete.el" (21710 25547 120569 +;;;;;; 583000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14373,8 +14369,8 @@ completions: ;;;*** -;;;### (autoloads nil "icon" "progmodes/icon.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "icon" "progmodes/icon.el" (21710 25465 317934 +;;;;;; 279000)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14414,8 +14410,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21710 +;;;;;; 25547 182569 307000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14440,8 +14436,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21710 25547 +;;;;;; 183569 302000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14570,7 +14566,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "ido" "ido.el" (21710 25547 121569 579000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14832,7 +14828,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "ielm" "ielm.el" (21710 25547 121569 579000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -14844,7 +14840,7 @@ See `inferior-emacs-lisp-mode' for details. ;;;*** -;;;### (autoloads nil "iimage" "iimage.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "iimage" "iimage.el" (21710 25465 196934 818000)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -14860,7 +14856,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "image" "image.el" (21710 25465 197934 814000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15053,8 +15049,8 @@ If Emacs is compiled without ImageMagick support, this does nothing. ;;;*** -;;;### (autoloads nil "image-dired" "image-dired.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "image-dired" "image-dired.el" (21710 25465 +;;;;;; 197934 814000)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) @@ -15191,8 +15187,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads nil "image-file" "image-file.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "image-file" "image-file.el" (21710 25465 197934 +;;;;;; 814000)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\ @@ -15254,8 +15250,8 @@ An image file is one whose name has an extension in ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "image-mode" "image-mode.el" (21710 25547 122569 +;;;;;; 574000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15302,7 +15298,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "imenu" "imenu.el" (21710 25547 122569 574000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15440,8 +15436,8 @@ for more information. ;;;*** -;;;### (autoloads nil "ind-util" "language/ind-util.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "ind-util" "language/ind-util.el" (21710 25465 +;;;;;; 210934 756000)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -15471,8 +15467,8 @@ Convert old Emacs Devanagari characters to UCS. ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21710 25547 +;;;;;; 183569 302000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15490,7 +15486,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "info" "info.el" (21710 25547 123569 570000)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -15700,8 +15696,8 @@ Otherwise, visit the manual in a new Info buffer. ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "info-look" "info-look.el" (21710 25465 198934 +;;;;;; 809000)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15748,8 +15744,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "info-xref" "info-xref.el" (21710 25465 198934 +;;;;;; 809000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -15832,8 +15828,8 @@ the sources handy. ;;;*** -;;;### (autoloads nil "informat" "informat.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "informat" "informat.el" (21710 25465 199934 +;;;;;; 805000)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15878,8 +15874,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inversion" "cedet/inversion.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "inversion" "cedet/inversion.el" (21710 25465 +;;;;;; 100935 246000)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) @@ -15891,8 +15887,8 @@ Only checks one based on which kind of Emacs is being run. ;;;*** -;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21710 +;;;;;; 25465 200934 800000)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -15912,8 +15908,8 @@ Toggle input method in interactive search. ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "isearchb" "isearchb.el" (21710 25465 204934 +;;;;;; 783000)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -15927,8 +15923,8 @@ accessed via isearchb. ;;;*** -;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21710 +;;;;;; 25465 200934 800000)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -16019,15 +16015,15 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 200934 800000)) ;;; Generated autoloads from international/iso-transl.el (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap) ;;;*** -;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21756 23917 +;;;;;; 647125 373000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16260,8 +16256,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to ;;;*** -;;;### (autoloads nil "japan-util" "language/japan-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "japan-util" "language/japan-util.el" (21710 +;;;;;; 25465 211934 751000)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -16338,8 +16334,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (21710 25465 205934 +;;;;;; 778000)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16362,8 +16358,8 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "js" "progmodes/js.el" (21710 25547 184569 +;;;;;; 298000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16375,14 +16371,14 @@ Major mode for editing JavaScript. ;;;*** -;;;### (autoloads nil "json" "json.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "json" "json.el" (21710 25465 205934 778000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "keypad" "emulation/keypad.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "keypad" "emulation/keypad.el" (21710 25465 +;;;;;; 139935 72000)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16437,8 +16433,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** -;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21710 +;;;;;; 25465 200934 800000)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -16459,8 +16455,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "kkc" "international/kkc.el" (21710 25465 201934 +;;;;;; 796000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16482,7 +16478,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21710 25465 205934 778000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16594,8 +16590,8 @@ If kbd macro currently being defined end it before activating it. ;;;*** -;;;### (autoloads nil "korea-util" "language/korea-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "korea-util" "language/korea-util.el" (21710 +;;;;;; 25465 211934 751000)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16609,8 +16605,8 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "landmark" "play/landmark.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "landmark" "play/landmark.el" (21710 25547 +;;;;;; 167569 373000)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16640,8 +16636,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "lao-util" "language/lao-util.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "lao-util" "language/lao-util.el" (21710 25465 +;;;;;; 211934 751000)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16678,8 +16674,8 @@ Transcribe Romanized Lao string STR to Lao character string. ;;;*** -;;;### (autoloads nil "latexenc" "international/latexenc.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "latexenc" "international/latexenc.el" (21710 +;;;;;; 25465 201934 796000)) ;;; Generated autoloads from international/latexenc.el (defvar latex-inputenc-coding-alist (purecopy '(("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ @@ -16711,7 +16707,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 201934 796000)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16752,8 +16748,8 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** -;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21710 +;;;;;; 25465 321934 261000)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16763,7 +16759,7 @@ A major mode to edit GNU ld script files ;;;*** -;;;### (autoloads nil "life" "play/life.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "life" "play/life.el" (21710 25465 296934 372000)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -16776,7 +16772,7 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads nil "linum" "linum.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "linum" "linum.el" (21710 25547 134569 521000)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -16813,8 +16809,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "loadhist" "loadhist.el" (21710 25465 223934 +;;;;;; 698000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16845,7 +16841,7 @@ something strange, such as redefining an Emacs function. ;;;*** -;;;### (autoloads nil "locate" "locate.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "locate" "locate.el" (21710 25465 224934 693000)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -16897,8 +16893,8 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21710 25465 370934 +;;;;;; 43000)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16929,8 +16925,8 @@ done. Otherwise, it uses the current buffer. ;;;*** -;;;### (autoloads nil "log-view" "vc/log-view.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "log-view" "vc/log-view.el" (21710 25465 370934 +;;;;;; 43000)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -16940,7 +16936,7 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "lpr" "lpr.el" (21710 25465 224934 693000)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17035,8 +17031,8 @@ for further customization of the printer command. ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21710 25547 134569 +;;;;;; 521000)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -17047,8 +17043,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads nil "lunar" "calendar/lunar.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "lunar" "calendar/lunar.el" (21710 25547 61569 +;;;;;; 846000)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -17062,8 +17058,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21710 25547 +;;;;;; 184569 298000)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17073,7 +17069,7 @@ A major mode to edit m4 macro files. ;;;*** -;;;### (autoloads nil "macros" "macros.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "macros" "macros.el" (21710 25465 224934 693000)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17162,8 +17158,8 @@ and then select the region of un-tablified names and use ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17193,8 +17189,8 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;*** -;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17223,8 +17219,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17298,8 +17294,8 @@ matches may be returned from the message body. ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17348,8 +17344,8 @@ double-quotes. ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17402,8 +17398,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any. ;;;*** -;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -17415,8 +17411,8 @@ The mail client is taken to be the handler of mailto URLs. ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21710 +;;;;;; 25465 321934 261000)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17533,8 +17529,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "makesum" "makesum.el" (21710 25465 230934 +;;;;;; 667000)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -17545,7 +17541,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads nil "man" "man.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "man" "man.el" (21710 25547 136569 512000)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17599,7 +17595,7 @@ Default bookmark handler for Man buffers. ;;;*** -;;;### (autoloads nil "master" "master.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "master" "master.el" (21710 25465 230934 667000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) @@ -17622,8 +17618,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads nil "mb-depth" "mb-depth.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mb-depth" "mb-depth.el" (21710 25465 230934 +;;;;;; 667000)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -17650,14 +17646,14 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "md4" "md4.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "md4" "md4.el" (21710 25465 230934 667000)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21706 9418 86773 -;;;;;; 130000)) +;;;### (autoloads nil "message" "gnus/message.el" (21710 25547 111569 +;;;;;; 623000)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -17822,8 +17818,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21710 +;;;;;; 25465 321934 261000)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) @@ -17839,8 +17835,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17883,8 +17879,8 @@ redisplayed as output is inserted. ;;;*** -;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21710 25465 234934 +;;;;;; 649000)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -17974,7 +17970,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21710 25547 138569 503000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -17991,8 +17987,8 @@ Display version information about MH-E and the MH mail handling system. ;;;*** -;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21710 25465 +;;;;;; 235934 644000)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18073,8 +18069,8 @@ perform the operation on all messages in that region. ;;;*** -;;;### (autoloads nil "midnight" "midnight.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "midnight" "midnight.el" (21710 25465 238934 +;;;;;; 631000)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -18100,8 +18096,8 @@ to its second argument TM. ;;;*** -;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21710 25465 +;;;;;; 238934 631000)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18130,7 +18126,7 @@ is modified to remove the default indication. ;;;*** -;;;### (autoloads nil "misc" "misc.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "misc" "misc.el" (21710 25465 239934 627000)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18158,8 +18154,8 @@ The return value is always nil. ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "misearch" "misearch.el" (21710 25547 139569 +;;;;;; 498000)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18240,8 +18236,8 @@ whose file names match the specified wildcard. ;;;*** -;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21710 +;;;;;; 25465 322934 257000)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) @@ -18252,8 +18248,8 @@ Major mode for the mixal asm language. ;;;*** -;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21710 25465 +;;;;;; 183934 876000)) ;;; Generated autoloads from gnus/mm-encode.el (autoload 'mm-default-file-encoding "mm-encode" "\ @@ -18263,8 +18259,8 @@ Return a default encoding for FILE. ;;;*** -;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21710 25547 +;;;;;; 112569 619000)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -18282,8 +18278,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21710 25465 +;;;;;; 183934 876000)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -18296,8 +18292,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21710 25547 112569 +;;;;;; 619000)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18313,8 +18309,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21710 25547 112569 +;;;;;; 619000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18333,7 +18329,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** -;;;### (autoloads nil "mml" "gnus/mml.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "mml" "gnus/mml.el" (21710 25547 113569 614000)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18358,8 +18354,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21710 25547 113569 +;;;;;; 614000)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -18374,8 +18370,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21710 25547 113569 +;;;;;; 614000)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18415,16 +18411,16 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21710 25465 +;;;;;; 101935 242000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) ;;;*** -;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21607 56025 -;;;;;; 801549 101000)) +;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21710 25465 +;;;;;; 322934 257000)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18457,8 +18453,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "morse" "play/morse.el" (21710 25547 167569 +;;;;;; 373000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18483,8 +18479,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** -;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21710 25465 239934 +;;;;;; 627000)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18531,7 +18527,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "mpc" "mpc.el" (21710 25547 140569 494000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18541,7 +18537,7 @@ Main entry point for MPC. ;;;*** -;;;### (autoloads nil "mpuz" "play/mpuz.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "mpuz" "play/mpuz.el" (21710 25465 297934 368000)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18551,7 +18547,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "msb" "msb.el" (21710 25547 140569 494000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18576,8 +18572,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21710 +;;;;;; 25547 124569 565000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -18709,8 +18705,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (21710 +;;;;;; 25547 124569 565000)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -18841,8 +18837,8 @@ per-character basis, this may not be accurate. ;;;*** -;;;### (autoloads nil "net-utils" "net/net-utils.el" (21679 50887 -;;;;;; 336751 696000)) +;;;### (autoloads nil "net-utils" "net/net-utils.el" (21710 25465 +;;;;;; 244934 604000)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -18936,8 +18932,8 @@ Open a network connection to HOST on PORT. ;;;*** -;;;### (autoloads nil "netrc" "net/netrc.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "netrc" "net/netrc.el" (21710 25465 244934 +;;;;;; 604000)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -18949,8 +18945,8 @@ listed in the PORTS list. ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (21716 -;;;;;; 45255 735319 375000)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (21732 +;;;;;; 22059 428321 608000)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19043,8 +19039,8 @@ a greeting from the server. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21710 +;;;;;; 25547 144569 476000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19066,7 +19062,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25547 144569 476000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19076,8 +19072,8 @@ Start newsticker plainview. ;;;*** -;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21710 +;;;;;; 25547 144569 476000)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -19087,8 +19083,8 @@ Start reading news. You may want to bind this to a key. ;;;*** -;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21710 +;;;;;; 25547 145569 472000)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -19108,8 +19104,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21710 +;;;;;; 25547 145569 472000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19119,15 +19115,15 @@ Start newsticker treeview. ;;;*** -;;;### (autoloads nil "newsticker" "net/newsticker.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "newsticker" "net/newsticker.el" (21710 25547 +;;;;;; 145569 472000)) ;;; Generated autoloads from net/newsticker.el (push (purecopy '(newsticker 1 99)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21710 25465 185934 +;;;;;; 867000)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19137,8 +19133,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21710 25465 185934 +;;;;;; 867000)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -19152,8 +19148,8 @@ symbol in the alist. ;;;*** -;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21710 25547 +;;;;;; 114569 610000)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -19164,7 +19160,7 @@ This command does not work if you use short group names. ;;;*** -;;;### (autoloads nil "nnml" "gnus/nnml.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "nnml" "gnus/nnml.el" (21710 25465 188934 854000)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19174,7 +19170,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "novice" "novice.el" (21710 25465 254934 560000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19206,8 +19202,8 @@ future sessions. ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21710 +;;;;;; 25465 352934 123000)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19221,14 +19217,14 @@ closing requests for requests that are used in matched pairs. ;;;*** -;;;### (autoloads nil "ntlm" "net/ntlm.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "ntlm" "net/ntlm.el" (21710 25547 146569 467000)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21710 25465 +;;;;;; 254934 560000)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19240,8 +19236,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21710 25547 +;;;;;; 150569 450000)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19301,8 +19297,8 @@ Many aspects this mode can be customized using ;;;*** -;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21710 25465 +;;;;;; 255934 555000)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -19314,8 +19310,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21710 25547 +;;;;;; 185569 293000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19352,8 +19348,8 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21710 25547 +;;;;;; 185569 293000)) ;;; Generated autoloads from progmodes/opascal.el (define-obsolete-function-alias 'delphi-mode 'opascal-mode "24.4") @@ -19388,7 +19384,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "org" "org/org.el" (21710 25547 163569 392000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19609,8 +19605,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21710 25465 +;;;;;; 277934 457000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -19883,8 +19879,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (21710 25465 +;;;;;; 278934 453000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -19926,8 +19922,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "org-colview" "org/org-colview.el" (21710 25465 +;;;;;; 278934 453000)) ;;; Generated autoloads from org/org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -19990,8 +19986,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21710 25547 +;;;;;; 157569 418000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -20001,8 +19997,8 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "org-macs" "org/org-macs.el" (21710 25465 281934 +;;;;;; 439000)) ;;; Generated autoloads from org/org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -20012,8 +20008,8 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** -;;;### (autoloads nil "org-version" "org/org-version.el" (21607 56025 -;;;;;; 301574 889000)) +;;;### (autoloads nil "org-version" "org/org-version.el" (21710 25465 +;;;;;; 284934 426000)) ;;; Generated autoloads from org/org-version.el (autoload 'org-release "org-version" "\ @@ -20030,8 +20026,8 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "outline" "outline.el" (21710 25547 165569 +;;;;;; 382000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20092,8 +20088,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21676 11899 -;;;;;; 256354 520000)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21710 25547 +;;;;;; 84569 744000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20165,7 +20161,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads nil "paren" "paren.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "paren" "paren.el" (21710 25547 165569 382000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20191,8 +20187,8 @@ matching parenthesis is highlighted in `show-paren-style' after ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21710 +;;;;;; 25547 61569 846000)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20205,8 +20201,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21710 25465 +;;;;;; 323934 252000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20255,8 +20251,8 @@ See also the user variables `pascal-type-keywords', `pascal-start-keywords' and ;;;*** -;;;### (autoloads nil "password-cache" "password-cache.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "password-cache" "password-cache.el" (21710 +;;;;;; 25465 293934 386000)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20277,8 +20273,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21710 25547 +;;;;;; 84569 744000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20339,8 +20335,8 @@ of the form (UPAT EXP). ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20350,8 +20346,8 @@ Completion rules for the `cvs' command. ;;;*** -;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21710 25547 165569 +;;;;;; 382000)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20378,8 +20374,8 @@ Completion for the GNU tar utility. ;;;*** -;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21710 25465 +;;;;;; 293934 386000)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20399,8 +20395,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20410,8 +20406,8 @@ Completion for the `rpm' command. ;;;*** -;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20466,8 +20462,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20491,8 +20487,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (21689 338 694604 -;;;;;; 955000)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (21710 25465 293934 +;;;;;; 386000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20549,7 +20545,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21710 25465 371934 38000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -20624,8 +20620,8 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21710 25465 +;;;;;; 370934 43000)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ @@ -20633,8 +20629,8 @@ Global menu used by PCL-CVS.") ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21710 +;;;;;; 25547 185569 293000)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20695,8 +20691,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21710 25465 +;;;;;; 352934 123000)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -20776,8 +20772,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "plstore" "gnus/plstore.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "plstore" "gnus/plstore.el" (21710 25465 190934 +;;;;;; 845000)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -20792,8 +20788,8 @@ Major mode for editing PLSTORE files. ;;;*** -;;;### (autoloads nil "po" "textmodes/po.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "po" "textmodes/po.el" (21710 25465 352934 +;;;;;; 123000)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -20804,7 +20800,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads nil "pong" "play/pong.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "pong" "play/pong.el" (21710 25465 297934 368000)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -20820,7 +20816,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21710 25547 117569 596000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -20831,8 +20827,8 @@ Use streaming commands. ;;;*** -;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21710 25547 84569 +;;;;;; 744000)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -20882,8 +20878,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "printing" "printing.el" (21710 25547 168569 +;;;;;; 369000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21471,7 +21467,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "proced" "proced.el" (21710 25547 168569 369000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21489,8 +21485,8 @@ Proced buffers. ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "profiler" "profiler.el" (21710 25465 299934 +;;;;;; 359000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21518,8 +21514,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21710 25547 +;;;;;; 186569 289000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21552,7 +21548,7 @@ With prefix argument ARG, restart the Prolog process if running before. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21710 25465 334934 203000)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ @@ -21563,8 +21559,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21710 25547 +;;;;;; 186569 289000)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) @@ -21611,8 +21607,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (21670 36217 165621 -;;;;;; 979000)) +;;;### (autoloads nil "ps-print" "ps-print.el" (21710 25547 197569 +;;;;;; 240000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -21809,15 +21805,15 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21710 25547 64569 +;;;;;; 833000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21737 51412 -;;;;;; 646766 605000)) +;;;### (autoloads nil "python" "progmodes/python.el" (21756 23917 +;;;;;; 646125 381000)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 5)) package--builtin-versions) @@ -21851,7 +21847,7 @@ Major mode for editing Python files. ;;;*** -;;;### (autoloads nil "qp" "gnus/qp.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "qp" "gnus/qp.el" (21710 25465 190934 845000)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -21870,8 +21866,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "quail" "international/quail.el" (21710 25547 +;;;;;; 125569 561000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22101,8 +22097,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21710 +;;;;;; 25465 220934 711000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22115,7 +22111,7 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'. ;;;*** ;;;### (autoloads nil "quail/uni-input" "leim/quail/uni-input.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 223934 698000)) ;;; Generated autoloads from leim/quail/uni-input.el (autoload 'ucs-input-activate "quail/uni-input" "\ @@ -22129,8 +22125,8 @@ While this input method is active, the variable ;;;*** -;;;### (autoloads nil "quickurl" "net/quickurl.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "quickurl" "net/quickurl.el" (21710 25465 247934 +;;;;;; 591000)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -22201,8 +22197,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21710 25547 146569 +;;;;;; 467000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22240,8 +22236,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21710 +;;;;;; 25465 135935 90000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22259,8 +22255,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "recentf" "recentf.el" (21710 25465 336934 +;;;;;; 194000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22286,7 +22282,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "rect" "rect.el" (21710 25547 197569 240000)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22426,8 +22422,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "refill" "textmodes/refill.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "refill" "textmodes/refill.el" (21710 25465 +;;;;;; 353934 118000)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -22447,8 +22443,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21704 54100 -;;;;;; 244617 275000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21710 25547 +;;;;;; 212569 173000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -22497,8 +22493,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21710 +;;;;;; 25547 209569 186000)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload 'reftex-citation "reftex-cite" "\ @@ -22528,7 +22524,7 @@ While entering the regexp, completion on knows citation keys is possible. ;;;*** ;;;### (autoloads nil "reftex-global" "textmodes/reftex-global.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25547 209569 186000)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload 'reftex-isearch-minor-mode "reftex-global" "\ @@ -22545,7 +22541,7 @@ With no argument, this command toggles ;;;*** ;;;### (autoloads nil "reftex-index" "textmodes/reftex-index.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25547 210569 182000)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload 'reftex-index-phrases-mode "reftex-index" "\ @@ -22578,7 +22574,7 @@ Here are all local bindings. ;;;*** ;;;### (autoloads nil "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25547 210569 182000)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload 'reftex-all-document-files "reftex-parse" "\ @@ -22590,8 +22586,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21707 -;;;;;; 30279 916059 915000)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21710 +;;;;;; 25547 211569 177000)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22600,8 +22596,8 @@ of master file. ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21710 +;;;;;; 25547 84569 744000)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22630,15 +22626,15 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21710 25465 136935 +;;;;;; 86000)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21710 25547 +;;;;;; 213569 169000)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -22692,7 +22688,7 @@ to turn the *scratch* buffer into your notes buffer. ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "repeat" "repeat.el" (21710 25465 336934 194000)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -22715,8 +22711,8 @@ recently executed command not bound to an input event\". ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (21710 25465 +;;;;;; 226934 684000)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -22747,8 +22743,8 @@ mail-sending package is used for editing and sending the message. ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "reposition" "reposition.el" (21710 25465 337934 +;;;;;; 190000)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -22774,7 +22770,7 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads nil "reveal" "reveal.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "reveal" "reveal.el" (21710 25547 197569 240000)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -22809,8 +22805,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21710 25465 136935 +;;;;;; 86000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -22825,8 +22821,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (21710 25465 247934 +;;;;;; 591000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -22870,8 +22866,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21670 36217 165621 -;;;;;; 979000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21710 25547 135569 +;;;;;; 516000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23068,8 +23064,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21710 25465 +;;;;;; 228934 676000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23133,8 +23129,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21710 25465 +;;;;;; 255934 555000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23145,8 +23141,8 @@ Return a pattern. ;;;*** -;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21710 25465 +;;;;;; 255934 555000)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23158,8 +23154,8 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil. ;;;*** -;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21710 25465 +;;;;;; 256934 551000)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23189,8 +23185,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21710 25465 256934 +;;;;;; 551000)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23217,8 +23213,8 @@ must be equal. ;;;*** -;;;### (autoloads nil "robin" "international/robin.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "robin" "international/robin.el" (21710 25465 +;;;;;; 203934 787000)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -23250,7 +23246,7 @@ Start using robin package NAME, which is a string. ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "rot13" "rot13.el" (21710 25465 337934 190000)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23287,8 +23283,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (21710 25547 213569 +;;;;;; 169000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23318,8 +23314,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21710 +;;;;;; 25547 188569 280000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23336,8 +23332,8 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21710 25547 198569 +;;;;;; 235000)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23355,8 +23351,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21710 25465 136935 +;;;;;; 86000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -23667,15 +23663,15 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21710 25465 +;;;;;; 248934 587000)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "savehist" "savehist.el" (21710 25547 198569 +;;;;;; 235000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -23707,8 +23703,8 @@ histories, which is probably undesirable. ;;;*** -;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21710 25547 +;;;;;; 188569 280000)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -23747,8 +23743,8 @@ that variable's value is a string. ;;;*** -;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21710 25465 +;;;;;; 190934 845000)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -23761,8 +23757,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "scroll-all" "scroll-all.el" (21710 25547 198569 +;;;;;; 235000)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23787,8 +23783,8 @@ one window apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21710 25465 +;;;;;; 337934 190000)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -23804,16 +23800,16 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "secrets" "net/secrets.el" (21710 25465 248934 +;;;;;; 587000)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) ;;;*** -;;;### (autoloads nil "semantic" "cedet/semantic.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "semantic" "cedet/semantic.el" (21710 25547 +;;;;;; 64569 833000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) @@ -23871,7 +23867,7 @@ Semantic mode. ;;;*** ;;;### (autoloads nil "semantic/bovine/grammar" "cedet/semantic/bovine/grammar.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25547 65569 828000)) ;;; Generated autoloads from cedet/semantic/bovine/grammar.el (autoload 'bovine-grammar-mode "semantic/bovine/grammar" "\ @@ -23882,7 +23878,7 @@ Major mode for editing Bovine grammars. ;;;*** ;;;### (autoloads nil "semantic/wisent/grammar" "cedet/semantic/wisent/grammar.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25465 113935 188000)) ;;; Generated autoloads from cedet/semantic/wisent/grammar.el (autoload 'wisent-grammar-mode "semantic/wisent/grammar" "\ @@ -23892,8 +23888,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21710 25465 +;;;;;; 229934 671000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24174,7 +24170,7 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "server" "server.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "server" "server.el" (21710 25547 198569 235000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24241,7 +24237,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "ses" "ses.el" (21710 25547 199569 231000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24285,8 +24281,8 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21710 +;;;;;; 25547 214569 164000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24351,8 +24347,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21676 -;;;;;; 11881 756047 924000)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21710 +;;;;;; 25547 188569 280000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24415,8 +24411,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21710 25465 +;;;;;; 136935 86000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24465,8 +24461,8 @@ function, `load-path-shadows-find'. ;;;*** -;;;### (autoloads nil "shadowfile" "shadowfile.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "shadowfile" "shadowfile.el" (21710 25465 339934 +;;;;;; 181000)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -24504,7 +24500,7 @@ Set up file shadowing. ;;;*** -;;;### (autoloads nil "shell" "shell.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "shell" "shell.el" (21710 25547 199569 231000)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24552,7 +24548,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "shr" "net/shr.el" (21710 25547 147569 463000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24569,8 +24565,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (21710 25465 191934 +;;;;;; 841000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24595,8 +24591,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21710 25465 +;;;;;; 191934 841000)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -24611,8 +24607,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simula" "progmodes/simula.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "simula" "progmodes/simula.el" (21710 25465 +;;;;;; 326934 239000)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -24660,8 +24656,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "skeleton" "skeleton.el" (21710 25547 201569 +;;;;;; 222000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -24779,8 +24775,8 @@ symmetrical ones, and the same character twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21710 25547 +;;;;;; 220569 137000)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -24807,8 +24803,8 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** -;;;### (autoloads nil "smiley" "gnus/smiley.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "smiley" "gnus/smiley.el" (21710 25465 191934 +;;;;;; 841000)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -24825,8 +24821,8 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** -;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21710 25547 +;;;;;; 136569 512000)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -24841,8 +24837,8 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads nil "snake" "play/snake.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "snake" "play/snake.el" (21710 25465 297934 +;;;;;; 368000)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -24865,8 +24861,8 @@ Snake mode keybindings: ;;;*** -;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21710 25465 +;;;;;; 248934 587000)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -24895,8 +24891,8 @@ then `snmpv2-mode-hook'. ;;;*** -;;;### (autoloads nil "solar" "calendar/solar.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "solar" "calendar/solar.el" (21710 25465 95935 +;;;;;; 269000)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -24911,8 +24907,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "solitaire" "play/solitaire.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "solitaire" "play/solitaire.el" (21710 25465 +;;;;;; 297934 368000)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -24987,7 +24983,7 @@ Pick your favorite shortcuts: ;;;*** -;;;### (autoloads nil "sort" "sort.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "sort" "sort.el" (21710 25465 341934 172000)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25162,7 +25158,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "spam" "gnus/spam.el" (21710 25547 118569 592000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25176,8 +25172,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21710 +;;;;;; 25465 191934 841000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25219,8 +25215,8 @@ Spam reports will be queued with the method used when ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "speedbar" "speedbar.el" (21710 25547 202569 +;;;;;; 218000)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25244,8 +25240,8 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "spook" "play/spook.el" (21710 25465 297934 +;;;;;; 368000)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25260,8 +25256,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21710 25547 189569 +;;;;;; 276000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 4)) package--builtin-versions) @@ -25722,15 +25718,15 @@ buffer. ;;;*** -;;;### (autoloads nil "srecode" "cedet/srecode.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "srecode" "cedet/srecode.el" (21710 25465 113935 +;;;;;; 188000)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (21669 40236 816336 299000)) +;;;;;; (21710 25547 69569 810000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -25742,8 +25738,8 @@ Major-mode for writing SRecode macros. ;;;*** -;;;### (autoloads nil "starttls" "gnus/starttls.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "starttls" "gnus/starttls.el" (21710 25465 +;;;;;; 192934 836000)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -25766,8 +25762,8 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "strokes" "strokes.el" (21710 25465 343934 +;;;;;; 163000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -25880,8 +25876,8 @@ Read a complex stroke and insert its glyph into the current buffer. ;;;*** -;;;### (autoloads nil "studly" "play/studly.el" (21607 56025 301574 -;;;;;; 889000)) +;;;### (autoloads nil "studly" "play/studly.el" (21710 25465 297934 +;;;;;; 368000)) ;;; Generated autoloads from play/studly.el (autoload 'studlify-region "studly" "\ @@ -25901,8 +25897,8 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (21710 25547 +;;;;;; 189569 276000)) ;;; Generated autoloads from progmodes/subword.el (autoload 'subword-mode "subword" "\ @@ -25996,8 +25992,8 @@ See `superword-mode' for more information on Superword mode. ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (21710 25465 +;;;;;; 229934 671000)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -26029,8 +26025,8 @@ and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "t-mouse" "t-mouse.el" (21710 25465 344934 +;;;;;; 158000)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -26058,7 +26054,7 @@ It relies on the `gpm' daemon being activated. ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "tabify" "tabify.el" (21710 25465 344934 158000)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -26087,8 +26083,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "table" "textmodes/table.el" (21710 25465 358934 +;;;;;; 96000)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -26680,7 +26676,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads nil "talk" "talk.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "talk" "talk.el" (21710 25465 344934 158000)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -26695,8 +26691,8 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "tar-mode" "tar-mode.el" (21710 25547 204569 +;;;;;; 209000)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -26719,8 +26715,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21710 25465 328934 +;;;;;; 230000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -26768,8 +26764,8 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "telnet" "net/telnet.el" (21710 25465 249934 +;;;;;; 582000)) ;;; Generated autoloads from net/telnet.el (autoload 'telnet "telnet" "\ @@ -26794,7 +26790,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "term" "term.el" (21710 25547 205569 204000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -26836,8 +26832,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21710 +;;;;;; 25465 137935 81000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -26847,8 +26843,8 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads nil "tetris" "play/tetris.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "tetris" "play/tetris.el" (21710 25465 297934 +;;;;;; 368000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) @@ -26873,8 +26869,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21710 25547 +;;;;;; 214569 164000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27175,8 +27171,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21710 25465 +;;;;;; 360934 87000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27215,8 +27211,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21710 25465 +;;;;;; 360934 87000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27300,8 +27296,8 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads nil "thai-util" "language/thai-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "thai-util" "language/thai-util.el" (21710 +;;;;;; 25465 211934 751000)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27328,8 +27324,8 @@ Compose Thai characters in the current buffer. ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "thingatpt" "thingatpt.el" (21710 25465 361934 +;;;;;; 83000)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27393,7 +27389,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21710 25465 361934 83000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27427,8 +27423,8 @@ In dired, call the setroot program on the image at point. ;;;*** -;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21710 +;;;;;; 25465 212934 747000)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -27501,8 +27497,8 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21710 25547 +;;;;;; 215569 160000)) ;;; Generated autoloads from textmodes/tildify.el (push (purecopy '(tildify 4 5)) package--builtin-versions) @@ -27526,7 +27522,7 @@ This function performs no refilling of the changed text. ;;;*** -;;;### (autoloads nil "time" "time.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "time" "time.el" (21710 25465 361934 83000)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -27588,8 +27584,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21710 +;;;;;; 25547 61569 846000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27700,8 +27696,8 @@ This function does not work for SECONDS greater than `most-positive-fixnum'. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (21710 25465 361934 +;;;;;; 83000)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -27741,8 +27737,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21710 +;;;;;; 25547 61569 846000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -27852,7 +27848,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 204934 783000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -27874,7 +27870,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "tmm" "tmm.el" (21710 25547 215569 160000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27916,8 +27912,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21715 -;;;;;; 24393 407468 552000)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21732 +;;;;;; 22059 425321 625000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -27984,8 +27980,8 @@ Mode for displaying and reprioritizing top priority Todo. ;;;*** -;;;### (autoloads nil "tool-bar" "tool-bar.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "tool-bar" "tool-bar.el" (21710 25465 362934 +;;;;;; 78000)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -28055,8 +28051,8 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21710 25465 137935 +;;;;;; 81000)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -28069,8 +28065,8 @@ to a tcp server on another machine. ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21710 25465 +;;;;;; 137935 81000)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -28115,8 +28111,8 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21712 48204 744664 -;;;;;; 78000)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21756 23917 639125 +;;;;;; 436000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28231,8 +28227,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21710 25465 +;;;;;; 250934 578000)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28242,8 +28238,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "tutorial" "tutorial.el" (21710 25465 362934 +;;;;;; 78000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28267,8 +28263,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "tv-util" "language/tv-util.el" (21607 56024 -;;;;;; 801559 72000)) +;;;### (autoloads nil "tv-util" "language/tv-util.el" (21710 25465 +;;;;;; 212934 747000)) ;;; Generated autoloads from language/tv-util.el (autoload 'tai-viet-composition-function "tv-util" "\ @@ -28278,8 +28274,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21710 +;;;;;; 25465 361934 83000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28326,8 +28322,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "type-break" "type-break.el" (21710 25547 216569 +;;;;;; 155000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28459,7 +28455,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "uce" "mail/uce.el" (21710 25465 230934 667000)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -28473,7 +28469,7 @@ You might need to set `uce-mail-reader' before using this. ;;;*** ;;;### (autoloads nil "ucs-normalize" "international/ucs-normalize.el" -;;;;;; (21669 40237 316336 766000)) +;;;;;; (21710 25465 204934 783000)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -28538,8 +28534,8 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus. ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (21710 +;;;;;; 25465 361934 83000)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28559,8 +28555,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21710 25465 230934 +;;;;;; 667000)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -28580,8 +28576,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use. ;;;*** -;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21669 40236 -;;;;;; 816336 299000)) +;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21710 25465 +;;;;;; 137935 81000)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -28593,7 +28589,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "url" "url/url.el" (21710 25547 217569 151000)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -28640,8 +28636,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (21710 25465 363934 +;;;;;; 74000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -28682,8 +28678,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** -;;;### (autoloads nil "url-cache" "url/url-cache.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-cache" "url/url-cache.el" (21710 25547 +;;;;;; 216569 155000)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -28704,8 +28700,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-cid" "url/url-cid.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-cid" "url/url-cid.el" (21710 25465 363934 +;;;;;; 74000)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -28715,8 +28711,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-dav" "url/url-dav.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-dav" "url/url-dav.el" (21710 25547 216569 +;;;;;; 155000)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -28750,8 +28746,8 @@ added to this list, so most requests can just pass in nil. ;;;*** -;;;### (autoloads nil "url-file" "url/url-file.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-file" "url/url-file.el" (21710 25465 364934 +;;;;;; 69000)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -28761,8 +28757,8 @@ Handle file: and ftp: URLs. ;;;*** -;;;### (autoloads nil "url-gw" "url/url-gw.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-gw" "url/url-gw.el" (21710 25547 217569 +;;;;;; 151000)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -28780,8 +28776,8 @@ Might do a non-blocking connection; use `process-status' to check. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21710 +;;;;;; 25547 217569 151000)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28835,8 +28831,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-http" "url/url-http.el" (21710 25547 217569 +;;;;;; 151000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -28848,8 +28844,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-irc" "url/url-irc.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-irc" "url/url-irc.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -28859,8 +28855,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -28873,8 +28869,8 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** -;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21710 25465 +;;;;;; 365934 65000)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -28889,8 +28885,8 @@ Handle the mailto: URL syntax. ;;;*** -;;;### (autoloads nil "url-misc" "url/url-misc.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-misc" "url/url-misc.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -28921,8 +28917,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-news" "url/url-news.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-news" "url/url-news.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -28937,8 +28933,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-ns" "url/url-ns.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-ns" "url/url-ns.el" (21710 25465 365934 +;;;;;; 65000)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -28978,8 +28974,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-parse" "url/url-parse.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-parse" "url/url-parse.el" (21710 25465 +;;;;;; 365934 65000)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -29030,8 +29026,8 @@ parses to ;;;*** -;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21710 25465 +;;;;;; 365934 65000)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -29041,8 +29037,8 @@ Setup variables that expose info about you and your system. ;;;*** -;;;### (autoloads nil "url-queue" "url/url-queue.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "url-queue" "url/url-queue.el" (21710 25547 +;;;;;; 217569 151000)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -29056,8 +29052,8 @@ The variable `url-queue-timeout' sets a timeout. ;;;*** -;;;### (autoloads nil "url-util" "url/url-util.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "url-util" "url/url-util.el" (21710 25547 217569 +;;;;;; 151000)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29225,8 +29221,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "userlock" "userlock.el" (21710 25465 366934 +;;;;;; 60000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29254,8 +29250,8 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (21710 25465 +;;;;;; 204934 783000)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29280,7 +29276,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf7" "gnus/utf7.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "utf7" "gnus/utf7.el" (21710 25465 192934 836000)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29290,8 +29286,8 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;*** -;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21669 40237 -;;;;;; 316336 766000)) +;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21710 25465 +;;;;;; 230934 667000)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29315,7 +29311,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "vc" "vc/vc.el" (21710 25547 224569 119000)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29600,8 +29596,8 @@ Return the branch part of a revision number REV. ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21669 40237 -;;;;;; 826337 297000)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21710 25547 +;;;;;; 220569 137000)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29638,8 +29634,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21710 25547 221569 +;;;;;; 133000)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29649,8 +29645,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21710 25547 221569 +;;;;;; 133000)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -29666,8 +29662,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21710 25547 221569 +;;;;;; 133000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -29678,8 +29674,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21710 25547 221569 +;;;;;; 133000)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -29703,8 +29699,8 @@ These are the commands available for use in the file status buffer: ;;;*** -;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21710 +;;;;;; 25547 222569 128000)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -29727,8 +29723,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21710 25547 222569 +;;;;;; 128000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -29739,7 +29735,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21710 25547 222569 128000)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -29750,8 +29746,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21710 25547 223569 +;;;;;; 124000)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -29767,8 +29763,8 @@ Name of the monotone directory's format file.") ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21710 25547 223569 +;;;;;; 124000)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -29781,8 +29777,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21710 25547 223569 +;;;;;; 124000)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -29800,8 +29796,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21710 25547 223569 +;;;;;; 124000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29814,8 +29810,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21710 +;;;;;; 25547 190569 271000)) ;;; Generated autoloads from progmodes/vera-mode.el (push (purecopy '(vera-mode 2 28)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -29874,7 +29870,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21669 40237 826337 297000)) +;;;;;; (21710 25547 192569 262000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30013,8 +30009,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21710 +;;;;;; 25547 195569 249000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -30568,8 +30564,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "viet-util" "language/viet-util.el" (21669 -;;;;;; 40237 316336 766000)) +;;;### (autoloads nil "viet-util" "language/viet-util.el" (21710 +;;;;;; 25465 212934 747000)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -30613,7 +30609,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics. ;;;*** -;;;### (autoloads nil "view" "view.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "view" "view.el" (21710 25465 376934 16000)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -30869,8 +30865,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "viper" "emulation/viper.el" (21669 40236 816336 -;;;;;; 299000)) +;;;### (autoloads nil "viper" "emulation/viper.el" (21710 25465 141935 +;;;;;; 64000)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) @@ -30887,8 +30883,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21669 -;;;;;; 40236 816336 299000)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21710 +;;;;;; 25465 138935 77000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -30978,7 +30974,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "wdired" "wdired.el" (21710 25465 377934 11000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -30996,8 +30992,8 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads nil "webjump" "net/webjump.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "webjump" "net/webjump.el" (21710 25465 253934 +;;;;;; 564000)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -31013,8 +31009,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21669 -;;;;;; 40237 826337 297000)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21710 +;;;;;; 25547 195569 249000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31044,8 +31040,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "whitespace" "whitespace.el" (21710 25547 225569 +;;;;;; 115000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31444,8 +31440,8 @@ cleaning up these problems. ;;;*** -;;;### (autoloads nil "wid-browse" "wid-browse.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "wid-browse" "wid-browse.el" (21710 25465 377934 +;;;;;; 11000)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -31473,8 +31469,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21710 25547 226569 +;;;;;; 111000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31516,8 +31512,8 @@ Setup current buffer so editing string widgets works. ;;;*** -;;;### (autoloads nil "windmove" "windmove.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "windmove" "windmove.el" (21710 25465 378934 +;;;;;; 7000)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -31569,7 +31565,7 @@ Default MODIFIER is 'shift. ;;;*** -;;;### (autoloads nil "winner" "winner.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "winner" "winner.el" (21710 25547 227569 106000)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -31592,7 +31588,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "woman" "woman.el" (21710 25547 228569 102000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31641,7 +31637,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (21669 40237 826337 297000)) +;;;### (autoloads nil "xml" "xml.el" (21710 25465 380933 998000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -31697,8 +31693,8 @@ Both features can be combined by providing a cons cell ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21669 40237 316336 -;;;;;; 766000)) +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21710 25465 256934 +;;;;;; 551000)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -31716,8 +31712,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21669 40237 826337 -;;;;;; 297000)) +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21710 25547 228569 +;;;;;; 102000)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -31746,7 +31742,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** -;;;### (autoloads nil "yenc" "gnus/yenc.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "yenc" "gnus/yenc.el" (21710 25465 192934 836000)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -31761,7 +31757,7 @@ Extract file name from an yenc header. ;;;*** -;;;### (autoloads nil "zone" "play/zone.el" (21669 40237 316336 766000)) +;;;### (autoloads nil "zone" "play/zone.el" (21710 25465 297934 368000)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -31806,14 +31802,16 @@ Zone out, completely. ;;;;;; "cedet/ede/util.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" ;;;;;; "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el" ;;;;;; "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el" -;;;;;; "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el" -;;;;;; "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el" -;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm.el" -;;;;;; "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" -;;;;;; "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el" -;;;;;; "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" -;;;;;; "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el" -;;;;;; "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" +;;;;;; "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el" +;;;;;; "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el" +;;;;;; "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el" +;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el" +;;;;;; "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el" +;;;;;; "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el" +;;;;;; "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el" +;;;;;; "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el" +;;;;;; "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el" +;;;;;; "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" ;;;;;; "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el" ;;;;;; "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el" ;;;;;; "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el" @@ -31831,39 +31829,42 @@ Zone out, completely. ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" -;;;;;; "cedet/semantic/wisent/python.el" "cedet/semantic/wisent/wisent.el" -;;;;;; "cedet/srecode/args.el" "cedet/srecode/compile.el" "cedet/srecode/cpp.el" -;;;;;; "cedet/srecode/ctxt.el" "cedet/srecode/dictionary.el" "cedet/srecode/document.el" +;;;;;; "cedet/semantic/wisent/javat-wy.el" "cedet/semantic/wisent/js-wy.el" +;;;;;; "cedet/semantic/wisent/python-wy.el" "cedet/semantic/wisent/python.el" +;;;;;; "cedet/semantic/wisent/wisent.el" "cedet/srecode/args.el" +;;;;;; "cedet/srecode/compile.el" "cedet/srecode/cpp.el" "cedet/srecode/ctxt.el" +;;;;;; "cedet/srecode/dictionary.el" "cedet/srecode/document.el" ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" ;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" -;;;;;; "cedet/srecode/srt.el" "cedet/srecode/table.el" "cedet/srecode/template.el" -;;;;;; "cedet/srecode/texi.el" "cus-dep.el" "dframe.el" "dired-aux.el" -;;;;;; "dired-x.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "dynamic-setting.el" -;;;;;; "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" -;;;;;; "emacs-lisp/byte-opt.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" -;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" -;;;;;; "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el" -;;;;;; "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el" -;;;;;; "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" -;;;;;; "emacs-lisp/smie.el" "emacs-lisp/subr-x.el" "emacs-lisp/tcover-ses.el" -;;;;;; "emacs-lisp/tcover-unsafep.el" "emulation/cua-gmrk.el" "emulation/edt-lk201.el" -;;;;;; "emulation/edt-mapper.el" "emulation/edt-pc.el" "emulation/edt-vt100.el" -;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el" -;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el" -;;;;;; "emulation/viper-util.el" "erc/erc-backend.el" "erc/erc-goodies.el" -;;;;;; "erc/erc-ibuffer.el" "erc/erc-lang.el" "eshell/em-alias.el" -;;;;;; "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el" -;;;;;; "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el" -;;;;;; "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el" -;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" -;;;;;; "eshell/em-term.el" "eshell/em-tramp.el" "eshell/em-unix.el" -;;;;;; "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el" -;;;;;; "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-module.el" -;;;;;; "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el" -;;;;;; "eshell/esh-var.el" "ezimage.el" "format-spec.el" "fringe.el" -;;;;;; "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" +;;;;;; "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" +;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" +;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el" +;;;;;; "dos-w32.el" "dynamic-setting.el" "emacs-lisp/authors.el" +;;;;;; "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" +;;;;;; "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" +;;;;;; "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-custom.el" +;;;;;; "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-opt.el" +;;;;;; "emacs-lisp/eieio-speedbar.el" "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" +;;;;;; "emacs-lisp/package-x.el" "emacs-lisp/smie.el" "emacs-lisp/subr-x.el" +;;;;;; "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el" +;;;;;; "emulation/cua-gmrk.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el" +;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/viper-cmd.el" +;;;;;; "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el" +;;;;;; "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el" +;;;;;; "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el" +;;;;;; "erc/erc-lang.el" "eshell/em-alias.el" "eshell/em-banner.el" +;;;;;; "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el" +;;;;;; "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el" +;;;;;; "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el" +;;;;;; "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el" +;;;;;; "eshell/em-tramp.el" "eshell/em-unix.el" "eshell/em-xtra.el" +;;;;;; "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el" +;;;;;; "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el" +;;;;;; "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el" +;;;;;; "ezimage.el" "format-spec.el" "fringe.el" "generic-x.el" +;;;;;; "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el" ;;;;;; "gnus/gnus-cite.el" "gnus/gnus-cus.el" "gnus/gnus-demon.el" ;;;;;; "gnus/gnus-dup.el" "gnus/gnus-eform.el" "gnus/gnus-ems.el" ;;;;;; "gnus/gnus-icalendar.el" "gnus/gnus-int.el" "gnus/gnus-logic.el" @@ -31886,8 +31887,15 @@ Zone out, completely. ;;;;;; "gnus/spam-wash.el" "hex-util.el" "hfy-cmap.el" "ibuf-ext.el" ;;;;;; "international/cp51932.el" "international/eucjp-ms.el" "international/fontset.el" ;;;;;; "international/iso-ascii.el" "international/ja-dic-cnv.el" -;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "kermit.el" -;;;;;; "language/hanja-util.el" "language/thai-word.el" "ldefs-boot.el" +;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "international/uni-bidi.el" +;;;;;; "international/uni-category.el" "international/uni-combining.el" +;;;;;; "international/uni-comment.el" "international/uni-decimal.el" +;;;;;; "international/uni-decomposition.el" "international/uni-digit.el" +;;;;;; "international/uni-lowercase.el" "international/uni-mirrored.el" +;;;;;; "international/uni-name.el" "international/uni-numeric.el" +;;;;;; "international/uni-old-name.el" "international/uni-titlecase.el" +;;;;;; "international/uni-uppercase.el" "kermit.el" "language/hanja-util.el" +;;;;;; "language/thai-word.el" "ldefs-boot.el" "leim/ja-dic/ja-dic.el" ;;;;;; "leim/quail/arabic.el" "leim/quail/croatian.el" "leim/quail/cyril-jis.el" ;;;;;; "leim/quail/cyrillic.el" "leim/quail/czech.el" "leim/quail/ethiopic.el" ;;;;;; "leim/quail/georgian.el" "leim/quail/greek.el" "leim/quail/hanja-jis.el" @@ -31975,8 +31983,8 @@ Zone out, completely. ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21747 1197 271747 -;;;;;; 619000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21756 24813 458504 +;;;;;; 639000)) ;;;*** diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 34ef96c7a04..5167540c2fc 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -70,7 +70,7 @@ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ -/^#undef VERSION/s/^.*$/#define VERSION "24.4.90"/ +/^#undef VERSION/s/^.*$/#define VERSION "24.4.91"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ diff --git a/nt/config.nt b/nt/config.nt index c67d2a50df7..7c67fe5bbde 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -1576,7 +1576,7 @@ along with GNU Emacs. If not, see . */ #undef USG_SUBTTY_WORKS /* Version number of package */ -#define VERSION "24.4.90" +#define VERSION "24.4.91" /* Define to 1 if unsetenv returns void instead of int. */ #undef VOID_UNSETENV diff --git a/nt/emacs.rc b/nt/emacs.rc index a87bf79964a..50a08ba62ae 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -11,8 +11,8 @@ Emacs ICON icons/emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,4,90,0 - PRODUCTVERSION 24,4,90,0 + FILEVERSION 24,4,91,0 + PRODUCTVERSION 24,4,91,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -29,12 +29,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 4, 90, 0\0" + VALUE "FileVersion", "24, 4, 91, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 4, 90, 0\0" + VALUE "ProductVersion", "24, 4, 91, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index cb82ae2cf49..a2d6a8b5f61 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,4,90,0 - PRODUCTVERSION 24,4,90,0 + FILEVERSION 24,4,91,0 + PRODUCTVERSION 24,4,91,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 4, 90, 0\0" + VALUE "FileVersion", "24, 4, 91, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 4, 90, 0\0" + VALUE "ProductVersion", "24, 4, 91, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 2cce573df6f..06699662126 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -22,7 +22,7 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). -VERSION = 24.4.90 +VERSION = 24.4.91 TMP_DIST_DIR = emacs-$(VERSION) From d03ec1cf1662e3dc911439f09e64e8a5a3754832 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sun, 8 Mar 2015 20:30:23 +0200 Subject: [PATCH 256/457] Fix test/indent/js.js * test/indent/js.js: Set `js-indent-level' to 2. Fix indentation in an example. --- test/ChangeLog | 5 +++++ test/indent/js.js | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/ChangeLog b/test/ChangeLog index a9c20f6fbfa..92ce4b62a0b 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-03-08 Dmitry Gutov + + * indent/js.js: Set `js-indent-level' to 2. Fix indentation in an + example. + 2015-03-04 Michael Albinus * automated/tramp-tests.el (top): Declare `tramp-get-remote-stat' diff --git a/test/indent/js.js b/test/indent/js.js index d330fa06d5b..f41849da284 100644 --- a/test/indent/js.js +++ b/test/indent/js.js @@ -1,3 +1,5 @@ +// -*- js-indent-level: 2 -*- + var a = 1; b = 2; @@ -9,7 +11,7 @@ var e = 100500, function test () { - return /[/]/.test ('/') // (bug#19397) + return /[/]/.test ('/') // (bug#19397) } var f = bar('/protocols/') From dad0fc589c18dd95cf1ac77869a4530e2848c328 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 8 Mar 2015 20:57:29 +0200 Subject: [PATCH 257/457] ruby-mode: Expect regexp after { or | too Fixes: debbugs:20026 * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect beginning of regexp also after open brace or vertical bar. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/ruby-mode.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b277c7c518..60f5dfcdb7c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-08 Nobuyoshi Nakada + + * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect + beginning of regexp also after open brace or vertical bar. + (Bug#20026) + 2015-03-07 Stefan Monnier * battery.el (battery-echo-area-format): Simplify default. diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index d1e42ca3443..4307109f654 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1817,7 +1817,7 @@ It will be properly highlighted even when the call omits parens.") (defvar ruby-syntax-before-regexp-re (concat ;; Special tokens that can't be followed by a division operator. - "\\(^\\|[[=(,~;<>]" + "\\(^\\|[[{|=(,~;<>]" ;; Distinguish ternary operator tokens. ;; FIXME: They don't really have to be separated with spaces. "\\|[?:] " From d15317cc1750b116467fb5178250be27fd752bd0 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sun, 8 Mar 2015 20:57:47 +0200 Subject: [PATCH 258/457] Add an indent test example for bug#20026 * test/indent/ruby.rb: Add an example for bug#20026. --- test/ChangeLog | 2 ++ test/indent/ruby.rb | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/test/ChangeLog b/test/ChangeLog index 92ce4b62a0b..301cc4046e5 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,7 @@ 2015-03-08 Dmitry Gutov + * indent/ruby.rb: Add an example for bug#20026. + * indent/js.js: Set `js-indent-level' to 2. Fix indentation in an example. diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb index 82cc63f9168..dec6de98605 100644 --- a/test/indent/ruby.rb +++ b/test/indent/ruby.rb @@ -40,6 +40,10 @@ def foo /foo/xi != %r{bar}mo.tee +foo { /"tee/ + bar { |qux| /'fee"/ } # bug#20026 +} + bar(class: XXX) do # ruby-indent-keyword-label foo end From e991af9228af77356df1e4ce7e824d5140a3bf8a Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sun, 8 Mar 2015 22:09:32 +0200 Subject: [PATCH 259/457] ruby-mode: Change faces used for self, true, false and nil Fixes: debbugs:17733 * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use `font-lock-constant-face' for nil, true and false. Highlight `self' as a keyword. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/ruby-mode.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 60f5dfcdb7c..5f26239ecdc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-08 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use + `font-lock-constant-face' for nil, true and false. Highlight + `self' as a keyword. (Bug#17733) + 2015-03-08 Nobuyoshi Nakada * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 4307109f654..4abc413f636 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -2053,8 +2053,9 @@ See `font-lock-syntax-table'.") "rescue" "retry" "return" - "then" + "self" "super" + "then" "unless" "undef" "until" @@ -2149,8 +2150,8 @@ See `font-lock-syntax-table'.") "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$" ;; Variables. (,(concat ruby-font-lock-keyword-beg-re - "\\_<\\(nil\\|self\\|true\\|false\\)\\_>") - 1 font-lock-variable-name-face) + "\\_<\\(nil\\|true\\|false\\)\\_>") + 1 font-lock-constant-face) ;; Keywords that evaluate to certain values. ("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" (0 font-lock-builtin-face)) From 6b134bcba9de5605086ee9382c0be13174480cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Sj=C3=B8gren?= Date: Sun, 8 Mar 2015 22:45:06 +0000 Subject: [PATCH 260/457] lisp/gnus/gnus-notifications.el (gnus-notifications-action): Replace x-focus-frame kludge by calling gnus-select-frame-set-input-focus --- lisp/gnus/gnus-notifications.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el index 22dba3570a3..f73aac1f5b3 100644 --- a/lisp/gnus/gnus-notifications.el +++ b/lisp/gnus/gnus-notifications.el @@ -81,7 +81,7 @@ not get notifications." (article (nth 2 group-article))) (cond ((string= key "read") (gnus-fetch-group group (list article)) - (when (and window-system (fboundp 'x-focus-frame)) (x-focus-frame (selected-frame)))) + (gnus-select-frame-set-input-focus (selected-frame))) ((string= key "mark-read") (gnus-update-read-articles group From 6df13146cccc062c8bef9ed9c52827ec07c5885e Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Fri, 6 Mar 2015 03:18:36 -0500 Subject: [PATCH 261/457] EUDC: Support BBDB >= 3 Fixes: bug#19678 Co-authored-by: Thomas Fitzsimmons * net/eudcb-bbdb.el (eudc-bbdb-field): New function. (eudc-bbdb-filter-non-matching-record): Call eudc-bbdb-field. (eudc-bbdb-format-record-as-result): Likewise. --- lisp/ChangeLog | 7 +++++++ lisp/net/eudcb-bbdb.el | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5f26239ecdc..ed28911497a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-03-06 Sergio Durigan Junior + Thomas Fitzsimmons + + * net/eudcb-bbdb.el (eudc-bbdb-field): New function. + (eudc-bbdb-filter-non-matching-record): Call eudc-bbdb-field. + (eudc-bbdb-format-record-as-result): Likewise. + 2015-03-08 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index 5be2bec0c5d..bd5d4536aab 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el @@ -42,6 +42,24 @@ (defvar eudc-bbdb-current-query nil) (defvar eudc-bbdb-current-return-attributes nil) +(defvar bbdb-version) + +(defun eudc-bbdb-field (field-symbol) + "Convert FIELD-SYMBOL so that it is recognized by the current BBDB version. +BBDB < 3 used `net'; BBDB >= 3 uses `mail'." + ;; This just-in-time translation permits upgrading from BBDB 2 to + ;; BBDB 3 without restarting Emacs. + (if (and (eq field-symbol 'net) + (or + ;; MELPA versions of BBDB may have a bad package version, + ;; but they're all version 3 or later. + (equal bbdb-version "@PACKAGE_VERSION@") + ;; Development versions of BBDB can have the format "X.YZ + ;; devo". Split the string just in case. + (version<= "3" (car (split-string bbdb-version))))) + 'mail + field-symbol)) + (defvar eudc-bbdb-attributes-translation-alist '((name . lastname) (email . net) @@ -85,7 +103,9 @@ (progn (setq bbdb-val (eval (list (intern (concat "bbdb-record-" - (symbol-name attr))) + (symbol-name + (eudc-bbdb-field + attr)))) 'record))) (if (listp bbdb-val) (if eudc-bbdb-enable-substring-matches @@ -168,7 +188,7 @@ The record is filtered according to `eudc-bbdb-current-return-attributes'" (setq val (eval (list (intern (concat "bbdb-record-" - (symbol-name attr))) + (symbol-name (eudc-bbdb-field attr)))) 'record)))) (t (error "Unknown BBDB attribute"))) From 0c1dd712f7682ad85aad82c09967748ca5bed7eb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 8 Mar 2015 18:54:18 -0700 Subject: [PATCH 262/457] Fix ChangeLog typos --- lisp/ChangeLog | 1 + nt/ChangeLog | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 121a395e63d..3e458135186 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2015-03-09 Eli Zaretskii * dired.el (dired-delete-file): Doc fix. (Bug#20021) + 2015-03-06 Sergio Durigan Junior Thomas Fitzsimmons diff --git a/nt/ChangeLog b/nt/ChangeLog index 78630415c6f..f804abe2e88 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -9,7 +9,6 @@ (spawn): If calling a quoted batch file pass NULL for progname. (Bug#18745) -2015-03-09 Eli Zaretskii 2015-03-03 Eli Zaretskii * cmdproxy.c (get_next_token): Don't make backslashes disappear From 4fab7badf5ce341cd6b1e32e72f55eee5c3962e8 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 9 Mar 2015 05:26:57 +0200 Subject: [PATCH 263/457] ruby-mode: Don't consider `=' a part of symbol when followed by `>' Fixes: debbugs:18644 * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't consider `=' a part of symbol when followed by `>'. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/ruby-mode.el | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3e458135186..e1842973acb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-09 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't consider + `=' a part of symbol when followed by `>'. (Bug#18644) + 2015-03-09 Eli Zaretskii * dired.el (dired-delete-file): Doc fix. (Bug#20021) diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 4abc413f636..06b1fcf1729 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -2155,8 +2155,16 @@ See `font-lock-syntax-table'.") ;; Keywords that evaluate to certain values. ("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" (0 font-lock-builtin-face)) - ;; Symbols. - ("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|@?\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)" + ;; Symbols with symbol characters. + ("\\(^\\|[^:]\\)\\(:@?\\(?:\\w\\|_\\)+\\)\\([!?=]\\)?" + (2 font-lock-constant-face) + (3 (unless (and (eq (char-before (match-end 3)) ?=) + (eq (char-after (match-end 3)) ?>)) + ;; bug#18466 + font-lock-constant-face) + nil t)) + ;; Symbols with special characters. + ("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)" 2 font-lock-constant-face) ;; Special globals. (,(concat "\\$\\(?:[:\"!@;,/\\._><\\$?~=*&`'+0-9]\\|-[0adFiIlpvw]\\|" From 8854b9cf5283cac3e4a5a3726325a82b88c1fcb5 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 9 Mar 2015 05:53:58 +0200 Subject: [PATCH 264/457] ruby-mode: Detect regexps after `!' Fixes: debbugs:19285 * lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect regexps after `!'. --- lisp/ChangeLog | 2 ++ lisp/progmodes/ruby-mode.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e1842973acb..b284ef16eaf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,8 @@ * progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't consider `=' a part of symbol when followed by `>'. (Bug#18644) + (ruby-syntax-before-regexp-re): Detect regexps after `!'. + (Bug#19285) 2015-03-09 Eli Zaretskii diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 06b1fcf1729..060bc847eb4 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1817,7 +1817,7 @@ It will be properly highlighted even when the call omits parens.") (defvar ruby-syntax-before-regexp-re (concat ;; Special tokens that can't be followed by a division operator. - "\\(^\\|[[{|=(,~;<>]" + "\\(^\\|[[{|=(,~;<>!]" ;; Distinguish ternary operator tokens. ;; FIXME: They don't really have to be separated with spaces. "\\|[?:] " From b7ed48c3ce8e77acc08d4948684333bef3238d2d Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Mon, 9 Mar 2015 12:46:29 +0100 Subject: [PATCH 265/457] Add seq-into as a public function * lisp/emacs-lisp/seq.el: Make seq-into a public function (replacing seq--into) * test/automated/seq-tests.el: Add tests for seq-into * doc/lispref/sequences.texi: Add documentation for seq-into --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/sequences.texi | 22 ++++++++++++++++++++++ lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/seq.el | 12 +++++++----- test/ChangeLog | 4 ++++ test/automated/seq-tests.el | 22 ++++++++++++++++++++++ 6 files changed, 65 insertions(+), 5 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 42bff7c865a..260656c6cf7 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2015-03-09 Nicolas Petton + + * sequences.texi (seq-into): Add documentation for the new + seq-into function. + 2015-03-03 Eli Zaretskii * processes.texi (Synchronous Processes): Update documentation of diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 04404f886e0..1af353590cf 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -740,6 +740,28 @@ of @var{sequence}. Keys are compared using @code{equal}. @end example @end defun +@defun seq-into sequence type + This function converts the sequence @var{sequence} into a sequence +of type @var{type}. @var{type} can be one of the following symbols: +@code{vector}, @code{string} or @code{list}. + +@example +@group +(seq-into [1 2 3] 'list) +@result{} (1 2 3) +@end group +@group +(seq-into nil 'vector) +@result{} [] +@end group +@group +(seq-into "hello" 'vector) +@result{} [104 101 108 108 111] +@end group +@end example +@end defun + + @defmac seq-doseq (var sequence [result]) body@dots{} @cindex sequence iteration This macro is like @code{dolist}, except that @var{sequence} can be a list, diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b284ef16eaf..d8330a46c89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-09 Nicolas Petton + + * emacs-lisp/seq.el (seq-into): New function. + Bump seq.el version to 1.3. + 2015-03-09 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't consider diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index ad4c3536b44..59b91408d09 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -4,7 +4,8 @@ ;; Author: Nicolas Petton ;; Keywords: sequences -;; Version: 1.2 +;; Version: 1.3 +;; Package: seq ;; Maintainer: emacs-devel@gnu.org @@ -171,7 +172,7 @@ The result is a sequence of the same type as SEQ." (if (listp seq) (sort (seq-copy seq) pred) (let ((result (seq-sort pred (append seq nil)))) - (seq--into result (type-of seq))))) + (seq-into result (type-of seq))))) (defun seq-contains-p (seq elt &optional testfn) "Return the first element in SEQ that equals to ELT. @@ -265,10 +266,11 @@ See also the function `nreverse', which is used more often." seq) (if (listp seq) result - (seq--into result (type-of seq))))))) + (seq-into result (type-of seq))))))) -(defun seq--into (seq type) - "Convert the sequence SEQ into a sequence of type TYPE." +(defun seq-into (seq type) + "Convert the sequence SEQ into a sequence of type TYPE. +TYPE can be one of the following symbols: vector, string or list." (pcase type (`vector (vconcat seq)) (`string (concat seq)) diff --git a/test/ChangeLog b/test/ChangeLog index 301cc4046e5..876b9462611 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2015-03-09 Nicolas Petton + + * automated/seq-tests.el (test-seq-into): Add a test for seq-into. + 2015-03-08 Dmitry Gutov * indent/ruby.rb: Add an example for bug#20026. diff --git a/test/automated/seq-tests.el b/test/automated/seq-tests.el index badb3267f43..d3536b6f9a6 100644 --- a/test/automated/seq-tests.el +++ b/test/automated/seq-tests.el @@ -228,5 +228,27 @@ Evaluate BODY for each created sequence. (should (equal (type-of (seq-reverse seq)) (type-of seq))))) +(ert-deftest test-seq-into () + (let* ((vector [1 2 3]) + (list (seq-into vector 'list))) + (should (same-contents-p vector list)) + (should (listp list))) + (let* ((list '(hello world)) + (vector (seq-into list 'vector))) + (should (same-contents-p vector list)) + (should (vectorp vector))) + (let* ((string "hello") + (list (seq-into string 'list))) + (should (same-contents-p string list)) + (should (stringp string))) + (let* ((string "hello") + (vector (seq-into string 'vector))) + (should (same-contents-p string vector)) + (should (stringp string))) + (let* ((list nil) + (vector (seq-into list 'vector))) + (should (same-contents-p list vector)) + (should (vectorp vector)))) + (provide 'seq-tests) ;;; seq-tests.el ends here From cd0ad72129c319525b5f589d23b7908ed0726cea Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Mar 2015 18:41:31 +0200 Subject: [PATCH 266/457] nt/ChangeLog: Fix typos. --- nt/ChangeLog | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index f804abe2e88..9d954d56473 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -3,12 +3,6 @@ * INSTALL: Add some more installation instructions for mingw-get users. (Bug#19989) -2015-03-09 Noam Postavsky - - * nt/cmdproxy.c (batch_file_p): New function. - (spawn): If calling a quoted batch file pass NULL for progname. - (Bug#18745) - 2015-03-03 Eli Zaretskii * cmdproxy.c (get_next_token): Don't make backslashes disappear @@ -18,7 +12,6 @@ (main): When passing a command line to the shell, use cmd.exe rules for quoting command-line tail. -2015-03-03 Oscar Fuentes 2015-02-27 Mark Laws Support daemon mode on MS-Windows (bug#19688) From b20113f0f72a20a6c7eb8bfeef4d64633ed7a80c Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Tue, 10 Mar 2015 02:39:01 +0200 Subject: [PATCH 267/457] Automate 'make all' in test/indent --- test/ChangeLog | 6 ++++++ test/indent/Makefile | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 876b9462611..e51dddc05f1 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-03-09 Dmitry Gutov + + * indent/Makefile: Call 'rm' with '-f'. Default EMACS to + '../../src/emacs'. Remove *.new in 'clean'. Set 'all' target to + run all examples. + 2015-03-09 Nicolas Petton * automated/seq-tests.el (test-seq-into): Add a test for seq-into. diff --git a/test/indent/Makefile b/test/indent/Makefile index 9e75f3dad57..83162681d72 100644 --- a/test/indent/Makefile +++ b/test/indent/Makefile @@ -1,14 +1,15 @@ RM=rm -EMACS=emacs +EMACS=../../src/emacs + +all: clean $(addsuffix .test,$(wildcard *.*)) clean: - -$(RM) *.test + -$(RM) -f *.new # TODO: # - mark the places where the indentation is known to be incorrect, # and allow either ignoring those errors or not. %.test: % - -$(RM) $<.new $(EMACS) --batch $< \ --eval '(indent-region (point-min) (point-max) nil)' \ --eval '(write-region (point-min) (point-max) "$<.new")' From ff032662775fb3faa7eaa99947fc40e18c948e82 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Mon, 9 Mar 2015 21:02:37 -0400 Subject: [PATCH 268/457] Recognize more LDAP attributes Fixes: debbugs:8983 * net/ldap.el (ldap-attribute-syntaxes-alist): Add LDAP attributes from RFC2798 Section 9.1.1. (Bug#8983) --- lisp/ChangeLog | 5 +++++ lisp/net/ldap.el | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d8330a46c89..df45ec49632 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-10 Thomas Fitzsimmons + + * net/ldap.el (ldap-attribute-syntaxes-alist): Add LDAP attributes + from RFC2798 Section 9.1.1. (Bug#8983) + 2015-03-09 Nicolas Petton * emacs-lisp/seq.el (seq-into): New function. diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index 1df975af3d9..1c604e330b2 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -376,9 +376,19 @@ RFC2252 section 4.3.2") (houseidentifier . 15) (supportedalgorithms . 49) (deltarevocationlist . 9) - (dmdname . 15)) + (dmdname . 15) + (carlicense . 15) + (departmentnumber . 15) + (displayname . 15) + (employeenumber . 15) + (employeetype . 15) + (jpegphoto . 28) + (preferredlanguage . 15) + (usersmimecertificate . 5) + (userpkcs12 . 5)) "A map of LDAP attribute names to their type object id minor number. -This table is built from RFC2252 Section 5 and RFC2256 Section 5") +This table is built from RFC2252 Section 5, RFC2256 Section 5 and +RFC2798 Section 9.1.1") ;; Coding/decoding functions From 778de7270b92fcaabd515816f118b28838318ca2 Mon Sep 17 00:00:00 2001 From: Przemyslaw Wojnowski Date: Mon, 9 Mar 2015 23:14:36 -0400 Subject: [PATCH 269/457] * test/automated/cl-lib-tests.el: Add tests for plusp, second, ... (cl-lib-test-plusp, cl-lib-test-minusp) (cl-lib-test-oddp, cl-lib-test-evenp, cl-lib-test-first) (cl-lib-test-second, cl-lib-test-third, cl-lib-test-fourth) (cl-lib-test-fifth, cl-lib-test-sixth, cl-lib-test-seventh) (cl-lib-test-eighth, cl-lib-test-ninth, cl-lib-test-tenth) (cl-lib-test-endp, cl-lib-test-nth-value) (cl-lib-nth-value-test-multiple-values, cl-test-caaar, cl-test-caadr) (cl-test-ldiff): New tests. (cl-digit-char-p): Tighten the test. --- test/ChangeLog | 13 +++ test/automated/cl-lib-tests.el | 189 ++++++++++++++++++++++++++++++++- 2 files changed, 197 insertions(+), 5 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index e51dddc05f1..03cc2818478 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,16 @@ +2015-03-10 Przemyslaw Wojnowski + + * automated/cl-lib-tests.el: Add tests for plusp, second, ... + (cl-lib-test-plusp, cl-lib-test-minusp) + (cl-lib-test-oddp, cl-lib-test-evenp, cl-lib-test-first) + (cl-lib-test-second, cl-lib-test-third, cl-lib-test-fourth) + (cl-lib-test-fifth, cl-lib-test-sixth, cl-lib-test-seventh) + (cl-lib-test-eighth, cl-lib-test-ninth, cl-lib-test-tenth) + (cl-lib-test-endp, cl-lib-test-nth-value) + (cl-lib-nth-value-test-multiple-values, cl-test-caaar, cl-test-caadr) + (cl-test-ldiff): New tests. + (cl-digit-char-p): Tighten the test. + 2015-03-09 Dmitry Gutov * indent/Makefile: Call 'rm' with '-f'. Default EMACS to diff --git a/test/automated/cl-lib-tests.el b/test/automated/cl-lib-tests.el index c83391b1cc5..1c36e7d7abf 100644 --- a/test/automated/cl-lib-tests.el +++ b/test/automated/cl-lib-tests.el @@ -223,13 +223,192 @@ (should (= (cl-the integer (cl-incf side-effect)) 1)) (should (= side-effect 1)))) +(ert-deftest cl-lib-test-plusp () + (should-not (cl-plusp -1.0e+INF)) + (should-not (cl-plusp -1.5e2)) + (should-not (cl-plusp -3.14)) + (should-not (cl-plusp -1)) + (should-not (cl-plusp -0.0)) + (should-not (cl-plusp 0)) + (should-not (cl-plusp 0.0)) + (should-not (cl-plusp -0.0e+NaN)) + (should-not (cl-plusp 0.0e+NaN)) + (should (cl-plusp 1)) + (should (cl-plusp 3.14)) + (should (cl-plusp 1.5e2)) + (should (cl-plusp 1.0e+INF)) + (should-error (cl-plusp "42") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-minusp () + (should (cl-minusp -1.0e+INF)) + (should (cl-minusp -1.5e2)) + (should (cl-minusp -3.14)) + (should (cl-minusp -1)) + (should-not (cl-minusp -0.0)) + (should-not (cl-minusp 0)) + (should-not (cl-minusp 0.0)) + (should-not (cl-minusp -0.0e+NaN)) + (should-not (cl-minusp 0.0e+NaN)) + (should-not (cl-minusp 1)) + (should-not (cl-minusp 3.14)) + (should-not (cl-minusp 1.5e2)) + (should-not (cl-minusp 1.0e+INF)) + (should-error (cl-minusp "-42") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-oddp () + (should (cl-oddp -3)) + (should (cl-oddp 3)) + (should-not (cl-oddp -2)) + (should-not (cl-oddp 0)) + (should-not (cl-oddp 2)) + (should-error (cl-oddp 3.0e+NaN) :type 'wrong-type-argument) + (should-error (cl-oddp 3.0) :type 'wrong-type-argument) + (should-error (cl-oddp "3") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-evenp () + (should (cl-evenp -2)) + (should (cl-evenp 0)) + (should (cl-evenp 2)) + (should-not (cl-evenp -3)) + (should-not (cl-evenp 3)) + (should-error (cl-evenp 2.0e+NaN) :type 'wrong-type-argument) + (should-error (cl-evenp 2.0) :type 'wrong-type-argument) + (should-error (cl-evenp "2") :type 'wrong-type-argument)) + (ert-deftest cl-digit-char-p () - (should (cl-digit-char-p ?3)) - (should (cl-digit-char-p ?a 11)) + (should (eql 3 (cl-digit-char-p ?3))) + (should (eql 10 (cl-digit-char-p ?a 11))) + (should (eql 10 (cl-digit-char-p ?A 11))) (should-not (cl-digit-char-p ?a)) - (should (cl-digit-char-p ?w 36)) - (should-error (cl-digit-char-p ?a 37)) - (should-error (cl-digit-char-p ?a 1))) + (should (eql 32 (cl-digit-char-p ?w 36))) + (should-error (cl-digit-char-p ?a 37) :type 'args-out-of-range) + (should-error (cl-digit-char-p ?a 1) :type 'args-out-of-range)) + +(ert-deftest cl-lib-test-first () + (should (null (cl-first '()))) + (should (= 4 (cl-first '(4)))) + (should (= 4 (cl-first '(4 2)))) + (should-error (cl-first "42") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-second () + (should (null (cl-second '()))) + (should (null (cl-second '(4)))) + (should (= 2 (cl-second '(1 2)))) + (should (= 2 (cl-second '(1 2 3)))) + (should-error (cl-second "1 2 3") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-third () + (should (null (cl-third '()))) + (should (null (cl-third '(1 2)))) + (should (= 3 (cl-third '(1 2 3)))) + (should (= 3 (cl-third '(1 2 3 4)))) + (should-error (cl-third "123") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-fourth () + (should (null (cl-fourth '()))) + (should (null (cl-fourth '(1 2 3)))) + (should (= 4 (cl-fourth '(1 2 3 4)))) + (should (= 4 (cl-fourth '(1 2 3 4 5)))) + (should-error (cl-fourth "1234") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-fifth () + (should (null (cl-fifth '()))) + (should (null (cl-fifth '(1 2 3 4)))) + (should (= 5 (cl-fifth '(1 2 3 4 5)))) + (should (= 5 (cl-fifth '(1 2 3 4 5 6)))) + (should-error (cl-fifth "12345") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-fifth () + (should (null (cl-fifth '()))) + (should (null (cl-fifth '(1 2 3 4)))) + (should (= 5 (cl-fifth '(1 2 3 4 5)))) + (should (= 5 (cl-fifth '(1 2 3 4 5 6)))) + (should-error (cl-fifth "12345") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-sixth () + (should (null (cl-sixth '()))) + (should (null (cl-sixth '(1 2 3 4 5)))) + (should (= 6 (cl-sixth '(1 2 3 4 5 6)))) + (should (= 6 (cl-sixth '(1 2 3 4 5 6 7)))) + (should-error (cl-sixth "123456") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-seventh () + (should (null (cl-seventh '()))) + (should (null (cl-seventh '(1 2 3 4 5 6)))) + (should (= 7 (cl-seventh '(1 2 3 4 5 6 7)))) + (should (= 7 (cl-seventh '(1 2 3 4 5 6 7 8)))) + (should-error (cl-seventh "1234567") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-eighth () + (should (null (cl-eighth '()))) + (should (null (cl-eighth '(1 2 3 4 5 6 7)))) + (should (= 8 (cl-eighth '(1 2 3 4 5 6 7 8)))) + (should (= 8 (cl-eighth '(1 2 3 4 5 6 7 8 9)))) + (should-error (cl-eighth "12345678") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-ninth () + (should (null (cl-ninth '()))) + (should (null (cl-ninth '(1 2 3 4 5 6 7 8)))) + (should (= 9 (cl-ninth '(1 2 3 4 5 6 7 8 9)))) + (should (= 9 (cl-ninth '(1 2 3 4 5 6 7 8 9 10)))) + (should-error (cl-ninth "123456789") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-tenth () + (should (null (cl-tenth '()))) + (should (null (cl-tenth '(1 2 3 4 5 6 7 8 9)))) + (should (= 10 (cl-tenth '(1 2 3 4 5 6 7 8 9 10)))) + (should (= 10 (cl-tenth '(1 2 3 4 5 6 7 8 9 10 11)))) + (should-error (cl-tenth "1234567890") :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-endp () + (should (cl-endp '())) + (should-not (cl-endp '(1))) + (should-error (cl-endp 1) :type 'wrong-type-argument) + (should-error (cl-endp [1]) :type 'wrong-type-argument)) + +(ert-deftest cl-lib-test-nth-value () + (let ((vals (cl-values 2 3))) + (should (= (cl-nth-value 0 vals) 2)) + (should (= (cl-nth-value 1 vals) 3)) + (should (null (cl-nth-value 2 vals))) + (should-error (cl-nth-value 0.0 vals) :type 'wrong-type-argument))) + +(ert-deftest cl-lib-nth-value-test-multiple-values () + "While CL multiple values are an alias to list, these won't work." + :expected-result :failed + (should (eq (cl-nth-value 0 '(2 3)) '(2 3))) + (should (= (cl-nth-value 0 1) 1)) + (should (null (cl-nth-value 1 1))) + (should-error (cl-nth-value -1 (cl-values 2 3)) :type 'args-out-of-range) + (should (string= (cl-nth-value 0 "only lists") "only lists"))) + +(ert-deftest cl-test-caaar () + (should (null (cl-caaar '()))) + (should (null (cl-caaar '(() (2))))) + (should (null (cl-caaar '((() (2)) (a b))))) + (should-error (cl-caaar '(1 2)) :type 'wrong-type-argument) + (should-error (cl-caaar '((1 2))) :type 'wrong-type-argument) + (should (= 1 (cl-caaar '(((1 2) (3 4)))))) + (should (null (cl-caaar '((() (3 4))))))) + +(ert-deftest cl-test-caadr () + (should (null (cl-caadr '()))) + (should (null (cl-caadr '(1)))) + (should-error (cl-caadr '(1 2)) :type 'wrong-type-argument) + (should (= 2 (cl-caadr '(1 (2 3))))) + (should (equal '((2) (3)) (cl-caadr '((1) (((2) (3))) (4)))))) + +(ert-deftest cl-test-ldiff () + (let ((l '(1 2 3))) + (should (null (cl-ldiff '() '()))) + (should (null (cl-ldiff '() l))) + (should (null (cl-ldiff l l))) + (should (equal l (cl-ldiff l '()))) + ;; must be part of the list + (should (equal l (cl-ldiff l '(2 3)))) + (should (equal '(1) (cl-ldiff l (nthcdr 1 l)))) + ;; should return a copy + (should-not (eq (cl-ldiff l '()) l)))) (ert-deftest cl-parse-integer () (should-error (cl-parse-integer "abc")) From 33d9869b5f7a5acaca838e2b57e5ae713df9603d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 10 Mar 2015 00:49:20 -0700 Subject: [PATCH 270/457] Spelling and minor grammar fixes --- lisp/ChangeLog | 4 ++-- lisp/emacs-lisp/package.el | 6 +++--- lisp/net/tramp-adb.el | 2 +- lisp/net/tramp-sh.el | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df45ec49632..c25f4efcdd0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -173,7 +173,7 @@ Use `with-temp-file'. * net/tramp-sh.el (tramp-perl-file-attributes) - (tramp-perl-directory-files-and-attributes): Escape apostrophs in + (tramp-perl-directory-files-and-attributes): Escape apostrophes in file names. (tramp-do-file-attributes-with-stat): Quote file name. (tramp-sh-handle-directory-files-and-attributes): Fall back to @@ -185,7 +185,7 @@ Normalize use of "cd". (tramp-do-directory-files-and-attributes-with-stat): Use the `quoting-style' arg of `ls' if possible. Make it also working for - file names with apostrophs. + file names with apostrophes. (tramp-sh-handle-file-name-all-completions): Use arguments of `ls' in proper order. (tramp-do-copy-or-rename-file-via-buffer) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 00608f3d2c7..0d001bff4cf 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1695,10 +1695,10 @@ similar to an entry in `package-alist'. Save the cached copy to ;;;###autoload (defun package-refresh-contents () - "Download the description of all configured ELPAs. + "Download descriptions of all configured ELPA packages. For each archive configured in the variable `package-archives', -this informs Emacs about the latest versions of all packages it -offers, and makes them available for download." +inform Emacs about the latest versions of all packages it offers, +and make them available for download." (interactive) ;; FIXME: Do it asynchronously. (unless (file-exists-p package-user-dir) diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index fae54520102..6696dcf1505 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -1013,7 +1013,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (tramp-set-connection-property v "process-buffer" nil)))))) (defun tramp-adb-get-device (vec) - "Return full host name from VEC to be used in shell exceution. + "Return full host name from VEC to be used in shell execution. E.g. a host name \"192.168.1.1#5555\" returns \"192.168.1.1:5555\" a host name \"R38273882DE\" returns \"R38273882DE\"." ;; Sometimes this is called before there is a connection process diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 580c5d08ecd..76d2b014917 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1695,7 +1695,7 @@ be non-negative integers." ;; "-"; this would confuse xargs. "ls -aQ" might be a solution, ;; but it does not work on all remote systems. Therefore, we ;; use \000 as file separator. - ;; Apostrophs in the stat output are masked as \037 character, in + ;; Apostrophes in the stat output are masked as \037 characters, in ;; order to make a proper shell escape of them in file names. "cd %s && echo \"(\"; (%s %s -a | " "xargs %s -c " @@ -1703,7 +1703,7 @@ be non-negative integers." " -- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/\037/\"/g'); echo \")\"") (tramp-shell-quote-argument localname) (tramp-get-ls-command vec) - ;; On systems which have no quotings style, file names with + ;; On systems which have no quoting style, file names with ;; special characters could fail. (if (tramp-get-ls-command-with-quoting-style vec) "--quoting-style=shell" "") From 933e0ab4b0d583b81b8624def414b7895987927b Mon Sep 17 00:00:00 2001 From: Jackson Ray Hamilton Date: Sat, 7 Mar 2015 18:01:05 -0800 Subject: [PATCH 271/457] New indentation option for js-mode * lisp/progmodes/js.el (js--proper-indentation): Add new custom option `js-indent-first-initialiser' and a function to utilize it, `js--maybe-goto-declaration-keyword-end'. * test/indent/js.js: Add local variables. * test/indent/js-indent-first-initialiser-t.js: New test for `js-indent-first-initialiser'. * test/indent/js-indent-first-initialiser-dynamic.js: New test for `js-indent-first-initialiser'. --- lisp/ChangeLog | 14 ++++ lisp/progmodes/js.el | 75 +++++++++++++++++++ .../js-indent-first-initialiser-dynamic.js | 30 ++++++++ test/indent/js-indent-first-initialiser-t.js | 21 ++++++ test/indent/js.js | 7 +- 5 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 test/indent/js-indent-first-initialiser-dynamic.js create mode 100644 test/indent/js-indent-first-initialiser-t.js diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c25f4efcdd0..c7cf53df5e0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2015-03-10 Jackson Ray Hamilton + + * lisp/progmodes/js.el (js--proper-indentation): Add new custom + option `js-indent-first-initialiser' and a function to utilize it, + `js--maybe-goto-declaration-keyword-end'. + + * test/indent/js.js: Add local variables. + + * test/indent/js-indent-first-initialiser-t.js: New test for + `js-indent-first-initialiser'. + + * test/indent/js-indent-first-initialiser-dynamic.js: New test for + `js-indent-first-initialiser'. + 2015-03-10 Thomas Fitzsimmons * net/ldap.el (ldap-attribute-syntaxes-alist): Add LDAP attributes diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index d7712e4c49e..27e67bb77c1 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -509,6 +509,50 @@ getting timeout messages." :type 'integer :group 'js) +(defcustom js-indent-first-initialiser nil + "Specially indent the first variable declaration's initialiser +in variable statements. + +Normally, the first declaration's initialiser is unindented, and +subsequent declarations have their identifiers lined up against +the first: + + var o = { + foo: 3 + }; + + var o = { + foo: 3 + }, + bar = 2; + +When t, always indent the first declaration's initialiser by an +additional level: + + var o = { + foo: 3 + }; + + var o = { + foo: 3 + }, + bar = 2; + +When `dynamic', if there is only one declaration, don't indent +the first one's initialiser; otherwise, indent it. + + var o = { + foo: 3 + }; + + var o = { + foo: 3 + }, + bar = 2;" + :type 'boolean + :safe 'symbolp + :group 'js) + ;;; KeyMap (defvar js-mode-map @@ -1858,6 +1902,36 @@ In particular, return the buffer position of the first `for' kwd." (goto-char for-kwd) (current-column)))) +(defun js--maybe-goto-declaration-keyword-end (parse-status) + "Helper function for `js--proper-indentation'. +Depending on the value of `js-indent-first-initialiser', move +point to the end of a variable declaration keyword so that +indentation is aligned to that column." + (cond + ((eq js-indent-first-initialiser t) + (when (looking-at js--declaration-keyword-re) + (goto-char (1+ (match-end 0))))) + ((eq js-indent-first-initialiser 'dynamic) + (let ((bracket (nth 1 parse-status)) + declaration-keyword-end + at-closing-bracket-p + comma-p) + (when (looking-at js--declaration-keyword-re) + (setq declaration-keyword-end (match-end 0)) + (save-excursion + (goto-char bracket) + (setq at-closing-bracket-p + (condition-case nil + (progn + (forward-sexp) + t) + (error nil))) + (when at-closing-bracket-p + (while (forward-comment 1)) + (setq comma-p (looking-at-p ",")))) + (when comma-p + (goto-char (1+ declaration-keyword-end)))))))) + (defun js--proper-indentation (parse-status) "Return the proper indentation for the current line." (save-excursion @@ -1891,6 +1965,7 @@ In particular, return the buffer position of the first `for' kwd." (skip-syntax-backward " ") (when (eq (char-before) ?\)) (backward-list)) (back-to-indentation) + (js--maybe-goto-declaration-keyword-end parse-status) (let* ((in-switch-p (unless same-indent-p (looking-at "\\_"))) (same-indent-p (or same-indent-p diff --git a/test/indent/js-indent-first-initialiser-dynamic.js b/test/indent/js-indent-first-initialiser-dynamic.js new file mode 100644 index 00000000000..9c705dbeba9 --- /dev/null +++ b/test/indent/js-indent-first-initialiser-dynamic.js @@ -0,0 +1,30 @@ +var foo = function() { + return 7; +}; + +var foo = function() { + return 7; + }, + bar = 8; + +var foo = function() { + return 7; + }, + bar = function() { + return 8; + }; + +// Local Variables: +// indent-tabs-mode: nil +// js-indent-level: 2 +// js-indent-first-initialiser: dynamic +// End: + +// The following test intentionally produces a scan error and should +// be placed below all other tests to prevent awkward indentation. +// (It still thinks it's within the body of a function.) + +var foo = function() { + return 7; + , + bar = 8; diff --git a/test/indent/js-indent-first-initialiser-t.js b/test/indent/js-indent-first-initialiser-t.js new file mode 100644 index 00000000000..2f08527e5ff --- /dev/null +++ b/test/indent/js-indent-first-initialiser-t.js @@ -0,0 +1,21 @@ +var foo = function() { + return 7; + }; + +var foo = function() { + return 7; + }, + bar = 8; + +var foo = function() { + return 7; + }, + bar = function() { + return 8; + }; + +// Local Variables: +// indent-tabs-mode: nil +// js-indent-level: 2 +// js-indent-first-initialiser: t +// End: diff --git a/test/indent/js.js b/test/indent/js.js index f41849da284..ad7cb56a277 100644 --- a/test/indent/js.js +++ b/test/indent/js.js @@ -1,5 +1,3 @@ -// -*- js-indent-level: 2 -*- - var a = 1; b = 2; @@ -65,3 +63,8 @@ b += baz(`http://foo.bar/${tee}`) .qux(); + +// Local Variables: +// indent-tabs-mode: nil +// js-indent-level: 2 +// End: From 8db37916ca4241ee977901ae589a86a609a32c3c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Mar 2015 18:37:35 -0400 Subject: [PATCH 272/457] * lisp/gnus/message.el (message-valid-fqdn-regexp): Bump :version --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/message.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 763267c3413..1744a132804 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-03-10 Glenn Morris + + * message.el (message-valid-fqdn-regexp): Bump :version for + 2014-11-17 change. + 2015-03-08 Rasmus Pank Roulund * gnus-notifications.el (gnus-notifications-action): Raise window diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 112f0ba127c..04145ded107 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1969,7 +1969,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'." ;; "dead" nato bitnet uucp "Regular expression that matches a valid FQDN." ;; see also: gnus-button-valid-fqdn-regexp - :version "22.1" + :version "25.1" :group 'message-headers :type 'regexp) From 6c9681afe9d7296bc984f602a26cf78d577fcc1e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Mar 2015 18:40:09 -0400 Subject: [PATCH 273/457] * lisp/progmodes/js.el (js-indent-first-initialiser): Fix doc, type, version. First line of the doc string should be a complete sentence. * etc/NEWS: Mention new option. # Fix associated ChangeLog entries. --- etc/NEWS | 2 ++ lisp/ChangeLog | 18 +++++++----------- lisp/progmodes/js.el | 18 ++++++++---------- test/ChangeLog | 8 ++++++++ 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index ad8b6f27812..6f59064560e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -389,6 +389,8 @@ The remainder were: ** New ERT function `ert-summarize-tests-batch-and-exit'. +** New js.el option `js-indent-first-initialiser'. + --- ** `Info-fontify-maximum-menu-size' can be t for no limit. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7cf53df5e0..5184167ecd8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,16 +1,12 @@ +2015-03-10 Glenn Morris + + * progmodes/js.el (js-indent-first-initialiser): + Fix doc, type, version. + 2015-03-10 Jackson Ray Hamilton - * lisp/progmodes/js.el (js--proper-indentation): Add new custom - option `js-indent-first-initialiser' and a function to utilize it, - `js--maybe-goto-declaration-keyword-end'. - - * test/indent/js.js: Add local variables. - - * test/indent/js-indent-first-initialiser-t.js: New test for - `js-indent-first-initialiser'. - - * test/indent/js-indent-first-initialiser-dynamic.js: New test for - `js-indent-first-initialiser'. + * progmodes/js.el (js-indent-first-initialiser): New option. + (js--maybe-goto-declaration-keyword-end): New function. 2015-03-10 Thomas Fitzsimmons diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 27e67bb77c1..7e547428da9 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -510,12 +510,9 @@ getting timeout messages." :group 'js) (defcustom js-indent-first-initialiser nil - "Specially indent the first variable declaration's initialiser -in variable statements. - + "Non-nil means specially indent the first variable declaration's initialiser. Normally, the first declaration's initialiser is unindented, and -subsequent declarations have their identifiers lined up against -the first: +subsequent declarations have their identifiers aligned with it: var o = { foo: 3 @@ -526,8 +523,8 @@ the first: }, bar = 2; -When t, always indent the first declaration's initialiser by an -additional level: +If this option has the value t, indent the first declaration's +initialiser by an additional level: var o = { foo: 3 @@ -538,8 +535,8 @@ additional level: }, bar = 2; -When `dynamic', if there is only one declaration, don't indent -the first one's initialiser; otherwise, indent it. +If this option has the value `dynamic', if there is only one declaration, +don't indent the first one's initialiser; otherwise, indent it. var o = { foo: 3 @@ -549,7 +546,8 @@ the first one's initialiser; otherwise, indent it. foo: 3 }, bar = 2;" - :type 'boolean + :version "25.1" + :type '(choice (const nil) (const t) (const dynamic)) :safe 'symbolp :group 'js) diff --git a/test/ChangeLog b/test/ChangeLog index 03cc2818478..93ee3c5bc16 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,11 @@ +2015-03-10 Jackson Ray Hamilton + + * indent/js.js: Add local variables. + + * indent/js-indent-first-initialiser-t.js: + * indent/js-indent-first-initialiser-dynamic.js: + New tests for `js-indent-first-initialiser'. + 2015-03-10 Przemyslaw Wojnowski * automated/cl-lib-tests.el: Add tests for plusp, second, ... From c3ca6a911a84e49aa0a0126cfc8640b90fb73572 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Mar 2015 18:46:39 -0400 Subject: [PATCH 274/457] # Further ChangeLog fix --- lisp/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5184167ecd8..b798e14c087 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,6 +7,7 @@ * progmodes/js.el (js-indent-first-initialiser): New option. (js--maybe-goto-declaration-keyword-end): New function. + (js--proper-indentation): Use js--maybe-goto-declaration-keyword-end. 2015-03-10 Thomas Fitzsimmons From 2a1be9eb2361f705e61839b78e8bba1d841944f6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 10 Mar 2015 16:29:01 -0700 Subject: [PATCH 275/457] Prefer "initialize" to "initialise" * lisp/progmodes/js.el (js-indent-first-init): Rename from js-indent-first-initialiser, to avoid worrying about American vs British spelling. All uses changed. * test/indent/js-indent-init-t.js: Rename from indent/js-indent-first-initialiser-t.js. * test/indent/js-indent-init-dynamic.js: Rename from test/indent/js-indent-first-initialiser-dynamic.js. --- ChangeLog | 2 +- etc/NEWS | 2 +- lisp/ChangeLog | 15 +++++++++++---- lisp/ChangeLog.16 | 4 ++-- lisp/progmodes/js.el | 16 ++++++++-------- test/ChangeLog | 8 ++++++++ ...iser-dynamic.js => js-indent-init-dynamic.js} | 2 +- ...irst-initialiser-t.js => js-indent-init-t.js} | 2 +- 8 files changed, 33 insertions(+), 18 deletions(-) rename test/indent/{js-indent-first-initialiser-dynamic.js => js-indent-init-dynamic.js} (92%) rename test/indent/{js-indent-first-initialiser-t.js => js-indent-init-t.js} (88%) diff --git a/ChangeLog b/ChangeLog index 5e5c922fd45..4f6523ea812 100644 --- a/ChangeLog +++ b/ChangeLog @@ -394,7 +394,7 @@ 2014-11-25 Glenn Morris - * configure.ac: Fix yesterday's use of uninitialised $version. + * configure.ac: Fix yesterday's use of uninitialized $version. 2014-11-25 Oscar Fuentes diff --git a/etc/NEWS b/etc/NEWS index 6f59064560e..75d55de3f36 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -389,7 +389,7 @@ The remainder were: ** New ERT function `ert-summarize-tests-batch-and-exit'. -** New js.el option `js-indent-first-initialiser'. +** New js.el option `js-indent-first-init'. --- ** `Info-fontify-maximum-menu-size' can be t for no limit. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b798e14c087..b25988de516 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-03-10 Paul Eggert + + Prefer "initialize" to "initialise" + * progmodes/js.el (js-indent-first-init): + Rename from js-indent-first-initialiser, to avoid worrying about + American vs British spelling. All uses changed. + 2015-03-10 Glenn Morris * progmodes/js.el (js-indent-first-initialiser): @@ -4551,7 +4558,7 @@ (tildify-foreach-region-function): New variable specifying a function determining portions of buffer that should be tildified. It allows major modes to create a filtering function - more elaborate than a set of regular expressions. Initialised to + more elaborate than a set of regular expressions. Initialized to `tildify--deprecated-ignore-evironments' by default to handle now deprecated `tildify-ignored-environments-alist' variable. (tildify--foreach-region): A new function that takes @@ -9015,7 +9022,7 @@ file-format 2 --- ie. no local printers --- and 3 --- i.e. may have local printers. (ses-localvars): Add local variables needed for local printer handling. - (ses-set-localvars): Handle hashmap initialisation. + (ses-set-localvars): Handle hashmap initialization. (ses-paramlines-plist): Add param-line for number of local printers. (ses-paramfmt-plist): New defconst, needed for code factorization between functions `ses-set-parameter' and @@ -12275,7 +12282,7 @@ * progmodes/cc-mode.el (c-initialize-cc-mode): Add CC Mode hooks to electric-indent-{,local-}-mode. (c-basic-common-init): Set electric-indent-inhibit. - Initialise c-electric-flag from electric-indent-mode. + Initialize c-electric-flag from electric-indent-mode. (c-electric-indent-mode-hook, c-electric-indent-local-mode-hook): New hook functions which propagate electric-indent-mode to CC mode. @@ -24212,7 +24219,7 @@ 2013-04-30 Alan Mackenzie - Handle arbitrarily long C++ member initialisation lists. + Handle arbitrarily long C++ member initialization lists. * progmodes/cc-engine.el (c-back-over-member-initializers): new function. (c-guess-basic-syntax): New CASE 5R (extracted from 5B) to handle diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index 14ee914179e..bf8a97352c6 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -6751,7 +6751,7 @@ 2012-09-09 Alan Mackenzie * progmodes/cc-engine.el (c-state-cache-init): - Initialise c-state-semi-nonlit-pos-cache\(-limit\)? properly. + Initialize c-state-semi-nonlit-pos-cache\(-limit\)? properly. (c-record-parse-state-state): Record c-state-semi-nonlit-pos-cache\(-limit\)?. @@ -15662,7 +15662,7 @@ (c-nonlabel-token-key): Allow string literals for AWK. Refactor for the other modes. - Large brace-block initialisation makes CC Mode slow: Fix. + Large brace-block initialization makes CC Mode slow: Fix. Tidy up and accelerate c-in-literal, etc. by using the c-parse-state routines. Limit backward searching in c-font-lock-enclosing.decl. diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 7e547428da9..ff002983d12 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -509,9 +509,9 @@ getting timeout messages." :type 'integer :group 'js) -(defcustom js-indent-first-initialiser nil - "Non-nil means specially indent the first variable declaration's initialiser. -Normally, the first declaration's initialiser is unindented, and +(defcustom js-indent-first-init nil + "Non-nil means specially indent the first variable declaration's initializer. +Normally, the first declaration's initializer is unindented, and subsequent declarations have their identifiers aligned with it: var o = { @@ -524,7 +524,7 @@ subsequent declarations have their identifiers aligned with it: bar = 2; If this option has the value t, indent the first declaration's -initialiser by an additional level: +initializer by an additional level: var o = { foo: 3 @@ -536,7 +536,7 @@ initialiser by an additional level: bar = 2; If this option has the value `dynamic', if there is only one declaration, -don't indent the first one's initialiser; otherwise, indent it. +don't indent the first one's initializer; otherwise, indent it. var o = { foo: 3 @@ -1902,14 +1902,14 @@ In particular, return the buffer position of the first `for' kwd." (defun js--maybe-goto-declaration-keyword-end (parse-status) "Helper function for `js--proper-indentation'. -Depending on the value of `js-indent-first-initialiser', move +Depending on the value of `js-indent-first-init', move point to the end of a variable declaration keyword so that indentation is aligned to that column." (cond - ((eq js-indent-first-initialiser t) + ((eq js-indent-first-init t) (when (looking-at js--declaration-keyword-re) (goto-char (1+ (match-end 0))))) - ((eq js-indent-first-initialiser 'dynamic) + ((eq js-indent-first-init 'dynamic) (let ((bracket (nth 1 parse-status)) declaration-keyword-end at-closing-bracket-p diff --git a/test/ChangeLog b/test/ChangeLog index 93ee3c5bc16..fba6cfcd4c8 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,11 @@ +2015-03-10 Paul Eggert + + Prefer "initialize" to "initialise" + * indent/js-indent-init-t.js: Rename from + indent/js-indent-first-initialiser-t.js. + * indent/js-indent-init-dynamic.js: Rename from + test/indent/js-indent-first-initialiser-dynamic.js. + 2015-03-10 Jackson Ray Hamilton * indent/js.js: Add local variables. diff --git a/test/indent/js-indent-first-initialiser-dynamic.js b/test/indent/js-indent-init-dynamic.js similarity index 92% rename from test/indent/js-indent-first-initialiser-dynamic.js rename to test/indent/js-indent-init-dynamic.js index 9c705dbeba9..f330c2ce7af 100644 --- a/test/indent/js-indent-first-initialiser-dynamic.js +++ b/test/indent/js-indent-init-dynamic.js @@ -17,7 +17,7 @@ var foo = function() { // Local Variables: // indent-tabs-mode: nil // js-indent-level: 2 -// js-indent-first-initialiser: dynamic +// js-indent-first-initializer: dynamic // End: // The following test intentionally produces a scan error and should diff --git a/test/indent/js-indent-first-initialiser-t.js b/test/indent/js-indent-init-t.js similarity index 88% rename from test/indent/js-indent-first-initialiser-t.js rename to test/indent/js-indent-init-t.js index 2f08527e5ff..bb755420ba7 100644 --- a/test/indent/js-indent-first-initialiser-t.js +++ b/test/indent/js-indent-init-t.js @@ -17,5 +17,5 @@ var foo = function() { // Local Variables: // indent-tabs-mode: nil // js-indent-level: 2 -// js-indent-first-initialiser: t +// js-indent-first-init: t // End: From f0e8673a9e708fc0ba6c092ec2fc777efbb4bb23 Mon Sep 17 00:00:00 2001 From: Jackson Ray Hamilton Date: Tue, 10 Mar 2015 22:07:10 -0700 Subject: [PATCH 276/457] * indent/js-indent-init-dynamic.js: Fix spelling error. --- test/ChangeLog | 4 ++++ test/indent/js-indent-init-dynamic.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/ChangeLog b/test/ChangeLog index fba6cfcd4c8..6a474e1d4e5 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2015-03-10 Jackson Ray Hamilton + + * indent/js-indent-init-dynamic.js: Fix spelling error. + 2015-03-10 Paul Eggert Prefer "initialize" to "initialise" diff --git a/test/indent/js-indent-init-dynamic.js b/test/indent/js-indent-init-dynamic.js index f330c2ce7af..536a976e86e 100644 --- a/test/indent/js-indent-init-dynamic.js +++ b/test/indent/js-indent-init-dynamic.js @@ -17,7 +17,7 @@ var foo = function() { // Local Variables: // indent-tabs-mode: nil // js-indent-level: 2 -// js-indent-first-initializer: dynamic +// js-indent-first-init: dynamic // End: // The following test intentionally produces a scan error and should From 41bba4b40f6e07924a3681ffeabb26ca48424095 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 11 Mar 2015 10:54:56 -0400 Subject: [PATCH 277/457] * lisp/simple.el (goto-history-element): Don't burp on t history. --- lisp/ChangeLog | 18 +++++++++++------- lisp/simple.el | 4 +++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b25988de516..c5d2e6c95fd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-11 Stefan Monnier + + * simple.el (goto-history-element): Don't burp on t history. + 2015-03-10 Paul Eggert Prefer "initialize" to "initialise" @@ -46,14 +50,14 @@ 2015-03-08 Dmitry Gutov - * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use - `font-lock-constant-face' for nil, true and false. Highlight - `self' as a keyword. (Bug#17733) + * progmodes/ruby-mode.el (ruby-font-lock-keywords): + Use `font-lock-constant-face' for nil, true and false. + Highlight `self' as a keyword. (Bug#17733) 2015-03-08 Nobuyoshi Nakada - * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect - beginning of regexp also after open brace or vertical bar. + * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): + Expect beginning of regexp also after open brace or vertical bar. (Bug#20026) 2015-03-07 Stefan Monnier @@ -277,8 +281,8 @@ 2015-03-03 Agustín Martín Domingo Improve string search in `flyspell-word-search-*`. (Bug#16800) - * textmodes/flyspell.el (flyspell-duplicate-distance): Limit - default search distance for duplicated words to 40000. + * textmodes/flyspell.el (flyspell-duplicate-distance): + Limit default search distance for duplicated words to 40000. (flyspell-word-search-backward, flyspell-word-search-forward): Search as full word with defined casechars, not as substring. diff --git a/lisp/simple.el b/lisp/simple.el index 1e64f998fd4..4deb4cfce2e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1940,7 +1940,9 @@ The argument NABS specifies the absolute history position." (user-error (if minibuffer-default "End of defaults; no next item" "End of history; no default available"))) - (if (> nabs (length (symbol-value minibuffer-history-variable))) + (if (> nabs (if (listp (symbol-value minibuffer-history-variable)) + (length (symbol-value minibuffer-history-variable)) + 0)) (user-error "Beginning of history; no preceding item")) (unless (memq last-command '(next-history-element previous-history-element)) From b90f502cc18b60644ce3898699589ecd9653b397 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 11 Mar 2015 11:00:25 -0400 Subject: [PATCH 278/457] * lisp/gnus/registry.el (registry-db): Don't oset-default an instance slot. * lisp/gnus/gnus-registry.el (gnus-registry-handle-action) (gnus-registry-post-process-groups): Don't add-to-list on a local var. (gnus-registry-keywords): Make it do something. (gnus-registry-import-eld): Remove unused var `new-entry'. (gnus-registry-action): Remove unused var `to-name'. (gnus-registry-make-db): Prefer `make-instance' to avoid compiler warnings. (gnus-registry-load, gnus-registry-fixup-registry): Avoid `oset'. --- lisp/gnus/ChangeLog | 14 ++++++++++++++ lisp/gnus/gnus-registry.el | 39 +++++++++++++++++++------------------- lisp/gnus/registry.el | 9 ++++++--- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1744a132804..64124bc183d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,17 @@ +2015-03-11 Stefan Monnier + + * gnus-registry.el (gnus-registry-handle-action) + (gnus-registry-post-process-groups): Don't add-to-list on a local var. + (gnus-registry-keywords): Make it do something. + (gnus-registry-import-eld): Remove unused var `new-entry'. + (gnus-registry-action): Remove unused var `to-name'. + (gnus-registry-make-db): Prefer `make-instance' to avoid + compiler warnings. + (gnus-registry-load, gnus-registry-fixup-registry): Avoid `oset'. + + * registry.el (registry-db): Don't oset-default an instance-allocated + slot. + 2015-03-10 Glenn Morris * message.el (message-valid-fqdn-regexp): Bump :version for diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index ac903a250ec..1d5887dad26 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -277,16 +277,16 @@ This can slow pruning down. Set to nil to perform no sorting." (defun gnus-registry-fixup-registry (db) (when db (let ((old (oref db tracked))) - (oset db precious + (setf (oref db precious) (append gnus-registry-extra-entries-precious '())) - (oset db max-size + (setf (oref db max-size) (or gnus-registry-max-entries most-positive-fixnum)) - (oset db prune-factor + (setf (oref db prune-factor) (or gnus-registry-prune-factor 0.1)) - (oset db tracked + (setf (oref db tracked) (append gnus-registry-track-extra '(mark group keyword))) (when (not (equal old (oref db tracked))) @@ -297,14 +297,13 @@ This can slow pruning down. Set to nil to perform no sorting." (defun gnus-registry-make-db (&optional file) (interactive "fGnus registry persistence file: \n") (gnus-registry-fixup-registry - (registry-db - "Gnus Registry" - :file (or file gnus-registry-cache-file) - ;; these parameters are set in `gnus-registry-fixup-registry' - :max-size most-positive-fixnum - :version registry-db-version - :precious nil - :tracked nil))) + (make-instance 'registry-db + :file (or file gnus-registry-cache-file) + ;; these parameters are set in `gnus-registry-fixup-registry' + :max-size most-positive-fixnum + :version registry-db-version + :precious nil + :tracked nil))) (defvar gnus-registry-db (gnus-registry-make-db) "The article registry by Message ID. See `registry-db'.") @@ -336,7 +335,7 @@ This is not required after changing `gnus-registry-cache-file'." old-file-name file))) (progn (gnus-registry-read old-file-name) - (oset gnus-registry-db :file file) + (setf (oref gnus-registry-db :file) file) (gnus-message 1 "Registry filename changed to %s" file)) (gnus-registry-remake-db t)))) (error @@ -398,8 +397,7 @@ This is not required after changing `gnus-registry-cache-file'." (sender (nth 0 (gnus-registry-extract-addresses (mail-header-from data-header)))) (from (gnus-group-guess-full-name-from-command-method from)) - (to (if to (gnus-group-guess-full-name-from-command-method to) nil)) - (to-name (if to to "the Bit Bucket"))) + (to (if to (gnus-group-guess-full-name-from-command-method to) nil))) (gnus-message 7 "Gnus registry: article %s %s from %s to %s" id (if method "respooling" "going") from to) @@ -455,7 +453,8 @@ This is not required after changing `gnus-registry-cache-file'." (let ((new (or (assq (first kv) entry) (list (first kv))))) (dolist (toadd (cdr kv)) - (add-to-list 'new toadd t)) + (unless (member toadd new) + (setq new (append new (list toadd))))) (setq entry (cons new (assq-delete-all (first kv) entry)))))) (gnus-message 10 "Gnus registry: new entry for %s is %S" @@ -699,7 +698,7 @@ possible. Uses `gnus-registry-split-strategy'." 10 "%s: stripped group %s to %s" log-agent group short-name)) - (add-to-list 'out short-name)) + (pushnew short-name out :test #'equal)) ;; else... (gnus-message 7 @@ -785,8 +784,9 @@ Overrides existing keywords with FORCE set non-nil." (gnus-registry-set-id-key id 'keyword words))))) (defun gnus-registry-keywords () - (let ((table (registry-lookup-secondary gnus-registry-db 'keyword))) - (when table (maphash (lambda (k v) k) table)))) + (let ((table (registry-lookup-secondary gnus-registry-db 'keyword)) + (ks ())) + (when table (maphash (lambda (k _v) (push k ks)) table) ks))) (defun gnus-registry-find-keywords (keyword) (interactive (list @@ -1104,7 +1104,6 @@ only the last one's marks are returned." (setq entry (car-safe old) old (cdr-safe old)) (let* ((id (car-safe entry)) - (new-entry (gnus-registry-get-or-make-entry id)) (rest (cdr-safe entry)) (groups (loop for p in rest when (stringp p) diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 881eb9f5a65..1c83b939d80 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -98,7 +98,12 @@ :type (or null float) :documentation "The registry version.") (max-size :initarg :max-size - ;; :initform most-positive-fixnum ;; see below + ;; EIEIO's :initform is not 100% compatible with CLOS in + ;; that if the form is an atom, it assumes it's constant + ;; value rather than an expression, so in order to get the value + ;; of `most-positive-fixnum', we need to use an + ;; expression that's not just a symbol. + :initform (symbol-value 'most-positive-fixnum) :type integer :custom integer :documentation "The maximum number of registry entries.") @@ -123,8 +128,6 @@ (data :initarg :data :type hash-table :documentation "The data hashtable."))) -;; Do this separately, since defclass doesn't allow expressions in :initform. -(oset-default 'registry-db max-size most-positive-fixnum) (defmethod initialize-instance :BEFORE ((this registry-db) slots) "Check whether a registry object needs to be upgraded." From 2401274b239e837ec274b373ba0f2848faaea7b2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 11 Mar 2015 11:06:11 -0400 Subject: [PATCH 279/457] * international/quail.el (quail-input-method): Use with-silent-modifications --- lisp/ChangeLog | 3 +++ lisp/international/quail.el | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c5d2e6c95fd..35689c1e8d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2015-03-11 Stefan Monnier + * international/quail.el (quail-input-method): + Use with-silent-modifications. + * simple.el (goto-history-element): Don't burp on t history. 2015-03-10 Paul Eggert diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 2755fd68bef..5e422bf5fdb 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -202,7 +202,7 @@ It is an alist of translations and corresponding keys." See also the documentation of `quail-define-package'." (nth 11 quail-current-package)) (defsubst quail-overlay-plist () - "Return property list of an overly used in the current Quail package." + "Return property list of an overlay used in the current Quail package." (nth 12 quail-current-package)) (defsubst quail-update-translation-function () "Return a function for updating translation in the current Quail package." @@ -1335,9 +1335,7 @@ If STR has `advice' text property, append the following special event: overriding-local-map) (list key) (quail-setup-overlays (quail-conversion-keymap)) - (let ((modified-p (buffer-modified-p)) - (buffer-undo-list t) - (inhibit-modification-hooks t)) + (with-silent-modifications (unwind-protect (let ((input-string (if (quail-conversion-keymap) (quail-start-conversion key) @@ -1349,7 +1347,6 @@ If STR has `advice' text property, append the following special event: (list (aref input-string 0)) (quail-input-string-to-events input-string)))) (quail-delete-overlays) - (set-buffer-modified-p modified-p) ;; Run this hook only when the current input method doesn't require ;; conversion. When conversion is required, the conversion function ;; should run this hook at a proper timing. From cc1132158206626d9cab7b98ca68e8ca43dddc8c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 12 Mar 2015 08:59:56 -0700 Subject: [PATCH 280/457] Fix --no-bitmap-icon * src/frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is nil/not present in the parameter alist. Fixes: debbugs:19680 --- src/ChangeLog | 5 +++++ src/frame.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index ca5f85a0157..90908fcf759 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-12 Glenn Morris + + * frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is + nil/not present in the parameter alist. (Bug#19680) + 2015-02-28 Eli Zaretskii * search.c (find_newline): Avoid assertion violations in diff --git a/src/frame.h b/src/frame.h index 3d3982f4104..bc49cfa44ec 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1349,7 +1349,7 @@ x_set_bitmap_icon (struct frame *f) { Lisp_Object obj = assq_no_quit (Qicon_type, f->param_alist); - if (CONSP (obj)) + if (CONSP (obj) && !NILP (XCDR (obj))) x_bitmap_icon (f, XCDR (obj)); } From fc10058a4f8a68891bd7a3508d62f03bfa5bf7ce Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 12 Mar 2015 19:34:45 +0200 Subject: [PATCH 281/457] Fix support of scripts in w32font.c (Bug#19993) src/w32font.c (font_supported_scripts): Add subranges for Latin Supplement, Latin Extended-A/B, Vai, Supplemental Punctuation, Tai Le, Buginese, Yijing Hexagrams, Ancient Greek Numbers, Tai Xuan Jing, Counting Rods, Sundanese, Lepcha, Ol Chiki, Saurashtra, Kayah Li, Rejang, Ancient Symbols, Phistos Disc, Carian, Lycian, Lydian, Dominoe Tiles, and Mahjong Tiles. Break the Mathematical Alphanumeric Symbols into several "scripts" like fontset.el does. (syms_of_w32font): DEFSYM all the new script symbols. lisp/international/fontset.el (script-representative-chars): Add a representative character for 'vai'. --- lisp/ChangeLog | 5 ++ lisp/international/fontset.el | 1 + src/ChangeLog | 12 ++++ src/w32font.c | 102 +++++++++++++++++++++++++++++----- 4 files changed, 105 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 35689c1e8d2..534ba9d5f23 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-12 Eli Zaretskii + + * international/fontset.el (script-representative-chars): Add a + representative character for 'vai'. + 2015-03-11 Stefan Monnier * international/quail.el (quail-input-method): diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 8eb1c0d3961..06a47af0103 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -153,6 +153,7 @@ (cyrillic #x42F) (armenian #x531) (hebrew #x5D0) + (vai #xA500) (arabic #x628) (syriac #x710) (thaana #x78C) diff --git a/src/ChangeLog b/src/ChangeLog index fc776188f05..517052590c3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2015-03-12 Eli Zaretskii + + * w32font.c (font_supported_scripts): Add subranges for Latin + Supplement, Latin Extended-A/B, Vai, Supplemental Punctuation, Tai + Le, Buginese, Yijing Hexagrams, Ancient Greek Numbers, Tai Xuan + Jing, Counting Rods, Sundanese, Lepcha, Ol Chiki, Saurashtra, + Kayah Li, Rejang, Ancient Symbols, Phistos Disc, Carian, Lycian, + Lydian, Dominoe Tiles, and Mahjong Tiles. Break the Mathematical + Alphanumeric Symbols into several "scripts" like fontset.el does. + (Bug#19993) + (syms_of_w32font): DEFSYM all the new script symbols. + 2015-03-07 Eli Zaretskii * w32fns.c : diff --git a/src/w32font.c b/src/w32font.c index 422f082e72b..77994593c6d 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -2127,9 +2127,18 @@ font_supported_scripts (FONTSIGNATURE * sig) supported = Fcons ((sym), supported) SUBRANGE (0, Qlatin); - /* The following count as latin too, ASCII should be present in these fonts, - so don't need to mark them separately. */ /* 1: Latin-1 supplement, 2: Latin Extended A, 3: Latin Extended B. */ + /* Most fonts that support Latin will have good coverage of the + Extended blocks, so in practice marking them below is not really + needed, or useful: if a font claims support for, say, Latin + Extended-B, but does not contain glyphs for some of the + characters in the range, the user will have to augment her + fontset to display those few characters. But we mark these + subranges here anyway, for the marginal use cases where they + might make a difference. */ + SUBRANGE (1, Qlatin); + SUBRANGE (2, Qlatin); + SUBRANGE (3, Qlatin); SUBRANGE (4, Qphonetic); /* 5: Spacing and tone modifiers, 6: Combining Diacritical Marks. */ SUBRANGE (7, Qgreek); @@ -2137,7 +2146,12 @@ font_supported_scripts (FONTSIGNATURE * sig) SUBRANGE (9, Qcyrillic); SUBRANGE (10, Qarmenian); SUBRANGE (11, Qhebrew); - /* 12: Vai. */ + /* Bit 12 is rather useless if the user has Hebrew fonts installed, + because apparently at some point in the past bit 12 was "Hebrew + Extended", and many Hebrew fonts still have this bit set. The + only workaround is to customize fontsets to use fonts like Ebrima + or Quivira. */ + SUBRANGE (12, Qvai); SUBRANGE (13, Qarabic); SUBRANGE (14, Qnko); SUBRANGE (15, Qdevanagari); @@ -2153,8 +2167,11 @@ font_supported_scripts (FONTSIGNATURE * sig) SUBRANGE (25, Qlao); SUBRANGE (26, Qgeorgian); SUBRANGE (27, Qbalinese); - /* 28: Hangul Jamo. */ - /* 29: Latin Extended, 30: Greek Extended, 31: Punctuation. */ + /* 28: Hangul Jamo -- covered by the default fontset. */ + /* 29: Latin Extended, 30: Greek Extended -- covered above. */ + /* 31: Supplemental Punctuation -- most probably be masked by + Courier New, so fontset customization is needed. */ + SUBRANGE (31, Qsymbol); /* 32-47: Symbols (defined below). */ SUBRANGE (48, Qcjk_misc); /* Match either 49: katakana or 50: hiragana for kana. */ @@ -2169,6 +2186,9 @@ font_supported_scripts (FONTSIGNATURE * sig) SUBRANGE (59, Qhan); /* There are others, but this is the main one. */ SUBRANGE (59, Qideographic_description); /* Windows lumps this in. */ SUBRANGE (59, Qkanbun); /* And this. */ + /* These are covered well either by the default Courier New or by + CJK fonts that are set up specially in the default fontset. So + marking them here wouldn't be useful. */ /* 60: Private use, 61: CJK strokes and compatibility. */ /* 62: Alphabetic Presentation, 63: Arabic Presentation A. */ /* 64: Combining half marks, 65: Vertical and CJK compatibility. */ @@ -2197,31 +2217,54 @@ font_supported_scripts (FONTSIGNATURE * sig) SUBRANGE (87, Qdeseret); SUBRANGE (88, Qbyzantine_musical_symbol); SUBRANGE (88, Qmusical_symbol); /* Windows doesn't distinguish these. */ - SUBRANGE (89, Qmathematical); + SUBRANGE (89, Qmathematical_bold); /* See fontset.el:setup-default-fontset. */ + SUBRANGE (89, Qmathematical_italic); + SUBRANGE (89, Qmathematical_bold_italic); + SUBRANGE (89, Qmathematical_script); + SUBRANGE (89, Qmathematical_bold_script); + SUBRANGE (89, Qmathematical_fraktur); + SUBRANGE (89, Qmathematical_double_struck); + SUBRANGE (89, Qmathematical_bold_fraktur); + SUBRANGE (89, Qmathematical_sans_serif); + SUBRANGE (89, Qmathematical_sans_serif_bold); + SUBRANGE (89, Qmathematical_sans_serif_italic); + SUBRANGE (89, Qmathematical_sans_serif_bold_italic); + SUBRANGE (89, Qmathematical_monospace); /* 90: Private use, 91: Variation selectors, 92: Tags. */ SUBRANGE (93, Qlimbu); SUBRANGE (94, Qtai_le); - /* 95: New Tai Le */ - SUBRANGE (90, Qbuginese); + SUBRANGE (95, Qtai_le); + SUBRANGE (96, Qbuginese); SUBRANGE (97, Qglagolitic); SUBRANGE (98, Qtifinagh); /* 99: Yijing Hexagrams. */ + SUBRANGE (99, Qhan); SUBRANGE (100, Qsyloti_nagri); SUBRANGE (101, Qlinear_b); - /* 102: Ancient Greek Numbers. */ + SUBRANGE (102, Qancient_greek_number); SUBRANGE (103, Qugaritic); SUBRANGE (104, Qold_persian); SUBRANGE (105, Qshavian); SUBRANGE (106, Qosmanya); SUBRANGE (107, Qcypriot); SUBRANGE (108, Qkharoshthi); - /* 109: Tai Xuan Jing. */ + SUBRANGE (109, Qtai_xuan_jing_symbol); SUBRANGE (110, Qcuneiform); - /* 111: Counting Rods, 112: Sundanese, 113: Lepcha, 114: Ol Chiki. */ - /* 115: Saurashtra, 116: Kayah Li, 117: Rejang. */ + SUBRANGE (111, Qcounting_rod_numeral); + SUBRANGE (112, Qsundanese); + SUBRANGE (113, Qlepcha); + SUBRANGE (114, Qol_chiki); + SUBRANGE (115, Qsaurashtra); + SUBRANGE (116, Qkayah_li); + SUBRANGE (117, Qrejang); SUBRANGE (118, Qcham); - /* 119: Ancient symbols, 120: Phaistos Disc. */ - /* 121: Carian, Lycian, Lydian, 122: Dominoes, Mahjong tiles. */ + SUBRANGE (119, Qancient_symbol); + SUBRANGE (120, Qphaistos_disc); + SUBRANGE (121, Qlycian); + SUBRANGE (121, Qcarian); + SUBRANGE (121, Qlydian); + SUBRANGE (122, Qdomino_tile); + SUBRANGE (122, Qmahjong_tile); /* 123-127: Reserved. */ /* There isn't really a main symbol range, so include symbol if any @@ -2530,6 +2573,7 @@ syms_of_w32font (void) DEFSYM (Qcyrillic, "cyrillic"); DEFSYM (Qarmenian, "armenian"); DEFSYM (Qhebrew, "hebrew"); + DEFSYM (Qvai, "vai"); DEFSYM (Qarabic, "arabic"); DEFSYM (Qsyriac, "syriac"); DEFSYM (Qnko, "nko"); @@ -2567,7 +2611,19 @@ syms_of_w32font (void) DEFSYM (Qyi, "yi"); DEFSYM (Qbyzantine_musical_symbol, "byzantine-musical-symbol"); DEFSYM (Qmusical_symbol, "musical-symbol"); - DEFSYM (Qmathematical, "mathematical"); + DEFSYM (Qmathematical_bold, "mathematical-bold"); + DEFSYM (Qmathematical_italic, "mathematical-italic"); + DEFSYM (Qmathematical_bold_italic, "mathematical-bold-italic"); + DEFSYM (Qmathematical_script, "mathematical-script"); + DEFSYM (Qmathematical_bold_script, "mathematical-bold-script"); + DEFSYM (Qmathematical_fraktur, "mathematical-fraktur"); + DEFSYM (Qmathematical_double_struck, "mathematical-double-struck"); + DEFSYM (Qmathematical_bold_fraktur, "mathematical-bold-fraktur"); + DEFSYM (Qmathematical_sans_serif, "mathematical-sans-serif"); + DEFSYM (Qmathematical_sans_serif_bold, "mathematical-sans-serif-bold"); + DEFSYM (Qmathematical_sans_serif_italic, "mathematical-sans-serif-italic"); + DEFSYM (Qmathematical_sans_serif_bold_italic, "mathematical-sans-serif-bold-italic"); + DEFSYM (Qmathematical_monospace, "mathematical-monospace"); DEFSYM (Qcham, "cham"); DEFSYM (Qphonetic, "phonetic"); DEFSYM (Qbalinese, "balinese"); @@ -2594,6 +2650,22 @@ syms_of_w32font (void) DEFSYM (Qtai_le, "tai_le"); DEFSYM (Qtifinagh, "tifinagh"); DEFSYM (Qugaritic, "ugaritic"); + DEFSYM (Qlycian, "lycian"); + DEFSYM (Qcarian, "carian"); + DEFSYM (Qlydian, "lydian"); + DEFSYM (Qdomino_tile, "domino-tile"); + DEFSYM (Qmahjong_tile, "mahjong-tile"); + DEFSYM (Qtai_xuan_jing_symbol, "tai-xuan-jing-symbol"); + DEFSYM (Qcounting_rod_numeral, "counting-rod-numeral"); + DEFSYM (Qancient_symbol, "ancient-symbol"); + DEFSYM (Qphaistos_disc, "phaistos-disc"); + DEFSYM (Qancient_greek_number, "ancient-greek-number"); + DEFSYM (Qsundanese, "sundanese"); + DEFSYM (Qlepcha, "lepcha"); + DEFSYM (Qol_chiki, "ol-chiki"); + DEFSYM (Qsaurashtra, "saurashtra"); + DEFSYM (Qkayah_li, "kayah-li"); + DEFSYM (Qrejang, "rejang"); /* W32 font encodings. */ DEFVAR_LISP ("w32-charset-info-alist", From ac4cce624c4f51cbc57a210ade0ca74a1893d636 Mon Sep 17 00:00:00 2001 From: Rasmus Pank Roulund Date: Thu, 12 Mar 2015 15:02:55 -0400 Subject: [PATCH 282/457] Fixes: debbugs:19335 * lisp/ido.el (ido-add-virtual-buffers-to-list): Include bookmark-alist files --- lisp/ChangeLog | 5 +++++ lisp/ido.el | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 534ba9d5f23..97253c8824e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-12 Rasmus Pank Roulund + + * ido.el (ido-add-virtual-buffers-to-list): Include bookmark-alist + files (bug#19335). + 2015-03-12 Eli Zaretskii * international/fontset.el (script-representative-chars): Add a diff --git a/lisp/ido.el b/lisp/ido.el index 1f4e3facd36..563f406aeb6 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -3480,8 +3480,14 @@ This is to make them appear as if they were \"virtual buffers\"." ;; the file which the user might thought was still open. (unless recentf-mode (recentf-mode 1)) (setq ido-virtual-buffers nil) - (let (name) - (dolist (head recentf-list) + (let ((bookmarks (and (boundp 'bookmark-alist) + bookmark-alist)) + name) + (dolist (head (append + recentf-list + (delq nil (mapcar (lambda (bookmark) + (cdr (assoc 'filename bookmark))) + bookmarks)))) (setq name (file-name-nondirectory head)) ;; In case HEAD is a directory with trailing /. See bug#14552. (when (equal name "") From b91eafe31a524b391d5cec079cf8f36c2f9d5f30 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 12 Mar 2015 22:22:22 +0200 Subject: [PATCH 283/457] Support goal column in multi-line minibuffer * lisp/simple.el (next-line-or-history-element) (previous-line-or-history-element): Remember the goal column of possibly multi-line input, and restore it afterwards. Fixes: debbugs:19824 --- lisp/ChangeLog | 6 ++++++ lisp/simple.el | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97253c8824e..8ddf9ed02ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-12 Juri Linkov + + * simple.el (next-line-or-history-element) + (previous-line-or-history-element): Remember the goal column of + possibly multi-line input, and restore it afterwards. (Bug#19824) + 2015-03-12 Rasmus Pank Roulund * ido.el (ido-add-virtual-buffers-to-list): Include bookmark-alist diff --git a/lisp/simple.el b/lisp/simple.el index 4deb4cfce2e..98188a07b6f 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1992,7 +1992,14 @@ When point moves over the bottom line of multi-line minibuffer, puts ARGth next element of the minibuffer history in the minibuffer." (interactive "^p") (or arg (setq arg 1)) - (let ((old-point (point))) + (let* ((old-point (point)) + ;; Remember the original goal column of possibly multi-line input + ;; excluding the length of the prompt on the first line. + (prompt-end (minibuffer-prompt-end)) + (old-column (unless (and (eolp) (> (point) prompt-end)) + (if (= (line-number-at-pos) 1) + (max (- (current-column) (1- prompt-end)) 0) + (current-column))))) (condition-case nil (with-no-warnings (next-line arg)) @@ -2000,7 +2007,14 @@ next element of the minibuffer history in the minibuffer." ;; Restore old position since `line-move-visual' moves point to ;; the end of the line when it fails to go to the next line. (goto-char old-point) - (next-history-element arg))))) + (next-history-element arg) + ;; Restore the original goal column on the last line + ;; of possibly multi-line input. + (goto-char (point-max)) + (when old-column + (if (= (line-number-at-pos) 1) + (move-to-column (+ old-column (1- (minibuffer-prompt-end)))) + (move-to-column old-column))))))) (defun previous-line-or-history-element (&optional arg) "Move cursor vertically up ARG lines, or to the previous history element. @@ -2008,7 +2022,14 @@ When point moves over the top line of multi-line minibuffer, puts ARGth previous element of the minibuffer history in the minibuffer." (interactive "^p") (or arg (setq arg 1)) - (let ((old-point (point))) + (let* ((old-point (point)) + ;; Remember the original goal column of possibly multi-line input + ;; excluding the length of the prompt on the first line. + (prompt-end (minibuffer-prompt-end)) + (old-column (unless (and (eolp) (> (point) prompt-end)) + (if (= (line-number-at-pos) 1) + (max (- (current-column) (1- prompt-end)) 0) + (current-column))))) (condition-case nil (with-no-warnings (previous-line arg)) @@ -2016,7 +2037,15 @@ previous element of the minibuffer history in the minibuffer." ;; Restore old position since `line-move-visual' moves point to ;; the beginning of the line when it fails to go to the previous line. (goto-char old-point) - (previous-history-element arg))))) + (previous-history-element arg) + ;; Restore the original goal column on the first line + ;; of possibly multi-line input. + (goto-char (minibuffer-prompt-end)) + (if old-column + (if (= (line-number-at-pos) 1) + (move-to-column (+ old-column (1- (minibuffer-prompt-end)))) + (move-to-column old-column)) + (goto-char (line-end-position))))))) (defun next-complete-history-element (n) "Get next history element which completes the minibuffer before the point. From 2c59be9c67e50f70f0407794bfe79038ded58a72 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 13 Mar 2015 09:55:59 -0700 Subject: [PATCH 284/457] * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static. --- src/ChangeLog | 4 ++++ src/editfns.c | 2 +- src/systime.h | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 517052590c3..0c32b74fdba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-03-13 Paul Eggert + + * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static. + 2015-03-12 Eli Zaretskii * w32font.c (font_supported_scripts): Add subranges for Latin diff --git a/src/editfns.c b/src/editfns.c index dbcb3160b27..7c146f13e14 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1411,7 +1411,7 @@ check_time_validity (int validity) /* A substitute for mktime_z on platforms that lack it. It's not thread-safe, but should be good enough for Emacs in typical use. */ #ifndef HAVE_TZALLOC -time_t +static time_t mktime_z (timezone_t tz, struct tm *tm) { char *oldtz = getenv ("TZ"); diff --git a/src/systime.h b/src/systime.h index 4787c512aaa..744af17b640 100644 --- a/src/systime.h +++ b/src/systime.h @@ -118,8 +118,6 @@ extern struct timespec lisp_time_argument (Lisp_Object); typedef char const *timezone_t; INLINE timezone_t tzalloc (char const *name) { return name; } INLINE void tzfree (timezone_t tz) { } -/* Defined in editfns.c. */ -extern time_t mktime_z (timezone_t, struct tm *); #endif INLINE_HEADER_END From 8e63340dcae6e3c968952968b3cb32004f9e3cbf Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 13 Mar 2015 09:57:18 -0700 Subject: [PATCH 285/457] * frame.c (x_get_resource_string) [!USE_GTK]: Don't define. --- src/ChangeLog | 2 ++ src/frame.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0c32b74fdba..c8189ffc0e7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2015-03-13 Paul Eggert + * frame.c (x_get_resource_string) [!USE_GTK]: Don't define. + * editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static. 2015-03-12 Eli Zaretskii diff --git a/src/frame.c b/src/frame.c index aa07219d152..22086552ea3 100644 --- a/src/frame.c +++ b/src/frame.c @@ -4188,7 +4188,7 @@ display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute, attribute, class, component, subclass); } -#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT +#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT && !defined USE_GTK /* Used when C code wants a resource value. */ /* Called from oldXMenu/Create.c. */ char * From f5a0faac1365938e08987fc88dd82ed4e3d674b4 Mon Sep 17 00:00:00 2001 From: Kevin Ryde Date: Fri, 13 Mar 2015 11:06:58 -0700 Subject: [PATCH 286/457] info-look fixes for Texinfo 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * info-look.el (c-mode, bison-mode, makefile-mode) (makefile-automake-mode, texinfo-mode, autoconf-mode, awk-mode) (latex-mode, emacs-lisp-mode, sh-mode, cfengine-mode): Match `foo' and 'foo' and ‘foo’ for @item and similar. (latex-mode): Match multi-arg \frac{num}{den} or \sqrt[root]{n} in suffix regexp. --- lisp/ChangeLog | 10 ++++++++++ lisp/info-look.el | 47 ++++++++++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ddf9ed02ad..9de9f4813d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2015-03-13 Kevin Ryde yahoo.com.au> + + info-look fixes for Texinfo 5 + * info-look.el (c-mode, bison-mode, makefile-mode) + (makefile-automake-mode, texinfo-mode, autoconf-mode, awk-mode) + (latex-mode, emacs-lisp-mode, sh-mode, cfengine-mode): Match + `foo' and 'foo' and ‘foo’ for @item and similar. + (latex-mode): Match multi-arg \frac{num}{den} or \sqrt[root]{n} in + suffix regexp. + 2015-03-12 Juri Linkov * simple.el (next-line-or-history-element) diff --git a/lisp/info-look.el b/lisp/info-look.el index 1baea4619f8..9cf185edf57 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -35,6 +35,11 @@ ;; (or CTAN mirrors) ;; Perl: (or CPAN mirrors) +;; Traditionally, makeinfo quoted `like this', but version 5 and later +;; quotes 'like this' or ‘like this’. Doc specs with patterns +;; therefore match open and close quotes with ['`‘] and ['’], +;; respectively. + ;;; Code: (require 'info) @@ -716,12 +721,12 @@ Return nil if there is nothing appropriate in the buffer near point." ;; suffix "\\>" is not used because that sends DBL_MAX to ;; DBL_MAX_EXP ("_" is a non-word char) ("(libc)Variable Index" nil - "^\\([ \t]+-+ \\(Variable\\|Macro\\): .*\\<\\|`\\)" - "\\( \\|'?$\\)") + "^\\([ \t]+-+ \\(Variable\\|Macro\\): .*\\<\\|['`‘]\\)" + "\\( \\|['’]?$\\)") ("(libc)Type Index" nil "^[ \t]+-+ Data Type: \\<" "\\>") ("(termcap)Var Index" nil - "^[ \t]*`" "'")) + "^[ \t]*['`‘]" "['’]")) :parse-rule 'info-lookup-guess-c-symbol) (info-lookup-maybe-add-help @@ -733,7 +738,7 @@ Return nil if there is nothing appropriate in the buffer near point." :mode 'bison-mode :regexp "[:;|]\\|%\\([%{}]\\|[_a-z]+\\)\\|YY[_A-Z]+\\|yy[_a-z]+" :doc-spec '(("(bison)Index" nil - "`" "'")) + "['`‘]" "['’]")) :parse-rule "[:;|]\\|%\\([%{}]\\|[_a-zA-Z][_a-zA-Z0-9]*\\)" :other-modes '(c-mode)) @@ -741,7 +746,7 @@ Return nil if there is nothing appropriate in the buffer near point." :mode 'makefile-mode :regexp "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z][_a-zA-Z0-9-]*" :doc-spec '(("(make)Name Index" nil - "^[ \t]*`" "'")) + "^[ \t]*['`‘]" "['’]")) :parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+") (info-lookup-maybe-add-help @@ -756,15 +761,16 @@ Return nil if there is nothing appropriate in the buffer near point." :doc-spec '( ;; "(automake)Macro Index" is autoconf macros used in ;; configure.ac, not Makefile.am, so don't have that here. - ("(automake)Variable Index" nil "^[ \t]*`" "'") + ("(automake)Variable Index" nil "^[ \t]*['`‘]" "['’]") ;; In automake 1.4 macros and variables were a combined node. - ("(automake)Macro and Variable Index" nil "^[ \t]*`" "'") + ("(automake)Macro and Variable Index" nil "^[ \t]*['`‘]" + "['’]") ;; Directives like "if" are in the "General Index". ;; Prefix "`" since the text for say `+=' isn't always an ;; @item etc and so not always at the start of a line. - ("(automake)General Index" nil "`" "'") + ("(automake)General Index" nil "['`‘]" "['’]") ;; In automake 1.3 there was just a single "Index" node. - ("(automake)Index" nil "`" "'")) + ("(automake)Index" nil "['`‘]" "['’]")) :other-modes '(makefile-mode)) (info-lookup-maybe-add-help @@ -775,7 +781,7 @@ Return nil if there is nothing appropriate in the buffer near point." (lambda (item) (if (string-match "^\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\( .*\\)?$" item) (concat "@" (match-string 1 item)))) - "`" "[' ]"))) + "['`‘]" "['’ ]"))) (info-lookup-maybe-add-help :mode 'm4-mode @@ -821,7 +827,7 @@ Return nil if there is nothing appropriate in the buffer near point." ;; macros (eg. AC_PROG_CC). Ensure this is after the autoconf ;; index, so as to prefer the autoconf docs. ("(automake)Macro and Variable Index" nil - "^[ \t]*`" "'")) + "^[ \t]*['`‘]" "['’]")) ;; Autoconf symbols are M4 macros. Thus use M4's parser. :parse-rule 'ignore :other-modes '(m4-mode)) @@ -846,7 +852,7 @@ Return nil if there is nothing appropriate in the buffer near point." ;; Built-in functions (matches to many entries). ((string-match "^[a-z]+$" item) item)))) - "`" "\\([ \t]*([^)]*)\\)?'"))) + "['`‘]" "\\([ \t]*([^)]*)\\)?['’]"))) (info-lookup-maybe-add-help :mode 'perl-mode @@ -885,16 +891,19 @@ Return nil if there is nothing appropriate in the buffer near point." ;; From http://home.gna.org/latexrefman "(latex2e)Command Index" "(latex)Command Index") - nil "`" "\\({[^}]*}\\)?'"))) + ;; \frac{NUM}{DEN} etc can have more than one {xx} argument. + ;; \sqrt[ROOT]{num} and others can have square brackets. + nil "[`'‘]" "\\({[^}]*}|\\[[^]]*\\]\\)*['’]"))) + (info-lookup-maybe-add-help :mode 'emacs-lisp-mode :regexp "[^][()`',\" \t\n]+" :doc-spec '(;; Commands with key sequences appear in nodes as `foo' and ;; those without as `M-x foo'. - ("(emacs)Command Index" nil "`\\(M-x[ \t\n]+\\)?" "'") + ("(emacs)Command Index" nil "['`‘]\\(M-x[ \t\n]+\\)?" "['’]") ;; Variables normally appear in nodes as just `foo'. - ("(emacs)Variable Index" nil "`" "'") + ("(emacs)Variable Index" nil "['`‘]" "['’]") ;; Almost all functions, variables, etc appear in nodes as ;; " -- Function: foo" etc. A small number of aliases and ;; symbols appear only as `foo', and will miss out on exact @@ -976,9 +985,9 @@ Return nil if there is nothing appropriate in the buffer near point." ;; bash has "." and ":" in its index, but those chars will probably never ;; work in info, so don't bother matching them in the regexp. :regexp "\\([a-zA-Z0-9_-]+\\|[!{}@*#?$]\\|\\[\\[?\\|]]?\\)" - :doc-spec '(("(bash)Builtin Index" nil "^`" "[ .']") - ("(bash)Reserved Word Index" nil "^`" "[ .']") - ("(bash)Variable Index" nil "^`" "[ .']") + :doc-spec '(("(bash)Builtin Index" nil "^['`‘]" "[ .'’]") + ("(bash)Reserved Word Index" nil "^['`‘]" "[ .'’]") + ("(bash)Variable Index" nil "^['`‘]" "[ .'’]") ;; coreutils (version 4.5.10) doesn't have a separate program ;; index, so exclude extraneous stuff (most of it) by demanding @@ -1026,7 +1035,7 @@ Return nil if there is nothing appropriate in the buffer near point." item)) ;; This gets functions in evaluated classes. Other ;; possible patterns don't seem to work too well. - "`" "("))) + "['`‘]" "("))) (info-lookup-maybe-add-help :mode 'Custom-mode From a605a790a5304827efd1b3d16e060c52d6df212e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 13 Mar 2015 11:14:57 -0700 Subject: [PATCH 287/457] Fix ChangeLog typo --- lisp/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9de9f4813d0..d393190803d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,4 @@ -2015-03-13 Kevin Ryde yahoo.com.au> +2015-03-13 Kevin Ryde info-look fixes for Texinfo 5 * info-look.el (c-mode, bison-mode, makefile-mode) From 85f1a56f156f7f9aab1464318970b3a1d97fa533 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sat, 14 Mar 2015 16:14:09 +0100 Subject: [PATCH 288/457] Mention Bug 19482 on 2015-01-06 change. --- src/ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c8189ffc0e7..d9612db698b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1449,7 +1449,8 @@ 2015-01-06 Jan Djärv * nsterm.m (x_set_window_size): Call updateFrameSize to get real - size instead of using widht/height. The frame may be constrained. + size instead of using widht/height. The frame may be + constrained (Bug#19482). 2015-01-05 Paul Eggert From 2fdec80c2cebf486bc708c5a59b0cd52def5285b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 14 Mar 2015 19:30:36 +0200 Subject: [PATCH 289/457] Improve indexing in Emacs manual (Bug#20105) doc/emacs/basic.texi (Moving Point): Improve indexing for HOME and END. doc/emacs/cmdargs.texi (General Variables): Improve indexing for environment variables. doc/emacs/msdog.texi (Windows HOME): doc/emacs/msdog-xtra.texi (MS-DOS File Names): Remove markup from HOME in the index entries. --- doc/emacs/ChangeLog | 11 +++++++++ doc/emacs/basic.texi | 4 ++-- doc/emacs/cmdargs.texi | 49 ++++++++++++++++++++++++++++++++++++--- doc/emacs/msdog-xtra.texi | 2 +- doc/emacs/msdog.texi | 2 +- 5 files changed, 61 insertions(+), 7 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7d8fcf4cb6d..b9c16c969e3 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,14 @@ +2015-03-14 Eli Zaretskii + + * basic.texi (Moving Point): Improve indexing for HOME and END. + + * cmdargs.texi (General Variables): Improve indexing for + environment variables. + + * msdog.texi (Windows HOME): + * msdog-xtra.texi (MS-DOS File Names): Remove markup from HOME in + the index entries. (Bug#20105) + 2015-01-31 Eli Zaretskii * msdog.texi (Windows Files): Document characters invalid in diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 2594608e947..be45856a6dd 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -206,14 +206,14 @@ preserves position within the line, like @kbd{C-n}. @item C-a @itemx @key{Home} @kindex C-a -@kindex HOME +@kindex HOME key @findex move-beginning-of-line Move to the beginning of the line (@code{move-beginning-of-line}). @item C-e @itemx @key{End} @kindex C-e -@kindex END +@kindex END key @findex move-end-of-line Move to the end of the line (@code{move-end-of-line}). diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 42c8e33d5c7..071cd68f906 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -442,22 +442,31 @@ special meanings in Emacs. Most of these variables are also used by some other programs. Emacs does not require any of these environment variables to be set, but it uses their values if they are set. -@vtable @env +@c This used to be @vtable, but that enters the variables alone into +@c the Variable Index, which in some cases, like ``HOME'', might be +@c confused with keys by that name, and other cases, like ``NAME'', +@c might be confused with general-purpose phrases. +@table @env @item CDPATH +@vindex CDPATH, environment variable Used by the @code{cd} command to search for the directory you specify, when you specify a relative directory name. @item DBUS_SESSION_BUS_ADDRESS +@vindex DBUS_SESSION_BUS_ADDRESS, environment variable Used by D-Bus when Emacs is compiled with it. Usually, there is no need to change it. Setting it to a dummy address, like @samp{unix:path=/dev/null}, suppresses connections to the D-Bus session bus as well as autolaunching the D-Bus session bus if not running yet. @item EMACSDATA +@vindex EMACSDATA, environment variable Directory for the architecture-independent files that come with Emacs. This is used to initialize the variable @code{data-directory}. @item EMACSDOC +#vindex EMACSDOC, environment variable Directory for the documentation string file, which is used to initialize the Lisp variable @code{doc-directory}. @item EMACSLOADPATH +#vindex EMACSLOADPATH, environment variable A colon-separated list of directories@footnote{Here and below, whenever we say ``colon-separated list of directories'', it pertains to Unix and GNU/Linux systems. On MS-DOS and MS-Windows, the @@ -471,23 +480,28 @@ the default @code{load-path}. To specify an empty element in the middle of the list, use 2 colons in a row, as in @samp{EMACSLOADPATH="/tmp::/foo"}. @item EMACSPATH +@vindex EMACSPATH, environment variable A colon-separated list of directories to search for executable files. If set, Emacs uses this in addition to @env{PATH} (see below) when initializing the variable @code{exec-path} (@pxref{Shell}). @item EMAIL +@vindex EMAIL, environment variable @vindex user-mail-address@r{, initialization} Your email address; used to initialize the Lisp variable @code{user-mail-address}, which the Emacs mail interface puts into the @samp{From} header of outgoing messages (@pxref{Mail Headers}). @item ESHELL +@vindex ESHELL, environment variable Used for shell-mode to override the @env{SHELL} environment variable (@pxref{Interactive Shell}). @item HISTFILE +@vindex HISTFILE, environment variable The name of the file that shell commands are saved in between logins. This variable defaults to @file{~/.bash_history} if you use Bash, to @file{~/.sh_history} if you use ksh, and to @file{~/.history} otherwise. @item HOME +@vindex HOME, environment variable The location of your files in the directory tree; used for expansion of file names starting with a tilde (@file{~}). On MS-DOS, it defaults to the directory from which Emacs was started, with @@ -499,6 +513,7 @@ where @var{username} is your user name), though for backwards compatibility @file{C:/} will be used instead if a @file{.emacs} file is found there. @item HOSTNAME +@vindex HOSTNAME, environment variable The name of the machine that Emacs is running on. @c complete.el is obsolete since 24.1. @ignore @@ -507,15 +522,24 @@ A colon-separated list of directories. Used by the @code{complete} package to search for files. @end ignore @item INFOPATH +@vindex INFOPATH, environment variable A colon-separated list of directories in which to search for Info files. @item LC_ALL +@vindex LC_ALL, environment variable @itemx LC_COLLATE +@vindex LC_COLLATE, environment variable @itemx LC_CTYPE +@vindex LC_CTYPE, environment variable @itemx LC_MESSAGES +@vindex LC_MESSAGES, environment variable @itemx LC_MONETARY +@vindex LC_MONETARY, environment variable @itemx LC_NUMERIC +@vindex LC_NUMERIC, environment variable @itemx LC_TIME +@vindex LC_TIME, environment variable @itemx LANG +@vindex LANG, environment variable The user's preferred locale. The locale has six categories, specified by the environment variables @env{LC_COLLATE} for sorting, @env{LC_CTYPE} for character encoding, @env{LC_MESSAGES} for system @@ -537,73 +561,92 @@ matched against entries in @code{locale-language-names}, @code{locale-preferred-coding-systems}, to select a default language environment and coding system. @xref{Language Environments}. @item LOGNAME +@vindex LOGNAME, environment variable The user's login name. See also @env{USER}. @item MAIL +@vindex MAIL, environment variable The name of your system mail inbox. @ifnottex @item MH +@vindex MH, environment variable Name of setup file for the mh system. @xref{Top,,MH-E,mh-e, The Emacs Interface to MH}. @end ifnottex @item NAME +@vindex NAME, environment variable Your real-world name. This is used to initialize the variable @code{user-full-name} (@pxref{Mail Headers}). @item NNTPSERVER +@vindex NNTPSERVER, environment variable The name of the news server. Used by the mh and Gnus packages. @item ORGANIZATION +@vindex ORGANIZATION, environment variable The name of the organization to which you belong. Used for setting the `Organization:' header in your posts from the Gnus package. @item PATH +@vindex PATH, environment variable A colon-separated list of directories containing executable files. This is used to initialize the variable @code{exec-path} (@pxref{Shell}). @item PWD +@vindex PWD, environment variable If set, this should be the default directory when Emacs was started. @item REPLYTO +@vindex REPLYTO, environment variable If set, this specifies an initial value for the variable @code{mail-default-reply-to} (@pxref{Mail Headers}). @item SAVEDIR +@vindex SAVEDIR, environment variable The name of a directory in which news articles are saved by default. Used by the Gnus package. @item SHELL +@vindex SHELL, environment variable The name of an interpreter used to parse and execute programs run from inside Emacs. @item SMTPSERVER +@vindex SMTPSERVER, environment variable The name of the outgoing mail server. This is used to initialize the variable @code{smtpmail-smtp-server} (@pxref{Mail Sending}). @cindex background mode, on @command{xterm} @item TERM +@vindex TERM, environment variable The type of the terminal that Emacs is using. This variable must be set unless Emacs is run in batch mode. On MS-DOS, it defaults to @samp{internal}, which specifies a built-in terminal emulation that handles the machine's own display. @item TERMCAP +@vindex TERMCAP, environment variable The name of the termcap library file describing how to program the terminal specified by @env{TERM}. This defaults to @file{/etc/termcap}. @item TMPDIR +@vindex TMPDIR, environment variable @itemx TMP +@vindex TMP, environment variable @itemx TEMP +@vindex TEMP, environment variable These environment variables are used to initialize the variable @code{temporary-file-directory}, which specifies a directory in which to put temporary files (@pxref{Backup}). Emacs tries to use @env{TMPDIR} first. If that is unset, Emacs normally falls back on @file{/tmp}, but on MS-Windows and MS-DOS it instead falls back on @env{TMP}, then @env{TEMP}, and finally @file{c:/temp}. - @item TZ +@vindex TZ, environment variable This specifies the current time zone and possibly also daylight saving time information. On MS-DOS, if @env{TZ} is not set in the environment when Emacs starts, Emacs defines a default value as appropriate for the country code returned by DOS@. On MS-Windows, Emacs does not use @env{TZ} at all. @item USER +@vindex USER, environment variable The user's login name. See also @env{LOGNAME}. On MS-DOS, this defaults to @samp{root}. @item VERSION_CONTROL +@vindex VERSION_CONTROL, environment variable Used to initialize the @code{version-control} variable (@pxref{Backup Names}). -@end vtable +@end table @node Misc Variables @appendixsubsec Miscellaneous Variables diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi index 1033aeb700b..304039e6bf2 100644 --- a/doc/emacs/msdog-xtra.texi +++ b/doc/emacs/msdog-xtra.texi @@ -352,7 +352,7 @@ long file name support, set the environment variable @env{LFN} to DOS programs to access long file names, so Emacs built for MS-DOS will only see their short 8+3 aliases. -@cindex @env{HOME} directory under MS-DOS +@cindex HOME directory under MS-DOS MS-DOS has no notion of home directory, so Emacs on MS-DOS pretends that the directory where it is installed is the value of the @env{HOME} environment variable. That is, if your Emacs binary, diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 0245fed208c..a17d87543d9 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -425,7 +425,7 @@ names, which might cause misalignment of columns in Dired display. @node Windows HOME @section HOME and Startup Directories on MS-Windows -@cindex @code{HOME} directory on MS-Windows +@cindex HOME directory on MS-Windows The Windows equivalent of @code{HOME} is the @dfn{user-specific application data directory}. The actual location depends on the From ea8cab39be1bab165377237bd30eee15e76d991a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 14 Mar 2015 19:46:01 +0200 Subject: [PATCH 290/457] doc/lispref/minibuf.texi (Basic Completion): Fix a typo. (Bug#20108) --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/minibuf.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index be2bb3e79ed..319386d9f6c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2015-03-14 Eli Zaretskii + + * minibuf.texi (Basic Completion): Fix a typo. (Bug#20108) + 2015-02-07 Eli Zaretskii * processes.texi (Synchronous Processes): Update documentation of diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 14ac893f292..fa4ee04c769 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -723,7 +723,7 @@ just one matching completion, and the match is exact, it returns @code{t}. Otherwise, it returns the longest initial sequence common to all possible matching completions. -If @var{collection} is an list, the permissible completions are +If @var{collection} is a list, the permissible completions are specified by the elements of the list, each of which should be either a string, or a cons cell whose @sc{car} is either a string or a symbol (a symbol is converted to a string using @code{symbol-name}). If the From 3bf369928e44fd83c27ef436b05d9cd2b4abbfba Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sat, 14 Mar 2015 14:53:33 -0700 Subject: [PATCH 291/457] Add --no-x-resources option * lisp/startup.el (command-line): Process "--no-x-resources". * src/emacs.c (standard_args): Add --no-x-resources. (usage_message): Document that -Q implies --no-x-resources. --- lisp/ChangeLog | 4 ++++ lisp/startup.el | 7 +++++-- src/ChangeLog | 5 +++++ src/emacs.c | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d393190803d..8da573ed2f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-14 Daniel Colascione + + * startup.el (command-line): Process "--no-x-resources". + 2015-03-13 Kevin Ryde info-look fixes for Texinfo 5 diff --git a/lisp/startup.el b/lisp/startup.el index 999e53e56dd..7fa929a659d 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -875,7 +875,8 @@ please check its value") ;; processed. This is consistent with the way main in emacs.c ;; does things. (while (and (not done) args) - (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--debug-init") + (let* ((longopts '(("--no-init-file") ("--no-site-file") + ("--no-x-resources") ("--debug-init") ("--user") ("--iconic") ("--icon-type") ("--quick") ("--no-blinking-cursor") ("--basic-display"))) (argi (pop args)) @@ -906,7 +907,9 @@ please check its value") ((member argi '("-Q" "-quick")) (setq init-file-user nil site-run-file nil - inhibit-x-resources t)) + inhibit-x-resources t)) + ((member argi '("-no-x-resources")) + (setq inhibit-x-resources t)) ((member argi '("-D" "-basic-display")) (setq no-blinking-cursor t emacs-basic-display t) diff --git a/src/ChangeLog b/src/ChangeLog index d9612db698b..cb4aad6ec95 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-14 Daniel Colascione + + * emacs.c (standard_args): Add --no-x-resources. + (usage_message): Document that -Q implies --no-x-resources. + 2015-03-13 Paul Eggert * frame.c (x_get_resource_string) [!USE_GTK]: Don't define. diff --git a/src/emacs.c b/src/emacs.c index ca5633da2dd..d318fd4649a 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -237,6 +237,7 @@ Initialization options:\n\ --no-init-file, -q load neither ~/.emacs nor default.el\n\ --no-loadup, -nl do not load loadup.el into bare Emacs\n\ --no-site-file do not load site-start.el\n\ +--no-x-resources do not load X resources\n\ --no-site-lisp, -nsl do not add site-lisp directories to load-path\n\ --no-splash do not display a splash screen on startup\n\ --no-window-system, -nw do not communicate with X, ignoring $DISPLAY\n\ @@ -244,6 +245,7 @@ Initialization options:\n\ "\ --quick, -Q equivalent to:\n\ -q --no-site-file --no-site-lisp --no-splash\n\ + --no-x-resources\n\ --script FILE run FILE as an Emacs Lisp script\n\ --terminal, -t DEVICE use DEVICE for terminal I/O\n\ --user, -u USER load ~USER/.emacs instead of your own\n\ @@ -1661,6 +1663,7 @@ static const struct standard_args standard_args[] = { "-quick", 0, 55, 0 }, { "-q", "--no-init-file", 50, 0 }, { "-no-init-file", 0, 50, 0 }, + { "-no-x-resources", "--no-x-resources", 40, 0 }, { "-no-site-file", "--no-site-file", 40, 0 }, { "-u", "--user", 30, 1 }, { "-user", 0, 30, 1 }, From 554001dfa90be447dc0c71c596eb837d8e3b374b Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sat, 14 Mar 2015 16:32:04 -0700 Subject: [PATCH 292/457] Type checking for `define-widget' * lisp/widget.el (define-widget): Check that documentation is a string or nil; prevent wailing and gnashing of teeth when users forget to pass a docstring and wonder why their properties don't work. --- lisp/ChangeLog | 4 ++++ lisp/widget.el | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8da573ed2f7..5004924e9d3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2015-03-14 Daniel Colascione + * widget.el (define-widget): Check that documentation is a string + or nil; prevent wailing and gnashing of teeth when users forget to + pass a docstring and wonder why their properties don't work. + * startup.el (command-line): Process "--no-x-resources". 2015-03-13 Kevin Ryde diff --git a/lisp/widget.el b/lisp/widget.el index f8faa0f379b..539f91e63a0 100644 --- a/lisp/widget.el +++ b/lisp/widget.el @@ -83,6 +83,9 @@ create identical widgets: * (apply 'widget-create CLASS ARGS) The third argument DOC is a documentation string for the widget." + ;; + (unless (or (null doc) (stringp doc)) + (error "widget documentation must be `nil' or a string.")) (put name 'widget-type (cons class args)) (put name 'widget-documentation (purecopy doc)) name) From 84a6685660fd7585d9b7a5bb30dda7cf41c3ea84 Mon Sep 17 00:00:00 2001 From: "Michael R. Mauger" Date: Sat, 14 Mar 2015 23:05:28 -0400 Subject: [PATCH 293/457] 2015-03-14 Michael R. Mauger * progmodes/sql.el: Version 3.5 (sql-starts-with-prompt-re, sql-ends-with-prompt-re): Match password prompts. (sql-interactive-remove-continuation-prompt): Fixed regression. (Bug#6686) --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/sql.el | 45 ++++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8da573ed2f7..e0891e1947c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-14 Michael R. Mauger + + * progmodes/sql.el: Version 3.5 + (sql-starts-with-prompt-re, sql-ends-with-prompt-re): Match password prompts. + (sql-interactive-remove-continuation-prompt): Fixed regression. (Bug#6686) + 2015-03-14 Daniel Colascione * startup.el (command-line): Process "--no-x-resources". diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 2ed3a745bb0..3800cfb6b15 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -4,7 +4,7 @@ ;; Author: Alex Schroeder ;; Maintainer: Michael Mauger -;; Version: 3.4 +;; Version: 3.5 ;; Keywords: comm languages processes ;; URL: http://savannah.gnu.org/projects/emacs/ @@ -3296,13 +3296,13 @@ Allows the suppression of continuation prompts.") (defun sql-starts-with-prompt-re () "Anchor the prompt expression at the beginning of the output line. Remove the start of line regexp." - (replace-regexp-in-string "\\^" "\\\\`" comint-prompt-regexp)) + (concat "\\`" comint-prompt-regexp)) (defun sql-ends-with-prompt-re () "Anchor the prompt expression at the end of the output line. -Remove the start of line regexp from the prompt expression since -it may not follow newline characters in the output line." - (concat (replace-regexp-in-string "\\^" "" sql-prompt-regexp) "\\'")) +Match a SQL prompt or a password prompt." + (concat "\\(?:\\(?:" sql-prompt-regexp "\\)\\|" + "\\(?:" comint-password-prompt-regexp "\\)\\)\\'")) (defun sql-interactive-remove-continuation-prompt (oline) "Strip out continuation prompts out of the OLINE. @@ -3321,7 +3321,17 @@ to the next chunk to properly match the broken-up prompt. If the filter gets confused, it should reset and stop filtering to avoid deleting non-prompt output." - (when comint-prompt-regexp + ;; continue gathering lines of text iff + ;; + we know what a prompt looks like, and + ;; + there is held text, or + ;; + there are continuation prompt yet to come, or + ;; + not just a prompt string + (when (and comint-prompt-regexp + (or (> (length (or sql-preoutput-hold "")) 0) + (> (or sql-output-newline-count 0) 0) + (not (or (string-match sql-prompt-regexp oline) + (string-match sql-prompt-cont-regexp oline))))) + (save-match-data (let (prompt-found last-nl) @@ -3357,16 +3367,19 @@ to avoid deleting non-prompt output." sql-preoutput-hold "")) ;; Break up output by physical lines if we haven't hit the final prompt - (unless (and (not (string= oline "")) - (string-match (sql-ends-with-prompt-re) oline) - (>= (match-end 0) (length oline))) - (setq last-nl 0) - (while (string-match "\n" oline last-nl) - (setq last-nl (match-end 0))) - (setq sql-preoutput-hold (concat (substring oline last-nl) - sql-preoutput-hold) - oline (substring oline 0 last-nl)))))) - oline) + (let ((end-re (sql-ends-with-prompt-re))) + (unless (and (not (string= oline "")) + (string-match end-re oline) + (>= (match-end 0) (length oline))) + ;; Find everything upto the last nl + (setq last-nl 0) + (while (string-match "\n" oline last-nl) + (setq last-nl (match-end 0))) + ;; Hold after the last nl, return upto last nl + (setq sql-preoutput-hold (concat (substring oline last-nl) + sql-preoutput-hold) + oline (substring oline 0 last-nl))))))) + oline) ;;; Sending the region to the SQLi buffer. From 994168240aa3d81cb42cef2f049fec5739f9d850 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sun, 15 Mar 2015 00:17:05 -0700 Subject: [PATCH 294/457] Support indenting backquote substitutions in cl-indent * lisp/emacs-lisp/cl-indent.el (lisp-indent-backquote-substitution-mode): New user option. (common-lisp-indent-function-1, common-lisp-loop-part-indentation) (common-lisp-indent-function): Support normally indenting backquote substitutions. (extended-loop-p): Rename to `lisp-extended-loop-p'. --- lisp/ChangeLog | 9 ++++++ lisp/emacs-lisp/cl-indent.el | 62 +++++++++++++++++++++++++++++------- 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a9cf1b0f88f..fb2291c534c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-03-15 Daniel Colascione + + * emacs-lisp/cl-indent.el + (lisp-indent-backquote-substitution-mode): New user option. + (common-lisp-indent-function-1, common-lisp-loop-part-indentation) + (common-lisp-indent-function): Support normally indenting + backquote substitutions. + (extended-loop-p): Rename to `lisp-extended-loop-p'. + 2015-03-14 Michael R. Mauger * progmodes/sql.el: Version 3.5 diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index 1bcfb6df2cf..5e75406cf22 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -138,6 +138,19 @@ If non-nil, alignment is done with the first parameter :type 'boolean :group 'lisp-indent) +(defcustom lisp-indent-backquote-substitution-mode t + "How to indent substitutions in backquotes. +If `t', the default, indent substituted forms normally. +If `nil', do not apply special indentation rule to substituted +forms. If `corrected', subtract the `,' or `,@' from the form +column, indenting as if this character sequence were not present. +In any case, do not backtrack beyond a backquote substitution. + +Until Emacs 25.1, the `nil' behavior was hard-wired." + :version "25.1" + :type '(choice (const corrected) (const nil) (const t)) + :group 'lisp-indent) + (defvar lisp-indent-defun-method '(4 &lambda &body) "Defun-like indentation method. @@ -145,7 +158,7 @@ This applies when the value of the `common-lisp-indent-function' property is set to `defun'.") -(defun extended-loop-p (loop-start) +(defun lisp-extended-loop-p (loop-start) "True if an extended loop form starts at LOOP-START." (condition-case () (save-excursion @@ -170,11 +183,22 @@ the standard lisp indent package." "Compute the indentation of loop form constituents." (let* ((loop-indentation (save-excursion (goto-char (elt state 1)) - (current-column)))) + (current-column)))) + (when (and (eq lisp-indent-backquote-substitution-mode 'corrected)) + (save-excursion + (goto-char (elt state 1)) + (incf loop-indentation + (cond ((eq (char-before) ?,) -1) + ((and (eq (char-before) ?@) + (progn (backward-char) + (eq (char-before) ?,))) + -2) + (t 0))))) + (goto-char indent-point) (beginning-of-line) (list - (cond ((not (extended-loop-p (elt state 1))) + (cond ((not (lisp-extended-loop-p (elt state 1))) (+ loop-indentation lisp-simple-loop-indentation)) ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)") (+ loop-indentation lisp-loop-keyword-indentation)) @@ -264,9 +288,15 @@ at `common-lisp-indent-function' and, if set, use its value instead." ;; FIXME: why do we need to special-case loop? (if (save-excursion (goto-char (elt state 1)) - (looking-at (if (derived-mode-p 'emacs-lisp-mode) - "(\\(cl-\\)?[Ll][Oo][Oo][Pp]" - "([Ll][Oo][Oo][Pp]"))) + (and (looking-at (if (derived-mode-p 'emacs-lisp-mode) + "(\\(cl-\\)?loop" + "([Ll][Oo][Oo][Pp]")) + (or lisp-indent-backquote-substitution-mode + (not + (or (and (eq (char-before) ?@) + (progn (backward-char) + (eq (char-before) ?,))) + (eq (char-before) ?,)))))) (common-lisp-loop-part-indentation indent-point state) (common-lisp-indent-function-1 indent-point state))) @@ -373,11 +403,21 @@ instead." (not (eq (char-after (- containing-sexp 2)) ?\#))) ;; No indentation for "'(...)" elements (setq calculated (1+ sexp-column))) - ((or (eq (char-after (1- containing-sexp)) ?\,) - (and (eq (char-after (1- containing-sexp)) ?\@) - (eq (char-after (- containing-sexp 2)) ?\,))) - ;; ",(...)" or ",@(...)" - (setq calculated normal-indent)) + ((when + (or (eq (char-after (1- containing-sexp)) ?\,) + (and (eq (char-after (1- containing-sexp)) ?\@) + (eq (char-after (- containing-sexp 2)) ?\,))) + ;; ",(...)" or ",@(...)" + (when (eq lisp-indent-backquote-substitution-mode + 'corrected) + (incf sexp-column -1) + (when (eq (char-after (1- containing-sexp)) ?\@) + (incf sexp-column -1))) + (cond (lisp-indent-backquote-substitution-mode + (setf tentative-calculated normal-indent) + (setq depth lisp-indent-maximum-backtracking) + nil) + (t (setq calculated normal-indent))))) ((eq (char-after (1- containing-sexp)) ?\#) ;; "#(...)" (setq calculated (1+ sexp-column))) From 51e7e463e93708a0e40688f91200e9e9869ec662 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Sat, 14 Mar 2015 09:27:31 +0100 Subject: [PATCH 295/457] Font-lock elisp macros/special forms dynamically * emacs-lisp/lisp-mode.el (lisp--el-macro-regexp): New defconst. (lisp--el-update-macro-regexp, lisp--el-update-after-load) (lisp--el-match-macro): New functions. (lisp-mode-variables): Update lisp--el-macro-regexp and add lisp--el-update-after-load to after-load-functions. --- lisp/ChangeLog | 8 ++++++++ lisp/emacs-lisp/lisp-mode.el | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fb2291c534c..73ba0353d9d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-03-15 Tassilo Horn + + * emacs-lisp/lisp-mode.el (lisp--el-macro-regexp): New defconst. + (lisp--el-update-macro-regexp, lisp--el-update-after-load) + (lisp--el-match-macro): New functions. + (lisp-mode-variables): Update lisp--el-macro-regexp and add + lisp--el-update-after-load to after-load-functions. + 2015-03-15 Daniel Colascione * emacs-lisp/cl-indent.el diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 5d912097838..b4f87fdac66 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -181,6 +181,33 @@ nil))) res)) +(defconst lisp--el-macro-regexp nil + "A regular expression matching all loaded elisp macros. +Can be updated using `lisp--el-update-macro-regexp' after new +macros were defined.") + +(defun lisp--el-update-macro-regexp () + "Update `lisp--el-update-macro-regexp' from `obarray'. +Return non-nil only if the old and new value are different." + (let ((old-regex lisp--el-macro-regexp) + (elisp-macros nil)) + (mapatoms (lambda (a) + (when (or (macrop a) (special-form-p a)) + (push (symbol-name a) elisp-macros)))) + (setq lisp--el-macro-regexp + (concat "(" (regexp-opt elisp-macros t) "\\_>")) + (not (string= old-regex lisp--el-macro-regexp)))) + +(defun lisp--el-update-after-load (_file) + "Update `lisp--el-macro-regexp' and adjust font-lock in existing buffers." + (when (lisp--el-update-macro-regexp) + (dolist (buf (buffer-list)) + (when (derived-mode-p 'emacs-lisp-mode) + (font-lock-flush))))) + +(defun lisp--el-match-macro (limit) + (re-search-forward lisp--el-macro-regexp limit t)) + (pcase-let ((`(,vdefs ,tdefs ,el-defs-re ,cl-defs-re @@ -194,7 +221,9 @@ "when" "unless" "with-output-to-string" "ignore-errors" "dotimes" "dolist" "declare")) (lisp-errs '("warn" "error" "signal")) - ;; Elisp constructs. FIXME: update dynamically from obarray. + ;; Elisp constructs. Now they are update dynamically + ;; from obarray but they are also used for setting up + ;; the keywords for Common Lisp. (el-fdefs '("define-advice" "defadvice" "defalias" "define-derived-mode" "define-minor-mode" "define-generic-mode" "define-global-minor-mode" @@ -333,7 +362,7 @@ `( ;; Regexp negated char group. ("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend) ;; Control structures. Common Lisp forms. - (,(concat "(" el-kws-re "\\_>") . 1) + (lisp--el-match-macro . 1) ;; Exit/Feature symbols as constants. (,(concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\_>" "[ \t']*\\(\\(?:\\sw\\|\\s_\\)+\\)?") @@ -514,6 +543,9 @@ font-lock keywords will not be case sensitive." . lisp-font-lock-syntactic-face-function))) (setq-local prettify-symbols-alist lisp--prettify-symbols-alist) (when elisp + (unless lisp--el-macro-regexp + (lisp--el-update-macro-regexp)) + (add-hook 'after-load-functions #'lisp--el-update-after-load) (setq-local electric-pair-text-pairs (cons '(?\` . ?\') electric-pair-text-pairs))) (setq-local electric-pair-skip-whitespace 'chomp) From 28caedba0f5c387d9c8e8fc8de26b5399afeb68b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 15 Mar 2015 16:07:03 +0100 Subject: [PATCH 296/457] In Tramp. check ssh Control* options only when needed Fixes: debbugs:20015 * net/tramp-adb.el: * net/tramp-gvfs.el: * net/tramp-sh.el: * net/tramp-smb.el: Set tramp-autoload cookie for all defcustoms. * net/tramp-sh.el (tramp-use-ssh-controlmaster-options): New defcustom, moved from tramp.el. (tramp-ssh-controlmaster-options): New defvar, moved from tramp.el but with a nil initial value. (tramp-ssh-controlmaster-options): New defun. (tramp-do-copy-or-rename-file-out-of-band) (tramp-maybe-open-connection): Use it. * net/tramp.el (tramp-ssh-controlmaster-options) (tramp-use-ssh-controlmaster-options): Move them to tramp-sh.el. (tramp-default-method): Do not check for `tramp-ssh-controlmaster-options'. --- lisp/ChangeLog | 20 +++++++++++ lisp/net/tramp-adb.el | 3 ++ lisp/net/tramp-gvfs.el | 2 ++ lisp/net/tramp-sh.el | 75 ++++++++++++++++++++++++++++++++++++++---- lisp/net/tramp-smb.el | 6 ++++ lisp/net/tramp.el | 41 +---------------------- 6 files changed, 101 insertions(+), 46 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 73ba0353d9d..747a1d6c650 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,23 @@ +2015-03-15 Michael Albinus + + * net/tramp-adb.el: + * net/tramp-gvfs.el: + * net/tramp-sh.el: + * net/tramp-smb.el: Set tramp-autoload cookie for all defcustoms. + + * net/tramp.el (tramp-ssh-controlmaster-options) + (tramp-use-ssh-controlmaster-options): Move them to tramp-sh.el. + (tramp-default-method): Do not check for + `tramp-ssh-controlmaster-options'. + + * net/tramp-sh.el (tramp-use-ssh-controlmaster-options): + New defcustom, moved from tramp.el. + (tramp-ssh-controlmaster-options): New defvar, moved from tramp.el + but with a nil initial value. + (tramp-ssh-controlmaster-options): New defun. + (tramp-do-copy-or-rename-file-out-of-band) + (tramp-maybe-open-connection): Use it. (Bug#20015) + 2015-03-15 Tassilo Horn * emacs-lisp/lisp-mode.el (lisp--el-macro-regexp): New defconst. diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 6696dcf1505..a92ca4df51c 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -38,12 +38,14 @@ ;; Pacify byte-compiler. (defvar directory-sep-char) +;;;###tramp-autoload (defcustom tramp-adb-program "adb" "Name of the Android Debug Bridge program." :group 'tramp :version "24.4" :type 'string) +;;;###tramp-autoload (defcustom tramp-adb-connect-if-not-connected nil "Try to run `adb connect' if provided device is not connected currently. It is used for TCP/IP devices." @@ -55,6 +57,7 @@ It is used for TCP/IP devices." (defconst tramp-adb-method "adb" "*When this method name is used, forward all calls to Android Debug Bridge.") +;;;###tramp-autoload (defcustom tramp-adb-prompt "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]" "Regexp used as prompt in almquist shell." diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 1ea52eb670d..5988a284c6e 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -127,6 +127,7 @@ ;;;###tramp-autoload (add-to-list 'tramp-default-user-alist '("\\`synce\\'" nil nil)) +;;;###tramp-autoload (defcustom tramp-gvfs-zeroconf-domain "local" "Zeroconf domain to be used for discovering services, like host names." :group 'tramp @@ -374,6 +375,7 @@ It has been changed in GVFS 1.14.") ;; ;; +;;;###tramp-autoload (defcustom tramp-bluez-discover-devices-timeout 60 "Defines seconds since last bluetooth device discovery before rescanning. A value of 0 would require an immediate discovery during hostname diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 76d2b014917..73ad8c7e4ef 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -40,6 +40,7 @@ (defvar vc-git-program) (defvar vc-hg-program) +;;;###tramp-autoload (defcustom tramp-inline-compress-start-size 4096 "The minimum size of compressing where inline transfer. When inline transfer, compress transferred data of file @@ -48,6 +49,7 @@ If it is nil, no compression at all will be applied." :group 'tramp :type '(choice (const nil) integer)) +;;;###tramp-autoload (defcustom tramp-copy-size-limit 10240 "The maximum file size where inline copying is preferred over an \ out-of-the-band copy. @@ -105,6 +107,27 @@ detected as prompt when being sent on echoing hosts, therefore.") (defconst tramp-end-of-heredoc (md5 tramp-end-of-output) "String used to recognize end of heredoc strings.") +;;;###tramp-autoload +(defcustom tramp-use-ssh-controlmaster-options t + "Whether to use `tramp-ssh-controlmaster-options'." + :group 'tramp + :version "24.4" + :type 'boolean) + +(defvar tramp-ssh-controlmaster-options nil + "Which ssh Control* arguments to use. + +If it is a string, it should have the form +\"-o ControlMaster=auto -o ControlPath='tramp.%%r@%%h:%%p' +-o ControlPersist=no\". Percent characters in the ControlPath +spec must be doubled, because the string is used as format string. + +Otherwise, it will be auto-detected by Tramp, if +`tramp-use-ssh-controlmaster-options' is non-nil. The value +depends on the installed local ssh version. + +The string is used in `tramp-methods'.") + ;; Initialize `tramp-methods' with the supported methods. ;;;###tramp-autoload (add-to-list 'tramp-methods @@ -489,6 +512,7 @@ not be set here. Instead, it should be set via `tramp-remote-path'." :version "24.4" :type '(repeat string)) +;;;###tramp-autoload (defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile")) "Alist specifying extra arguments to pass to the remote shell. Entries are (REGEXP . ARGS) where REGEXP is a regular expression @@ -2354,10 +2378,7 @@ The method used must be an out-of-band method." spec (format-spec-make ?t (tramp-get-connection-property (tramp-get-connection-process v) "temp-file" "")) - options (format-spec - (if tramp-use-ssh-controlmaster-options - tramp-ssh-controlmaster-options "") - spec) + options (format-spec (tramp-ssh-controlmaster-options v) spec) spec (format-spec-make ?h host ?u user ?p port ?r listener ?c options ?k (if keep-date " " "")) @@ -4566,6 +4587,49 @@ Gateway hops are already opened." ;; Result. target-alist)) +(defun tramp-ssh-controlmaster-options (vec) + "Return the Control* arguments of the local ssh." + (cond + ;; No options to be computed. + ((or (null tramp-use-ssh-controlmaster-options) + (null (assoc "%c" (tramp-get-method-parameter + (tramp-file-name-method vec) 'tramp-login-args)))) + "") + + ;; There is already a value to be used. + ((stringp tramp-ssh-controlmaster-options) tramp-ssh-controlmaster-options) + + ;; Determine the options. + (t (setq tramp-ssh-controlmaster-options "") + (let ((case-fold-search t)) + (ignore-errors + (when (executable-find "ssh") + (with-temp-buffer + (tramp-call-process vec "ssh" nil t nil "-o" "ControlMaster") + (goto-char (point-min)) + (when (search-forward-regexp "missing.+argument" nil t) + (setq tramp-ssh-controlmaster-options "-o ControlMaster=auto"))) + (unless (zerop (length tramp-ssh-controlmaster-options)) + (with-temp-buffer + (tramp-call-process + vec "ssh" nil t nil + "-o" "ControlPath=%C" "host.does.not.exist") + (goto-char (point-min)) + (setq tramp-ssh-controlmaster-options + (if (search-forward-regexp "unknown.+key" nil t) + (concat tramp-ssh-controlmaster-options + " -o ControlPath='tramp.%%r@%%h:%%p'") + (concat tramp-ssh-controlmaster-options + " -o ControlPath='tramp.%%C'")))) + (with-temp-buffer + (tramp-call-process vec "ssh" nil t nil "-o" "ControlPersist") + (goto-char (point-min)) + (when (search-forward-regexp "missing.+argument" nil t) + (setq tramp-ssh-controlmaster-options + (concat tramp-ssh-controlmaster-options + " -o ControlPersist=no")))))))) + tramp-ssh-controlmaster-options))) + (defun tramp-maybe-open-connection (vec) "Maybe open a connection VEC. Does not do anything if a connection is already open, but re-opens the @@ -4647,8 +4711,7 @@ connection if a previous connection has died for some reason." (let* ((target-alist (tramp-compute-multi-hops vec)) ;; We will apply `tramp-ssh-controlmaster-options' ;; only for the first hop. - (options (if tramp-use-ssh-controlmaster-options - tramp-ssh-controlmaster-options "")) + (options (tramp-ssh-controlmaster-options vec)) (process-connection-type tramp-process-connection-type) (process-adaptive-read-buffering nil) (coding-system-for-read nil) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index d5fe17f0939..14360b96fe6 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -70,17 +70,20 @@ tramp-smb-method '((tramp-parse-netrc "~/.netrc")))) +;;;###tramp-autoload (defcustom tramp-smb-program "smbclient" "Name of SMB client to run." :group 'tramp :type 'string) +;;;###tramp-autoload (defcustom tramp-smb-acl-program "smbcacls" "Name of SMB acls to run." :group 'tramp :type 'string :version "24.4") +;;;###tramp-autoload (defcustom tramp-smb-conf "/dev/null" "Path of the smb.conf file. If it is nil, no smb.conf will be added to the `tramp-smb-program' @@ -280,6 +283,7 @@ See `tramp-actions-before-shell' for more info.") Operations not mentioned here will be handled by the default Emacs primitives.") ;; Options for remote processes via winexe. +;;;###tramp-autoload (defcustom tramp-smb-winexe-program "winexe" "Name of winexe client to run. If it isn't found in the local $PATH, the absolute path of winexe @@ -288,6 +292,7 @@ shall be given. This is needed for remote processes." :type 'string :version "24.3") +;;;###tramp-autoload (defcustom tramp-smb-winexe-shell-command "powershell.exe" "Shell to be used for processes on remote machines. This must be Powershell V2 compatible." @@ -295,6 +300,7 @@ This must be Powershell V2 compatible." :type 'string :version "24.3") +;;;###tramp-autoload (defcustom tramp-smb-winexe-shell-command-switch "-file -" "Command switch used together with `tramp-smb-winexe-shell-command'. This can be used to disable echo etc." diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 953525f37e4..10bb76983aa 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -307,43 +307,6 @@ started on the local host. You should specify a remote host `localhost' or the name of the local host. Another host name is useful only in combination with `tramp-default-proxies-alist'.") -;;;###tramp-autoload -(defconst tramp-ssh-controlmaster-options - (let ((result "") - (case-fold-search t)) - (ignore-errors - (when (executable-find "ssh") - (with-temp-buffer - (call-process "ssh" nil t nil "-o" "ControlMaster") - (goto-char (point-min)) - (when (search-forward-regexp "missing.+argument" nil t) - (setq result "-o ControlMaster=auto"))) - (unless (zerop (length result)) - (with-temp-buffer - (call-process - "ssh" nil t nil "-o" "ControlPath=%C" "host.does.not.exist") - (goto-char (point-min)) - (if (search-forward-regexp "unknown.+key" nil t) - (setq result - (concat result " -o ControlPath='tramp.%%r@%%h:%%p'")) - (setq result (concat result " -o ControlPath='tramp.%%C'")))) - (with-temp-buffer - (call-process "ssh" nil t nil "-o" "ControlPersist") - (goto-char (point-min)) - (when (search-forward-regexp "missing.+argument" nil t) - (setq result (concat result " -o ControlPersist=no"))))))) - result) - "Call ssh to detect whether it supports the Control* arguments. -Return a string to be used in `tramp-methods'.") - -;;;###tramp-autoload -(defcustom tramp-use-ssh-controlmaster-options - (not (zerop (length tramp-ssh-controlmaster-options))) - "Whether to use `tramp-ssh-controlmaster-options'." - :group 'tramp - :version "24.4" - :type 'boolean) - (defcustom tramp-default-method ;; An external copy method seems to be preferred, because it performs ;; much better for large files, and it hasn't too serious delays @@ -374,9 +337,7 @@ Return a string to be used in `tramp-methods'.") (fboundp 'auth-source-search) ;; ssh-agent is running. (getenv "SSH_AUTH_SOCK") - (getenv "SSH_AGENT_PID") - ;; We could reuse the connection. - (> (length tramp-ssh-controlmaster-options) 0)) + (getenv "SSH_AGENT_PID")) "scp" "ssh")) ;; Fallback. From 4e5eb85425214d62cd3962914565b281b74504ce Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 15 Mar 2015 19:17:46 +0200 Subject: [PATCH 297/457] Fix subtle problems with linum-mode and invisible text src/xdisp.c (handle_invisible_prop): Fix up it->position even when we are going to load overlays at the beginning of the invisible text. (setup_for_ellipsis): Reset the ignore_overlay_strings_at_pos_p flag also here. (next_overlay_string): Set the overlay_strings_at_end_processed_p flag only if the overlays just processed were actually loaded at EOB. --- src/ChangeLog | 11 ++++++++++ src/xdisp.c | 56 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index cb4aad6ec95..e328afcde8f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2015-03-15 Eli Zaretskii + + * xdisp.c (handle_invisible_prop): Fix up it->position even when + we are going to load overlays at the beginning of the invisible + text. + (setup_for_ellipsis): Reset the ignore_overlay_strings_at_pos_p + flag also here. + (next_overlay_string): Set the overlay_strings_at_end_processed_p + flag only if the overlays just processed were actually loaded at + EOB. + 2015-03-14 Daniel Colascione * emacs.c (standard_args): Add --no-x-resources. diff --git a/src/xdisp.c b/src/xdisp.c index ce685fd6e22..a17f5a9c34f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4412,6 +4412,27 @@ handle_invisible_prop (struct it *it) IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos); } + if (display_ellipsis_p) + { + /* Make sure that the glyphs of the ellipsis will get + correct `charpos' values. If we would not update + it->position here, the glyphs would belong to the + last visible character _before_ the invisible + text, which confuses `set_cursor_from_row'. + + We use the last invisible position instead of the + first because this way the cursor is always drawn on + the first "." of the ellipsis, whenever PT is inside + the invisible text. Otherwise the cursor would be + placed _after_ the ellipsis when the point is after the + first invisible character. */ + if (!STRINGP (it->object)) + { + it->position.charpos = newpos - 1; + it->position.bytepos = CHAR_TO_BYTE (it->position.charpos); + } + } + /* If there are before-strings at the start of invisible text, and the text is invisible because of a text property, arrange to show before-strings because 20.x did @@ -4443,23 +4464,6 @@ handle_invisible_prop (struct it *it) } else if (display_ellipsis_p) { - /* Make sure that the glyphs of the ellipsis will get - correct `charpos' values. If we would not update - it->position here, the glyphs would belong to the - last visible character _before_ the invisible - text, which confuses `set_cursor_from_row'. - - We use the last invisible position instead of the - first because this way the cursor is always drawn on - the first "." of the ellipsis, whenever PT is inside - the invisible text. Otherwise the cursor would be - placed _after_ the ellipsis when the point is after the - first invisible character. */ - if (!STRINGP (it->object)) - { - it->position.charpos = newpos - 1; - it->position.bytepos = CHAR_TO_BYTE (it->position.charpos); - } it->ellipsis_p = true; /* Let the ellipsis display before considering any properties of the following char. @@ -4504,6 +4508,11 @@ setup_for_ellipsis (struct it *it, int len) if (it->saved_face_id < 0 || it->saved_face_id != it->face_id) it->saved_face_id = it->face_id = DEFAULT_FACE_ID; + /* If the ellipsis represents buffer text, it means we advanced in + the buffer, so we should no longer ignore overlay strings. */ + if (it->method == GET_FROM_BUFFER) + it->ignore_overlay_strings_at_pos_p = false; + it->method = GET_FROM_DISPLAY_VECTOR; it->ellipsis_p = true; } @@ -5427,7 +5436,6 @@ next_overlay_string (struct it *it) && it->stop_charpos <= it->end_charpos)); it->current.overlay_string_index = -1; it->n_overlay_strings = 0; - it->overlay_strings_charpos = -1; /* If there's an empty display string on the stack, pop the stack, to resync the bidi iterator with IT's position. Such empty strings are pushed onto the stack in @@ -5444,8 +5452,18 @@ next_overlay_string (struct it *it) /* If we're at the end of the buffer, record that we have processed the overlay strings there already, so that next_element_from_buffer doesn't try it again. */ - if (NILP (it->string) && IT_CHARPOS (*it) >= it->end_charpos) + if (NILP (it->string) + && IT_CHARPOS (*it) >= it->end_charpos + && it->overlay_strings_charpos >= it->end_charpos) it->overlay_strings_at_end_processed_p = true; + /* Note: we reset overlay_strings_charpos only here, to make + sure the just-processed overlays were indeed at EOB. + Otherwise, overlays on text with invisible text property, + which are processed with IT's position past the invisible + text, might fool us into thinking the overlays at EOB were + already processed (linum-mode can cause this, for + example). */ + it->overlay_strings_charpos = -1; } else { From 8599360928a0169b232fe1d67cc8228edd4f790c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 15 Mar 2015 14:21:04 -0400 Subject: [PATCH 298/457] (url-insert-file-contents): Set buffer-file-coding-system Fixes: debbugs:20010 * lisp/url/url-handlers.el (url-insert-file-contents): Call after-insert-file-set-coding like insert-file-contents, to set buffer-file-coding-system. --- lisp/url/ChangeLog | 6 ++++++ lisp/url/url-handlers.el | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 0f464135840..8733614387a 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,9 @@ +2015-03-15 Stefan Monnier + + * url-handlers.el (url-insert-file-contents): Call + after-insert-file-set-coding like insert-file-contents, to set + buffer-file-coding-system (bug#20010). + 2015-01-22 Paul Eggert Don't downcase system diagnostics' first letters diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el index 23006e1e087..ff3eafd19da 100644 --- a/lisp/url/url-handlers.el +++ b/lisp/url/url-handlers.el @@ -1,4 +1,4 @@ -;;; url-handlers.el --- file-name-handler stuff for URL loading +;;; url-handlers.el --- file-name-handler stuff for URL loading -*- lexical-binding:t -*- ;; Copyright (C) 1996-1999, 2004-2015 Free Software Foundation, Inc. @@ -228,7 +228,7 @@ the arguments that would have been passed to OPERATION." ;; a local process. nil))) -(defun url-handler-file-remote-p (filename &optional identification connected) +(defun url-handler-file-remote-p (filename &optional identification _connected) (let ((url (url-generic-parse-url filename))) (if (and (url-type url) (not (equal (url-type url) "file"))) ;; Maybe we can find a suitable check for CONNECTED. For now, @@ -250,7 +250,7 @@ the arguments that would have been passed to OPERATION." ;; The actual implementation ;;;###autoload (defun url-copy-file (url newname &optional ok-if-already-exists - keep-time preserve-uid-gid) + _keep-time _preserve-uid-gid) "Copy URL to NEWNAME. Both args must be strings. Signals a `file-already-exists' error if file NEWNAME already exists, unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil. @@ -334,8 +334,13 @@ They count bytes from the beginning of the body." (unless (cadr size-and-charset) ;; If the headers don't specify any particular charset, use the ;; usual heuristic/rules that we apply to files. - (decode-coding-inserted-region start (point) url visit beg end replace)) - (list url (car size-and-charset)))))) + (decode-coding-inserted-region start (point) url + visit beg end replace)) + (let ((inserted (car size-and-charset))) + (when (fboundp 'after-insert-file-set-coding) + (let ((insval (after-insert-file-set-coding inserted visit))) + (if insval (setq inserted insval)))) + (list url inserted)))))) (put 'insert-file-contents 'url-file-handlers 'url-insert-file-contents) From c43762dd81886382fe2caa6dc434e189bd5106d2 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sun, 15 Mar 2015 20:17:09 +0100 Subject: [PATCH 299/457] Fix description of fullscreen mode on MS-Windows (Bug#20110). * efaq.texi (Fullscreen mode on MS-Windows): Fix description (Bug#20110). --- doc/misc/ChangeLog | 6 +++++- doc/misc/efaq.texi | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0e43b9ffe4d..e493793bc05 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,8 +1,12 @@ +2015-03-15 Martin Rudalics + + * efaq.texi (Fullscreen mode on MS-Windows): Fix description (Bug#20110). + 2015-02-04 Kelvin White * erc.texi (Advanced Usage, Options): Add descriptions and examples for erc-format-nick-function and erc-rename-buffers options. - (Connecting): fix typo + (Connecting): Fix typo 2014-12-29 Michael Albinus diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 8f6515ae3d0..3078122d11c 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -2678,8 +2678,16 @@ variable in the environment. @cindex Maximize frame @cindex Fullscreen mode -Use the function @code{w32-send-sys-command}. For example, you can -put the following in your @file{.emacs} file: +Beginning with Emacs 24.4 either run Emacs with the @samp{--maximized} +command-line option or put the following form in your @file{.emacs} +file: + +@lisp +(add-hook 'emacs-startup-hook 'toggle-frame-maximized) +@end lisp + +With older versions use the function @code{w32-send-sys-command}. For +example, you can put the following in your @file{.emacs} file: @lisp (add-hook 'emacs-startup-hook From 3eb4d23a7cdee6f763b5be4947f70a1040c25424 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Mon, 16 Mar 2015 14:48:09 +0000 Subject: [PATCH 300/457] Make Edebug work with Follow Mode. * emacs-lisp/edebug.el (edebug--display-1): Remove call to edebug-adjust-window. (edebug--recursive-edit): Don't bind pre/post-command-hooks to nil over the recursive edit. (edebug-adjust-window): Remove. --- lisp/ChangeLog | 10 ++++++++++ lisp/emacs-lisp/edebug.el | 34 ---------------------------------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 747a1d6c650..c6fab7fba3d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2015-03-16 Alan Mackenzie + + Make Edebug work with Follow Mode. + + * emacs-lisp/edebug.el (edebug--display-1): Remove call to + edebug-adjust-window. + (edebug--recursive-edit): Don't bind pre/post-command-hooks to nil + over the recursive edit. + (edebug-adjust-window): Remove. + 2015-03-15 Michael Albinus * net/tramp-adb.el: diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 10918775f49..333f02842f7 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -2446,9 +2446,6 @@ MSG is printed after `::::} '." edebug-function) )) - (setcdr edebug-window-data - (edebug-adjust-window (cdr edebug-window-data))) - ;; Test if there is input, not including keyboard macros. (if (input-pending-p) (progn @@ -2677,12 +2674,6 @@ MSG is printed after `::::} '." (defining-kbd-macro (if edebug-continue-kbd-macro defining-kbd-macro)) - ;; Disable command hooks. This is essential when - ;; a hook function is instrumented - to avoid infinite loop. - ;; This may be more than we need, however. - (pre-command-hook nil) - (post-command-hook nil) - ;; others?? ) @@ -2722,31 +2713,6 @@ MSG is printed after `::::} '." ;;; Display related functions -(defun edebug-adjust-window (old-start) - ;; If pos is not visible, adjust current window to fit following context. - ;; (message "window: %s old-start: %s window-start: %s pos: %s" - ;; (selected-window) old-start (window-start) (point)) (sit-for 5) - (if (not (pos-visible-in-window-p)) - (progn - ;; First try old-start - (if old-start - (set-window-start (selected-window) old-start)) - (if (not (pos-visible-in-window-p)) - (progn - ;; (message "resetting window start") (sit-for 2) - (set-window-start - (selected-window) - (save-excursion - (forward-line - (if (< (point) (window-start)) -1 ; one line before if in back - (- (/ (window-height) 2)) ; center the line moving forward - )) - (beginning-of-line) - (point))))))) - (window-start)) - - - (defconst edebug-arrow-alist '((Continue-fast . "=") (Trace-fast . "-") From ac85901854a693061371db5562cb16419a022711 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 16 Mar 2015 19:46:45 +0200 Subject: [PATCH 301/457] doc/misc/efaq-w32.texi: Remove outdated information and update. --- doc/misc/ChangeLog | 4 + doc/misc/efaq-w32.texi | 421 ++++++++++++++++++----------------------- 2 files changed, 189 insertions(+), 236 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index e493793bc05..8bb094778a2 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Eli Zaretskii + + * efaq-w32.texi: Remove outdated information and update. + 2015-03-15 Martin Rudalics * efaq.texi (Fullscreen mode on MS-Windows): Fix description (Bug#20110). diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index 8332ad98f4c..1deeeca9d19 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -128,10 +128,12 @@ systems. @cindex supported versions of Windows Emacs @value{EMACSVER} is known to run on all versions of Windows from -@c FIXME does it really still support Windows 98? Does it matter? -Windows 98 and Windows NT 4.0 through to Windows 7. The Windows port is -built using the Win32 API and supports most features of the X version, -including variable width fonts, images and tooltips. +Windows 98 and Windows NT 4.0 through to Windows 8.1. The Windows +port is built using the Win32 API and supports most features of the X +version, including variable width fonts, images and tooltips. + +Emacs on Windows can be compiled as either a 32-bit or a 64-bit +executable, using the MinGW GCC compiler and development tools. @node Other versions of Emacs @section What other versions of Emacs run on Windows? @@ -163,10 +165,12 @@ instructions (requires DJGPP). @cindex where to get Emacs binaries Pre-compiled versions are distributed from @uref{http://ftpmirror.gnu.org/emacs/windows/, ftp.gnu.org mirrors}. -Emacs binaries are distributed as zip files, digitally -signed by the developer who built them. Generally most users will -want the file @file{emacs-@value{EMACSVER}-bin-i386.zip}, which -contains everything you need to get started. +Emacs binaries are distributed as zip files, digitally signed by the +developer who built them. Generally most users will want the file +@file{emacs-@value{EMACSVER}-bin-i686-pc-mingw.zip} for the 32-bit +build, and @file{emacs-@value{EMACSVER}-bin-x86_64-w64-mingw32.zip} +for the 64-bit build. The zip archive contains everything you need to +get started. @cindex where to get sources @cindex Emacs source code @@ -187,17 +191,18 @@ development site. @section How can I compile Emacs myself? @cindex compiling Emacs -To compile Emacs on Windows, you will need the MingW or Cygwin port of -GCC with MingW make, or a Microsoft C compiler with nmake and the -single threaded C runtime library. Recent versions of Microsoft -Visual Studio no longer come with the single threaded C runtime -library, which is required for certain POSIX compatibility, so MingW -is usually the best choice. Image support requires external -libraries, the headers and import libraries for which will need to be -installed where your compiler can find them. You will also need ports -of GNU @command{rm} and @command{cp}, as the Windows native -equivalents are not consistent between versions. GNU texinfo will be -required to build the manuals. @xref{Other useful ports}. +To compile Emacs on Windows, you will need the MingW port of GCC and +Binutils, the MinGW runtime and development environment, and the MSYS +suite of tools. For the details, see the file @file{nt/INSTALL} in +the Emacs source distribution. + +Support for displaying images, as well as XML/HTML rendering and TLS +networking requires external libraries, the headers and import +libraries for which will need to be installed where your compiler can +find them. Again, the details, including URLs of sites where you can +download these libraries are in @file{nt/INSTALL}. @xref{Other useful +ports}, for auxiliary tools you may wish to install and use in +conjunction with Emacs. After unpacking the source, or checking out of the repository, be sure to read the instructions in @file{nt/README} and @file{nt/INSTALL}. @@ -211,39 +216,25 @@ to read the instructions in @file{nt/README} and @file{nt/INSTALL}. By default, Emacs is compiled with debugging on, and optimizations enabled. The optimizations may interfere with some types of debugging; the debugger may not show clearly where it is, or may not be able to inspect certain -variables. If this is the case, reconfigure with @option{--no-opt}. +variables. If this is the case, reconfigure with @kbd{CFLAGS='-O0 -g3'} The file @file{etc/DEBUG} contains general debugging hints, as well as -specific notes about debugging Emacs with both gdb and Microsoft debuggers. +specific notes about debugging Emacs. -@menu -* GDB:: -* Microsoft Developer Studio:: -@end menu - -@node GDB -@subsection GDB -@cindex GDB, debugging Emacs with @cindex debugging Emacs with GDB - GDB is the GNU debugger, which can be used to debug Emacs when it has -been compiled with GCC. The best results will be obtained if you -start gdb from the @file{src} directory as @samp{gdb oo/i386/emacs.exe}. -This will load the init file @file{.gdbinit} in that directory, to -define some extra commands for working with lisp while debugging, and -set up breakpoints to catch abnormal aborts. +been compiled with MinGW GCC. The best results will be obtained if +you start gdb from the @file{src} directory as @kbd{gdb ./emacs.exe}. +This will load the init file @file{.gdbinit}@footnote{ +Latest versions of GDB might refuse to load the init file for security +reasons, unless you customize GDB; alternatively, use an explicit +@kbd{source ./gdbinit} command after entering GDB. +} in that directory, to define some extra commands for working with +lisp while debugging, and set up breakpoints to catch abnormal +aborts. -@node Microsoft Developer Studio -@subsection Microsoft Developer Studio -@cindex MSVC++, debugging Emacs with -@cindex DevStudio, debugging Emacs with -@cindex debugging Emacs with MS DevStudio - -MS DevStudio can be used to debug Emacs when it has been compiled with -a Microsoft compiler. To view lisp variables, you can call the -function @code{debug_print} from the Quickwatch window. Some -@uref{http://www.gnu.org/software/emacs/windows/ntemacs/discuss/debug.txt, -old tips} are probably still valid. +A Windows port of GDB can be found on MinGW download sites and on some +others. @c ------------------------------------------------------------ @node Installing Emacs @@ -251,7 +242,7 @@ old tips} are probably still valid. @menu * Unpacking:: -* Installing:: +* Installing binaries:: * Image support:: * Init file:: * Location of init file:: @@ -279,24 +270,27 @@ old tips} are probably still valid. The binary distributions are distributed as zip files, which are handled natively by Windows XP and later. For earlier versions, there are many tools that can handle the zip format, from InfoZip's command line unzip -tool, to 7zip's multi-format graphical archive explorer. Although +tool, to 7zip's multi-format graphical archive explorer. (Although popular, WinZip has caused problems with line-ends in the past, and is not -Free software, so we do not recommend it. +Free software, so we do not recommend it.) -Source distributions are distributed as gzipped tar files. 7zip and -similar multi-format graphical tools can handle these, or you can get -Windows ports of the command line gzip and tar tools from multiple sources. +Source distributions are distributed as @file{.tar.gz} or +@file{.tar.xz} files. 7zip and similar multi-format graphical tools +can handle these, or you can get Windows ports of the command line +gzip and tar tools from multiple sources, or use @command{bsdtar}. @xref{Other useful ports}. The command to unpack a source distribution from the command line is: + @example tar xzf emacs-@value{EMACSVER}.tar.gz @end example If this does not work with the versions of tar and gzip that you have, you may need to try a two step process: + @example -gzip -dc emacs-@value{EMACSVER}.tar.gz | tar xvf - +gzip -dc emacs-@value{EMACSVER}.tar.gz | tar xf - @end example You may see many messages from tar complaining about being unable to change @@ -304,8 +298,21 @@ the modification time on directories, and from gzip complaining about a broken pipe. These messages are usually harmless, caused by incomplete ports that are not fully aware of the limitations of Windows. -@node Installing -@section How do I install Emacs after unpacking? +And here's an example of using @command{bsdtar} (from the +@samp{libarchive} package) to unpack a @file{.tar.xz} archive: + +@example +bsdtar -xf emacs-@value{EMACSVER}.tar.xz +@end example + +Expect @command{bsdtar} to unpack the whole distribution without any +complaints. + +Once you unpack the source distribution, look in @file{nt/INSTALL} +file for build instructions. + +@node Installing binaries +@section How do I install Emacs after unpacking the binary zip? @cindex installing Emacs @pindex addpm @cindex Start Menu, creating icons for Emacs @@ -313,7 +320,8 @@ that are not fully aware of the limitations of Windows. You can run Emacs without any extra steps, but if you want icons in your Start Menu, or for Emacs to detect the image libraries that are already installed on your system as part of GTK, then you should run the program -@file{emacs-@value{EMACSVER}\bin\addpm.exe}. +@file{addpm.exe}, which is usually installed into the same @file{bin} +directory with @file{emacs.exe}. @node Image support @section How do I get image support? @@ -323,6 +331,7 @@ installed on your system as part of GTK, then you should run the program @cindex gif, installing image support in Emacs @cindex tiff, installing image support in Emacs @cindex xpm, installing image support in Emacs +@cindex rsvg, installing image support in Emacs @cindex toolbar, installing color icons in @cindex color images, installing support for images in Emacs @cindex monochrome images, getting color images in Emacs @@ -330,12 +339,12 @@ installed on your system as part of GTK, then you should run the program Emacs has built in support for XBM and PBM/PGM/PPM images. This is sufficient to see the monochrome splash screen and tool-bar icons. -Since 22.2, the official precompiled binaries for Windows have bundled +Since v22.2, the official precompiled binaries for Windows have bundled libXpm, which is required to display the color versions of those images. -Emacs is compiled to recognize JPEG, PNG, GIF and TIFF images also, -but displaying these image types require external DLLs which are not -bundled with Emacs. @xref{Other useful ports}. +Emacs is compiled to recognize JPEG, PNG, GIF, TIFF, and RSVG images +also, but displaying these image types require external DLLs which are +not bundled with Emacs. @xref{Other useful ports}. @node Init file @section What is my init file? @@ -344,11 +353,11 @@ bundled with Emacs. @xref{Other useful ports}. When Emacs starts up, it attempts to load and execute the contents of a file commonly called @file{.emacs} (though it may have other names, -@pxref{Installing Emacs,,Where do I put my init file?}) which contains any -customizations you have made. You can manually add lisp code to your -.emacs, or you can use the Customization interface accessible from the -@emph{Options} menu. If the file does not exist, Emacs will start -with the default settings. +@pxref{Location of init file,,Where do I put my init file?}) which +contains any customizations you have made. You can manually add lisp +code to your .emacs, or you can use the Customization interface +accessible from the @emph{Options} menu. If the file does not exist, +Emacs will start with the default settings. @node Location of init file @section Where do I put my init file? @@ -358,15 +367,15 @@ with the default settings. @cindex init.el @cindex registry, setting the HOME directory in -On Windows, the .emacs file may be called _emacs for backward -compatibility with DOS and FAT filesystems where filenames could not -start with a dot. Some users prefer to continue using such a name, -because Explorer cannot create a file with a name starting with a dot, -even though the filesystem and most other programs can handle it. -In Emacs 22 and later, the init file may also be called -@file{.emacs.d/init.el}. Many of the other files that are created -by lisp packages are now stored in the @file{.emacs.d} directory too, -so this keeps all your Emacs related files in one place. +On Windows, the @file{.emacs} file may be called @file{_emacs} for +backward compatibility with DOS and FAT filesystems where filenames +could not start with a dot. Some users prefer to continue using such +a name due to historical problems various Windows tools had in the +past with file names that begin with a dot. In Emacs 22 and later, +the init file may also be called @file{.emacs.d/init.el}. Many of the +other files that are created by lisp packages are now stored in the +@file{.emacs.d} directory too, so this keeps all your Emacs related +files in one place. All the files mentioned above should go in your @env{HOME} directory. The @env{HOME} directory is determined by following the steps below: @@ -387,14 +396,14 @@ backward compatibility, as previous versions defaulted to @file{C:/} if @env{HOME} was not set. @item Use the user's AppData directory, usually a directory called -@file{Application Data} under the user's profile directory, the location +@file{AppData} under the user's profile directory, the location of which varies according to Windows version and whether the computer is part of a domain. @end enumerate Within Emacs, @key{~} at the beginning of a file name is expanded to your -@env{HOME} directory, so you can always find your .emacs file with -@kbd{C-x C-f ~/.emacs}. +@env{HOME} directory, so you can always find your @file{.emacs} file +by typing the command @kbd{C-x C-f ~/.emacs}. @node Troubleshooting init file @section Troubleshooting init file problems @@ -409,15 +418,16 @@ to. You can do this by evaluating the following expression in the @file{*scratch*} buffer using @kbd{C-x C-e}: @example -(insert (getenv "HOME")) +(getenv "HOME") @end example -Look carefully at what is printed and make sure the value is -valid. For example, if the value has trailing whitespace, Emacs won't -be able to find the directory. Also, be sure that the value isn't a -relative drive letter (e.g., @file{d:} without a backslash); if it is, -then @env{HOME} is going to be whatever the current directory on that -drive is, which is likely not what you want to happen. +Look carefully at what is printed in the echo area, and make sure the +value is valid. For example, if the value has trailing whitespace, +Emacs won't be able to find the directory. Also, be sure that the +value isn't a relative drive letter (e.g., @file{d:} without a +backslash or a forward slash after the colon); if it is, then +@env{HOME} is going to be whatever the current directory on that drive +is, which is likely not what you want to happen. @node Associate files with Emacs @section How do I associate files with Emacs? @@ -488,9 +498,9 @@ Thanks to Jason Rumney and Sigbjorn Finne for these tips. The location of the Desktop varies between different versions of Windows, and in a corporate environment can be moved around by the -network administrator. On NT derivatives, you can use the value of -the @env{USERPROFILE} environment variable to find where the desktop -might be: +network administrator. On latest Windows versions, you can use the +value of the @env{USERPROFILE} environment variable to find where the +desktop might be: @example @kbd{C-x C-f $USERPROFILE/Desktop} @@ -512,7 +522,7 @@ menu by default). Once you have a file from the Desktop inside Emacs, @end menu @node Focus follows mouse -@subsection How do it make the active window follow the mouse? +@subsection How do I make the active window follow the mouse? @vindex focus-follows-mouse @cindex point to focus @cindex mouse over to focus @@ -524,6 +534,11 @@ even though Windows has a click to focus policy by default (there is software available to change that though). The latter can be used to make Emacs use a focus-follow-mouse policy within its own frames. +You can also change the Windows click-to-focus policy by changing +settings in the Registry. The details vary according to your Windows +version; look on the Internet for instructions to enable ``active +window tracking'' for your version of Windows. + @node Swap CapsLock and Control @subsection How do I swap CapsLock and Control? @cindex scan codes, modifying @@ -576,7 +591,7 @@ Date: 04 Dec 1996 14:36:21 -0600 Message-ID: Subject: Re: Re[2]: problem with caps/ctrl swap on NT 4.0 @end ignore -@example +@smallexample It's a binary value that lets you map keystrokes in the low-level keyboard drivers in NT. As a result you don't have to worry about applications bypassing mappings that you've done at a higher level (i.e. it just works). @@ -600,7 +615,7 @@ lock key will behave as caps-lock. To swap, you also need to map 0x3a to This registry value is system wide, and can't be made user-specific. It also only takes affect on reboot. -@end example +@end smallexample @item Ulfar Erlingsson has provided a registry file that sets the CapsLock key to be a Control key and the Windows key to be an Alt key: @@ -663,7 +678,8 @@ buffers etc. will instead act on the region. An inactive mark needs to be reactivated to operate on it, unless @code{mark-even-if-inactive} is set. Secondly, @code{transient-mark-mode} also highlights the region when it is active, providing the same visual clue that you get -in other programs. +in other programs. This mode is turned on by default in latest +versions of Emacs. In addition to seeing the highlighting, new Emacs users often expect editing commands to replace the region when it is active. This behavior @@ -717,14 +733,16 @@ message as documented in Microsoft's API documentation. @cindex delete Emacs directory Emacs does not come with an uninstall program. No files are installed -outside of the Emacs base directory, so deleting that directory is -sufficient to clean away the files. If you ran @command{addpm}, -you'll need to delete the Start Menu group too. The registry entries -inserted by @command{addpm} will not cause any problems if you leave -them there, but for the sake of completeness, you can use @command{regedit} -to remove the keys under @code{HKEY_LOCAL_MACHINE} orx -@code{HKEY_CURRENT_USER}: @code{SOFTWARE\GNU\Emacs}, and the key -@code{HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\emacs.exe} if it exists. +outside of the directories you find in the binary zip archive, so +deleting those directories is sufficient to clean away the files. If +you ran @command{addpm}, you'll need to delete the Start Menu group +too. The registry entries inserted by @command{addpm} will not cause +any problems if you leave them there, but for the sake of +completeness, you can use @command{regedit} to remove the keys under +@code{HKEY_LOCAL_MACHINE} orx @code{HKEY_CURRENT_USER}: +@code{SOFTWARE\GNU\Emacs}, and the key +@code{HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App +Paths\emacs.exe} if it exists. @node Does not run @section When I run Emacs nothing happens @@ -751,9 +769,10 @@ been truncated to CONTRIBU or CONTRI~1, your distribution has been corrupted while unpacking and Emacs will not start. @end enumerate -If it is still not working, send mail to the list, describing what -you've done, and what you are seeing. (The more information you send -the more likely it is that you'll receive a helpful response.. +If it is still not working, send mail to the +@email{help-gnu-emacs@@gnu.org} mailing list, describing what you've +done, and what you are seeing. (The more information you send the more +likely it is that you'll receive a helpful response.) @node Virus @section Does Emacs contain a virus? @@ -880,7 +899,6 @@ The doc string contains a list of the system sounds you can use. * Font names:: * Bold and italic:: * Multilingual fonts:: -* BDF fonts:: * Font menu:: * Line ends:: @end menu @@ -910,9 +928,9 @@ an indication of whether the font is outline (.TTF, .ATM) or raster (.FON) based when fonts are listed, which may let you differentiate between two fonts with the same name and different technologies. -From Emacs 23, the preferred font name format will be moving to the simpler -and more flexible fontconfig format. XLFD names will continue to be -supported for backward compatibility. +Starting with Emacs 23, the preferred font name format will be moving +to the simpler and more flexible fontconfig format. XLFD names will +continue to be supported for backward compatibility. @example XLFD: -*-Courier New-normal-r-*-*-13-*-*-*-c-*-iso8859-1 @@ -959,6 +977,9 @@ and manually set the font for italic, bold and bold-italic as follows: (set-face-font 'bold-italic "-*-Courier New-bold-i-*-*-11-*-*-*-c-*-iso8859-1") @end example +The @code{w32-enable-synthesized-fonts} variable is obsolete starting +from Emacs 24.4, as Emacs no longer has this limitation. + @node Multilingual fonts @section Multilingual font support @cindex multilingual display, fonts @@ -985,11 +1006,8 @@ require the BDF fonts from the GNU intlfonts package. For many languages, native truetype fonts are sufficient, and in Emacs 23 the need for BDF fonts will disappear for almost all languages. At -the time of writing, some Arabic characters in the HELLO file still do -not display with native fonts, because they are pre-composed characters -from MULE character sets rather than standard Unicode Arabic, but all -other characters are able to be displayed with appropriate truetype or -opentype fonts. +the time of writing, all supported characters are able to be displayed +with appropriate truetype or opentype fonts. @node Non-latin display @subsection How do I get Emacs to display non-latin characters? @@ -1025,6 +1043,12 @@ new fontset with @code{create-fontset-from-ascii-font} or chinese-big5-2:-*-MingLiU-normal-r-*-*-12-*-*-*-c-*-big5-*" t) @end example +Alternatively, you can augment the default fontset with information of +which fonts to use for certain ranges of characters or for specific +scripts/character sets. @xref{Modifying Fontsets,, Modifying +Fontsets, emacs, The GNU Emacs Manual}, for details and some useful +examples. + @node International fonts @subsection Where can I find fonts for other languages? @cindex language support, finding fonts @@ -1037,10 +1061,10 @@ new fontset with @code{create-fontset-from-ascii-font} or In addition to the wide range of fonts that come with the language support packages of various components of Windows itself, GNU/Linux distributions these days come with a number of Free truetype fonts -that cover a wide range of languages. The GNU intlfonts source -distribution contains BDF fonts covering all of the languages that can -be displayed by Emacs 22, and can be downloaded from -@uref{http://ftpmirror.gnu.org/intlfonts, ftp.gnu.org mirrors}. +that cover a wide range of languages. The GNU Unifont project +contains glyphs for most of the Unicode codespace, and can be +downloaded from @uref{http://ftpmirror.gnu.org/unifont, ftp.gnu.org +mirrors}. @node Third-party multibyte @subsection How do I use third party programs to display multibyte characters? @@ -1058,12 +1082,6 @@ for that language, but the third party software is intercepting it and using a different font behind the scenes). @xref{Non-latin display}. -In addition to defining a fontset with the expected font, you may also need -to disable unicode output with: -@example -(setq w32-enable-unicode-output nil) -@end example - @node Localized fonts @subsection Can I use a font with a name in my language? @cindex fonts, localized font names @@ -1073,87 +1091,9 @@ Normally Emacs should initialize @code{locale-coding-system} appropriately based on your locale, which will let Emacs use font names in your local language successfully. -@node BDF fonts -@section How do I use bdf fonts with Emacs? -@cindex BDF fonts, using -@cindex GNU intlfonts, using -@cindex intlfonts, using -@vindex w32-bdf-filename-alist -@vindex bdf-directory-alist -@vindex font-encoding-alist -@findex w32-find-bdf-fonts -@findex set-frame-font - -To use bdf fonts with Emacs, you need to tell Emacs where the fonts -are located, create fontsets for them, and then use them. We'll use -the 16 dot international fonts from @uref{http://ftpmirror.gnu.org/intlfonts, -ftp.gnu.org/gnu/intlfonts} as an -example put together by Jason Rumney. - -Download @file{16dots.tar.gz} and unpack it; I'll assume that they are in -@file{c:\intlfonts}. Then set @code{w32-bdf-filename-alist} to the list of -fonts returned by using @code{w32-find-bdf-fonts} to enumerate all of -the font files. It is a good idea to set the variable -@code{bdf-directory-list} at the same time so @code{ps-print} knows where -to find the fonts: -@example -(setq bdf-directory-list - '("c:/intlfonts/Asian" "c:/intlfonts/Chinese" - "c:/intlfonts/Chinese-X" "c:/intlfonts/Ethiopic" - "c:/intlfonts/European" "c:/intlfonts/Japanese" - "c:/intlfonts/Japanese-X" "c:/intlfonts/Korean-X" - "c:/intlfonts/Misc/")) - -(setq w32-bdf-filename-alist (w32-find-bdf-fonts bdf-directory-list)) -@end example - -Then create fontsets for the BDF fonts: - -@example -(create-fontset-from-fontset-spec - "-*-fixed-medium-r-normal-*-16-*-*-*-c-*-fontset-bdf, -japanese-jisx0208:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0208.1983-*, -katakana-jisx0201:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0201*-*, -latin-jisx0201:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0201*-*, -japanese-jisx0208-1978:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0208.1978-*, -thai-tis620:-misc-fixed-medium-r-normal--16-160-72-72-m-80-tis620.2529-1, -lao:-misc-fixed-medium-r-normal--16-160-72-72-m-80-MuleLao-1, -tibetan-1-column:-TibMdXA-fixed-medium-r-normal--16-160-72-72-m-80-MuleTibetan-1, -ethiopic:-Admas-Ethiomx16f-Medium-R-Normal--16-150-100-100-M-160-Ethiopic-Unicode, -tibetan:-TibMdXA-fixed-medium-r-normal--16-160-72-72-m-160-MuleTibetan-0") -@end example - -Many of the international bdf fonts from gnu.org are type 0, and therefore -need to be added to font-encoding-alist: - -@example -;; Need to add some fonts to font-encoding-alist since the bdf fonts -;; are type 0 not the default type 1. -(setq font-encoding-alist - (append '(("MuleTibetan-0" (tibetan . 0)) - ("GB2312" (chinese-gb2312 . 0)) - ("JISX0208" (japanese-jisx0208 . 0)) - ("JISX0212" (japanese-jisx0212 . 0)) - ("VISCII" (vietnamese-viscii-lower . 0)) - ("KSC5601" (korean-ksc5601 . 0)) - ("MuleArabic-0" (arabic-digit . 0)) - ("MuleArabic-1" (arabic-1-column . 0)) - ("MuleArabic-2" (arabic-2-column . 0))) font-encoding-alist)) -@end example - -You can now use the Emacs font menu (@pxref{Fonts and text -translation,,How can I have Emacs use a font menu like on X?}) to -select the @emph{bdf: 16-dot medium} fontset, or you can select it by -setting the default font: - -@example - (set-frame-font "fontset-bdf") -@end example - -Try loading the file @file{etc/HELLO}, and you should be able to see the -various international fonts displayed (except for Hindi, which is not -included in the 16-dot font distribution). - +@c This feature disappeared in Emacs 23, but I'm keeping its +@c description here, since I think it was a mistake to remove it, and +@c resurrecting it doesn't sound too problematic. @node Font menu @section How can I have Emacs use a font menu like on X? @cindex fonts, displaying a menu @@ -1171,6 +1111,8 @@ Place the following in your init file: * Add fonts to menu:: @end menu +@c This variable still exists, but will have no effect until +@c w32-use-w32-font-dialog support is resurrected, see above. @node Add fonts to menu @subsection How can I add my font to the font menu? @cindex font menu, adding fonts @@ -1204,7 +1146,6 @@ this collection of email messages} on the topic. @menu * Automatic line ends:: -* Line ends by filename:: * Line ends by file system:: @end menu @@ -1220,19 +1161,6 @@ file in Unix (LF) mode with the Ctrl-M characters displayed as @samp{^M}. It does this to be safe, as no data loss will occur if the file is really binary and the Ctrl-M characters are significant. -@node Line ends by filename -@subsection CR/LF translation by file extension -@cindex line ends, determining by filename -@cindex binary files, determining by file name -@vindex file-name-buffer-file-type-alist - -The variable @code{file-name-buffer-file-type-alist} holds a list of -filename patterns and their associated type; binary or text. Files marked -as binary will not have line-end detection performed on them, and instead -will always be displayed as is. With auto-detection in recent versions of -Emacs, this is seldom useful for existing files, but can still be used -to influence the choice of line ends for newly created files. - @node Line ends by file system @subsection CR/LF translation by file system @cindex line ends, determining by filesystem @@ -1260,8 +1188,9 @@ MS Windows, but this has still been insufficient to keep up with changes in printing technology from text and postscript based printers connected via ports that can be accessed directly, to graphical printers that are only accessible via USB. For details, see -@uref{http://www.emacswiki.org/cgi-bin/wiki/PrintingFromEmacs, Emacs -Wiki}. +@uref{http://www.emacswiki.org/emacs/PrintingFromEmacs, Emacs +Wiki}, @uref{http://www.emacswiki.org/emacs/PrintWithWebBrowser}, and +@uref{http://www.emacswiki.org/emacs/PrintFromWindowsExplorer}. @c ------------------------------------------------------------ @node Sub-processes @@ -1293,9 +1222,7 @@ Wiki}. The quoting rules for native Windows shells and Cygwin shells have some subtle differences. When Emacs spawns subprocesses, it tries to determine whether the process is a Cygwin program and changes its -quoting mechanism appropriately. See this -@uref{http://www.gnu.org/software/emacs/windows/ntemacs/discuss/shell-quoting, -previous discussion} for details. +quoting mechanism appropriately. @node Subprocess hang @section Programs reading input hang @@ -1357,9 +1284,11 @@ you can use @code{setbuf} and @code{setvbuf} to manipulate the buffering semantics. Some programs handle this by having an explicit flag to control their -buffering behavior, typically @option{-i} for interactive. Other -programs manage to detect that they are running under Emacs, by -using @samp{getenv("emacs")} internally. +buffering behavior, typically @option{-i} for interactive, or by a +special environment variable. Other programs manage to detect that +they are running under Emacs, by using @samp{getenv("emacs")} +internally. Look in the program's documentation for the way around +this issue. @menu * Perl script buffering:: @@ -1428,6 +1357,7 @@ this discussion} for more details. @vindex explicit-shell-file-name You can start an interactive shell in Emacs by typing @kbd{M-x shell}. +By default, this will start the standard Windows shell @file{cmd.exe}. Emacs uses the @env{SHELL} environment variable to determine which program to use as the shell. To instruct Emacs to use a non-default shell, you can either set this environment variable, or customize @@ -1467,11 +1397,6 @@ default shell in Emacs, you can place the following in your init file: (add-hook 'shell-mode-hook 'my-shell-setup) @end example -If you find that you are having trouble with Emacs tracking drive -changes with bash, see Mike Fabian's -@uref{http://www.gnu.org/software/emacs/windows/ntemacs/discuss/drive-tracking, -note}. - WARNING: Some versions of bash set and use the environment variable PID. For some as yet unknown reason, if @env{PID} is set and Emacs passes it on to bash subshells, bash dies (Emacs can inherit the @@ -1489,7 +1414,7 @@ continue to use bash as your subshell: @cindex cygwin mount points, using within Emacs The package -@uref{http://www.emacswiki.org/cgi-bin/wiki/cygwin-mount.el, +@uref{http://www.emacswiki.org/emacs/cygwin-mount.el, cygwin-mount.el} teaches Emacs about Cygwin mount points. @node Dired ls @@ -1849,11 +1774,15 @@ your type (@code{flyspell}). Both packages depend on a copy of @command{ispell} 3.2 or a compatible spell-checking program. GNU Aspell is a popular choice these days, Windows installers are available from the @uref{http://aspell.net/win32/, official site}. +Another possibility is Hunspell, which is available from +@uref{https://sourceforge.net/projects/ezwinports/files/?source=navbar, +the ezwinports site}. Once installed, you will need to configure @code{ispell-program-name} -to tell ispell and flyspell to use @command{aspell} as a replacement for -ispell. You can include the full path to the @file{aspell} binary, which -means you do not need to add its installation directory to the @env{PATH}. +to tell ispell and flyspell to use @command{aspell} or +@command{hunspell} as a replacement for ispell. You can include the +full path to the @file{aspell}/@file{hunspell} binary, which means you +do not need to add its installation directory to the @env{PATH}. @node Encryption @section Emacs and encryption @@ -1942,6 +1871,13 @@ of grep is to use @samp{findstr /n /r}. @node Developing with Emacs @chapter Developing with Emacs +We recommend using the GNU Compiler Collection for developing C/C++ +code from Emacs. The MinGW development toolchain provides Windows +ports of GCC and other compilers. + +The rest of this chapter describes other alternatives which you may +need to use. + @menu * MSVC:: * Borland C++ Builder:: @@ -2178,6 +2114,7 @@ suggestions} for improving the interaction of perldb and Emacs. @menu * Cygwin:: * MinGW:: +* EZWinPorts:: * UWIN:: * GnuWin32:: * GTK:: @@ -2230,6 +2167,17 @@ filesystem mapping to appear more POSIX like to the scripts that it runs. This is intended to complement the MinGW tools to make it easier to port software to Windows. +@node EZWinPorts +@section EZWinPorts +@cindex ezwinports + +The @uref{https://sourceforge.net/projects/ezwinports/, EZWinPorts +project} provides many useful ports of recent versions of GNU and Unix +software. This includes all the optional libraries used by Emacs +(image libraries, libxml2, GnuTLS), RCS, Terxinfo, a clone of +@command{man} command, Grep, xz, bzip2, bsdtar, ID Utils, Findutils, +Hunspell, Gawk, GNU Make, Groff, GDB. + @node UWIN @section UWIN @cindex uwin environment @@ -2251,8 +2199,8 @@ is @command{ksh}, the Korn shell. @uref{http://gnuwin32.sourceforge.net/} GnuWin32 provides precompiled native Windows ports of a wide selection -of Free software and libraries. Tools available here that are useful -for Emacs include: +of Free software and libraries. Unfortunately, the ports are +outdated. Tools available here that are useful for Emacs include: @itemize @item Arc - used by @code{archive-mode} to edit .arc files. @@ -2302,7 +2250,8 @@ Man pages for Emacs and other ported programs that you have can be read using Emacs' built-in manual reader @code{woman}. This requires no external programs, but if you do have a port of @command{man}, there is also an Emacs wrapper @code{man} that -which may be slightly faster. +which may be slightly faster. A Windows version of @command{man} is +available from the EZWinPorts site (@pxref{EZWinPorts}). @c ------------------------------------------------------------ @node Further information From 14c47d39fabf1f5dbc239f7e0f5a994e36ecc2ff Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 16 Mar 2015 20:01:38 +0200 Subject: [PATCH 302/457] doc/misc/efaq-w32.texi: Spell-check. --- doc/misc/efaq-w32.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index 1deeeca9d19..3ef8d154e8a 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -191,7 +191,7 @@ development site. @section How can I compile Emacs myself? @cindex compiling Emacs -To compile Emacs on Windows, you will need the MingW port of GCC and +To compile Emacs on Windows, you will need the MinGW port of GCC and Binutils, the MinGW runtime and development environment, and the MSYS suite of tools. For the details, see the file @file{nt/INSTALL} in the Emacs source distribution. @@ -739,7 +739,7 @@ you ran @command{addpm}, you'll need to delete the Start Menu group too. The registry entries inserted by @command{addpm} will not cause any problems if you leave them there, but for the sake of completeness, you can use @command{regedit} to remove the keys under -@code{HKEY_LOCAL_MACHINE} orx @code{HKEY_CURRENT_USER}: +@code{HKEY_LOCAL_MACHINE} or @code{HKEY_CURRENT_USER}: @code{SOFTWARE\GNU\Emacs}, and the key @code{HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\emacs.exe} if it exists. @@ -1907,7 +1907,7 @@ tools to build your project. Christopher Payne wrote a Visual Studio add-in that makes Emacs the default text editor, this has now been taken over by Jeff Paquette. -See the following two URLS for details: +See the following two URLs for details: @itemize @item @uref{http://sourceforge.net/projects/visemacs/} for the latest version. @item @uref{http://www.smathers.net/VisEmacs.htm} for notes on usage. @@ -2174,7 +2174,7 @@ to port software to Windows. The @uref{https://sourceforge.net/projects/ezwinports/, EZWinPorts project} provides many useful ports of recent versions of GNU and Unix software. This includes all the optional libraries used by Emacs -(image libraries, libxml2, GnuTLS), RCS, Terxinfo, a clone of +(image libraries, libxml2, GnuTLS), RCS, Texinfo, a clone of @command{man} command, Grep, xz, bzip2, bsdtar, ID Utils, Findutils, Hunspell, Gawk, GNU Make, Groff, GDB. From ab4e4cc92c62051983f4ee5f1bf9c82440086451 Mon Sep 17 00:00:00 2001 From: Vibhav Pant Date: Tue, 17 Mar 2015 05:01:59 +0530 Subject: [PATCH 303/457] Add 'clear' functionality to eshell. * eshell/esh-mode.el (eshell/clear): New function. * etc/NEWS: Mention new built-in command. --- etc/NEWS | 4 ++++ lisp/ChangeLog | 4 ++++ lisp/eshell/esh-mode.el | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 75d55de3f36..491d0d3de54 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -556,6 +556,10 @@ to avoid interfering with the kill ring. allow overriding the regular expression that recognizes the ldapsearch command line's password prompt. +** Eshell + +*** The new built-in command `clear' can scroll window contents out of sight. + +++ ** tar-mode: new `tar-new-entry' command, allowing for new members to be added to the archive. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c6fab7fba3d..3af4bb20b04 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-16 Vibhav Pant + + * eshell/esh-mode.el (eshell/clear): New function. + 2015-03-16 Alan Mackenzie Make Edebug work with Follow Mode. diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index da83ec6a6ab..15120cb61d4 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -871,6 +871,13 @@ When run interactively, widen the buffer first." (goto-char (point-max)) (recenter -1)) +(defun eshell/clear () + "Scroll contents of eshell window out of sight, leaving a blank window." + (interactive) + (let ((number-newlines (count-lines (window-start) (point)))) + (insert (make-string number-newlines ?\n))) + (eshell-send-input)) + (defun eshell-get-old-input (&optional use-current-region) "Return the command input on the current line." (if use-current-region From 43a847c02c3eb848cd0d55a4722bfe7f39b1112f Mon Sep 17 00:00:00 2001 From: Vibhav Pant Date: Tue, 17 Mar 2015 05:27:23 +0530 Subject: [PATCH 304/457] Fixes: debbugs:19335 * net/browse-url.el (browse-url-browser-function): Add "Conkeror". (browse-url-conkeror-program, browse-url-conkeror-arguments) (browse-url-conkeror-new-window-is-buffer): New defcustoms. (browse-url-default-browser): Check for `browse-url-conkeror' and call `browse-url-conkeror-program'. (browse-url-conkeror): New command. (bug#19863) * etc/NEWS: Mention added support for Conkeror. --- etc/NEWS | 4 +++ lisp/ChangeLog | 10 ++++++++ lisp/net/browse-url.el | 56 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 491d0d3de54..24ed0799b2c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -560,6 +560,10 @@ command line's password prompt. *** The new built-in command `clear' can scroll window contents out of sight. +** Browse-url + +*** browse-url now supports the Conkeror Web Browser. + +++ ** tar-mode: new `tar-new-entry' command, allowing for new members to be added to the archive. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3af4bb20b04..1383fdb2ecf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2015-03-16 Vibhav Pant + + * net/browse-url.el (browse-url-browser-function): Add "Conkeror". + (browse-url-conkeror-program, browse-url-conkeror-arguments) + (browse-url-conkeror-new-window-is-buffer): New defcustoms. + (browse-url-default-browser): Check for `browse-url-conkeror' + and call `browse-url-conkeror-program'. + (browse-url-conkeror): New command. + (bug#19863) + 2015-03-16 Vibhav Pant * eshell/esh-mode.el (eshell/clear): New function. diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 5e61c094c2e..4b64d95d0c6 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -42,6 +42,7 @@ ;; browse-url-netscape Netscape 1.1b1 ;; browse-url-mosaic XMosaic/mMosaic <= 2.4 ;; browse-url-cci XMosaic 2.5 +;; browse-url-conkeror Conkeror Dont know ;; browse-url-w3 w3 0 ;; browse-url-w3-gnudoit w3 remotely ;; browse-url-text-* Any text browser 0 @@ -236,6 +237,7 @@ regexp should probably be \".\" to specify a default browser." (function-item :tag "Netscape" :value browse-url-netscape) (function-item :tag "Mosaic" :value browse-url-mosaic) (function-item :tag "Mosaic using CCI" :value browse-url-cci) + (function-item :tag "Conkeror" :value browse-url-conkeror) (function-item :tag "Text browser in an xterm window" :value browse-url-text-xterm) (function-item :tag "Text browser in an Emacs window" @@ -416,6 +418,13 @@ functionality is not available there." :type 'boolean :group 'browse-url) +(defcustom browse-url-conkeror-new-window-is-buffer nil + "Whether to open up new windows in a buffer or a new window. +If non-nill, then open the URL in a new buffer rather than a new window if +`browse-url-conkeror' is asked to open it in a new window" + :type 'boolean + :group 'browse-url) + (defcustom browse-url-galeon-new-window-is-tab nil "Whether to open up new windows in a tab or a new window. If non-nil, then open the URL in a new tab rather than a new window if @@ -462,6 +471,17 @@ commands reverses the effect of this variable. Requires Netscape version :type 'string :group 'browse-url) +(defcustom browse-url-conkeror-program "conkeror" + "The name by which to invoke Conkeror." + :type 'string + :version "25.1" + :group 'browse-url) + +(defcustom browse-url-conkeror-arguments nil + "A list of strings to pass to Conkeror as arguments." + :type '(repeat (string :tag "Argument")) + :group 'browse-url) + (defcustom browse-url-filename-alist `(("^/\\(ftp@\\|anonymous@\\)?\\([^:]+\\):/*" . "ftp://\\2/") ;; The above loses the username to avoid the browser prompting for @@ -936,6 +956,7 @@ used instead of `browse-url-new-window-flag'." ((executable-find browse-url-kde-program) 'browse-url-kde) ((executable-find browse-url-netscape-program) 'browse-url-netscape) ((executable-find browse-url-mosaic-program) 'browse-url-mosaic) + ((executable-find browse-url-conkeror-program) 'browse-url-conkeror) ((executable-find browse-url-xterm-program) 'browse-url-text-xterm) ((locate-library "w3") 'browse-url-w3) (t @@ -1359,6 +1380,41 @@ used instead of `browse-url-new-window-flag'." (process-send-string "browse-url" "disconnect\r\n") (delete-process "browse-url")) +;; --- Conkeror --- +;;;###autoload +(defun browse-url-conkeror (url &optional new-window) + "Ask the Conkeror WWW browser to load URL. +Default to the URL around or before point. The strings in the variable +`browse-url-conkeror-arguments' are also passed to Conkeror. + +When called interactively, if variable `browse-url-new-window-flag' +is non-nil, load the document in a new Conkeror window, otherwise use a random +existing one. A non-nil interactive prefix argument reverses the effect of +`browse-url-new-window-flag' + +If `browse-url-conkeror-new-window-is-buffer' then whenever a document would +otherwise be loaded in a new window, it is loaded in a new buffer in an existing +window instead. + +When called non-interatively, optional second argument NEW-WINDOW is used instead of +`browse-url-new-window-flag'" + (interactive (browse-url-interactive-arg "URL: ")) + (setq url (browse-url-encode-url url)) + (let* ((process-environment (browse-url-process-environment))) + (apply 'start-process (format "conkeror %s" url) + nil + browse-url-conkeror-program + (append + browse-url-conkeror-arguments + (list + "-e" + (format "load_url_in_new_%s('%s')" + (if (browse-url-maybe-new-window new-window) + (if browse-url-conkeror-new-window-is-buffer + "buffer" + "window") + "buffer") + url)))))) ;; --- W3 --- ;; External. From f925fc93bac41d7622d1af927e33b0e738ff55b0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 16 Mar 2015 14:49:01 -0400 Subject: [PATCH 305/457] Add `predicate' arg to `read-buffer' and use it for erc-iswitchb Fixes: debbugs:20116 * src/minibuf.c (Fread_buffer): Add `predicate' argument. * src/callint.c (Fcall_interactively): Adjust calls accordingly. * lisp/erc/erc.el (erc-switch-to-buffer): Rename from erc-iswitchb and rewrite using read-buffer. (erc--buffer-p): New function, extracted from erc-buffer-filter. (erc-buffer-filter): Use it. (erc-with-all-buffers-of-server): Silence compile warning if the return value is unused. (erc-is-valid-nick-p, erc-common-server-suffixes, erc-get-arglist) (erc-command-name, erc-popup-input-buffer): Use \` and \' to match beg/end of string. * lisp/obsolete/iswitchb.el (iswitchb-read-buffer): Add `predicate' arg. * lisp/isearchb.el (isearchb-iswitchb): Adjust accordingly. * lisp/ido.el (ido-read-buffer): Add `predicate' argument. * lisp/misearch.el (unload-function-defs-list): Declare before use. --- etc/NEWS | 4 ++ lisp/ChangeLog | 7 +++ lisp/emulation/viper-init.el | 2 +- lisp/erc/ChangeLog | 12 +++++ lisp/erc/erc.el | 99 +++++++++++++++++------------------- lisp/ido.el | 8 +-- lisp/isearchb.el | 6 ++- lisp/misearch.el | 4 +- lisp/obsolete/iswitchb.el | 6 +-- lisp/replace.el | 2 +- src/ChangeLog | 5 ++ src/callint.c | 4 +- src/minibuf.c | 18 +++++-- 13 files changed, 105 insertions(+), 72 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 24ed0799b2c..cabd0087d92 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -594,6 +594,8 @@ a typographically-correct documents. * Incompatible Lisp Changes in Emacs 25.1 +** read-buffer-function can now be called with a 4th argument (`predicate'). + ** completion-table-dynamic stays in the minibuffer. If you want the old behavior of calling the function in the buffer from which the minibuffer was entered, call it with the new argument @@ -631,6 +633,8 @@ word syntax, use `\sw' instead. * Lisp Changes in Emacs 25.1 +** `read-buffer' takes a new `predicate' argument. + ** Emacs Lisp now supports generators. ** New finalizer facility for running code when objects diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1383fdb2ecf..e9e910a8857 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-03-16 Stefan Monnier + + * obsolete/iswitchb.el (iswitchb-read-buffer): Add `predicate' arg. + * isearchb.el (isearchb-iswitchb): Adjust accordingly. + * ido.el (ido-read-buffer): Add `predicate' argument. + * misearch.el (unload-function-defs-list): Declare before use. + 2015-03-16 Vibhav Pant * net/browse-url.el (browse-url-browser-function): Add "Conkeror". diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 75932a80d44..e575eee6c93 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -463,7 +463,7 @@ color displays. By default, the delimiters are used only on TTYs." :type 'boolean :group 'viper) -(defcustom viper-read-buffer-function 'read-buffer +(defcustom viper-read-buffer-function #'read-buffer "Function to use for prompting the user for a buffer name." :type 'symbol :group 'viper) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 4f5fced1bd5..e75b8cc0078 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,15 @@ +2015-03-16 Stefan Monnier + + * erc.el (erc-switch-to-buffer): Rename from erc-iswitchb and rewrite + using read-buffer (bug#20116). + (erc--buffer-p): New function, extracted from erc-buffer-filter. + (erc-buffer-filter): Use it. + (erc-with-all-buffers-of-server): Silence compile warning if the return + value is unused. + (erc-is-valid-nick-p, erc-common-server-suffixes, erc-get-arglist) + (erc-command-name, erc-popup-input-buffer): Use \` and \' to match + beg/end of string. + 2015-03-03 Kelvin White * erc.el: Add old version string back to file header for diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index a84f9f07523..7e76a6def42 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1110,7 +1110,7 @@ which the local user typed." (define-key map "\C-a" 'erc-bol) (define-key map [home] 'erc-bol) (define-key map "\C-c\C-a" 'erc-bol) - (define-key map "\C-c\C-b" 'erc-iswitchb) + (define-key map "\C-c\C-b" 'erc-switch-to-buffer) (define-key map "\C-c\C-c" 'erc-toggle-interpret-controls) (define-key map "\C-c\C-d" 'erc-input-action) (define-key map "\C-c\C-e" 'erc-toggle-ctcp-autoresponse) @@ -1647,6 +1647,14 @@ If PROC is not supplied, all processes are searched." (throw 'buffer (current-buffer))))) proc)))) +(defun erc--buffer-p (buf predicate proc) + (with-current-buffer buf + (and (derived-mode-p 'erc-mode) + (or (not proc) + (eq proc erc-server-process)) + (funcall predicate) + buf))) + (defun erc-buffer-filter (predicate &optional proc) "Return a list of `erc-mode' buffers matching certain criteria. PREDICATE is a function executed with each buffer, if it returns t, that buffer @@ -1659,12 +1667,7 @@ server connection, or nil which means all open connections." nil (mapcar (lambda (buf) (when (buffer-live-p buf) - (with-current-buffer buf - (and (eq major-mode 'erc-mode) - (or (not proc) - (eq proc erc-server-process)) - (funcall predicate) - buf)))) + (erc--buffer-p buf predicate proc))) (buffer-list))))) (defun erc-buffer-list (&optional predicate proc) @@ -1695,42 +1698,32 @@ nil." ,pro)))) ;; Silence the byte-compiler by binding the result of mapcar to ;; a variable. + (ignore res) res))) -;; (iswitchb-mode) will autoload iswitchb.el -(defvar iswitchb-temp-buflist) -(declare-function iswitchb-read-buffer "iswitchb" - (prompt &optional default require-match start matches-set)) -(defvar iswitchb-make-buflist-hook) - -(defun erc-iswitchb (&optional arg) - "Use `iswitchb-read-buffer' to prompt for a ERC buffer to switch to. +(define-obsolete-function-alias 'erc-iswitchb 'erc-switch-to-buffer "25.1") +(defun erc-switch-to-buffer (&optional arg) + "Prompt for a ERC buffer to switch to. When invoked with prefix argument, use all erc buffers. Without prefix ARG, allow only buffers related to same session server. If `erc-track-mode' is in enabled, put the last element of -`erc-modified-channels-alist' in front of the buffer list. - -Due to some yet unresolved reason, global function `iswitchb-mode' -needs to be active for this function to work." +`erc-modified-channels-alist' in front of the buffer list." (interactive "P") - (let ((enabled (bound-and-true-p iswitchb-mode))) - (or enabled (iswitchb-mode 1)) - (unwind-protect - (let ((iswitchb-make-buflist-hook - (lambda () - (setq iswitchb-temp-buflist - (mapcar 'buffer-name - (erc-buffer-list - nil - (when arg erc-server-process))))))) - (switch-to-buffer - (iswitchb-read-buffer - "Switch-to: " - (if (boundp 'erc-modified-channels-alist) - (buffer-name (caar (last erc-modified-channels-alist))) - nil) - t))) - (or enabled (iswitchb-mode -1))))) + (switch-to-buffer + (read-buffer "Switch to ERC buffer: " + (when (boundp 'erc-modified-channels-alist) + (buffer-name (caar (last erc-modified-channels-alist)))) + t + ;; Only allow ERC buffers in the same session. + (let ((proc (unless arg erc-server-process))) + (lambda (bufname) + (let ((buf (get-buffer bufname))) + (when buf + (erc--buffer-p buf (lambda () t) proc) + (with-current-buffer buf + (and (derived-mode-p 'erc-mode) + (or (null proc) + (eq proc erc-server-process))))))))))) (defun erc-channel-list (proc) "Return a list of channel buffers. @@ -2189,7 +2182,7 @@ be invoked for the values of the other parameters." Arguments are the same as for `erc'." (interactive (erc-select-read-args)) (let ((erc-server-connect-function 'erc-open-tls-stream)) - (apply 'erc r))) + (apply #'erc r))) (defun erc-open-tls-stream (name buffer host port) "Open an TLS stream to an IRC server. @@ -2403,7 +2396,7 @@ If STRING is nil, the function does nothing." (defun erc-is-valid-nick-p (nick) "Check if NICK is a valid IRC nickname." - (string-match (concat "^" erc-valid-nick-regexp "$") nick)) + (string-match (concat "\\`" erc-valid-nick-regexp "\\'") nick)) (defun erc-display-line (string &optional buffer) "Display STRING in the ERC BUFFER. @@ -2602,9 +2595,9 @@ server within `erc-lurker-threshold-time'. See also erc-lurker-threshold-time)))) (defcustom erc-common-server-suffixes - '(("openprojects.net$" . "OPN") - ("freenode.net$" . "freenode") - ("oftc.net$" . "OFTC")) + '(("openprojects.net\\'" . "OPN") + ("freenode.net\\'" . "freenode") + ("oftc.net\\'" . "OFTC")) "Alist of common server name suffixes. This variable is used in mode-line display to save screen real estate. Set it to nil if you want to avoid changing @@ -2640,7 +2633,7 @@ ARGS, PARSED, and TYPE are used to format MSG sensibly. See also `erc-format-message' and `erc-display-line'." (let ((string (if (symbolp msg) - (apply 'erc-format-message msg args) + (apply #'erc-format-message msg args) msg))) (setq string (cond @@ -2689,7 +2682,7 @@ See also `erc-server-send'." (defun erc-get-arglist (fun) "Return the argument list of a function without the parens." (let ((arglist (format "%S" (erc-function-arglist fun)))) - (if (string-match "^(\\(.*\\))$" arglist) + (if (string-match "\\`(\\(.*\\))\\'" arglist) (match-string 1 arglist) arglist))) @@ -2705,7 +2698,7 @@ is not alive, nil otherwise." "For CMD being the function name of a ERC command, something like erc-cmd-FOO, this returns a string /FOO." (let ((command-name (symbol-name cmd))) - (if (string-match "^erc-cmd-\\(.*\\)$" command-name) + (if (string-match "\\`erc-cmd-\\(.*\\)\\'" command-name) (concat "/" (match-string 1 command-name)) command-name))) @@ -2796,7 +2789,7 @@ VALUE is computed by evaluating the rest of LINE in Lisp." (erc-display-line (concat "Available user variables:\n" (apply - 'concat + #'concat (mapcar (lambda (var) (let ((val (symbol-value var))) @@ -3775,7 +3768,7 @@ Unban all currently banned users in the current channel." t))) (erc-server-send (format "MODE %s b" chnl))))) - (t (let ((bans (mapcar 'cdr erc-channel-banlist))) + (t (let ((bans (mapcar #'cdr erc-channel-banlist))) (when bans ;; Glob the bans into groups of three, and carry out the unban. ;; eg. /mode #foo -bbb a*!*@* b*!*@* c*!*@* @@ -3930,7 +3923,7 @@ If `point' is at the beginning of a channel name, use that as default." (concat "Set topic of " (erc-default-target) ": ") (when erc-channel-topic (let ((ss (split-string erc-channel-topic "\C-o"))) - (cons (apply 'concat (if (cdr ss) (butlast ss) ss)) + (cons (apply #'concat (if (cdr ss) (butlast ss) ss)) 0)))))) (let ((topic-list (split-string topic "\C-o"))) ; strip off the topic setter (erc-cmd-TOPIC (concat (erc-default-target) " " (car topic-list))))) @@ -5052,7 +5045,7 @@ arg-modes is a list of triples of the form: (MODE-CHAR ON/OFF ARGUMENT)." (if (string-match "^\\s-*\\(\\S-+\\)\\(\\s-.*$\\|$\\)" mode-string) - (let ((chars (mapcar 'char-to-string (match-string 1 mode-string))) + (let ((chars (mapcar #'char-to-string (match-string 1 mode-string))) ;; arguments in channel modes (args-str (match-string 2 mode-string)) (args nil) @@ -5998,7 +5991,7 @@ Returns a list of the form (HIGH LOW), compatible with Emacs time format." (if (> minutes 0) `("%d minutes, %d seconds" ,minutes ,seconds) `("%d seconds" ,seconds)))) - output (apply 'format format-args)) + output (apply #'format format-args)) ;; Change all "1 units" to "1 unit". (while (string-match "\\([^0-9]\\|^\\)1 \\S-+\\(s\\)" output) (setq output (erc-replace-match-subexpression-in-string @@ -6246,7 +6239,7 @@ if `erc-away' is non-nil." (defun erc-format-channel-modes () "Return the current channel's modes." - (concat (apply 'concat + (concat (apply #'concat "+" erc-channel-modes) (cond ((and erc-channel-user-limit erc-channel-key) (if erc-show-channel-key-p @@ -6438,7 +6431,7 @@ All windows are opened in the current frame." "Mode: " (mapcar (lambda (e) (list (symbol-name e))) - (apropos-internal "-mode$" 'commandp)) + (apropos-internal "-mode\\'" 'commandp)) nil t)))) (pop-to-buffer (make-indirect-buffer (current-buffer) buffer-name)) (funcall mode) @@ -6634,7 +6627,7 @@ See also `format-spec'." (error "No format spec for message %s" msg)) (when (functionp entry) (setq entry (apply entry args))) - (format-spec entry (apply 'format-spec-make args)))) + (format-spec entry (apply #'format-spec-make args)))) ;;; Various hook functions diff --git a/lisp/ido.el b/lisp/ido.el index 563f406aeb6..60a59d6e99d 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1590,10 +1590,10 @@ enable the mode if ARG is omitted or nil." (when ido-everywhere (when (memq ido-mode '(both file)) (put 'ido-everywhere 'file (cons read-file-name-function nil)) - (setq read-file-name-function 'ido-read-file-name)) + (setq read-file-name-function #'ido-read-file-name)) (when (memq ido-mode '(both buffer)) (put 'ido-everywhere 'buffer (cons read-buffer-function nil)) - (setq read-buffer-function 'ido-read-buffer)))) + (setq read-buffer-function #'ido-read-buffer)))) (defvar ido-minor-mode-map-entry nil) @@ -4782,7 +4782,7 @@ Modified from `icomplete-completions'." (put 'dired-do-rename 'ido 'ignore) ;;;###autoload -(defun ido-read-buffer (prompt &optional default require-match) +(defun ido-read-buffer (prompt &optional default require-match predicate) "Ido replacement for the built-in `read-buffer'. Return the name of a buffer selected. PROMPT is the prompt to give to the user. DEFAULT if given is the default @@ -4796,7 +4796,7 @@ If REQUIRE-MATCH is non-nil, an existing buffer must be selected." (if (eq ido-exit 'fallback) (let ((read-buffer-function nil)) (run-hook-with-args 'ido-before-fallback-functions 'read-buffer) - (read-buffer prompt default require-match)) + (read-buffer prompt default require-match predicate)) buf))) ;;;###autoload diff --git a/lisp/isearchb.el b/lisp/isearchb.el index ffd4d62be38..5e7771cea52 100644 --- a/lisp/isearchb.el +++ b/lisp/isearchb.el @@ -75,7 +75,9 @@ ;; killing iswitchb.el and then trying to switch back is broken ;; make sure TAB isn't broken -(require 'iswitchb) +;;; Code: + +(require 'iswitchb) ;FIXME: Don't rely on iswitchb! (defgroup isearchb nil "Switch between buffers using a mechanism like isearch." @@ -118,7 +120,7 @@ Its purpose is to pass different call arguments to (interactive) (let* ((prompt "iswitch ") (iswitchb-method 'samewindow) - (buf (iswitchb-read-buffer prompt nil nil iswitchb-text t))) + (buf (iswitchb-read-buffer prompt nil nil nil iswitchb-text t))) (if (eq iswitchb-exit 'findfile) (call-interactively 'find-file) (when buf diff --git a/lisp/misearch.el b/lisp/misearch.el index dcc819564fb..65969113d93 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -234,7 +234,7 @@ set in `multi-isearch-buffers' or `multi-isearch-buffers-regexp'." (ido-ignore-item-temp-list bufs)) (while (not (string-equal (setq buf (read-buffer - (if (eq read-buffer-function 'ido-read-buffer) + (if (eq read-buffer-function #'ido-read-buffer) "Next buffer to search (C-j to end): " "Next buffer to search (RET to end): ") nil t)) @@ -377,6 +377,8 @@ whose file names match the specified wildcard." (goto-char (if isearch-forward (point-min) (point-max))) (isearch-forward-regexp nil t))) +(defvar unload-function-defs-list) + (defun multi-isearch-unload-function () "Remove autoloaded variables from `unload-function-defs-list'. Also prevent the feature from being reloaded via `isearch-mode-hook'." diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el index 6b1e5347e21..111de8537d3 100644 --- a/lisp/obsolete/iswitchb.el +++ b/lisp/obsolete/iswitchb.el @@ -175,10 +175,10 @@ ;; iswitchb-read-buffer has been written to be a drop in replacement ;; for the normal buffer selection routine `read-buffer'. To use ;; iswitch for all buffer selections in Emacs, add: -;; (setq read-buffer-function 'iswitchb-read-buffer) +;; (setq read-buffer-function #'iswitchb-read-buffer) ;; (This variable was introduced in Emacs 20.3.) ;; XEmacs users can get the same behavior by doing: -;; (defalias 'read-buffer 'iswitchb-read-buffer) +;; (defalias 'read-buffer #'iswitchb-read-buffer) ;; since `read-buffer' is defined in lisp. ;; Using iswitchb for other completion tasks. @@ -586,7 +586,7 @@ in a separate window. )))) (defun iswitchb-read-buffer (prompt &optional default require-match - start matches-set) + _predicate start matches-set) "Replacement for the built-in `read-buffer'. Return the name of a buffer selected. PROMPT is the prompt to give to the user. diff --git a/lisp/replace.el b/lisp/replace.el index e0636e0728c..70b86dd2016 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1369,7 +1369,7 @@ See also `multi-occur-in-matching-buffers'." (ido-ignore-item-temp-list bufs)) (while (not (string-equal (setq buf (read-buffer - (if (eq read-buffer-function 'ido-read-buffer) + (if (eq read-buffer-function #'ido-read-buffer) "Next buffer to search (C-j to end): " "Next buffer to search (RET to end): ") nil t)) diff --git a/src/ChangeLog b/src/ChangeLog index e328afcde8f..fbf8fb452fc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-16 Stefan Monnier + + * minibuf.c (Fread_buffer): Add `predicate' argument. + * callint.c (Fcall_interactively): Adjust calls accordingly. + 2015-03-15 Eli Zaretskii * xdisp.c (handle_invisible_prop): Fix up it->position even when diff --git a/src/callint.c b/src/callint.c index 0c6c03036c8..cf50e0c3788 100644 --- a/src/callint.c +++ b/src/callint.c @@ -531,13 +531,13 @@ invoke it. If KEYS is omitted or nil, the return value of args[i] = Fcurrent_buffer (); if (EQ (selected_window, minibuf_window)) args[i] = Fother_buffer (args[i], Qnil, Qnil); - args[i] = Fread_buffer (callint_message, args[i], Qt); + args[i] = Fread_buffer (callint_message, args[i], Qt, Qnil); break; case 'B': /* Name of buffer, possibly nonexistent. */ args[i] = Fread_buffer (callint_message, Fother_buffer (Fcurrent_buffer (), Qnil, Qnil), - Qnil); + Qnil, Qnil); break; case 'c': /* Character. */ diff --git a/src/minibuf.c b/src/minibuf.c index e7c288b251b..c03316965d3 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1081,7 +1081,7 @@ A user option, or customizable variable, is one for which return Fintern (name, Qnil); } -DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, +DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 4, 0, doc: /* Read the name of a buffer and return as a string. Prompt with PROMPT. Optional second arg DEF is value to return if user enters an empty line. @@ -1093,8 +1093,11 @@ The argument PROMPT should be a string ending with a colon and a space. If `read-buffer-completion-ignore-case' is non-nil, completion ignores case while reading the buffer name. If `read-buffer-function' is non-nil, this works by calling it as a -function, instead of the usual behavior. */) - (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match) +function, instead of the usual behavior. +Optional arg PREDICATE if non-nil is a function limiting the buffers that can +be considered. */) + (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match, + Lisp_Object predicate) { Lisp_Object result; char *s; @@ -1136,11 +1139,16 @@ function, instead of the usual behavior. */) } result = Fcompleting_read (prompt, intern ("internal-complete-buffer"), - Qnil, require_match, Qnil, + predicate, require_match, Qnil, Qbuffer_name_history, def, Qnil); } else - result = call3 (Vread_buffer_function, prompt, def, require_match); + result = (NILP (predicate) + /* Partial backward compatibility for older read_buffer_functions + which don't expect a `predicate' argument. */ + ? call3 (Vread_buffer_function, prompt, def, require_match) + : call4 (Vread_buffer_function, prompt, def, require_match, + predicate)); return unbind_to (count, result); } From 801eda8a2a00b3f28a69ffe51b05a649fffc5c58 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 16 Mar 2015 16:11:38 -0400 Subject: [PATCH 306/457] * lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): Optimize &aux. Rework to avoid cl--do-arglist in more cases; add comments to explain what's going on. (cl--do-&aux): New function extracted from cl--do-arglist. (cl--do-arglist): Use it. * lisp/emacs-lisp/cl-generic.el: Add Version: header, for ELPA purposes. --- lisp/ChangeLog | 7 ++ lisp/emacs-lisp/cl-generic.el | 1 + lisp/emacs-lisp/cl-macs.el | 148 ++++++++++++++++++++++----------- test/automated/cl-lib-tests.el | 17 ++++ 4 files changed, 124 insertions(+), 49 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9e910a8857..41898bee686 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2015-03-16 Stefan Monnier + * emacs-lisp/cl-macs.el (cl--transform-lambda): Rework to avoid + cl--do-arglist in more cases; add comments to explain what's going on. + (cl--do-&aux): New function extracted from cl--do-arglist. + (cl--do-arglist): Use it. + + * emacs-lisp/cl-generic.el: Add Version: header, for ELPA purposes. + * obsolete/iswitchb.el (iswitchb-read-buffer): Add `predicate' arg. * isearchb.el (isearchb-iswitchb): Adjust accordingly. * ido.el (ido-read-buffer): Add `predicate' argument. diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index a8483ea1355..41c760e960e 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -3,6 +3,7 @@ ;; Copyright (C) 2015 Free Software Foundation, Inc. ;; Author: Stefan Monnier +;; Version: 1.0 ;; This file is part of GNU Emacs. diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 36f263cd20a..712a7485167 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -220,7 +220,20 @@ The name is made by appending a number to PREFIX, default \"G\"." (defconst cl--lambda-list-keywords '(&optional &rest &key &allow-other-keys &aux &whole &body &environment)) -(defvar cl--bind-block) (defvar cl--bind-defs) (defvar cl--bind-enquote) +;; Internal hacks used in formal arg lists: +;; - &cl-quote: Added to formal-arglists to mean that any default value +;; mentioned in the formal arglist should be considered as implicitly +;; quoted rather than evaluated. This is used in `cl-defsubst' when +;; performing compiler-macro-expansion, since at that time the +;; arguments hold expressions rather than values. +;; - &cl-defs (DEF . DEFS): Gives the default value to use for missing +;; optional arguments which don't have an explicit default value. +;; DEFS is an alist mapping vars to their default default value. +;; and DEF is the default default to use for all other vars. + +(defvar cl--bind-block) ;Name of surrounding block, only use for `signal' data. +(defvar cl--bind-defs) ;(DEF . DEFS) giving the "default default" for optargs. +(defvar cl--bind-enquote) ;Non-nil if &cl-quote was in the formal arglist! (defvar cl--bind-lets) (defvar cl--bind-forms) (defun cl--transform-lambda (form bind-block) @@ -229,19 +242,26 @@ BIND-BLOCK is the name of the symbol to which the function will be bound, and which will be used for the name of the `cl-block' surrounding the function's body. FORM is of the form (ARGS . BODY)." - ;; FIXME: (lambda (a &aux b) 1) expands to (lambda (a &rest --cl-rest--) ...) - ;; where the --cl-rest-- is clearly undesired. (let* ((args (car form)) (body (cdr form)) (orig-args args) (cl--bind-block bind-block) (cl--bind-defs nil) (cl--bind-enquote nil) - (cl--bind-lets nil) (cl--bind-forms nil) (parsed-body (macroexp-parse-body body)) (header (car parsed-body)) (simple-args nil)) (setq body (cdr parsed-body)) + ;; "(. X) to (&rest X)" conversion already done in cl--do-arglist, but we + ;; do it here as well, so as to be able to see if we can avoid + ;; cl--do-arglist. (setq args (if (listp args) (cl-copy-list args) (list '&rest args))) (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p))))) - (if (setq cl--bind-defs (cadr (memq '&cl-defs args))) - (setq args (delq '&cl-defs (delq cl--bind-defs args)) - cl--bind-defs (cadr cl--bind-defs))) + (let ((cl-defs (memq '&cl-defs args))) + (when cl-defs + (setq cl--bind-defs (cadr cl-defs)) + ;; Remove "&cl-defs DEFS" from args. + (setcdr cl-defs (cddr cl-defs)) + (setq args (delq '&cl-defs args)) + ;; Optimize away trivial &cl-defs. + (if (and (null (car cl--bind-defs)) + (cl-every (lambda (x) (null (cadr x))) (cdr cl--bind-defs))) + (setq cl--bind-defs nil)))) (if (setq cl--bind-enquote (memq '&cl-quote args)) (setq args (delq '&cl-quote args))) (if (memq '&whole args) (error "&whole not currently implemented")) @@ -249,6 +269,9 @@ FORM is of the form (ARGS . BODY)." (v (cadr p))) (if p (setq args (nconc (delq (car p) (delq v args)) `(&aux (,v macroexpand-all-environment)))))) + ;; Take away all the simple args whose parsing can be handled more + ;; efficiently by a plain old `lambda' than the manual parsing generated + ;; by `cl--do-arglist'. (while (and args (symbolp (car args)) (not (memq (car args) '(nil &rest &body &key &aux))) (not (and (eq (car args) '&optional) @@ -256,30 +279,50 @@ FORM is of the form (ARGS . BODY)." (push (pop args) simple-args)) (or (eq cl--bind-block 'cl-none) (setq body (list `(cl-block ,cl--bind-block ,@body)))) - (if (null args) - (cl-list* nil (nreverse simple-args) (nconc header body)) - (if (memq '&optional simple-args) (push '&optional args)) - (cl--do-arglist args nil (- (length simple-args) - (if (memq '&optional simple-args) 1 0))) - (setq cl--bind-lets (nreverse cl--bind-lets)) - (cl-list* nil - (nconc (nreverse simple-args) - (list '&rest (car (pop cl--bind-lets)))) - (nconc (save-match-data ;; Macro expansion can take place in the - ;; middle of apparently harmless computation, so it - ;; should not touch the match-data. - (require 'help-fns) - (cons (help-add-fundoc-usage - (if (stringp (car header)) (pop header)) - ;; Be careful with make-symbol and (back)quote, - ;; see bug#12884. - (let ((print-gensym nil) (print-quoted t)) - (format "%S" (cons 'fn (cl--make-usage-args - orig-args))))) - header)) - (list `(let* ,cl--bind-lets - ,@(nreverse cl--bind-forms) - ,@body))))))) + (let* ((cl--bind-lets nil) (cl--bind-forms nil) + (rest-args + (cond + ((null args) nil) + ((eq (car args) '&aux) + (cl--do-&aux args) + (setq cl--bind-lets (nreverse cl--bind-lets)) + nil) + (t ;; `simple-args' doesn't handle all the parsing that we need, + ;; so we pass the rest to cl--do-arglist which will do + ;; "manual" parsing. + (let ((slen (length simple-args))) + (when (memq '&optional simple-args) + (push '&optional args) (cl-decf slen)) + (setq header + ;; Macro expansion can take place in the middle of + ;; apparently harmless computation, so it should not + ;; touch the match-data. + (save-match-data + (require 'help-fns) + (cons (help-add-fundoc-usage + (if (stringp (car header)) (pop header)) + ;; Be careful with make-symbol and (back)quote, + ;; see bug#12884. + (let ((print-gensym nil) (print-quoted t)) + (format "%S" (cons 'fn (cl--make-usage-args + orig-args))))) + header))) + ;; FIXME: we'd want to choose an arg name for the &rest param + ;; and pass that as `expr' to cl--do-arglist, but that ends up + ;; generating code with a redundant let-binding, so we instead + ;; pass a dummy and then look in cl--bind-lets to find what var + ;; this was bound to. + (cl--do-arglist args :dummy slen) + (setq cl--bind-lets (nreverse cl--bind-lets)) + ;; (cl-assert (eq :dummy (nth 1 (car cl--bind-lets)))) + (list '&rest (car (pop cl--bind-lets)))))))) + `(nil + (,@(nreverse simple-args) ,@rest-args) + ,@header + ,(macroexp-let* cl--bind-lets + (macroexp-progn + `(,@(nreverse cl--bind-forms) + ,@body))))))) ;;;###autoload (defmacro cl-defun (name args &rest body) @@ -422,8 +465,7 @@ its argument list allows full Common Lisp conventions." (setcdr last nil) (nconc (cl--make-usage-args arglist) (cl--make-usage-var tail))) (setcdr last tail))) - ;; `orig-args' can contain &cl-defs (an internal - ;; CL thingy I don't understand), so remove it. + ;; `orig-args' can contain &cl-defs. (let ((x (memq '&cl-defs arglist))) (when x (setq arglist (delq (car x) (remq (cadr x) arglist))))) (let ((state nil)) @@ -450,6 +492,17 @@ its argument list allows full Common Lisp conventions." )))) arglist)))) +(defun cl--do-&aux (args) + (while (and (eq (car args) '&aux) (pop args)) + (while (and args (not (memq (car args) cl--lambda-list-keywords))) + (if (consp (car args)) + (if (and cl--bind-enquote (cl-cadar args)) + (cl--do-arglist (caar args) + `',(cadr (pop args))) + (cl--do-arglist (caar args) (cadr (pop args)))) + (cl--do-arglist (pop args) nil)))) + (if args (error "Malformed argument list ends with: %S" args))) + (defun cl--do-arglist (args expr &optional num) ; uses cl--bind-* (if (nlistp args) (if (or (memq args cl--lambda-list-keywords) (not (symbolp args))) @@ -459,8 +512,7 @@ its argument list allows full Common Lisp conventions." (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p))))) (let ((p (memq '&body args))) (if p (setcar p '&rest))) (if (memq '&environment args) (error "&environment used incorrectly")) - (let ((save-args args) - (restarg (memq '&rest args)) + (let ((restarg (memq '&rest args)) (safety (if (cl--compiling-file) cl--optimize-safety 3)) (keys nil) (laterarg nil) (exactarg nil) minarg) @@ -530,7 +582,12 @@ its argument list allows full Common Lisp conventions." (intern (format ":%s" name))))) (varg (if (consp (car arg)) (cl-cadar arg) (car arg))) (def (if (cdr arg) (cadr arg) - (or (car cl--bind-defs) (cadr (assq varg cl--bind-defs))))) + ;; The ordering between those two or clauses is + ;; irrelevant, since in practice only one of the two + ;; is ever non-nil (the car is only used for + ;; cl-deftype which doesn't use the cdr). + (or (car cl--bind-defs) + (cadr (assq varg cl--bind-defs))))) (look `(plist-member ,restarg ',karg))) (and def cl--bind-enquote (setq def `',def)) (if (cddr arg) @@ -567,15 +624,8 @@ its argument list allows full Common Lisp conventions." keys) (car ,var))))))) (push `(let ((,var ,restarg)) ,check) cl--bind-forms))) - (while (and (eq (car args) '&aux) (pop args)) - (while (and args (not (memq (car args) cl--lambda-list-keywords))) - (if (consp (car args)) - (if (and cl--bind-enquote (cl-cadar args)) - (cl--do-arglist (caar args) - `',(cadr (pop args))) - (cl--do-arglist (caar args) (cadr (pop args)))) - (cl--do-arglist (pop args) nil)))) - (if args (error "Malformed argument list %s" save-args))))) + (cl--do-&aux args) + nil))) (defun cl--arglist-args (args) (if (nlistp args) (list args) @@ -2608,7 +2658,7 @@ non-nil value, that slot cannot be set via `setf'. (make (cl-mapcar (function (lambda (s d) (if (memq s anames) s d))) slots defaults))) (push `(cl-defsubst ,name - (&cl-defs '(nil ,@descs) ,@args) + (&cl-defs (nil ,@descs) ,@args) ,@(if (cl--safe-expr-p `(progn ,@(mapcar #'cl-second descs))) '((declare (side-effect-free t)))) (,(or type #'vector) ,@make)) @@ -2716,8 +2766,8 @@ Of course, we really can't know that for sure, so it's just a heuristic." (t (inline-quote (or (cl-typep ,val ',head) (cl-typep ,val ',rest))))))))) - (`(member . ,args) - (inline-quote (and (memql ,val ',args) t))) + (`(eql ,v) (inline-quote (and (eql ,val ',v) t))) + (`(member . ,args) (inline-quote (and (memql ,val ',args) t))) (`(satisfies ,pred) (inline-quote (funcall #',pred ,val))) ((and (pred symbolp) type (guard (get type 'cl-deftype-handler))) (inline-quote @@ -2977,7 +3027,7 @@ The type name can then be used in `cl-typecase', `cl-check-type', etc." (declare (debug cl-defmacro) (doc-string 3) (indent 2)) `(cl-eval-when (compile load eval) (put ',name 'cl-deftype-handler - (cl-function (lambda (&cl-defs '('*) ,@arglist) ,@body))))) + (cl-function (lambda (&cl-defs ('*) ,@arglist) ,@body))))) (cl-deftype extended-char () `(and character (not base-char))) diff --git a/test/automated/cl-lib-tests.el b/test/automated/cl-lib-tests.el index 1c36e7d7abf..2c188a40059 100644 --- a/test/automated/cl-lib-tests.el +++ b/test/automated/cl-lib-tests.el @@ -427,4 +427,21 @@ (ert-deftest cl-flet-test () (should (equal (cl-flet ((f1 (x) x)) (let ((x #'f1)) (funcall x 5))) 5))) +(ert-deftest cl-lib-test-typep () + (cl-deftype cl-lib-test-type (&optional x) `(member ,x)) + ;; Make sure we correctly implement the rule that deftype's optional args + ;; default to `*' rather than to nil. + (should (cl-typep '* 'cl-lib-test-type)) + (should-not (cl-typep 1 'cl-lib-test-type))) + +(ert-deftest cl-lib-arglist-performance () + ;; An `&aux' should not cause lambda's arglist to be turned into an &rest + ;; that's parsed by hand. + (should (eq () (nth 1 (nth 1 (macroexpand + '(cl-function (lambda (&aux (x 1)) x))))))) + (cl-defstruct (cl-lib--s (:constructor cl-lib--s-make (&optional a))) a) + ;; Similarly the &cl-defs thingy shouldn't cause fallback to manual parsing + ;; of args if the default for optional args is nil. + (should (equal '(&optional a) (help-function-arglist 'cl-lib--s-make)))) + ;;; cl-lib.el ends here From a961dcedeb7ae84c0ca6e8e1b94d3dd881a26b98 Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Mon, 16 Mar 2015 12:25:42 -0400 Subject: [PATCH 307/457] Don't test "\t" in file names on Cygwin. Fixes: debbugs:20119 * test/automated/tramp-tests.el (tramp--test-special-characters): Don't test "\t" in file names on Cygwin. --- test/ChangeLog | 5 +++++ test/automated/tramp-tests.el | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 6a474e1d4e5..a7d1dfdceae 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-03-16 Ken Brown + + * automated/tramp-tests.el (tramp--test-special-characters): Don't + test "\t" in file names on Cygwin. (Bug#20119) + 2015-03-10 Jackson Ray Hamilton * indent/js-indent-init-dynamic.js: Fix spelling error. diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 020f31f4e6f..9ba67430960 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1621,12 +1621,15 @@ This requires restrictions of file name syntax." (defun tramp--test-special-characters () "Perform the test in `tramp-test30-special-characters*'." - ;; Newlines, slashes and backslashes in file names are not supported. - ;; So we don't test. + ;; Newlines, slashes and backslashes in file names are not + ;; supported. So we don't test. And we don't test the tab + ;; character on Windows or Cygwin, because the backslash is + ;; interpreted as a path separator, preventing "\t" from being + ;; expanded to . (tramp--test-check-files (if (tramp--test-smb-or-windows-nt-p) "foo bar baz" - (if (tramp--test-adb-p) + (if (or (tramp--test-adb-p) (eq system-type 'cygwin)) " foo bar baz " " foo\tbar baz\t")) "$foo$bar$$baz$" From b0743354e5502395f9a64b534a5ff5579c64ed42 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Mon, 16 Mar 2015 22:10:00 +0000 Subject: [PATCH 308/457] Edebug: Allow "S" to work during trace mode. Fixes debbugs #20074. Also display the overlay arrow in go and go-nonstop modes. * emacs-lisp/edebug.el (edebug--display-1): Move the `input-pending' test to after trace mode's `sit-for'. (edebug--recursive-edit): Insert "(sit-for 0)" after "(edebug-overlay-arrow)". --- lisp/ChangeLog | 10 ++++++++++ lisp/emacs-lisp/edebug.el | 28 ++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 41898bee686..cbd1bce25e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2015-03-16 Alan Mackenzie + + Edebug: Allow "S" to work during trace mode. Fixes debbugs #20074. + Also display the overlay arrow in go and go-nonstop modes. + + * emacs-lisp/edebug.el (edebug--display-1): Move the + `input-pending' test to after trace mode's `sit-for'. + (edebug--recursive-edit): Insert "(sit-for 0)" after + "(edebug-overlay-arrow)". + 2015-03-16 Stefan Monnier * emacs-lisp/cl-macs.el (cl--transform-lambda): Rework to avoid diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 333f02842f7..aa7cdf96337 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -2446,15 +2446,6 @@ MSG is printed after `::::} '." edebug-function) )) - ;; Test if there is input, not including keyboard macros. - (if (input-pending-p) - (progn - (setq edebug-execution-mode 'step - edebug-stop t) - (edebug-stop) - ;; (discard-input) ; is this unfriendly?? - )) - ;; Make sure we bind those in the right buffer (bug#16410). (let ((overlay-arrow-position overlay-arrow-position) (overlay-arrow-string overlay-arrow-string)) @@ -2507,14 +2498,18 @@ MSG is printed after `::::} '." ((eq edebug-execution-mode 'Trace-fast) (sit-for 0))) ; Force update and continue. + (when (input-pending-p) + (setq edebug-stop t) + (setq edebug-execution-mode 'step) ; for `edebug-overlay-arrow' + (edebug-stop)) + + (edebug-overlay-arrow) + (unwind-protect (if (or edebug-stop (memq edebug-execution-mode '(step next)) (eq arg-mode 'error)) - (progn - ;; (setq edebug-execution-mode 'step) - ;; (edebug-overlay-arrow) ; This doesn't always show up. - (edebug--recursive-edit arg-mode))) ; <--- Recursive edit + (edebug--recursive-edit arg-mode)) ; <--- Recursive edit ;; Reset the edebug-window-data to whatever it is now. (let ((window (if (eq (window-buffer) edebug-buffer) @@ -2702,8 +2697,9 @@ MSG is printed after `::::} '." (if (buffer-name edebug-buffer) ; if it still exists (progn (set-buffer edebug-buffer) - (if (memq edebug-execution-mode '(go Go-nonstop)) - (edebug-overlay-arrow)) + (when (memq edebug-execution-mode '(go Go-nonstop)) + (edebug-overlay-arrow) + (sit-for 0)) (edebug-mode -1)) ;; gotta have a buffer to let its buffer local variables be set (get-buffer-create " bogus edebug buffer")) @@ -2721,7 +2717,7 @@ MSG is printed after `::::} '." (step . "=>") (next . "=>") (go . "<>") - (Go-nonstop . "..") ; not used + (Go-nonstop . "..") ) "Association list of arrows for each edebug mode.") From 508049aae95c42a3e6fe989ff403bf7cb6f88433 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 17 Mar 2015 10:18:10 +0100 Subject: [PATCH 309/457] Change test for ControlPath in order to avoid DNS timeouts. Fixes: debbugs:20015 * net/tramp-sh.el (tramp-ssh-controlmaster-options): Change test for ControlPath in order to avoid DNS timeouts. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp-sh.el | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cbd1bce25e8..96478223d49 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-17 Michael Albinus + + * net/tramp-sh.el (tramp-ssh-controlmaster-options): Change test + for ControlPath in order to avoid DNS timeouts. (Bug#20015) + 2015-03-16 Alan Mackenzie Edebug: Allow "S" to work during trace mode. Fixes debbugs #20074. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 73ad8c7e4ef..b6c47bcb7bb 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4565,7 +4565,7 @@ Gateway hops are already opened." ;; In case the host name is not used for the remote shell ;; command, the user could be misguided by applying a random - ;; hostname. + ;; host name. (let* ((v (car target-alist)) (method (tramp-file-name-method v)) (host (tramp-file-name-host v))) @@ -4611,9 +4611,13 @@ Gateway hops are already opened." (setq tramp-ssh-controlmaster-options "-o ControlMaster=auto"))) (unless (zerop (length tramp-ssh-controlmaster-options)) (with-temp-buffer + ;; When we use a non-existing host name, we could run + ;; into DNS timeouts. So we use "localhost" with an + ;; improper port, expecting nobody runs sshd on the + ;; telnet port. (tramp-call-process vec "ssh" nil t nil - "-o" "ControlPath=%C" "host.does.not.exist") + "-p" "23" "-o" "ControlPath=%C" "localhost") (goto-char (point-min)) (setq tramp-ssh-controlmaster-options (if (search-forward-regexp "unknown.+key" nil t) From 330cf1a71787946b9fd4c74bad0e66c1bad7fa7f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 17 Mar 2015 20:29:55 +0200 Subject: [PATCH 310/457] Resurrect the lost optional fixed font menu on w32 lisp/mouse.el (mouse-appearance-menu): If w32-use-w32-font-dialog is nil, construct a menu of fixed fonts. This resurrects a feature lost in Emacs 23. lisp/w32-vars.el (w32-use-w32-font-dialog): Add a ':set' function to reset mouse-appearance-menu-map, so the font dialog is recomputed the next time the menu is requested. (w32-fixed-font-alist): Fix to use correct names of Courier fonts. --- lisp/ChangeLog | 11 +++++++++++ lisp/mouse.el | 11 ++++++++--- lisp/w32-vars.el | 17 ++++++++++++----- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96478223d49..b29694be0d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2015-03-17 Eli Zaretskii + + * mouse.el (mouse-appearance-menu): If w32-use-w32-font-dialog is + nil, construct a menu of fixed fonts. This resurrects a feature + lost in Emacs 23. + + * w32-vars.el (w32-use-w32-font-dialog): Add a ':set' function to + reset mouse-appearance-menu-map, so the font dialog is recomputed + the next time the menu is requested. + (w32-fixed-font-alist): Fix to use correct names of Courier fonts. + 2015-03-17 Michael Albinus * net/tramp-sh.el (tramp-ssh-controlmaster-options): Change test diff --git a/lisp/mouse.el b/lisp/mouse.el index e78eca40bc5..be9562c8d77 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -1820,13 +1820,18 @@ choose a font." (define-key mouse-appearance-menu-map [text-scale-increase] '(menu-item "Increase Buffer Text Size" text-scale-increase)) ;; Font selector - (if (functionp 'x-select-font) + (if (and (functionp 'x-select-font) + (or (not (boundp 'w32-use-w32-font-dialog)) + w32-use-w32-font-dialog)) (define-key mouse-appearance-menu-map [x-select-font] '(menu-item "Change Buffer Font..." x-select-font)) ;; If the select-font is unavailable, construct a menu. (let ((font-submenu (make-sparse-keymap "Change Text Font")) - (font-alist (cdr (append x-fixed-font-alist - (list (generate-fontset-menu)))))) + (font-alist (cdr (append + (if (eq system-type 'windows-nt) + w32-fixed-font-alist + x-fixed-font-alist) + (list (generate-fontset-menu)))))) (dolist (family font-alist) (let* ((submenu-name (car family)) (submenu-map (make-sparse-keymap submenu-name))) diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el index ae42ee7ecda..f9212be406c 100644 --- a/lisp/w32-vars.el +++ b/lisp/w32-vars.el @@ -34,10 +34,17 @@ ;; Redefine the font selection to use the standard W32 dialog (defcustom w32-use-w32-font-dialog t - "Use the standard font dialog. + "If non-nil, use the standard Windows font dialog for font selection. If nil, pop up a menu of a fixed set of fonts including fontsets, like -X does. See `w32-fixed-font-alist' for the font menu definition." +X does. See `w32-fixed-font-alist' for the fonts to appear in the menu. + +Setting this variable directly does not have any effect; +use either \\[customize] or set `mouse-appearance-menu-map' to nil +after changing the value of this variable." :type 'boolean + :set (lambda (symbol value) + (set symbol value) + (setq mouse-appearance-menu-map nil)) :group 'w32) (defvar w32-list-proportional-fonts nil @@ -104,11 +111,11 @@ X does. See `w32-fixed-font-alist' for the font menu definition." "-*-Lucida Sans Typewriter-semibold-r-*-*-16-*-*-*-c-*-iso8859-1")) ("Courier" ("Courier 10x8" - "-*-Courier-*normal-r-*-*-*-97-*-*-c-80-iso8859-1") + "-*-Courier New-normal-r-*-*-*-97-*-*-c-80-iso8859-1") ("Courier 12x9" - "-*-Courier-*normal-r-*-*-*-120-*-*-c-90-iso8859-1") + "-*-Courier New-normal-r-*-*-*-120-*-*-c-90-iso8859-1") ("Courier 15x12" - "-*-Courier-*normal-r-*-*-*-150-*-*-c-120-iso8859-1") + "-*-Courier New-normal-r-*-*-*-150-*-*-c-120-iso8859-1") ;; For these, we specify the point height. ("") ("8" "-*-Courier New-normal-r-*-*-11-*-*-*-c-*-iso8859-1") From 6f73c465a8990560fedb1c9897c893056b4b04ef Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 17 Mar 2015 14:30:42 -0400 Subject: [PATCH 311/457] * cl-macs.el (cl--transform-lambda): Refine last change. Fixes: debbugs:20125 * test/automated/cl-lib-tests.el: Use lexical-binding. (cl-lib-arglist-performance): Refine test to the case where one of the fields has a non-nil default value. Use existing `mystruct' defstruct. (cl-lib-struct-accessors): Use `pcase' to be a bit more flexible in the accepted outputs. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/cl-macs.el | 26 +++++++++++++++----------- test/ChangeLog | 20 ++++++++++++++------ test/automated/cl-lib-tests.el | 30 ++++++++++++++++-------------- 4 files changed, 50 insertions(+), 31 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96478223d49..b7062bb5c66 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-17 Stefan Monnier + + * emacs-lisp/cl-macs.el (cl--transform-lambda): Refine last change + (bug#20125). + 2015-03-17 Michael Albinus * net/tramp-sh.el (tramp-ssh-controlmaster-options): Change test diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 712a7485167..56fbcf0b2fd 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -257,11 +257,7 @@ FORM is of the form (ARGS . BODY)." (setq cl--bind-defs (cadr cl-defs)) ;; Remove "&cl-defs DEFS" from args. (setcdr cl-defs (cddr cl-defs)) - (setq args (delq '&cl-defs args)) - ;; Optimize away trivial &cl-defs. - (if (and (null (car cl--bind-defs)) - (cl-every (lambda (x) (null (cadr x))) (cdr cl--bind-defs))) - (setq cl--bind-defs nil)))) + (setq args (delq '&cl-defs args)))) (if (setq cl--bind-enquote (memq '&cl-quote args)) (setq args (delq '&cl-quote args))) (if (memq '&whole args) (error "&whole not currently implemented")) @@ -272,11 +268,19 @@ FORM is of the form (ARGS . BODY)." ;; Take away all the simple args whose parsing can be handled more ;; efficiently by a plain old `lambda' than the manual parsing generated ;; by `cl--do-arglist'. - (while (and args (symbolp (car args)) - (not (memq (car args) '(nil &rest &body &key &aux))) - (not (and (eq (car args) '&optional) - (or cl--bind-defs (consp (cadr args)))))) - (push (pop args) simple-args)) + (let ((optional nil)) + (while (and args (symbolp (car args)) + (not (memq (car args) '(nil &rest &body &key &aux))) + (or (not optional) + ;; Optional args whose default is nil are simple. + (null (nth 1 (assq (car args) (cdr cl--bind-defs))))) + (not (and (eq (car args) '&optional) (setq optional t) + (car cl--bind-defs)))) + (push (pop args) simple-args)) + (when optional + (if args (push '&optional args)) + ;; Don't keep a dummy trailing &optional without actual optional args. + (if (eq '&optional (car simple-args)) (pop simple-args)))) (or (eq cl--bind-block 'cl-none) (setq body (list `(cl-block ,cl--bind-block ,@body)))) (let* ((cl--bind-lets nil) (cl--bind-forms nil) @@ -292,7 +296,7 @@ FORM is of the form (ARGS . BODY)." ;; "manual" parsing. (let ((slen (length simple-args))) (when (memq '&optional simple-args) - (push '&optional args) (cl-decf slen)) + (cl-decf slen)) (setq header ;; Macro expansion can take place in the middle of ;; apparently harmless computation, so it should not diff --git a/test/ChangeLog b/test/ChangeLog index a7d1dfdceae..e150aba2874 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,7 +1,15 @@ +2015-03-17 Stefan Monnier + + * automated/cl-lib-tests.el: Use lexical-binding. + (cl-lib-arglist-performance): Refine test to the case where one of the + fields has a non-nil default value. Use existing `mystruct' defstruct. + (cl-lib-struct-accessors): Use `pcase' to be a bit more flexible in the + accepted outputs. + 2015-03-16 Ken Brown - * automated/tramp-tests.el (tramp--test-special-characters): Don't - test "\t" in file names on Cygwin. (Bug#20119) + * automated/tramp-tests.el (tramp--test-special-characters): + Don't test "\t" in file names on Cygwin. (Bug#20119) 2015-03-10 Jackson Ray Hamilton @@ -78,8 +86,8 @@ 2015-03-03 Daniel Colascione - * automated/generator-tests.el (cps-testcase): Use - `cps-inhibit-atomic-optimization' instead of + * automated/generator-tests.el (cps-testcase): + Use `cps-inhibit-atomic-optimization' instead of `cps-disable-atomic-optimization'. (cps-test-declarations-preserved): New test. @@ -184,8 +192,8 @@ 2015-02-07 Dmitry Gutov - * automated/vc-tests.el (vc-test--working-revision): Fix - `vc-working-revision' checks to be compared against nil, which is + * automated/vc-tests.el (vc-test--working-revision): + Fix `vc-working-revision' checks to be compared against nil, which is what is should return for unregistered files. 2015-02-06 Nicolas Petton diff --git a/test/automated/cl-lib-tests.el b/test/automated/cl-lib-tests.el index 2c188a40059..ce0e5918653 100644 --- a/test/automated/cl-lib-tests.el +++ b/test/automated/cl-lib-tests.el @@ -1,4 +1,4 @@ -;;; cl-lib.el --- tests for emacs-lisp/cl-lib.el +;;; cl-lib.el --- tests for emacs-lisp/cl-lib.el -*- lexical-binding:t -*- ;; Copyright (C) 2013-2015 Free Software Foundation, Inc. @@ -204,7 +204,10 @@ :b :a :a 42) '(42 :a)))) -(cl-defstruct mystruct (abc :readonly t) def) +(cl-defstruct (mystruct + (:constructor cl-lib--con-1 (&aux (abc 1))) + (:constructor cl-lib--con-2 (&optional def))) + (abc 5 :readonly t) (def nil)) (ert-deftest cl-lib-struct-accessors () (let ((x (make-mystruct :abc 1 :def 2))) (should (eql (cl-struct-slot-value 'mystruct 'abc x) 1)) @@ -213,8 +216,17 @@ (should (eql (cl-struct-slot-value 'mystruct 'def x) -1)) (should (eql (cl-struct-slot-offset 'mystruct 'abc) 1)) (should-error (cl-struct-slot-offset 'mystruct 'marypoppins)) - (should (equal (cl-struct-slot-info 'mystruct) - '((cl-tag-slot) (abc :readonly t) (def)))))) + (should (pcase (cl-struct-slot-info 'mystruct) + (`((cl-tag-slot) (abc 5 :readonly t) + (def . ,(or `nil `(nil)))) + t))))) + +(ert-deftest cl-lib-arglist-performance () + ;; An `&aux' should not cause lambda's arglist to be turned into an &rest + ;; that's parsed by hand. + (should (equal () (help-function-arglist 'cl-lib--con-1))) + (should (pcase (help-function-arglist 'cl-lib--con-2) + (`(&optional ,_) t)))) (ert-deftest cl-the () (should (eql (cl-the integer 42) 42)) @@ -434,14 +446,4 @@ (should (cl-typep '* 'cl-lib-test-type)) (should-not (cl-typep 1 'cl-lib-test-type))) -(ert-deftest cl-lib-arglist-performance () - ;; An `&aux' should not cause lambda's arglist to be turned into an &rest - ;; that's parsed by hand. - (should (eq () (nth 1 (nth 1 (macroexpand - '(cl-function (lambda (&aux (x 1)) x))))))) - (cl-defstruct (cl-lib--s (:constructor cl-lib--s-make (&optional a))) a) - ;; Similarly the &cl-defs thingy shouldn't cause fallback to manual parsing - ;; of args if the default for optional args is nil. - (should (equal '(&optional a) (help-function-arglist 'cl-lib--s-make)))) - ;;; cl-lib.el ends here From e70a1f9b42857fa1315302b9c140a6d40ea15f1d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 17 Mar 2015 20:38:48 +0200 Subject: [PATCH 312/457] lisp/mouse.el: Fix last change. --- lisp/mouse.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/mouse.el b/lisp/mouse.el index be9562c8d77..c50913f4636 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -1801,6 +1801,8 @@ choose a font." (declare-function buffer-face-mode-invoke "face-remap" (face arg &optional interactive)) (declare-function font-face-attributes "font.c" (font &optional frame)) +(defvar w32-use-w32-font-dialog) +(defvar w32-fixed-font-alist) (defun mouse-appearance-menu (event) "Show a menu for changing the default face in the current buffer." From 7cf5b3748cb1c8df5a0189bf6b5e95b550c16668 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 17 Mar 2015 20:07:38 +0100 Subject: [PATCH 313/457] Avoid leading tabs in shell scripts, sent by Tramp. Fixes: debbugs:20118 * tramp-sh.el (tramp-maybe-send-script): Avoid leading tabs in shell scripts. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp-sh.el | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b734aaa39e3..cf4eeae2287 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-17 Michael Albinus + + * tramp-sh.el (tramp-maybe-send-script): Avoid leading tabs in + shell scripts. (Bug#20118) + 2015-03-17 Eli Zaretskii * mouse.el (mouse-appearance-menu): If w32-use-w32-font-dialog is diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index b6c47bcb7bb..133d886f372 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3725,6 +3725,10 @@ Only send the definition if it has not already been done." (tramp-get-connection-process vec) "scripts" nil))) (unless (member name scripts) (with-tramp-progress-reporter vec 5 (format "Sending script `%s'" name) + ;; In bash, leading TABs like in `tramp-vc-registered-read-file-names' + ;; could result in unwanted command expansion. Avoid this. + (setq script (tramp-compat-replace-regexp-in-string + (make-string 1 ?\t) (make-string 8 ? ) script)) ;; The script could contain a call of Perl. This is masked with `%s'. (when (and (string-match "%s" script) (not (tramp-get-remote-perl vec))) From 771978259eb6b1caf0a37554c006e42d7ab802c6 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 17 Mar 2015 22:41:36 +0200 Subject: [PATCH 314/457] Font-lock more Kernel methods as built-in --- lisp/ChangeLog | 5 +++++ lisp/progmodes/ruby-mode.el | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cf4eeae2287..57d988b6887 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-17 Bozhidar Batsov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Font-lock + more Kernel methods. + 2015-03-17 Michael Albinus * tramp-sh.el (tramp-maybe-send-script): Avoid leading tabs in diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 060bc847eb4..40204faa379 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -2069,16 +2069,25 @@ See `font-lock-syntax-table'.") ruby-font-lock-keyword-beg-re (regexp-opt '( ;; built-in methods on Kernel + "abort" "at_exit" "autoload" "autoload?" + "binding" + "block_given?" + "callcc" + "caller" "catch" "eval" "exec" + "exit" + "exit!" "fork" "format" + "global_variables" "lambda" "load" + "local_variables" "loop" "open" "p" @@ -2089,11 +2098,16 @@ See `font-lock-syntax-table'.") "puts" "require" "require_relative" + "sleep" "spawn" "sprintf" + "srand" "syscall" "system" + "throw" + "trace_var" "trap" + "untrace_var" "warn" ;; keyword-like private methods on Module "alias_method" From 5b77d81840b2dff821abefb2adb1f7f2f495be62 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 17 Mar 2015 23:40:20 +0200 Subject: [PATCH 315/457] Separate Kernel methods with required args from those without --- lisp/progmodes/ruby-mode.el | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 40204faa379..921ca314004 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -2069,25 +2069,14 @@ See `font-lock-syntax-table'.") ruby-font-lock-keyword-beg-re (regexp-opt '( ;; built-in methods on Kernel - "abort" - "at_exit" "autoload" "autoload?" - "binding" - "block_given?" - "callcc" - "caller" "catch" "eval" "exec" - "exit" - "exit!" - "fork" "format" - "global_variables" "lambda" "load" - "local_variables" "loop" "open" "p" @@ -2098,10 +2087,8 @@ See `font-lock-syntax-table'.") "puts" "require" "require_relative" - "sleep" "spawn" "sprintf" - "srand" "syscall" "system" "throw" @@ -2140,10 +2127,14 @@ See `font-lock-syntax-table'.") "at_exit" "binding" "block_given?" + "callcc" "caller" "exit" "exit!" "fail" + "fork" + "global_variables" + "local_variables" "private" "protected" "public" From 64db0c26faba21e7aedc0c5f57e04ed175b04f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Tue, 17 Mar 2015 22:33:36 +0100 Subject: [PATCH 316/457] Discriminate between pseudo-classes and -elements * textmodes/css-mode.el (css--font-lock-keywords): Discriminate between pseudo-classes and pseudo-elements. (css-pseudo-ids): Remove. (css-pseudo-class-ids): New variable. (css-pseudo-element-ids): New variable. --- lisp/ChangeLog | 8 ++++++++ lisp/textmodes/css-mode.el | 22 +++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 57d988b6887..898d9cbf361 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-03-17 Simen Heggestøyl + + * textmodes/css-mode.el (css--font-lock-keywords): Discriminate + between pseudo-classes and pseudo-elements. + (css-pseudo-ids): Remove. + (css-pseudo-class-ids): New variable. + (css-pseudo-element-ids): New variable. + 2015-03-17 Bozhidar Batsov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Font-lock diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 44dc4dff3de..c88960373cb 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -3,6 +3,7 @@ ;; Copyright (C) 2006-2015 Free Software Foundation, Inc. ;; Author: Stefan Monnier +;; Maintainer: Simen Heggestøyl ;; Keywords: hypermedia ;; This file is part of GNU Emacs. @@ -120,10 +121,17 @@ ;; (media . "^ +\\* '\\([^ '\n]+\\)' media group") ;; (property . "^ +\\* '\\([^ '\n]+\\)',"))) -(defconst css-pseudo-ids - '("active" "after" "before" "first" "first-child" "first-letter" "first-line" - "focus" "hover" "lang" "left" "link" "right" "visited") - "Identifiers for pseudo-elements and pseudo-classes.") +(defconst css-pseudo-class-ids + '("active" "checked" "disabled" "empty" "enabled" "first" + "first-child" "first-of-type" "focus" "hover" "indeterminate" "lang" + "last-child" "last-of-type" "left" "link" "nth-child" + "nth-last-child" "nth-last-of-type" "nth-of-type" "only-child" + "only-of-type" "right" "root" "target" "visited") + "Identifiers for pseudo-classes.") + +(defconst css-pseudo-element-ids + '("after" "before" "first-letter" "first-line") + "Identifiers for pseudo-elements.") (defconst css-at-ids '("charset" "font-face" "import" "media" "page") @@ -258,7 +266,11 @@ (concat "\\(?:" scss--hash-re "\\|[^@/:{} \t\n#]\\)" "[^:{}#]*\\(?:" scss--hash-re "[^:{}#]*\\)*")) - "\\(?::" (regexp-opt css-pseudo-ids t) + ;; Even though pseudo-elements should be prefixed by ::, a + ;; single colon is accepted for backward compatibility. + "\\(?:\\(:" (regexp-opt (append css-pseudo-class-ids + css-pseudo-element-ids) t) + "\\|\\::" (regexp-opt css-pseudo-element-ids t) "\\)" "\\(?:([^\)]+)\\)?" (if (not sassy) "[^:{}\n]*" From 62fde9ee0fe62c8285c61b01444e8e59d1654685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Tue, 17 Mar 2015 22:58:13 +0100 Subject: [PATCH 317/457] Add support for completion in `css-mode' * textmodes/css-mode.el (css--complete-property): New function for completing CSS properties. (css--complete-pseudo-element-or-class): New function for completing CSS pseudo-elements and pseudo-classes. (css--complete-at-rule): New function for completing CSS at-rules. (css-completion-at-point): New function providing completion for `css-mode'. (css-mode): Add support for completion. --- lisp/ChangeLog | 8 +++++++ lisp/textmodes/css-mode.el | 45 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 898d9cbf361..973322691b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,6 +5,14 @@ (css-pseudo-ids): Remove. (css-pseudo-class-ids): New variable. (css-pseudo-element-ids): New variable. + (css--complete-property): New function for completing CSS + properties. + (css--complete-pseudo-element-or-class): New function for + completing CSS pseudo-elements and pseudo-classes. + (css--complete-at-rule): New function for completing CSS at-rules. + (css-completion-at-point): New function providing completion for + `css-mode'. + (css-mode): Add support for completion. 2015-03-17 Bozhidar Batsov diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index c88960373cb..555122b1b42 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -29,7 +29,7 @@ ;; - electric ; and } ;; - filling code with auto-fill-mode -;; - completion +;; - attribute value completion ;; - fix font-lock errors with multi-line selectors ;;; Code: @@ -346,6 +346,45 @@ (`(:before . ,(or "{" "(")) (if (smie-rule-hanging-p) (smie-rule-parent 0))))) +;;; Completion + +(defun css--complete-property () + "Complete property at point." + (save-excursion + (let ((pos (point))) + (skip-chars-backward "-[:alnum:]") + (let ((start (point))) + (skip-chars-backward " \t\r\n") + (when (memq (char-before) '(?\{ ?\;)) + (list start pos css-property-ids)))))) + +(defun css--complete-pseudo-element-or-class () + "Complete pseudo-element or pseudo-class at point." + (save-excursion + (let ((pos (point))) + (skip-chars-backward "-[:alnum:]") + (when (eq (char-before) ?\:) + (list (point) pos + (if (eq (char-before (- (point) 1)) ?\:) + css-pseudo-element-ids + css-pseudo-class-ids)))))) + +(defun css--complete-at-rule () + "Complete at-rule (statement beginning with `@') at point." + (save-excursion + (let ((pos (point))) + (skip-chars-backward "-[:alnum:]") + (when (eq (char-before) ?\@) + (list (point) pos css-at-ids))))) + +(defun css-completion-at-point () + "Complete current symbol at point. +Currently supports completion of CSS properties, pseudo-elements, +pesudo-classes, and at-rules." + (or (css--complete-property) + (css--complete-pseudo-element-or-class) + (css--complete-at-rule))) + ;;;###autoload (define-derived-mode css-mode fundamental-mode "CSS" "Major mode to edit Cascading Style Sheets." @@ -361,7 +400,9 @@ :forward-token #'css-smie--forward-token :backward-token #'css-smie--backward-token) (setq-local electric-indent-chars - (append css-electric-keys electric-indent-chars))) + (append css-electric-keys electric-indent-chars)) + (add-hook 'completion-at-point-functions + #'css-completion-at-point nil 'local)) (defvar comment-continue) From 7ec63a3afa52213b7b3cd3ecc0717c6e6504dc43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Tue, 17 Mar 2015 23:11:55 +0100 Subject: [PATCH 318/457] Update CSS property list * textmodes/css-mode.el (css-extract-keyword-list): Remove function in favor of manual extraction. (css-extract-parse-val-grammar): Remove function in favor of manual extraction. (css-extract-props-and-vals): Remove function in favor of manual extraction. (css-at-ids): Update list of CSS at-rule ids. (css-property-ids): Update list of CSS properties. --- lisp/ChangeLog | 8 ++ lisp/textmodes/css-mode.el | 210 +++++++++++++++++-------------------- 2 files changed, 105 insertions(+), 113 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 973322691b0..25571bab9c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -13,6 +13,14 @@ (css-completion-at-point): New function providing completion for `css-mode'. (css-mode): Add support for completion. + (css-extract-keyword-list): Remove function in favor of manual + extraction. + (css-extract-parse-val-grammar): Remove function in favor of + manual extraction. + (css-extract-props-and-vals): Remove function in favor of manual + extraction. + (css-at-ids): Update list of CSS at-rule ids. + (css-property-ids): Update list of CSS properties. 2015-03-17 Bozhidar Batsov diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 555122b1b42..e3578f9e03a 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -38,89 +38,6 @@ "Cascading Style Sheets (CSS) editing mode." :group 'languages) - -(defun css-extract-keyword-list (res) - (with-temp-buffer - (url-insert-file-contents "http://www.w3.org/TR/REC-CSS2/css2.txt") - (goto-char (point-max)) - (search-backward "Appendix H. Index") - (forward-line) - (delete-region (point-min) (point)) - (let ((result nil) - keys) - (dolist (re res) - (goto-char (point-min)) - (setq keys nil) - (while (re-search-forward (cdr re) nil t) - (push (match-string 1) keys)) - (push (cons (car re) (sort keys 'string-lessp)) result)) - (nreverse result)))) - -(defun css-extract-parse-val-grammar (string env) - (let ((start 0) - (elems ()) - name) - (while (string-match - (concat "\\(?:" - (concat "]+>]+>\\(?:" - "<\\([^&]+\\)>\\|'\\([^']+\\)'" - "\\)") - "\\|" "\\(\\[\\)" - "\\|" "\\(]\\)" - "\\|" "\\(||\\)" - "\\|" "\\(|\\)" - "\\|" "\\([*+?]\\)" - "\\|" "\\({[^}]+}\\)" - "\\|" "\\(\\w+\\(?:-\\w+\\)*\\)" - "\\)[ \t\n]*") - string start) - ;; (assert (eq start (match-beginning 0))) - (setq start (match-end 0)) - (cond - ;; Reference to a type of value. - ((setq name (match-string-no-properties 1 string)) - (push (intern name) elems)) - ;; Reference to another property's values. - ((setq name (match-string-no-properties 2 string)) - (setq elems (delete-dups (append (cdr (assoc name env)) elems)))) - ;; A literal - ((setq name (match-string-no-properties 9 string)) - (push name elems)) - ;; We just ignore the rest. I.e. we ignore the structure because - ;; it's too difficult to exploit anyway (it would allow us to only - ;; complete top/center/bottom after one of left/center/right and - ;; vice-versa). - (t nil))) - elems)) - - -(defun css-extract-props-and-vals () - (with-temp-buffer - (url-insert-file-contents "http://www.w3.org/TR/CSS21/propidx.html") - (goto-char (point-min)) - (let ((props ())) - (while (re-search-forward "#propdef-\\([^\"]+\\)\">'\\1'" nil t) - (let ((prop (match-string-no-properties 1))) - (save-excursion - (goto-char (match-end 0)) - (search-forward "") - (let ((vals-string (buffer-substring (point) - (progn - (re-search-forward "[ \t\n]+|[ \t\n]+inherit") - (match-beginning 0))))) - ;; - (push (cons prop (css-extract-parse-val-grammar vals-string props)) - props))))) - props))) - -;; Extraction was done with: -;; (css-extract-keyword-list -;; '((pseudo . "^ +\\* :\\([^ \n,]+\\)") -;; (at . "^ +\\* @\\([^ \n,]+\\)") -;; (descriptor . "^ +\\* '\\([^ '\n]+\\)' (descriptor)") -;; (media . "^ +\\* '\\([^ '\n]+\\)' media group") -;; (property . "^ +\\* '\\([^ '\n]+\\)',"))) - (defconst css-pseudo-class-ids '("active" "checked" "disabled" "empty" "enabled" "first" "first-child" "first-of-type" "focus" "hover" "indeterminate" "lang" @@ -134,7 +51,7 @@ "Identifiers for pseudo-elements.") (defconst css-at-ids - '("charset" "font-face" "import" "media" "page") + '("charset" "font-face" "import" "media" "namespace" "page") "Identifiers that appear in the form @foo.") (defconst css-descriptor-ids @@ -150,36 +67,103 @@ "Identifiers for types of media.") (defconst css-property-ids - '("azimuth" "background" "background-attachment" "background-color" - "background-image" "background-position" "background-repeat" "block" - "border" "border-bottom" "border-bottom-color" "border-bottom-style" - "border-bottom-width" "border-collapse" "border-color" "border-left" - "border-left-color" "border-left-style" "border-left-width" "border-right" + '(;; CSS 2.1 properties (http://www.w3.org/TR/CSS21/propidx.html). + ;; + ;; Properties duplicated by any of the CSS3 modules below have + ;; been removed. + "azimuth" "border-collapse" "border-spacing" "bottom" + "caption-side" "clear" "clip" "content" "counter-increment" + "counter-reset" "cue" "cue-after" "cue-before" "direction" "display" + "elevation" "empty-cells" "float" "height" "left" "line-height" + "list-style" "list-style-image" "list-style-position" + "list-style-type" "margin" "margin-bottom" "margin-left" + "margin-right" "margin-top" "max-height" "max-width" "min-height" + "min-width" "orphans" "overflow" "padding" "padding-bottom" + "padding-left" "padding-right" "padding-top" "page-break-after" + "page-break-before" "page-break-inside" "pause" "pause-after" + "pause-before" "pitch" "pitch-range" "play-during" "position" + "quotes" "richness" "right" "speak" "speak-header" "speak-numeral" + "speak-punctuation" "speech-rate" "stress" "table-layout" "top" + "unicode-bidi" "vertical-align" "visibility" "voice-family" "volume" + "widows" "width" "z-index" + + ;; CSS Animations + ;; (http://www.w3.org/TR/css3-animations/#property-index) + "animation" "animation-delay" "animation-direction" + "animation-duration" "animation-fill-mode" + "animation-iteration-count" "animation-name" + "animation-play-state" "animation-timing-function" + + ;; CSS Backgrounds and Borders Module Level 3 + ;; (http://www.w3.org/TR/css3-background/#property-index) + "background" "background-attachment" "background-clip" + "background-color" "background-image" "background-origin" + "background-position" "background-repeat" "background-size" + "border" "border-bottom" "border-bottom-color" + "border-bottom-left-radius" "border-bottom-right-radius" + "border-bottom-style" "border-bottom-width" "border-color" + "border-image" "border-image-outset" "border-image-repeat" + "border-image-slice" "border-image-source" "border-image-width" + "border-left" "border-left-color" "border-left-style" + "border-left-width" "border-radius" "border-right" "border-right-color" "border-right-style" "border-right-width" - "border-spacing" "border-style" "border-top" "border-top-color" - "border-top-style" "border-top-width" "border-width" "bottom" - "caption-side" "clear" "clip" "color" "compact" "content" - "counter-increment" "counter-reset" "cue" "cue-after" "cue-before" - "cursor" "dashed" "direction" "display" "dotted" "double" "elevation" - "empty-cells" "float" "font" "font-family" "font-size" "font-size-adjust" - "font-stretch" "font-style" "font-variant" "font-weight" "groove" "height" - "hidden" "inline" "inline-table" "inset" "left" "letter-spacing" - "line-height" "list-item" "list-style" "list-style-image" - "list-style-position" "list-style-type" "margin" "margin-bottom" - "margin-left" "margin-right" "margin-top" "marker-offset" "marks" - "max-height" "max-width" "min-height" "min-width" "orphans" "outline" - "outline-color" "outline-style" "outline-width" "outset" "overflow" - "padding" "padding-bottom" "padding-left" "padding-right" "padding-top" - "page" "page-break-after" "page-break-before" "page-break-inside" "pause" - "pause-after" "pause-before" "pitch" "pitch-range" "play-during" "position" - "quotes" "richness" "ridge" "right" "run-in" "size" "solid" "speak" - "speak-header" "speak-numeral" "speak-punctuation" "speech-rate" "stress" - "table" "table-caption" "table-cell" "table-column" "table-column-group" - "table-footer-group" "table-header-group" "table-layout" "table-row" - "table-row-group" "text-align" "text-decoration" "text-indent" - "text-shadow" "text-transform" "top" "unicode-bidi" "vertical-align" - "visibility" "voice-family" "volume" "white-space" "widows" "width" - "word-spacing" "z-index") + "border-style" "border-top" "border-top-color" + "border-top-left-radius" "border-top-right-radius" + "border-top-style" "border-top-width" "border-width" "box-shadow" + + ;; CSS Basic User Interface Module Level 3 (CSS3 UI) + ;; (http://www.w3.org/TR/css3-ui/#property-index) + "box-sizing" "caret-color" "cursor" "nav-down" "nav-left" + "nav-right" "nav-up" "outline" "outline-color" "outline-offset" + "outline-style" "outline-width" "resize" "text-overflow" + + ;; CSS Color Module Level 3 + ;; (http://www.w3.org/TR/css3-color/#property) + "color" "opacity" + + ;; CSS Flexible Box Layout Module Level 1 + ;; (http://www.w3.org/TR/css-flexbox-1/#property-index) + "align-content" "align-items" "align-self" "flex" "flex-basis" + "flex-direction" "flex-flow" "flex-grow" "flex-shrink" "flex-wrap" + "justify-content" "order" + + ;; CSS Fonts Module Level 3 + ;; (http://www.w3.org/TR/css3-fonts/#property-index) + "font" "font-family" "font-feature-settings" "font-kerning" + "font-language-override" "font-size" "font-size-adjust" + "font-stretch" "font-style" "font-synthesis" "font-variant" + "font-variant-alternates" "font-variant-caps" + "font-variant-east-asian" "font-variant-ligatures" + "font-variant-numeric" "font-variant-position" "font-weight" + + ;; CSS Text Decoration Module Level 3 + ;; (http://dev.w3.org/csswg/css-text-decor-3/#property-index) + "text-decoration" "text-decoration-color" "text-decoration-line" + "text-decoration-skip" "text-decoration-style" "text-emphasis" + "text-emphasis-color" "text-emphasis-position" "text-emphasis-style" + "text-shadow" "text-underline-position" + + ;; CSS Text Module Level 3 + ;; (http://www.w3.org/TR/css3-text/#property-index) + "hanging-punctuation" "hyphens" "letter-spacing" "line-break" + "overflow-wrap" "tab-size" "text-align" "text-align-last" + "text-indent" "text-justify" "text-transform" "white-space" + "word-break" "word-spacing" "word-wrap" + + ;; CSS Transforms Module Level 1 + ;; (http://www.w3.org/TR/css3-2d-transforms/#property-index) + "backface-visibility" "perspective" "perspective-origin" + "transform" "transform-origin" "transform-style" + + ;; CSS Transitions + ;; (http://www.w3.org/TR/css3-transitions/#property-index) + "transition" "transition-delay" "transition-duration" + "transition-property" "transition-timing-function" + + ;; Filter Effects Module Level 1 + ;; (http://www.w3.org/TR/filter-effects/#property-index) + "color-interpolation-filters" "filter" "flood-color" + "flood-opacity" "lighting-color") "Identifiers for properties.") (defcustom css-electric-keys '(?\} ?\;) ;; '() From 41278b775bd3ebc213ff8b9eda2f2c04a5354bba Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 17 Mar 2015 16:55:02 -0700 Subject: [PATCH 319/457] Spacing and punctuation fixes --- doc/emacs/ack.texi | 2 +- doc/emacs/buffers.texi | 2 +- doc/emacs/display.texi | 2 +- doc/emacs/frames.texi | 2 +- doc/emacs/killing.texi | 2 +- doc/emacs/mule.texi | 2 +- doc/emacs/trouble.texi | 10 +++++----- doc/lispintro/emacs-lisp-intro.texi | 6 +++--- doc/lispref/commands.texi | 6 +++--- doc/lispref/display.texi | 2 +- doc/lispref/elisp.texi | 4 ++-- doc/lispref/frames.texi | 4 ++-- doc/lispref/functions.texi | 4 ++-- doc/lispref/internals.texi | 2 +- doc/lispref/loading.texi | 2 +- doc/lispref/minibuf.texi | 2 +- doc/lispref/numbers.texi | 2 +- doc/lispref/streams.texi | 2 +- doc/lispref/text.texi | 4 ++-- doc/misc/auth.texi | 4 ++-- doc/misc/calc.texi | 2 +- doc/misc/cc-mode.texi | 4 ++-- doc/misc/eieio.texi | 2 +- doc/misc/erc.texi | 6 +++--- doc/misc/eshell.texi | 2 +- doc/misc/eww.texi | 4 ++-- doc/misc/gnus.texi | 6 +++--- doc/misc/htmlfontify.texi | 4 ++-- doc/misc/idlwave.texi | 4 ++-- doc/misc/ido.texi | 2 +- doc/misc/newsticker.texi | 2 +- doc/misc/org.texi | 8 ++++---- doc/misc/pgg.texi | 2 +- doc/misc/reftex.texi | 6 +++--- doc/misc/todo-mode.texi | 4 ++-- doc/misc/tramp.texi | 2 +- doc/misc/vhdl-mode.texi | 6 +++--- doc/misc/vip.texi | 2 +- doc/misc/viper.texi | 2 +- doc/misc/woman.texi | 2 +- 40 files changed, 69 insertions(+), 69 deletions(-) diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index f97964b6a68..151c3f1b848 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -204,7 +204,7 @@ for Korean Hanja. @item Andrew Choi and Yamamoto Mitsuharu wrote the Carbon support, used -prior to Emacs 23 for Mac OS. Yamamoto Mitsuharu continued to +prior to Emacs 23 for Mac OS@. Yamamoto Mitsuharu continued to contribute to Mac OS support in the newer Nextstep port; and also improved support for multi-monitor displays. diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 88a122c8283..25b13d660a4 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -642,7 +642,7 @@ the directory names in reverse order, so that @file{/top/middle/file} becomes @samp{file\middle\top}, while @code{post-forward} puts them in forward order after the file name, as in @samp{file|top/middle}. If @code{uniquify-buffer-name-style} is set to @code{nil}, the buffer -names simply get @samp{<2>}, @samp{<3>}, etc. appended. +names simply get @samp{<2>}, @samp{<3>}, etc.@: appended. Which rule to follow for putting the directory names in the buffer name is not very important if you are going to @emph{look} at the diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index ae723b8d68c..38acc20955e 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -138,7 +138,7 @@ instructs the scrolling commands not to fontify (@pxref{Font Lock}) any unfontified text they scroll over, instead to assume it has the default face. This can cause Emacs to scroll to somewhat wrong buffer positions when the faces in use are not all the same size, even with -single (i.e. without auto-repeat) scrolling operations. +single (i.e., without auto-repeat) scrolling operations. @vindex scroll-up @vindex scroll-down diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index b5b9dbd7daa..f401c8f645f 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -955,7 +955,7 @@ bar width, change the @code{scroll-bar-width} frame parameter @cindex overscrolling If you're using Emacs on X (with GTK+ or Motif), you can customize the variable @code{scroll-bar-adjust-thumb-portion} to control -@dfn{overscrolling} of the scroll bar, i.e. dragging the thumb down even +@dfn{overscrolling} of the scroll bar, i.e., dragging the thumb down even when the end of the buffer is visible. If its value is non-@code{nil}, the scroll bar can be dragged downwards even if the end of the buffer is shown; if @code{nil}, the thumb will be at the diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 3092d34b566..4b90bf468d5 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -848,7 +848,7 @@ shifting the original text to the right. The command @kbd{C-x @key{SPC}} (@code{rectangle-mark-mode}) toggles whether the region-rectangle or the standard region is highlighted (first activating the region if necessary). When this mode is enabled, -commands that resize the region (@kbd{C-f}, @kbd{C-n} etc.) do +commands that resize the region (@kbd{C-f}, @kbd{C-n} etc.)@: do so in a rectangular fashion, and killing and yanking operate on the rectangle. @xref{Killing}. The mode persists only as long as the region is active. diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index f8b06bdb5d9..a80f942f61a 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -266,7 +266,7 @@ for more information about the language environment @var{lang-env}. Supported language environments include: @c @cindex entries below are split between portions of the list to -@c make them more accurate, i.e. land on the line that mentions the +@c make them more accurate, i.e., land on the line that mentions the @c language. However, makeinfo 4.x doesn't fill inside @quotation @c lines that follow a @cindex entry and whose text has no whitespace. @c To work around, we group the language environments together, so diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 2faa5d91cc6..22ec215d5e6 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -342,7 +342,7 @@ Here, @var{backtrace} is the name of a text file containing a copy of the backtrace, @var{bindir} is the name of the directory that contains the Emacs executable, and @var{emacs-binary} is the name of the Emacs executable file, normally @file{emacs} on GNU and Unix -systems and @file{emacs.exe} on MS-Windows and MS-DOS. Omit the +systems and @file{emacs.exe} on MS-Windows and MS-DOS@. Omit the @option{-p} option if your version of @command{addr2line} is too old to have it. @@ -1142,7 +1142,7 @@ making diffs of C code. This shows the name of the function that each change occurs in. If you are using the Emacs repository, make sure your copy is -up-to-date (e.g. with @code{git pull}). You can commit your changes +up-to-date (e.g., with @code{git pull}). You can commit your changes to a private branch and generate a patch from the master version by using @code{git format-patch master}. Or you can leave your changes uncommitted and use @code{git diff}. @@ -1173,7 +1173,7 @@ explanation in comments in the code. It will be more useful there. Please look at the change log entries of recent commits to see what sorts of information to put in, and to learn the style that we use. Note that, unlike some other projects, we do require change logs for -documentation, i.e. Texinfo files. +documentation, i.e., Texinfo files. @xref{Change Log}, @ifset WWW_GNU_ORG see @@ -1389,7 +1389,7 @@ user freedom and to defend the rights of all free software users. For general information, see the website @url{http://www.fsf.org/}. Generally speaking, for non-trivial contributions to GNU Emacs we -require that the copyright be assigned to the FSF. For the reasons +require that the copyright be assigned to the FSF@. For the reasons behind this, see @url{http://www.gnu.org/licenses/why-assign.html}. Copyright assignment is a simple process. Residents of some countries @@ -1408,7 +1408,7 @@ is not enough). Also, a disclaimer cannot be applied to future work, it has to be repeated each time you want to send something new. We can accept small changes (roughly, fewer than 15 lines) without -an assignment. This is a cumulative limit (e.g. three separate 5 line +an assignment. This is a cumulative limit (e.g., three separate 5 line patches) over all your contributions. @node Service diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index b6eff2de0dc..c67623d89cb 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -387,7 +387,7 @@ Truth and Falsehood in Emacs Lisp * Point and mark:: A review of various locations. * Template for save-excursion:: -A Few Buffer--Related Functions +A Few Buffer-Related Functions * Finding More:: How to find more information. * simplified-beginning-of-buffer:: Shows @code{goto-char}, @@ -4547,7 +4547,7 @@ and if so, prints an appropriate message. @end itemize @node Buffer Walk Through -@chapter A Few Buffer--Related Functions +@chapter A Few Buffer-Related Functions In this chapter we study in detail several of the functions used in GNU Emacs. This is called a ``walk-through''. These functions are used as @@ -12114,7 +12114,7 @@ Internet, see @uref{http://www.gnu.org/software/texinfo/manual/texinfo/} @end ifhtml @iftex -``Indicating Definitions, Commands, etc.'' in @cite{Texinfo, The GNU +``Indicating Definitions, Commands, etc.''@: in @cite{Texinfo, The GNU Documentation Format}. @end iftex @end itemize diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 6fdc8e2ec79..b81d0f84e5c 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -132,7 +132,7 @@ byte compiler to warn if the command is called from Lisp. The output of @code{describe-function} will include similar information. The value of the property can be: a string, which the byte-compiler will use directly in its warning (it should end with a period, and not -start with a capital, e.g. ``use @dots{} instead.''); @code{t}; any +start with a capital, e.g., ``use @dots{} instead.''); @code{t}; any other symbol, which should be an alternative function to use in Lisp code. @@ -1043,8 +1043,8 @@ the current Emacs session. If a symbol has not yet been so used, @end defun @menu -* Keyboard Events:: Ordinary characters--keys with symbols on them. -* Function Keys:: Function keys--keys with names, not symbols. +* Keyboard Events:: Ordinary characters -- keys with symbols on them. +* Function Keys:: Function keys -- keys with names, not symbols. * Mouse Events:: Overview of mouse events. * Click Events:: Pushing and releasing a mouse button. * Drag Events:: Moving the mouse before releasing the button. diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 5dd74d25e8f..b73e70d1079 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2154,7 +2154,7 @@ stipple patterns. Alternative foreground color, a string. This is like @code{:foreground} but the color is only used as a foreground when the background color is near to the foreground that would have been used. This is useful for -example when marking text (i.e. the region face). If the text has a foreground +example when marking text (i.e., the region face). If the text has a foreground that is visible with the region face, that foreground is used. If the foreground is near the region face background, @code{:distant-foreground} is used instead so the text is readable. diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index fc552be161b..fc8ba7b4116 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -753,8 +753,8 @@ Defining Commands Input Events -* Keyboard Events:: Ordinary characters--keys with symbols on them. -* Function Keys:: Function keys--keys with names, not symbols. +* Keyboard Events:: Ordinary characters -- keys with symbols on them. +* Function Keys:: Function keys -- keys with names, not symbols. * Mouse Events:: Overview of mouse events. * Click Events:: Pushing and releasing a mouse button. * Drag Events:: Moving the mouse before releasing the button. diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 0b8106dfc9c..85695c614c8 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -360,7 +360,7 @@ coordinates might be negative. Position of the top-left corner and size of the work area (``usable'' space) in pixels as @samp{(@var{x} @var{y} @var{width} @var{height})}. This may be different from @samp{geometry} in that space occupied by -various window manager features (docks, taskbars, etc.) may be +various window manager features (docks, taskbars, etc.)@: may be excluded from the work area. Whether or not such features actually subtract from the work area depends on the platform and environment. Again, if the monitor is not the primary monitor, some of the @@ -1218,7 +1218,7 @@ These functions return the canonical height and width of a character in @var{frame}, measured in pixels. Together, these values establish the size of the default font on @var{frame}. The values depend on the choice of font for @var{frame}, see @ref{Font and Color Parameters}. -@end defun +@end defun The default font can be also set directly with the following function: diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 40b8322c73e..a853d2fbab5 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1222,7 +1222,7 @@ This macro is the handy way to add the advice @var{function} to the function stored in @var{place} (@pxref{Generalized Variables}). @var{where} determines how @var{function} is composed with the -existing function, e.g. whether @var{function} should be called before, or +existing function, e.g., whether @var{function} should be called before, or after the original function. @xref{Advice combinators}, for the list of available ways to compose the two functions. @@ -1310,7 +1310,7 @@ and its properties. @defun advice-eval-interactive-spec spec Evaluate the interactive @var{spec} just like an interactive call to a function with such a spec would, and then return the corresponding list of arguments -that was built. E.g. @code{(advice-eval-interactive-spec "r\nP")} will +that was built. E.g., @code{(advice-eval-interactive-spec "r\nP")} will return a list of three elements, containing the boundaries of the region and the current prefix argument. @end defun diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 2627ab74623..a5fff724ea1 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -1624,7 +1624,7 @@ similar advice may apply to the unsigned counterparts (e.g., of @code{intptr_t}). @item -Prefer @code{int} for Emacs character codes, in the range 0 ..@: 0x3FFFFF. +Prefer @code{int} for Emacs character codes, in the range 0 ..@: 0x3FFFFF@. More generally, prefer @code{int} for integers known to be in @code{int} range, e.g., screen column counts. diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index cf2f0007ca7..0ae8fbd0686 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -95,7 +95,7 @@ suffix), unless it contains an explicit directory name. If the option @code{load-prefer-newer} is non-@code{nil}, then when searching suffixes, @code{load} selects whichever version of a file -(@samp{.elc}, @samp{.el}, etc.) has been modified most recently. +(@samp{.elc}, @samp{.el}, etc.)@: has been modified most recently. If @var{filename} is a relative file name, such as @file{foo} or @file{baz/foo.bar}, @code{load} searches for the file using the variable diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 82039ba450f..4fec757393f 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -102,7 +102,7 @@ the minibuffer is in a separate frame. @xref{Minibuffers and Frames}. When Emacs is running in batch mode, any request to read from the minibuffer actually reads a line from the standard input descriptor that was supplied when Emacs was started. This supports only basic input: -none of the special minibuffer features (history, completion, etc.) +none of the special minibuffer features (history, completion, etc.)@: are available in batch mode. @node Text from Minibuffer diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index 1ee70504a73..8d1d3a798eb 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -261,7 +261,7 @@ If @var{x} is finite, then @var{s} is a floating-point number between 0.5 @math{x = s 2^e}. @end tex If @var{x} is zero or infinity, then @var{s} is the same as @var{x}. -If @var{x} is a NaN, then @var{s} is also a NaN. +If @var{x} is a NaN, then @var{s} is also a NaN@. If @var{x} is zero, then @var{e} is 0. @end defun diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi index e52a543110b..dfad2d83d54 100644 --- a/doc/lispref/streams.texi +++ b/doc/lispref/streams.texi @@ -344,7 +344,7 @@ When reading or writing from the standard input/output streams of the Emacs process in batch mode, it is sometimes required to make sure any arbitrary binary data will be read/written verbatim, and/or that no translation of newlines to or from CR-LF pairs are performed. This -issue does not exist on Posix hosts, only on MS-Windows and MS-DOS. +issue does not exist on Posix hosts, only on MS-Windows and MS-DOS@. The following function allows to control the I/O mode of any standard stream of the Emacs process. diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index a7cfb22e889..da67ec2b541 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -811,7 +811,7 @@ Delete trailing whitespace in the region defined by @var{start} and This command deletes whitespace characters after the last non-whitespace character in each line in the region. -If this command acts on the entire buffer (i.e. if called +If this command acts on the entire buffer (i.e., if called interactively with the mark inactive, or called from Lisp with @var{end} @code{nil}), it also deletes all trailing lines at the end of the buffer if the variable @code{delete-trailing-lines} is non-@code{nil}. @@ -2720,7 +2720,7 @@ text properties are considered, since strings never have overlays. @defun get-pos-property position prop &optional object This function is like @code{get-char-property}, except that it pays attention to properties' stickiness and overlays' advancement settings -instead of the property of the character at (i.e. right after) +instead of the property of the character at (i.e., right after) @var{position}. @end defun diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 8dbde4d5ea0..7a2fd9b2e35 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -111,9 +111,9 @@ You can use spaces inside a password or other token by surrounding the token with either single or double quotes. You can use single quotes inside a password or other token by -surrounding it with double quotes, e.g. @code{"he'llo"}. Similarly you +surrounding it with double quotes, e.g., @code{"he'llo"}. Similarly you can use double quotes inside a password or other token by surrounding -it with single quotes, e.g. @code{'he"llo'}. You can't mix both (so a +it with single quotes, e.g., @code{'he"llo'}. You can't mix both (so a password or other token can't have both single and double quotes). All this is optional. You could just say (but we don't recommend it, diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 30e39c43112..62a81b81ec7 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -36800,7 +36800,7 @@ desired function, or with @kbd{x} or @kbd{z} followed by a function name, or with @kbd{$} to take a formula from the top of the stack, or with @kbd{'} and a typed formula. In the last two cases, the formula may be a nameless function like @samp{<#1+#2>} or @samp{}, or it -may include @kbd{$}, @kbd{$$}, etc. (where @kbd{$} will correspond to the +may include @kbd{$}, @kbd{$$}, etc.@: (where @kbd{$} will correspond to the last argument of the created function), or otherwise you will be prompted for an argument list. The number of vectors popped from the stack by @kbd{V M} depends on the number of arguments of the function. diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 1b79640d77a..068706a9158 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -1038,7 +1038,7 @@ Movement}. They might be removed from a future release of @ccmode{}. Since there's a lot of normal text in comments and string literals, @ccmode{} provides features to edit these like in text mode. The goal is to do it seamlessly, i.e., you can use auto fill mode, sentence and -paragraph movement, paragraph filling, adaptive filling etc. wherever +paragraph movement, paragraph filling, adaptive filling etc.@: wherever there's a piece of normal text without having to think much about it. @ccmode{} keeps the indentation, fixes suitable comment line prefixes, and so on. @@ -7140,7 +7140,7 @@ of XEmacs since 19.16. Due to release schedule skew, it is likely that all of these Emacsen have old versions of @ccmode{} and so should be upgraded. Access to the @ccmode{} source code, as well as more detailed information on Emacsen -compatibility, etc. are all available on the web site: +compatibility, etc.@: are all available on the web site: @quotation @uref{http://cc-mode.sourceforge.net/} diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index 3f42862f07a..f17fd31a7f2 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -178,7 +178,7 @@ error. @ref{Signals}. First off, please note that this manual cannot serve as a complete introduction to object oriented programming and generic functions in -LISP. Although EIEIO is not a complete implementation of the Common +LISP@. Although EIEIO is not a complete implementation of the Common Lisp Object System (CLOS) and also differs from it in several aspects, it follows the same basic concepts. Therefore, it is highly recommended to learn those from a textbook or tutorial first, diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 2f4ffae87c1..3a86e1ba1ad 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -716,8 +716,8 @@ stuff, to the current ERC buffer." (setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc"))) ;; Rename server buffers to reflect the current network name instead -;; of SERVER:PORT. (e.g. "freenode" instead of "irc.freenode.net:6667"). This -;; is useful when using a bouncer like ZNC where you have multiple +;; of SERVER:PORT (e.g., "freenode" instead of "irc.freenode.net:6667"). +;; This is useful when using a bouncer like ZNC where you have multiple ;; connections to the same server. (setq erc-rename-buffers t) @@ -780,7 +780,7 @@ or if you have bugs to report, there are several places you can go. @item @uref{http://www.emacswiki.org/cgi-bin/wiki/ERC} is the -emacswiki.org page for ERC@. Anyone may add tips, hints, etc. to it. +emacswiki.org page for ERC@. Anyone may add tips, hints, etc.@: to it. @item You can ask questions about using ERC on the Emacs mailing list, diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index ca90573f30b..6d57a78d170 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -649,7 +649,7 @@ Programs that need a terminal to display output properly are referred to in this manual as ``visual commands,'' because they are not simply line-oriented. You must tell Eshell which commands are visual, by adding them to @code{eshell-visual-commands}; for commands that are -visual for only certain @emph{sub}-commands -- e.g. @samp{git log} but +visual for only certain @emph{sub}-commands -- e.g., @samp{git log} but not @samp{git status} -- use @code{eshell-visual-subcommands}; and for commands that are visual only when passed certain options, use @code{eshell-visual-options}. diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi index f60354d6d68..c7f84b5d4f0 100644 --- a/doc/misc/eww.texi +++ b/doc/misc/eww.texi @@ -126,7 +126,7 @@ specified in @code{eww-download-directory} (Default: @file{~/Downloads/}). @cindex History EWW remembers the URLs you have visited to allow you to go back and forth between them. By pressing @kbd{l} (@code{eww-back-url}) you go -to the previous URL. You can go forward again with @kbd{r} +to the previous URL@. You can go forward again with @kbd{r} (@code{eww-forward-url}). If you want an overview of your browsing history press @kbd{H} (@code{eww-list-histories}) to open the history buffer @file{*eww history*}. The history is lost when EWW is quit. @@ -247,7 +247,7 @@ Sessions, , emacs, The GNU Emacs Manual}. @vindex eww-desktop-remove-duplicates EWW history may sensibly contain multiple entries for the same page -URI. At run-time, these entries may still have different associated +URI@. At run-time, these entries may still have different associated point positions or the actual Web page contents. The latter, however, tend to be overly large to preserve in the desktop file, so they get omitted, thus rendering the respective diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index d714656457f..ed4d1a58f79 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -11482,7 +11482,7 @@ who wrote the article, the date it was written and the subject of the article. That's well and nice, but there's also lots of information most people do not want to see---what systems the article has passed through before reaching you, the @code{Message-ID}, the -@code{References}, etc. ad nauseam---and you'll probably want to get rid +@code{References}, etc.@: ad nauseam---and you'll probably want to get rid of some of those lines. If you want to keep all those lines in the article buffer, you can set @code{gnus-show-all-headers} to @code{t}. @@ -25905,7 +25905,7 @@ Store custom flags and keywords The registry can store custom flags and keywords for a message. For instance, you can mark a message ``To-Do'' this way and the flag will persist whether the message is in the nnimap, nnml, nnmaildir, -etc. backends. +etc.@: backends. @item Store arbitrary data @@ -25988,7 +25988,7 @@ registry will be pruned back to less than @code{gnus-registry-max-entries}. This option controls exactly how much less: the target is calculated as the maximum number of entries minus the maximum number times this factor. The default is 0.1: -i.e. if your registry is limited to 50000 entries, pruning will try to +i.e., if your registry is limited to 50000 entries, pruning will try to cut back to 45000 entries. Entries with keys marked as precious will not be pruned. @end defvar diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi index 630b5f798a1..6579cd6c7d1 100644 --- a/doc/misc/htmlfontify.texi +++ b/doc/misc/htmlfontify.texi @@ -839,7 +839,7 @@ See @ref{hfy-display-class} for details of valid values for @var{class}. (hfy-face-at P) @end lisp -Find face in effect at point P. If overlays are to be considered +Find face in effect at point P@. If overlays are to be considered (see @ref{hfy-optimisations}) then this may return a @code{defface} style list of face properties instead of a face symbol. @@ -1418,7 +1418,7 @@ Add @samp{
          } tags around the fontified body. a page with different colors than the fontified code.) @item keep-overlays -Preserve overlay highlighting (c.f. @code{ediff} or @code{goo-font-lock}) +Preserve overlay highlighting (cf.@: @code{ediff} or @code{goo-font-lock}) as well as basic faces. Can result in extremely verbose highlighting if there are many overlays (as is the case with @code{goo-font-lock}). diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 1858a51dd81..7cf9673add5 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -1010,7 +1010,7 @@ Non-@code{nil} means use last match on line for @cindex Highlighting of syntax @cindex Font lock -Highlighting of keywords, comments, strings etc. can be accomplished +Highlighting of keywords, comments, strings etc.@: can be accomplished with @code{font-lock}. If you are using @code{global-font-lock-mode} (in Emacs), or have @code{font-lock} turned on in any other buffer in XEmacs, it should also automatically work in IDLWAVE buffers. If you'd @@ -3111,7 +3111,7 @@ window, but is useful for immediate stepping, etc. @kindex C-c C-d C-p Do you find yourself repeatedly typing, e.g., @code{print,n_elements(x)}, and similar statements to remind yourself of the -type/size/structure/value/etc. of variables and expressions in your code +type/size/structure/value/etc.@: of variables and expressions in your code or at the command line? IDLWAVE has a suite of special commands to automate these types of variable or expression examinations. They work by sending statements to the shell formatted to include the indicated diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi index 25380c08bef..a80620f681f 100644 --- a/doc/misc/ido.texi +++ b/doc/misc/ido.texi @@ -305,7 +305,7 @@ the files in that directory, simply move the directory to the head of the list and hit @key{RET}. To go up to the parent directory, delete any partial file name already -specified (e.g. using @key{DEL}) and hit @key{DEL}. +specified (e.g., using @key{DEL}) and hit @key{DEL}. @c @deffn Command ido-delete-backward-updir diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index a9ebc203e31..aa1ad72e382 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -123,7 +123,7 @@ You may select any number of feeds from this list of (sample) news feeds. @vindex newsticker-url-list @item newsticker-url-list All your personal news feeds are defined here. Each feed is -identified by its name and an URL. You may set the start-time and the +identified by its name and an URL@. You may set the start-time and the retrieval interval for each feed as well as the retrieval command arguments in case that the default values do not fit a certain feed. diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 2cb80abb0db..d2721f6e35e 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -891,7 +891,7 @@ Recent Emacs distributions include a packaging system which lets you install Elisp libraries. You can install Org with @kbd{M-x package-install RET org}. @noindent @b{Important}: you need to do this in a session where no @code{.org} file has -been visited, i.e. where no Org built-in function have been loaded. +been visited, i.e., where no Org built-in function have been loaded. Otherwise autoload Org functions will mess up the installation. Then, to make sure your Org configuration is taken into account, initialize @@ -10444,7 +10444,7 @@ You can change the default state of this option by setting @item C-v Toggle visible-only export. Only export the text that is currently -visible, i.e. not hidden by outline visibility in the buffer. +visible, i.e., not hidden by outline visibility in the buffer. @end table @@ -12103,7 +12103,7 @@ Internet-style links for all other links. A link with no description and destined to a regular (un-itemized) outline heading is replaced with a cross-reference and section number of the heading. -A @samp{\ref@{label@}}-style reference to an image, table etc. is replaced +A @samp{\ref@{label@}}-style reference to an image, table etc.@: is replaced with a cross-reference and sequence number of the labeled entity. @xref{Labels and captions in ODT export}. @@ -13410,7 +13410,7 @@ from it (e.g., @code{beamer}). This is obviously the most powerful customization, since the changes happen at the parser level. Indeed, some export back-ends are built as extensions -of other ones (e.g. Markdown back-end an extension of HTML back-end). +of other ones (e.g., Markdown back-end an extension of HTML back-end). Extending a back-end means that if an element type is not transcoded by the new back-end, it will be handled by the original one. Hence you can extend diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index 4518de41415..a46c0fb8b4a 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi @@ -82,7 +82,7 @@ communication. Even though Mailcrypt has similar feature, it does not deal with detached PGP messages, normally used in PGP/MIME infrastructure. This was the main reason why I wrote the new library. -Note that the PGG library is now obsolete, replaced by EasyPG. +Note that the PGG library is now obsolete, replaced by EasyPG@. @xref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}. PGP/MIME is an application of MIME Object Security Services (RFC1848). diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index facfb4376db..1497b1f5f1d 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -608,7 +608,7 @@ Show calling point in another window. This is the point from where @item < Promote the current section. This will convert @code{\section} to -@code{\chapter}, @code{\subsection} to @code{\section} etc. If there is +@code{\chapter}, @code{\subsection} to @code{\section} etc. If there is an active region, all sections in the region will be promoted, including the one at point. To avoid mistakes, @RefTeX{} requires a fresh document scan before executing this command; if necessary, it will @@ -1567,7 +1567,7 @@ Here is the setup: @cindex @code{linguex}, LaTeX package @cindex LaTeX packages, @code{linguex} A more complex example is the @file{linguex.sty} package which defines -list macros @samp{\ex.}, @samp{\a.}, @samp{\b.} etc. for lists which are +list macros @samp{\ex.}, @samp{\a.}, @samp{\b.} etc.@: for lists which are terminated by @samp{\z.} or by an empty line. @example @@ -5906,7 +5906,7 @@ When no BibTeX database files are specified, citations can also use @noindent @b{Version 3.11} @itemize @bullet @item -Fixed bug which led to naked label in (e.g.@:) footnotes. +Fixed bug which led to naked label in (e.g.)@: footnotes. @item Added scroll-other-window functions to RefTeX-Select. @end itemize diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi index 6f684dea5d5..f58965cadab 100644 --- a/doc/misc/todo-mode.texi +++ b/doc/misc/todo-mode.texi @@ -1421,7 +1421,7 @@ Advance point to the next button. Put point on the previous button. @end table -These commands are cyclic, e.g. when point is on the last button, +These commands are cyclic, e.g., when point is on the last button, pressing @kbd{n} moves it to the first button. Typing @kbd{q} exits Todo Categories mode, killing the buffer and returning @@ -1787,7 +1787,7 @@ current file: @item F h @itemx h Hide the item headers if visible, or show them if they are hidden. -With done items, only the done header (i.e. the done tag and date-time +With done items, only the done header (i.e., the done tag and date-time string inserted when the item was marked done) is hidden, the original date-time string is not. With filtered items, the category (or category-file) tag is not hidden. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 5d02d909791..d9cb933cb6c 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -1001,7 +1001,7 @@ name. This special method uses the Android Debug Bridge for accessing Android devices. The Android Debug Bridge must be installed locally. Some GNU/Linux distributions offer it for installation, otherwise it -can be installed as part of the Android SDK. If the @command{adb} +can be installed as part of the Android SDK@. If the @command{adb} program is not found via the @env{PATH} environment variable, the variable @var{tramp-adb-program} must point to its absolute path. diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi index 524a534c38d..777bb107772 100644 --- a/doc/misc/vhdl-mode.texi +++ b/doc/misc/vhdl-mode.texi @@ -159,7 +159,7 @@ the construct on that line. A @dfn{syntactic component} consists of a pair of information (in lisp parlance, a @emph{cons cell}), where the first part is a @dfn{syntactic symbol}, and the second part is a @dfn{relative buffer position}. Syntactic symbols describe elements of -VHDL code, e.g. @code{statement}, @code{comment}, @code{block-open}, +VHDL code, e.g., @code{statement}, @code{comment}, @code{block-open}, @code{block-close}, etc. @xref{Syntactic Symbols}, for a complete list of currently recognized syntactic symbols and their semantics. Also, the variable @code{vhdl-offsets-alist} contains the list of currently @@ -633,8 +633,8 @@ similar to what is allowed in @code{vhdl-offsets-alist}. When the file is visited, VHDL Mode will automatically institute these offsets using @code{vhdl-set-offset}. @xref{Customizing Indentation}. -Note that file style settings (i.e. @code{vhdl-file-style}) are applied -before file offset settings (i.e. @code{vhdl-file-offsets}). +Note that file style settings (i.e., @code{vhdl-file-style}) are applied +before file offset settings (i.e., @code{vhdl-file-offsets}). @node Advanced Customizations diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index 9a5255d43af..ebb14944e24 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi @@ -436,7 +436,7 @@ Jump to mark (and pop mark off the mark ring). @cindex region -Vi operators like @kbd{d}, @kbd{c} etc. are usually used in combination +Vi operators like @kbd{d}, @kbd{c} etc.@: are usually used in combination with motion commands. It is now possible to use current region as the argument to these operators. (A @dfn{region} is a part of buffer delimited by point and mark.) The key @kbd{r} is used for this purpose. diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index bea7f47edbb..0ccc6ac91d5 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -1224,7 +1224,7 @@ Facilities like this make Vi's @kbd{:ab} command obsolete. @cindex Ex style motion @cindex line editor motion -Viper can be set free from the line--limited movements in Vi, such as @kbd{l} +Viper can be set free from the line-limited movements in Vi, such as @kbd{l} refusing to move beyond the line, @key{ESC} moving one character back, etc. These derive from Ex, which is a line editor. If your Viper customization file contains diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index d199afcf99f..a25924919a5 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -1141,7 +1141,7 @@ headings. Default is @code{t}. [Heading emboldening is @emph{not} standard @code{man} behavior.] @item woman-ignore -A boolean value. If non-@code{nil} then unrecognized requests etc. are +A boolean value. If non-@code{nil} then unrecognized requests etc.@: are ignored. Default is @code{t}. This gives the standard @code{roff} behavior. If @code{nil} then they are left in the buffer, which may aid debugging. From f9e354ebea34aeb1ef47b13ad77f670c7acb5b13 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 17 Mar 2015 17:09:34 -0700 Subject: [PATCH 320/457] Spelling and wording fixes --- lisp/net/browse-url.el | 39 +++++++++++++++++++------------------- lisp/textmodes/css-mode.el | 2 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 4b64d95d0c6..dff587e63ab 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -42,7 +42,7 @@ ;; browse-url-netscape Netscape 1.1b1 ;; browse-url-mosaic XMosaic/mMosaic <= 2.4 ;; browse-url-cci XMosaic 2.5 -;; browse-url-conkeror Conkeror Dont know +;; browse-url-conkeror Conkeror Don't know ;; browse-url-w3 w3 0 ;; browse-url-w3-gnudoit w3 remotely ;; browse-url-text-* Any text browser 0 @@ -62,7 +62,7 @@ ;; control. . ;; Browsers can cache Web pages so it may be necessary to tell them to -;; reload the current page if it has changed (e.g. if you have edited +;; reload the current page if it has changed (e.g., if you have edited ;; it). There is currently no perfect automatic solution to this. ;; Netscape allows you to specify the id of the window you want to @@ -420,8 +420,8 @@ functionality is not available there." (defcustom browse-url-conkeror-new-window-is-buffer nil "Whether to open up new windows in a buffer or a new window. -If non-nill, then open the URL in a new buffer rather than a new window if -`browse-url-conkeror' is asked to open it in a new window" +If non-nil, then open the URL in a new buffer rather than a new window if +`browse-url-conkeror' is asked to open it in a new window." :type 'boolean :group 'browse-url) @@ -823,7 +823,7 @@ narrowed." ;;;###autoload (defun browse-url (url &rest args) "Ask a WWW browser to load URL. -Prompts for a URL, defaulting to the URL at or before point. Variable +Prompt for a URL, defaulting to the URL at or before point. Variable `browse-url-browser-function' says which browser to use. If the URL is a mailto: URL, consult `browse-url-mailto-function' first, if that exists." @@ -862,7 +862,7 @@ first, if that exists." ;;;###autoload (defun browse-url-at-point (&optional arg) "Ask a WWW browser to load the URL at or before point. -Doesn't let you edit the URL like `browse-url'. Variable +Don't let you edit the URL like `browse-url'. Variable `browse-url-browser-function' says which browser to use." (interactive "P") (let ((url (browse-url-url-at-point))) @@ -876,7 +876,7 @@ Doesn't let you edit the URL like `browse-url'. Variable (defun browse-url-at-mouse (event) "Ask a WWW browser to load a URL clicked with the mouse. The URL is the one around or before the position of the mouse click -but point is not changed. Doesn't let you edit the URL like +but point is not changed. Don't let you edit the URL like `browse-url'. Variable `browse-url-browser-function' says which browser to use." (interactive "e") @@ -1384,20 +1384,21 @@ used instead of `browse-url-new-window-flag'." ;;;###autoload (defun browse-url-conkeror (url &optional new-window) "Ask the Conkeror WWW browser to load URL. -Default to the URL around or before point. The strings in the variable -`browse-url-conkeror-arguments' are also passed to Conkeror. +Default to the URL around or before point. Also pass the strings +in the variable `browse-url-conkeror-arguments' to Conkeror. -When called interactively, if variable `browse-url-new-window-flag' -is non-nil, load the document in a new Conkeror window, otherwise use a random -existing one. A non-nil interactive prefix argument reverses the effect of -`browse-url-new-window-flag' +When called interactively, if variable +`browse-url-new-window-flag' is non-nil, load the document in a +new Conkeror window, otherwise use a random existing one. A +non-nil interactive prefix argument reverses the effect of +`browse-url-new-window-flag'. -If `browse-url-conkeror-new-window-is-buffer' then whenever a document would -otherwise be loaded in a new window, it is loaded in a new buffer in an existing -window instead. +If variable `browse-url-conkeror-new-window-is-buffer' is +non-nil, then whenever a document would otherwise be loaded in a +new window, load it in a new buffer in an existing window instead. -When called non-interatively, optional second argument NEW-WINDOW is used instead of -`browse-url-new-window-flag'" +When called non-interactively, use optional second argument +NEW-WINDOW instead of `browse-url-new-window-flag'." (interactive (browse-url-interactive-arg "URL: ")) (setq url (browse-url-encode-url url)) (let* ((process-environment (browse-url-process-environment))) @@ -1495,7 +1496,7 @@ used instead of `browse-url-new-window-flag'." (n browse-url-text-input-attempts)) (require 'term) (if (and (browse-url-maybe-new-window new-buffer) buf) - ;; Rename away the OLD buffer. This isn't very polite, but + ;; Rename away the OLD buffer. This isn't very polite, but ;; term insists on working in a buffer named *lynx* and would ;; choke on *lynx*<1> (progn (set-buffer buf) diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index e3578f9e03a..3e7612aeee8 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -364,7 +364,7 @@ (defun css-completion-at-point () "Complete current symbol at point. Currently supports completion of CSS properties, pseudo-elements, -pesudo-classes, and at-rules." +pseudo-classes, and at-rules." (or (css--complete-property) (css--complete-pseudo-element-or-class) (css--complete-at-rule))) From 1a93b9145d6f6aadb75f51eeb8d7b5bc45f06940 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 17 Mar 2015 20:55:02 -0700 Subject: [PATCH 321/457] * lisp/net/browse-url.el: Omit confusing documentation. --- lisp/net/browse-url.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index dff587e63ab..b44bb71c046 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -862,8 +862,7 @@ first, if that exists." ;;;###autoload (defun browse-url-at-point (&optional arg) "Ask a WWW browser to load the URL at or before point. -Don't let you edit the URL like `browse-url'. Variable -`browse-url-browser-function' says which browser to use." +Variable `browse-url-browser-function' says which browser to use." (interactive "P") (let ((url (browse-url-url-at-point))) (if url @@ -876,9 +875,8 @@ Don't let you edit the URL like `browse-url'. Variable (defun browse-url-at-mouse (event) "Ask a WWW browser to load a URL clicked with the mouse. The URL is the one around or before the position of the mouse click -but point is not changed. Don't let you edit the URL like -`browse-url'. Variable `browse-url-browser-function' says which browser -to use." +but point is not changed. Variable `browse-url-browser-function' +says which browser to use." (interactive "e") (save-excursion (mouse-set-point event) From 9fdc166ee0ca212f7d5bf1cd9e1177932b0cd9aa Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Mon, 16 Mar 2015 10:25:14 +0100 Subject: [PATCH 322/457] Improve dynamic elisp keyword font-locking * emacs-lisp/byte-run.el (macro-declarations-alist): New declaration no-font-lock-keyword. (defmacro): Flush font-lock in existing elisp buffers. * emacs-lisp/lisp-mode.el (lisp--el-update-after-load) (lisp--el-update-macro-regexp, lisp--el-macro-regexp): Delete functions and defconst. (lisp--el-match-keyword): Rename from lisp--el-match-macro. (lisp--el-font-lock-flush-elisp-buffers): New function. (lisp-mode-variables): Remove code for updating lisp--el-macro-regexp, and add lisp--el-font-lock-flush-elisp-buffers to after-load-functions. --- lisp/ChangeLog | 15 ++++++++++++ lisp/emacs-lisp/byte-run.el | 28 +++++++++++++++++---- lisp/emacs-lisp/lisp-mode.el | 47 +++++++++++++++--------------------- 3 files changed, 57 insertions(+), 33 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25571bab9c5..e365346c972 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2015-03-17 Tassilo Horn + + * emacs-lisp/byte-run.el (macro-declarations-alist): New + declaration no-font-lock-keyword. + (defmacro): Flush font-lock in existing elisp buffers. + + * emacs-lisp/lisp-mode.el (lisp--el-update-after-load) + (lisp--el-update-macro-regexp, lisp--el-macro-regexp): Delete + functions and defconst. + (lisp--el-match-keyword): Rename from lisp--el-match-macro. + (lisp--el-font-lock-flush-elisp-buffers): New function. + (lisp-mode-variables): Remove code for updating + lisp--el-macro-regexp, and add + lisp--el-font-lock-flush-elisp-buffers to after-load-functions. + 2015-03-17 Simen Heggestøyl * textmodes/css-mode.el (css--font-lock-keywords): Discriminate diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index caa7e3dad33..e0d6c3e7829 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -147,11 +147,16 @@ This is used by `declare'.") (defvar macro-declarations-alist (cons (list 'debug - #'(lambda (name _args spec) - (list 'progn :autoload-end - (list 'put (list 'quote name) - ''edebug-form-spec (list 'quote spec))))) - defun-declarations-alist) + #'(lambda (name _args spec) + (list 'progn :autoload-end + (list 'put (list 'quote name) + ''edebug-form-spec (list 'quote spec))))) + (cons + (list 'no-font-lock-keyword + #'(lambda (name _args val) + (list 'function-put (list 'quote name) + ''no-font-lock-keyword (list 'quote val)))) + defun-declarations-alist)) "List associating properties of macros to their macro expansion. Each element of the list takes the form (PROP FUN) where FUN is a function. For each (PROP . VALUES) in a macro's declaration, the FUN corresponding @@ -201,6 +206,19 @@ The return value is undefined. (message "Warning: Unknown macro property %S in %S" (car x) name)))) decls))) + ;; Refresh font-lock if this is a new macro, or it is an + ;; existing macro whose 'no-font-lock-keyword declaration + ;; has changed. + (if (and + ;; If lisp-mode hasn't been loaded, there's no reason + ;; to flush. + (fboundp 'lisp--el-font-lock-flush-elisp-buffers) + (or (not (fboundp name)) ;; new macro + (and (fboundp name) ;; existing macro + (member `(function-put ',name 'no-font-lock-keyword + ',(get name 'no-font-lock-keyword)) + declarations)))) + (lisp--el-font-lock-flush-elisp-buffers)) (if declarations (cons 'prog1 (cons def declarations)) def)))))) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index b4f87fdac66..6b3077302ed 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -181,32 +181,25 @@ nil))) res)) -(defconst lisp--el-macro-regexp nil - "A regular expression matching all loaded elisp macros. -Can be updated using `lisp--el-update-macro-regexp' after new -macros were defined.") +(defun lisp--el-match-keyword (limit) + (catch 'found + (while (re-search-forward "(\\(\\(?:\\sw\\|\\s_\\)+\\)\\_>" limit t) + (let ((sym (intern-soft (match-string 1)))) + (when (or (special-form-p sym) + (and (macrop sym) + (not (get sym 'no-font-lock-keyword)))) + (throw 'found t)))))) -(defun lisp--el-update-macro-regexp () - "Update `lisp--el-update-macro-regexp' from `obarray'. -Return non-nil only if the old and new value are different." - (let ((old-regex lisp--el-macro-regexp) - (elisp-macros nil)) - (mapatoms (lambda (a) - (when (or (macrop a) (special-form-p a)) - (push (symbol-name a) elisp-macros)))) - (setq lisp--el-macro-regexp - (concat "(" (regexp-opt elisp-macros t) "\\_>")) - (not (string= old-regex lisp--el-macro-regexp)))) - -(defun lisp--el-update-after-load (_file) - "Update `lisp--el-macro-regexp' and adjust font-lock in existing buffers." - (when (lisp--el-update-macro-regexp) +(defun lisp--el-font-lock-flush-elisp-buffers (&optional file) + ;; Don't flush during load unless called from after-load-functions. + ;; In that case, FILE is non-nil. It's somehow strange that + ;; load-in-progress is t when an after-load-function is called since + ;; that should run *after* the load... + (when (or (not load-in-progress) file) (dolist (buf (buffer-list)) - (when (derived-mode-p 'emacs-lisp-mode) - (font-lock-flush))))) - -(defun lisp--el-match-macro (limit) - (re-search-forward lisp--el-macro-regexp limit t)) + (with-current-buffer buf + (when (derived-mode-p 'emacs-lisp-mode) + (font-lock-flush)))))) (pcase-let ((`(,vdefs ,tdefs @@ -362,7 +355,7 @@ Return non-nil only if the old and new value are different." `( ;; Regexp negated char group. ("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend) ;; Control structures. Common Lisp forms. - (lisp--el-match-macro . 1) + (lisp--el-match-keyword . 1) ;; Exit/Feature symbols as constants. (,(concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\_>" "[ \t']*\\(\\(?:\\sw\\|\\s_\\)+\\)?") @@ -543,9 +536,7 @@ font-lock keywords will not be case sensitive." . lisp-font-lock-syntactic-face-function))) (setq-local prettify-symbols-alist lisp--prettify-symbols-alist) (when elisp - (unless lisp--el-macro-regexp - (lisp--el-update-macro-regexp)) - (add-hook 'after-load-functions #'lisp--el-update-after-load) + (add-hook 'after-load-functions #'lisp--el-font-lock-flush-elisp-buffers) (setq-local electric-pair-text-pairs (cons '(?\` . ?\') electric-pair-text-pairs))) (setq-local electric-pair-skip-whitespace 'chomp) From fd93edbb1cabfdf0c732dbb0c6892a515b406a65 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Wed, 18 Mar 2015 08:15:54 +0100 Subject: [PATCH 323/457] Have gud-display-line not display source buffer in gud window. * lisp/progmodes/gud.el (gud-display-line): Make display-buffer not reuse selected window. (Bug#17675, Bug#19901, Bug#20034) --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/gud.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e365346c972..d61a0a67673 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-18 Dima Kogan + + Have gud-display-line not display source buffer in gud window. + * lisp/progmodes/gud.el (gud-display-line): Make display-buffer + not reuse selected window. (Bug#17675, Bug#19901, Bug#20034) + 2015-03-17 Tassilo Horn * emacs-lisp/byte-run.el (macro-declarations-alist): New diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 29a6dc63a68..9ab0667b5ba 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -2813,7 +2813,7 @@ Obeying it means displaying in another window the specified file and line." (gud-find-file true-file))) (window (and buffer (or (get-buffer-window buffer) - (display-buffer buffer)))) + (display-buffer buffer '(nil (inhibit-same-window . t)))))) (pos)) (when buffer (with-current-buffer buffer From 872481d9e26d7569145c897fd319b1104e028878 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 18 Mar 2015 10:31:07 -0400 Subject: [PATCH 324/457] Add classes as run-time descriptors of cl-structs. * lisp/emacs-lisp/cl-preloaded.el (cl--struct-get-class): New function. (cl--make-slot-desc): New constructor. (cl--plist-remove, cl--struct-register-child): New functions. (cl-struct-define): Rewrite. (cl-structure-class, cl-structure-object, cl-slot-descriptor) (cl--class): New structs. (cl--struct-default-parent): Initialize it here. * lisp/emacs-lisp/cl-macs.el (cl--find-class): New macro. (cl-defsubst, cl--defsubst-expand, cl--sublis): Move before first use. (cl--struct-default-parent): New var. (cl-defstruct): Adjust to new representation of classes; add default parent. In accessors, signal `wrong-type-argument' rather than a generic error. (cl-struct-sequence-type, cl-struct-slot-info) (cl-struct-slot-offset): Rewrite. * lisp/emacs-lisp/cl-generic.el (cl--generic-struct-specializers) (cl-generic-generalizers): Rewrite. * src/alloc.c (purecopy): Handle hash-tables. * lisp/emacs-lisp/debug.el (debug--implement-debug-on-entry): Bind inhibit-debug-on-entry here... (debug): Instead of here. * lisp/emacs-lisp/macroexp.el (macroexp--debug-eager): New var. (internal-macroexpand-for-load): Use it. * lwlib/xlwmenu.c (pop_up_menu): Remove debugging code. --- lisp/ChangeLog | 62 ++++++--- lisp/emacs-lisp/cl-generic.el | 64 +++++---- lisp/emacs-lisp/cl-macs.el | 198 +++++++++++++++------------ lisp/emacs-lisp/cl-preloaded.el | 231 ++++++++++++++++++++++++++++---- lisp/emacs-lisp/debug.el | 8 +- lisp/emacs-lisp/macroexp.el | 8 +- lwlib/ChangeLog | 4 + lwlib/xlwmenu.c | 58 ++++---- src/ChangeLog | 18 +-- src/alloc.c | 43 +++--- 10 files changed, 468 insertions(+), 226 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d61a0a67673..2db0f9a349a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,31 @@ +2015-03-18 Stefan Monnier + + Add classes as run-time descriptors of cl-structs. + * emacs-lisp/cl-preloaded.el (cl--struct-get-class): New function. + (cl--make-slot-desc): New constructor. + (cl--plist-remove, cl--struct-register-child): New functions. + (cl-struct-define): Rewrite. + (cl-structure-class, cl-structure-object, cl-slot-descriptor) + (cl--class): New structs. + (cl--struct-default-parent): Initialize it here. + * emacs-lisp/cl-macs.el (cl--find-class): New macro. + (cl-defsubst, cl--defsubst-expand, cl--sublis): Move before first use. + (cl--struct-default-parent): New var. + (cl-defstruct): Adjust to new representation of classes; add + default parent. In accessors, signal `wrong-type-argument' rather than + a generic error. + (cl-struct-sequence-type, cl-struct-slot-info) + (cl-struct-slot-offset): Rewrite. + * emacs-lisp/cl-generic.el (cl--generic-struct-specializers) + (cl-generic-generalizers): Rewrite. + + * emacs-lisp/macroexp.el (macroexp--debug-eager): New var. + (internal-macroexpand-for-load): Use it. + + * emacs-lisp/debug.el (debug--implement-debug-on-entry): + Bind inhibit-debug-on-entry here... + (debug): Instead of here. + 2015-03-18 Dima Kogan Have gud-display-line not display source buffer in gud window. @@ -6,13 +34,13 @@ 2015-03-17 Tassilo Horn - * emacs-lisp/byte-run.el (macro-declarations-alist): New - declaration no-font-lock-keyword. + * emacs-lisp/byte-run.el (macro-declarations-alist): + New declaration no-font-lock-keyword. (defmacro): Flush font-lock in existing elisp buffers. * emacs-lisp/lisp-mode.el (lisp--el-update-after-load) - (lisp--el-update-macro-regexp, lisp--el-macro-regexp): Delete - functions and defconst. + (lisp--el-update-macro-regexp, lisp--el-macro-regexp): + Delete functions and defconst. (lisp--el-match-keyword): Rename from lisp--el-match-macro. (lisp--el-font-lock-flush-elisp-buffers): New function. (lisp-mode-variables): Remove code for updating @@ -21,23 +49,17 @@ 2015-03-17 Simen Heggestøyl - * textmodes/css-mode.el (css--font-lock-keywords): Discriminate - between pseudo-classes and pseudo-elements. + * textmodes/css-mode.el (css--font-lock-keywords): + Discriminate between pseudo-classes and pseudo-elements. (css-pseudo-ids): Remove. - (css-pseudo-class-ids): New variable. - (css-pseudo-element-ids): New variable. - (css--complete-property): New function for completing CSS - properties. - (css--complete-pseudo-element-or-class): New function for + (css-pseudo-class-ids, css-pseudo-element-ids): New variables. + (css--complete-property): New function for completing CSS properties. + (css--complete-pseudo-element-or-class): New function completing CSS pseudo-elements and pseudo-classes. (css--complete-at-rule): New function for completing CSS at-rules. - (css-completion-at-point): New function providing completion for - `css-mode'. + (css-completion-at-point): New function. (css-mode): Add support for completion. - (css-extract-keyword-list): Remove function in favor of manual - extraction. - (css-extract-parse-val-grammar): Remove function in favor of - manual extraction. + (css-extract-keyword-list, css-extract-parse-val-grammar) (css-extract-props-and-vals): Remove function in favor of manual extraction. (css-at-ids): Update list of CSS at-rule ids. @@ -163,7 +185,7 @@ * progmodes/sql.el: Version 3.5 (sql-starts-with-prompt-re, sql-ends-with-prompt-re): Match password prompts. - (sql-interactive-remove-continuation-prompt): Fixed regression. (Bug#6686) + (sql-interactive-remove-continuation-prompt): Fix regression. (Bug#6686) 2015-03-14 Daniel Colascione @@ -178,8 +200,8 @@ info-look fixes for Texinfo 5 * info-look.el (c-mode, bison-mode, makefile-mode) (makefile-automake-mode, texinfo-mode, autoconf-mode, awk-mode) - (latex-mode, emacs-lisp-mode, sh-mode, cfengine-mode): Match - `foo' and 'foo' and ‘foo’ for @item and similar. + (latex-mode, emacs-lisp-mode, sh-mode, cfengine-mode): + Match `foo' and 'foo' and ‘foo’ for @item and similar. (latex-mode): Match multi-arg \frac{num}{den} or \sqrt[root]{n} in suffix regexp. diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 41c760e960e..c9ca92d7c09 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -857,6 +857,18 @@ Can only be used from within the lexical body of a primary or around method." ;;; Support for cl-defstructs specializers. (defun cl--generic-struct-tag (name) + ;; It's tempting to use (and (vectorp ,name) (aref ,name 0)) + ;; but that would suffer from some problems: + ;; - the vector may have size 0. + ;; - when called on an actual vector (rather than an object), we'd + ;; end up returning an arbitrary value, possibly colliding with + ;; other tagcode's values. + ;; - it can also result in returning all kinds of irrelevant + ;; values which would end up filling up the method-cache with + ;; lots of irrelevant/redundant entries. + ;; FIXME: We could speed this up by introducing a dedicated + ;; vector type at the C level, so we could do something like + ;; (and (vector-objectp ,name) (aref ,name 0)) `(and (vectorp ,name) (> (length ,name) 0) (let ((tag (aref ,name 0))) @@ -864,14 +876,18 @@ Can only be used from within the lexical body of a primary or around method." tag)))) (defun cl--generic-struct-specializers (tag) - (and (symbolp tag) - ;; A method call shouldn't itself mess with the match-data. - (string-match-p "\\`cl-struct-\\(.*\\)" (symbol-name tag)) - (let ((types (list (intern (substring (symbol-name tag) 10))))) - (while (get (car types) 'cl-struct-include) - (push (get (car types) 'cl-struct-include) types)) - (push 'cl-structure-object types) ;The "parent type" of all cl-structs. - (nreverse types)))) + (and (symbolp tag) (boundp tag) + (let ((class (symbol-value tag))) + (when (cl-typep class 'cl-structure-class) + (let ((types ()) + (classes (list class))) + ;; BFS precedence. + (while (let ((class (pop classes))) + (push (cl--class-name class) types) + (setq classes + (append classes + (cl--class-parents class))))) + (nreverse types)))))) (defconst cl--generic-struct-generalizer (cl-generic-make-generalizer @@ -881,27 +897,17 @@ Can only be used from within the lexical body of a primary or around method." (cl-defmethod cl-generic-generalizers :extra "cl-struct" (type) "Support for dispatch on cl-struct types." (or - (and (symbolp type) - (get type 'cl-struct-type) - (or (null (car (get type 'cl-struct-type))) - (error "Can't dispatch on cl-struct %S: type is %S" - type (car (get type 'cl-struct-type)))) - (or (equal '(cl-tag-slot) (car (get type 'cl-struct-slots))) - (error "Can't dispatch on cl-struct %S: no tag in slot 0" - type)) - ;; It's tempting to use (and (vectorp ,name) (aref ,name 0)) - ;; but that would suffer from some problems: - ;; - the vector may have size 0. - ;; - when called on an actual vector (rather than an object), we'd - ;; end up returning an arbitrary value, possibly colliding with - ;; other tagcode's values. - ;; - it can also result in returning all kinds of irrelevant - ;; values which would end up filling up the method-cache with - ;; lots of irrelevant/redundant entries. - ;; FIXME: We could speed this up by introducing a dedicated - ;; vector type at the C level, so we could do something like - ;; (and (vector-objectp ,name) (aref ,name 0)) - (list cl--generic-struct-generalizer)) + (when (symbolp type) + ;; Use the "cl--struct-class*" (inlinable) functions/macros rather than + ;; the "cl-struct-*" variants which aren't inlined, so that dispatch can + ;; take place without requiring cl-lib. + (let ((class (cl--find-class type))) + (and (cl-typep class 'cl-structure-class) + (when (cl--struct-class-type class) + (error "Can't dispatch on cl-struct %S: type is %S" + type (cl--struct-class-type class))) + (progn (cl-assert (null (cl--struct-class-named class))) t) + (list cl--generic-struct-generalizer)))) (cl-call-next-method))) ;;; Dispatch on "system types". diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 56fbcf0b2fd..d3866783447 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2434,8 +2434,79 @@ Like `cl-callf', but PLACE is the second argument of FUNC, not the first. (if (symbolp func) (cons func rargs) `(funcall #',func ,@rargs)))))))) +;;;###autoload +(defmacro cl-defsubst (name args &rest body) + "Define NAME as a function. +Like `defun', except the function is automatically declared `inline' and +the arguments are immutable. +ARGLIST allows full Common Lisp conventions, and BODY is implicitly +surrounded by (cl-block NAME ...). +The function's arguments should be treated as immutable. + +\(fn NAME ARGLIST [DOCSTRING] BODY...)" + (declare (debug cl-defun) (indent 2)) + (let* ((argns (cl--arglist-args args)) + (p argns) + ;; (pbody (cons 'progn body)) + ) + (while (and p (eq (cl--expr-contains args (car p)) 1)) (pop p)) + `(progn + ,(if p nil ; give up if defaults refer to earlier args + `(cl-define-compiler-macro ,name + ,(if (memq '&key args) + `(&whole cl-whole &cl-quote ,@args) + (cons '&cl-quote args)) + (cl--defsubst-expand + ',argns '(cl-block ,name ,@body) + ;; We used to pass `simple' as + ;; (not (or unsafe (cl-expr-access-order pbody argns))) + ;; But this is much too simplistic since it + ;; does not pay attention to the argvs (and + ;; cl-expr-access-order itself is also too naive). + nil + ,(and (memq '&key args) 'cl-whole) nil ,@argns))) + (cl-defun ,name ,args ,@body)))) + +(defun cl--defsubst-expand (argns body simple whole _unsafe &rest argvs) + (if (and whole (not (cl--safe-expr-p (cons 'progn argvs)))) whole + (if (cl--simple-exprs-p argvs) (setq simple t)) + (let* ((substs ()) + (lets (delq nil + (cl-mapcar (lambda (argn argv) + (if (or simple (macroexp-const-p argv)) + (progn (push (cons argn argv) substs) + nil) + (list argn argv))) + argns argvs)))) + ;; FIXME: `sublis/subst' will happily substitute the symbol + ;; `argn' in places where it's not used as a reference + ;; to a variable. + ;; FIXME: `sublis/subst' will happily copy `argv' to a different + ;; scope, leading to name capture. + (setq body (cond ((null substs) body) + ((null (cdr substs)) + (cl-subst (cdar substs) (caar substs) body)) + (t (cl--sublis substs body)))) + (if lets `(let ,lets ,body) body)))) + +(defun cl--sublis (alist tree) + "Perform substitutions indicated by ALIST in TREE (non-destructively)." + (let ((x (assq tree alist))) + (cond + (x (cdr x)) + ((consp tree) + (cons (cl--sublis alist (car tree)) (cl--sublis alist (cdr tree)))) + (t tree)))) + ;;; Structures. +(defmacro cl--find-class (type) + `(get ,type 'cl--class)) + +;; Rather than hard code cl-structure-object, we indirect through this variable +;; for bootstrapping reasons. +(defvar cl--struct-default-parent nil) + ;;;###autoload (defmacro cl-defstruct (struct &rest descs) "Define a struct type. @@ -2491,6 +2562,7 @@ non-nil value, that slot cannot be set via `setf'. (tag (intern (format "cl-struct-%s" name))) (tag-symbol (intern (format "cl-struct-%s-tags" name))) (include-descs nil) + (include-name nil) (type nil) (named nil) (forms nil) @@ -2520,12 +2592,14 @@ non-nil value, that slot cannot be set via `setf'. ((eq opt :predicate) (if args (setq predicate (car args)))) ((eq opt :include) - (when include (error "Can't :include more than once")) - (setq include (car args) - include-descs (mapcar (function - (lambda (x) - (if (consp x) x (list x)))) - (cdr args)))) + ;; FIXME: Actually, we can include more than once as long as + ;; we include EIEIO classes rather than cl-structs! + (when include-name (error "Can't :include more than once")) + (setq include-name (car args)) + (setq include-descs (mapcar (function + (lambda (x) + (if (consp x) x (list x)))) + (cdr args)))) ((eq opt :print-function) (setq print-func (car args))) ((eq opt :type) @@ -2537,19 +2611,21 @@ non-nil value, that slot cannot be set via `setf'. descs))) (t (error "Slot option %s unrecognized" opt))))) + (unless (or include-name type) + (setq include-name cl--struct-default-parent)) + (when include-name (setq include (cl--struct-get-class include-name))) (if print-func (setq print-func `(progn (funcall #',print-func cl-x cl-s cl-n) t)) - (or type (and include (not (get include 'cl-struct-print))) + (or type (and include (not (cl--struct-class-print include))) (setq print-auto t print-func (and (or (not (or include type)) (null print-func)) `(progn (princ ,(format "#S(%s" name) cl-s)))))) (if include - (let ((inc-type (get include 'cl-struct-type)) - (old-descs (get include 'cl-struct-slots))) - (or inc-type (error "%s is not a struct name" include)) - (and type (not (eq (car inc-type) type)) + (let* ((inc-type (cl--struct-class-type include)) + (old-descs (cl-struct-slot-info include))) + (and type (not (eq inc-type type)) (error ":type disagrees with :include for %s" name)) (while include-descs (setcar (memq (or (assq (caar include-descs) old-descs) @@ -2558,9 +2634,9 @@ non-nil value, that slot cannot be set via `setf'. old-descs) (pop include-descs))) (setq descs (append old-descs (delq (assq 'cl-tag-slot descs) descs)) - type (car inc-type) - named (assq 'cl-tag-slot descs)) - (if (cadr inc-type) (setq tag name named t))) + type inc-type + named (if type (assq 'cl-tag-slot descs) 'true)) + (if (cl--struct-class-named include) (setq tag name named t))) (if type (progn (or (memq type '(vector list)) @@ -2605,8 +2681,8 @@ non-nil value, that slot cannot be set via `setf'. (declare (side-effect-free t)) ,@(and pred-check (list `(or ,pred-check - (error "%s accessing a non-%s" - ',accessor ',name)))) + (signal 'wrong-type-argument + (list ',name cl-x))))) ,(if (memq type '(nil vector)) `(aref cl-x ,pos) (if (= pos 0) '(car cl-x) `(nth ,pos cl-x)))) @@ -2682,8 +2758,11 @@ non-nil value, that slot cannot be set via `setf'. `(progn (defvar ,tag-symbol) ,@(nreverse forms) + ;; Call cl-struct-define during compilation as well, so that + ;; a subsequent cl-defstruct in the same file can correctly include this + ;; struct as a parent. (eval-and-compile - (cl-struct-define ',name ,docstring ',include + (cl-struct-define ',name ,docstring ',include-name ',type ,(eq named t) ',descs ',tag-symbol ',tag ',print-auto)) ',name))) @@ -2693,7 +2772,7 @@ non-nil value, that slot cannot be set via `setf'. STRUCT-TYPE is a symbol naming a struct type. Return 'vector or 'list, or nil if STRUCT-TYPE is not a struct type. " (declare (side-effect-free t) (pure t)) - (car (get struct-type 'cl-struct-type))) + (cl--struct-class-type (cl--struct-get-class struct-type))) (defun cl-struct-slot-info (struct-type) "Return a list of slot names of struct STRUCT-TYPE. @@ -2702,7 +2781,19 @@ slot name symbol and OPTS is a list of slot options given to `cl-defstruct'. Dummy slots that represent the struct name and slots skipped by :initial-offset may appear in the list." (declare (side-effect-free t) (pure t)) - (get struct-type 'cl-struct-slots)) + (let* ((class (cl--struct-get-class struct-type)) + (slots (cl--struct-class-slots class)) + (type (cl--struct-class-type class)) + (descs (if type () (list '(cl-tag-slot))))) + (dotimes (i (length slots)) + (let ((slot (aref slots i))) + (push `(,(cl--slot-descriptor-name slot) + ,(cl--slot-descriptor-initform slot) + ,@(if (not (eq (cl--slot-descriptor-type slot) t)) + `(:type ,(cl--slot-descriptor-type slot))) + ,@(cl--slot-descriptor-props slot)) + descs))) + (nreverse descs))) (defun cl-struct-slot-offset (struct-type slot-name) "Return the offset of slot SLOT-NAME in STRUCT-TYPE. @@ -2711,9 +2802,8 @@ the structure data type and is adjusted for any structure name and :initial-offset slots. Signal error if struct STRUCT-TYPE does not contain SLOT-NAME." (declare (side-effect-free t) (pure t)) - (or (cl-position slot-name - (cl-struct-slot-info struct-type) - :key #'car :test #'eq) + (or (gethash slot-name + (cl--class-index-table (cl--struct-get-class struct-type))) (error "struct %s has no slot %s" struct-type slot-name))) (defvar byte-compile-function-environment) @@ -2898,70 +2988,6 @@ macro that returns its `&whole' argument." (if cl-found (setcdr cl-found t))) `(throw ,cl-tag ,cl-value)) -;;;###autoload -(defmacro cl-defsubst (name args &rest body) - "Define NAME as a function. -Like `defun', except the function is automatically declared `inline' and -the arguments are immutable. -ARGLIST allows full Common Lisp conventions, and BODY is implicitly -surrounded by (cl-block NAME ...). -The function's arguments should be treated as immutable. - -\(fn NAME ARGLIST [DOCSTRING] BODY...)" - (declare (debug cl-defun) (indent 2)) - (let* ((argns (cl--arglist-args args)) - (p argns) - ;; (pbody (cons 'progn body)) - ) - (while (and p (eq (cl--expr-contains args (car p)) 1)) (pop p)) - `(progn - ,(if p nil ; give up if defaults refer to earlier args - `(cl-define-compiler-macro ,name - ,(if (memq '&key args) - `(&whole cl-whole &cl-quote ,@args) - (cons '&cl-quote args)) - (cl--defsubst-expand - ',argns '(cl-block ,name ,@body) - ;; We used to pass `simple' as - ;; (not (or unsafe (cl-expr-access-order pbody argns))) - ;; But this is much too simplistic since it - ;; does not pay attention to the argvs (and - ;; cl-expr-access-order itself is also too naive). - nil - ,(and (memq '&key args) 'cl-whole) nil ,@argns))) - (cl-defun ,name ,args ,@body)))) - -(defun cl--defsubst-expand (argns body simple whole _unsafe &rest argvs) - (if (and whole (not (cl--safe-expr-p (cons 'progn argvs)))) whole - (if (cl--simple-exprs-p argvs) (setq simple t)) - (let* ((substs ()) - (lets (delq nil - (cl-mapcar (lambda (argn argv) - (if (or simple (macroexp-const-p argv)) - (progn (push (cons argn argv) substs) - nil) - (list argn argv))) - argns argvs)))) - ;; FIXME: `sublis/subst' will happily substitute the symbol - ;; `argn' in places where it's not used as a reference - ;; to a variable. - ;; FIXME: `sublis/subst' will happily copy `argv' to a different - ;; scope, leading to name capture. - (setq body (cond ((null substs) body) - ((null (cdr substs)) - (cl-subst (cdar substs) (caar substs) body)) - (t (cl--sublis substs body)))) - (if lets `(let ,lets ,body) body)))) - -(defun cl--sublis (alist tree) - "Perform substitutions indicated by ALIST in TREE (non-destructively)." - (let ((x (assq tree alist))) - (cond - (x (cdr x)) - ((consp tree) - (cons (cl--sublis alist (car tree)) (cl--sublis alist (cdr tree)))) - (t tree)))) - ;; Compile-time optimizations for some functions defined in this package. (defun cl--compiler-macro-member (form a list &rest keys) diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index 401d34b449e..a18e0e57b05 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -21,36 +21,22 @@ ;;; Commentary: -;; The expectation is that structs defined with cl-defstruct do not -;; need cl-lib at run-time, but we'd like to hide the details of the -;; cl-struct metadata behind the cl-struct-define function, so we put -;; it in this pre-loaded file. +;; The cl-defstruct macro is full of circularities, since it uses the +;; cl-structure-class type (and its accessors) which is defined with itself, +;; and it setups a default parent (cl-structure-object) which is also defined +;; with cl-defstruct, and to make things more interesting, the class of +;; cl-structure-object is of course an object of type cl-structure-class while +;; cl-structure-class's parent is cl-structure-object. +;; Furthermore, the code generated by cl-defstruct generally assumes that the +;; parent will be loaded when the child is loaded. But at the same time, the +;; expectation is that structs defined with cl-defstruct do not need cl-lib at +;; run-time, which means that the `cl-structure-object' parent can't be in +;; cl-lib but should be preloaded. So here's this preloaded circular setup. ;;; Code: (eval-when-compile (require 'cl-lib)) - -(defun cl-struct-define (name docstring parent type named slots children-sym - tag print-auto) - (cl-assert (or type (equal '(cl-tag-slot) (car slots)))) - (cl-assert (or type (not named))) - (if (boundp children-sym) - (add-to-list children-sym tag) - (set children-sym (list tag))) - (let* ((parent-class parent)) - (while parent-class - (add-to-list (intern (format "cl-struct-%s-tags" parent-class)) tag) - (setq parent-class (get parent-class 'cl-struct-include)))) - ;; If the cl-generic support, we need to be able to check - ;; if a vector is a cl-struct object, without knowing its particular type. - ;; So we use the (otherwise) unused function slots of the tag symbol - ;; to put a special witness value, to make the check easy and reliable. - (unless named (fset tag :quick-object-witness-check)) - (put name 'cl-struct-slots slots) - (put name 'cl-struct-type (list type named)) - (if parent (put name 'cl-struct-include parent)) - (if print-auto (put name 'cl-struct-print print-auto)) - (if docstring (put name 'structure-documentation docstring))) +(eval-when-compile (require 'cl-macs)) ;For cl--struct-class. ;; The `assert' macro from the cl package signals ;; `cl-assertion-failed' at runtime so always define it. @@ -63,6 +49,199 @@ (apply #'error string (append sargs args)) (signal 'cl-assertion-failed `(,form ,@sargs))))) +;; When we load this (compiled) file during pre-loading, the cl--struct-class +;; code below will need to access the `cl-struct' info, since it's considered +;; already as its parent (because `cl-struct' was defined while the file was +;; compiled). So let's temporarily setup a fake. +(defvar cl-struct-cl-structure-object-tags nil) +(unless (cl--find-class 'cl-structure-object) + (setf (cl--find-class 'cl-structure-object) 'dummy)) + +(fset 'cl--make-slot-desc + ;; To break circularity, we pre-define the slot constructor by hand. + ;; It's redefined a bit further down as part of the cl-defstruct of + ;; cl--slot-descriptor. + ;; BEWARE: Obviously, it's important to keep the two in sync! + (lambda (name &optional initform type props) + (vector 'cl-struct-cl-slot-descriptor + name initform type props))) + +(defun cl--struct-get-class (name) + (or (if (not (symbolp name)) name) + (cl--find-class name) + (if (not (get name 'cl-struct-type)) + ;; FIXME: Add a conversion for `eieio--class' so we can + ;; create a cl-defstruct that inherits from an eieio class? + (error "%S is not a struct name" name) + ;; Backward compatibility with a defstruct compiled with a version + ;; cl-defstruct from Emacs<25. Convert to new format. + (let ((tag (intern (format "cl-struct-%s" name))) + (type-and-named (get name 'cl-struct-type)) + (descs (get name 'cl-struct-slots))) + (cl-struct-define name nil (get name 'cl-struct-include) + (unless (and (eq (car type-and-named) 'vector) + (null (cadr type-and-named)) + (assq 'cl-tag-slot descs)) + (car type-and-named)) + (cadr type-and-named) + descs + (intern (format "cl-struct-%s-tags" name)) + tag + (get name 'cl-struct-print)) + (cl--find-class name))))) + +(defun cl--plist-remove (plist member) + (cond + ((null plist) nil) + ((null member) plist) + ((eq plist member) (cddr plist)) + (t `(,(car plist) ,(cadr plist) ,@(cl--plist-remove (cddr plist) member))))) + +(defun cl--struct-register-child (parent tag) + ;; Can't use (cl-typep parent 'cl-structure-class) at this stage + ;; because `cl-structure-class' is defined later. + (while (vectorp parent) + (add-to-list (cl--struct-class-children-sym parent) tag) + ;; Only register ourselves as a child of the leftmost parent since structs + ;; can only only have one parent. + (setq parent (car (cl--struct-class-parents parent))))) + +;;;###autoload +(defun cl-struct-define (name docstring parent type named slots children-sym + tag print) + (cl-assert (or type (not named))) + (if (boundp children-sym) + (add-to-list children-sym tag) + (set children-sym (list tag))) + (and (null type) (eq (caar slots) 'cl-tag-slot) + ;; Hide the tag slot from "standard" (i.e. non-`type'd) structs. + (setq slots (cdr slots))) + (let* ((parent-class (when parent (cl--struct-get-class parent))) + (n (length slots)) + (index-table (make-hash-table :test 'eq :size n)) + (vslots (let ((v (make-vector n nil)) + (i 0) + (offset (if type 0 1))) + (dolist (slot slots) + (let* ((props (cddr slot)) + (typep (plist-member props :type)) + (type (if typep (cadr typep) t))) + (aset v i (cl--make-slot-desc + (car slot) (nth 1 slot) + type (cl--plist-remove props typep)))) + (puthash (car slot) (+ i offset) index-table) + (cl-incf i)) + v)) + (class (cl--struct-new-class + name docstring + (unless (symbolp parent-class) (list parent-class)) + type named vslots index-table children-sym tag print))) + (unless (symbolp parent-class) + (let ((pslots (cl--struct-class-slots parent-class))) + (or (>= n (length pslots)) + (let ((ok t)) + (dotimes (i (length pslots)) + (unless (eq (cl--slot-descriptor-name (aref pslots i)) + (cl--slot-descriptor-name (aref vslots i))) + (setq ok nil))) + ok) + (error "Included struct %S has changed since compilation of %S" + parent name)))) + (cl--struct-register-child parent-class tag) + (unless (eq named t) + (eval `(defconst ,tag ',class) t) + ;; In the cl-generic support, we need to be able to check + ;; if a vector is a cl-struct object, without knowing its particular type. + ;; So we use the (otherwise) unused function slots of the tag symbol + ;; to put a special witness value, to make the check easy and reliable. + (fset tag :quick-object-witness-check)) + (setf (cl--find-class name) class))) + +(cl-defstruct (cl-structure-class + (:conc-name cl--struct-class-) + (:predicate cl--struct-class-p) + (:constructor nil) + (:constructor cl--struct-new-class + (name docstring parents type named slots index-table + children-sym tag print)) + (:copier nil)) + "The type of CL structs descriptors." + ;; The first few fields here are actually inherited from cl--class, but we + ;; have to define this one before, to break the circularity, so we manually + ;; list the fields here and later "backpatch" cl--class as the parent. + ;; BEWARE: Obviously, it's indispensable to keep these two structs in sync! + (name nil :type symbol) ;The type name. + (docstring nil :type string) + (parents nil :type (list-of cl--class)) ;The included struct. + (slots nil :type (vector cl--slot-descriptor)) + (index-table nil :type hash-table) + (tag nil :type symbol) ;Placed in cl-tag-slot. Holds the struct-class object. + (type nil :type (memq (vector list))) + (named nil :type bool) + (print nil :type bool) + (children-sym nil :type symbol) ;This sym's value holds the tags of children. + ) + +(cl-defstruct (cl-structure-object + (:predicate cl-struct-p) + (:constructor nil) + (:copier nil)) + "The root parent of all \"normal\" CL structs") + +(setq cl--struct-default-parent 'cl-structure-object) + +(cl-defstruct (cl-slot-descriptor + (:conc-name cl--slot-descriptor-) + (:constructor nil) + (:constructor cl--make-slot-descriptor + (name &optional initform type props)) + (:copier cl--copy-slot-descriptor)) + ;; FIXME: This is actually not used yet, for circularity reasons! + "Descriptor of structure slot." + name ;Attribute name (symbol). + initform + type + ;; Extra properties, kept in an alist, can include: + ;; :documentation, :protection, :custom, :label, :group, :printer. + (props nil :type alist)) + +(cl-defstruct (cl--class + (:constructor nil) + (:copier nil)) + "Type of descriptors for any kind of structure-like data." + ;; Intended to be shared between defstruct and defclass. + (name nil :type symbol) ;The type name. + (docstring nil :type string) + (parents nil :type (or cl--class (list-of cl--class))) + (slots nil :type (vector cl-slot-descriptor)) + (index-table nil :type hash-table)) + +(cl-assert + (let ((sc-slots (cl--struct-class-slots (cl--find-class 'cl-structure-class))) + (c-slots (cl--struct-class-slots (cl--find-class 'cl--class))) + (eq t)) + (dotimes (i (length c-slots)) + (let ((sc-slot (aref sc-slots i)) + (c-slot (aref c-slots i))) + (unless (eq (cl--slot-descriptor-name sc-slot) + (cl--slot-descriptor-name c-slot)) + (setq eq nil)))) + eq)) + +;; Close the recursion between cl-structure-object and cl-structure-class. +(setf (cl--struct-class-parents (cl--find-class 'cl-structure-class)) + (list (cl--find-class 'cl--class))) +(cl--struct-register-child + (cl--find-class 'cl--class) + (cl--struct-class-tag (cl--find-class 'cl-structure-class))) + +(cl-assert (cl--find-class 'cl-structure-class)) +(cl-assert (cl--find-class 'cl-structure-object)) +(cl-assert (cl-struct-p (cl--find-class 'cl-structure-class))) +(cl-assert (cl-struct-p (cl--find-class 'cl-structure-object))) +(cl-assert (cl--class-p (cl--find-class 'cl-structure-class))) +(cl-assert (cl--class-p (cl--find-class 'cl-structure-object))) + ;; Make sure functions defined with cl-defsubst can be inlined even in ;; packages which do not require CL. We don't put an autoload cookie ;; directly on that function, since those cookies only go to cl-loaddefs. diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 8c1440d02f3..83213285d4e 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -106,10 +106,10 @@ This is to optimize `debugger-make-xrefs'.") "Non-nil if we expect to get back in the debugger soon.") (defvar inhibit-debug-on-entry nil - "Non-nil means that debug-on-entry is disabled.") + "Non-nil means that `debug-on-entry' is disabled.") (defvar debugger-jumping-flag nil - "Non-nil means that debug-on-entry is disabled. + "Non-nil means that `debug-on-entry' is disabled. This variable is used by `debugger-jump', `debugger-step-through', and `debugger-reenable' to temporarily disable debug-on-entry.") @@ -165,7 +165,6 @@ first will be printed into the backtrace buffer." ;; Don't let these magic variables affect the debugger itself. (let ((last-command nil) this-command track-mouse (inhibit-trace t) - (inhibit-debug-on-entry t) unread-command-events unread-post-input-method-events last-input-event last-command-event last-nonmenu-event @@ -763,7 +762,8 @@ A call to this function is inserted by `debug-on-entry' to cause functions to break on entry." (if (or inhibit-debug-on-entry debugger-jumping-flag) nil - (funcall debugger 'debug))) + (let ((inhibit-debug-on-entry t)) + (funcall debugger 'debug)))) ;;;###autoload (defun debug-on-entry (function) diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 68bf4f62c34..f0410f87447 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -465,6 +465,8 @@ itself or not." (defvar macroexp--pending-eager-loads nil "Stack of files currently undergoing eager macro-expansion.") +(defvar macroexp--debug-eager nil) + (defun internal-macroexpand-for-load (form full-p) ;; Called from the eager-macroexpansion in readevalloop. (cond @@ -480,8 +482,10 @@ itself or not." (tail (member elem (cdr (member elem bt))))) (if tail (setcdr tail (list '…))) (if (eq (car-safe (car bt)) 'macroexpand-all) (setq bt (cdr bt))) - (message "Warning: Eager macro-expansion skipped due to cycle:\n %s" - (mapconcat #'prin1-to-string (nreverse bt) " => ")) + (if macroexp--debug-eager + (debug 'eager-macroexp-cycle) + (message "Warning: Eager macro-expansion skipped due to cycle:\n %s" + (mapconcat #'prin1-to-string (nreverse bt) " => "))) (push 'skip macroexp--pending-eager-loads) form)) (t diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index c98d72575a8..e5dfed2342a 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2015-03-18 Stefan Monnier + + * xlwmenu.c (pop_up_menu): Remove debugging code. + 2015-02-28 Jan Djärv * xlwmenu.c (remap_menubar): Re-realize menu to force move under diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index f781b7ee54c..9317dea02b0 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1719,7 +1719,7 @@ make_shadow_gcs (XlwMenuWidget mw) 1.2, 0x8000)) #else XQueryColor (dpy, cmap, &topc); - /* don't overflow/wrap! */ + /* Don't overflow/wrap! */ topc.red = MINL (65535, topc.red * 1.2); topc.green = MINL (65535, topc.green * 1.2); topc.blue = MINL (65535, topc.blue * 1.2); @@ -1780,8 +1780,8 @@ make_shadow_gcs (XlwMenuWidget mw) } } - if (!mw->menu.top_shadow_pixmap && - mw->menu.top_shadow_color == mw->core.background_pixel) + if (!mw->menu.top_shadow_pixmap + && mw->menu.top_shadow_color == mw->core.background_pixel) { mw->menu.top_shadow_pixmap = mw->menu.gray_pixmap; if (mw->menu.free_top_shadow_color_p) @@ -1791,8 +1791,8 @@ make_shadow_gcs (XlwMenuWidget mw) } mw->menu.top_shadow_color = mw->menu.foreground; } - if (!mw->menu.bottom_shadow_pixmap && - mw->menu.bottom_shadow_color == mw->core.background_pixel) + if (!mw->menu.bottom_shadow_pixmap + && mw->menu.bottom_shadow_color == mw->core.background_pixel) { mw->menu.bottom_shadow_pixmap = mw->menu.gray_pixmap; if (mw->menu.free_bottom_shadow_color_p) @@ -1856,7 +1856,7 @@ openXftFont (XlwMenuWidget mw) if (fname && strcmp (fname, "none") != 0) { int screen = XScreenNumberOfScreen (mw->core.screen); - int len = strlen (fname), i = len-1; + int len = strlen (fname), i = len - 1; /* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9. */ while (i > 0 && '0' <= fname[i] && fname[i] <= '9') --i; @@ -1880,7 +1880,7 @@ openXftFont (XlwMenuWidget mw) static void XlwMenuInitialize (Widget request, Widget w, ArgList args, Cardinal *num_args) { - /* Get the GCs and the widget size */ + /* Get the GCs and the widget size. */ XlwMenuWidget mw = (XlwMenuWidget) w; Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw))); Display* display = XtDisplay (mw); @@ -2014,7 +2014,7 @@ XlwMenuRealize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes) /* Only the toplevel menubar/popup is a widget so it's the only one that receives expose events through Xt. So we repaint all the other panes - when receiving an Expose event. */ + when receiving an Expose event. */ static void XlwMenuRedisplay (Widget w, XEvent *ev, Region region) { @@ -2056,14 +2056,14 @@ XlwMenuDestroy (Widget w) release_drawing_gcs (mw); release_shadow_gcs (mw); - /* this doesn't come from the resource db but is created explicitly - so we must free it ourselves. */ + /* This doesn't come from the resource db but is created explicitly + so we must free it ourselves. */ XFreePixmap (XtDisplay (mw), mw->menu.gray_pixmap); mw->menu.gray_pixmap = (Pixmap) -1; /* Don't free mw->menu.contents because that comes from our creator. The `*_stack' elements are just pointers into `contents' so leave - that alone too. But free the stacks themselves. */ + that alone too. But free the stacks themselves. */ if (mw->menu.old_stack) XtFree ((char *) mw->menu.old_stack); if (mw->menu.new_stack) XtFree ((char *) mw->menu.new_stack); @@ -2093,7 +2093,7 @@ XlwMenuDestroy (Widget w) if (mw->menu.windows [0].pixmap != None) XFreePixmap (XtDisplay (mw), mw->menu.windows [0].pixmap); - /* start from 1 because the one in slot 0 is w->core.window */ + /* Start from 1 because the one in slot 0 is w->core.window. */ for (i = 1; i < mw->menu.windows_length; i++) { if (mw->menu.windows [i].pixmap != None) @@ -2170,7 +2170,7 @@ XlwMenuSetValues (Widget current, Widget request, Widget new, XSetWindowBackground (XtDisplay (oldmw), oldmw->menu.windows [i].window, newmw->core.background_pixel); - /* clear windows and generate expose events */ + /* Clear windows and generate expose events. */ XClearArea (XtDisplay (oldmw), oldmw->menu.windows[i].window, 0, 0, 0, 0, True); } @@ -2244,7 +2244,7 @@ handle_single_motion_event (XlwMenuWidget mw, XMotionEvent *ev) set_new_state (mw, val, level); remap_menubar (mw); - /* Sync with the display. Makes it feel better on X terms. */ + /* Sync with the display. Makes it feel better on X terms. */ XSync (XtDisplay (mw), False); } @@ -2256,7 +2256,7 @@ handle_motion_event (XlwMenuWidget mw, XMotionEvent *ev) int state = ev->state; XMotionEvent oldev = *ev; - /* allow motion events to be generated again */ + /* Allow motion events to be generated again. */ if (ev->is_hint && XQueryPointer (XtDisplay (mw), ev->window, &ev->root, &ev->subwindow, @@ -2293,11 +2293,11 @@ Start (Widget w, XEvent *ev, String *params, Cardinal *num_params) releasing the button should always pop the menu down. */ next_release_must_exit = 1; - /* notes the absolute position of the menubar window */ + /* Notes the absolute position of the menubar window. */ mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x; mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y; - /* handles the down like a move, slots are compatible */ + /* Handles the down like a move, slots are compatible. */ ev->xmotion.is_hint = 0; handle_motion_event (mw, &ev->xmotion); } @@ -2327,7 +2327,7 @@ find_first_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) while (lw_separator_p (current->name, &separator, 0) || !current->enabled || (skip_titles && !current->call_data && !current->contents)) if (current->next) - current=current->next; + current = current->next; else return NULL; @@ -2340,9 +2340,9 @@ find_next_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) widget_value *current = item; enum menu_separator separator; - while (current->next && (current=current->next) && - (lw_separator_p (current->name, &separator, 0) || !current->enabled - || (skip_titles && !current->call_data && !current->contents))) + while (current->next && (current = current->next) + && (lw_separator_p (current->name, &separator, 0) || !current->enabled + || (skip_titles && !current->call_data && !current->contents))) ; if (current == item) @@ -2357,7 +2357,7 @@ find_next_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) && !current->contents)) { if (current->next) - current=current->next; + current = current->next; if (current == item) break; @@ -2374,12 +2374,12 @@ find_prev_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) widget_value *current = item; widget_value *prev = item; - while ((current=find_next_selectable (mw, current, skip_titles)) + while ((current = find_next_selectable (mw, current, skip_titles)) != item) { if (prev == current) break; - prev=current; + prev = current; } return prev; @@ -2560,7 +2560,7 @@ Select (Widget w, XEvent *ev, String *params, Cardinal *num_params) < XtGetMultiClickTime (XtDisplay (w)))) return; - /* pop down everything. */ + /* Pop down everything. */ mw->menu.new_depth = 1; remap_menubar (mw); @@ -2582,7 +2582,7 @@ Select (Widget w, XEvent *ev, String *params, Cardinal *num_params) } - /* Special code to pop-up a menu */ + /* Special code to pop-up a menu. */ static void pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent *event) { @@ -2619,14 +2619,14 @@ pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent *event) mw->menu.popped_up = True; if (XtIsShell (XtParent ((Widget)mw))) { - fprintf(stderr, "Config %d %d\n", x, y); + /* fprintf (stderr, "Config %d %d\n", x, y); */ XtConfigureWidget (XtParent ((Widget)mw), x, y, w, h, XtParent ((Widget)mw)->core.border_width); XtPopup (XtParent ((Widget)mw), XtGrabExclusive); display_menu (mw, 0, False, NULL, NULL, NULL); mw->menu.windows [0].x = x + borderwidth; mw->menu.windows [0].y = y + borderwidth; - mw->menu.top_depth = 1; /* Popup menus don't have a bar so top is 1 */ + mw->menu.top_depth = 1; /* Popup menus don't have a bar so top is 1. */ } else { @@ -2634,7 +2634,7 @@ pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent *event) XtAddGrab ((Widget) mw, True, True); - /* notes the absolute position of the menubar window */ + /* Notes the absolute position of the menubar window. */ mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x; mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y; mw->menu.top_depth = 2; diff --git a/src/ChangeLog b/src/ChangeLog index fbf8fb452fc..1b1a9c59033 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-03-18 Stefan Monnier + + * alloc.c (purecopy): Handle hash-tables. + 2015-03-16 Stefan Monnier * minibuf.c (Fread_buffer): Add `predicate' argument. @@ -6,13 +10,11 @@ 2015-03-15 Eli Zaretskii * xdisp.c (handle_invisible_prop): Fix up it->position even when - we are going to load overlays at the beginning of the invisible - text. + we are going to load overlays at the beginning of the invisible text. (setup_for_ellipsis): Reset the ignore_overlay_strings_at_pos_p flag also here. (next_overlay_string): Set the overlay_strings_at_end_processed_p - flag only if the overlays just processed were actually loaded at - EOB. + flag only if the overlays just processed were actually loaded at EOB. 2015-03-14 Daniel Colascione @@ -183,8 +185,8 @@ 2015-02-28 Martin Rudalics - * frame.c (make_initial_frame, Fmake_terminal_frame): Set - can_x_set_window_size and after_make_frame (Bug#19962). + * frame.c (make_initial_frame, Fmake_terminal_frame): + Set can_x_set_window_size and after_make_frame (Bug#19962). 2015-02-28 Eli Zaretskii @@ -454,8 +456,8 @@ * indent.c (Fvertical_motion): Accept an additional argument CUR-COL and use it as the starting screen coordinate. - * window.c (window_scroll_line_based, Fmove_to_window_line): All - callers of vertical-motion changed. + * window.c (window_scroll_line_based, Fmove_to_window_line): + All callers of vertical-motion changed. 2015-02-09 Dima Kogan diff --git a/src/alloc.c b/src/alloc.c index 022782504f1..1f4b1a4694e 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -3423,7 +3423,7 @@ union aligned_Lisp_Misc }; /* Allocation of markers and other objects that share that structure. - Works like allocation of conses. */ + Works like allocation of conses. */ #define MARKER_BLOCK_SIZE \ ((1020 - sizeof (struct marker_block *)) / sizeof (union aligned_Lisp_Misc)) @@ -4744,7 +4744,7 @@ mark_maybe_pointer (void *p) #endif /* Mark Lisp objects referenced from the address range START+OFFSET..END - or END+OFFSET..START. */ + or END+OFFSET..START. */ static void ATTRIBUTE_NO_SANITIZE_ADDRESS mark_memory (void *start, void *end) @@ -5356,7 +5356,6 @@ make_pure_vector (ptrdiff_t len) return new; } - DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0, doc: /* Make a copy of object OBJ in pure storage. Recursively copies contents of vectors and cons cells. @@ -5391,28 +5390,26 @@ purecopy (Lisp_Object obj) else if (FLOATP (obj)) obj = make_pure_float (XFLOAT_DATA (obj)); else if (STRINGP (obj)) - obj = make_pure_string (SSDATA (obj), SCHARS (obj), - SBYTES (obj), - STRING_MULTIBYTE (obj)); - else if (COMPILEDP (obj) || VECTORP (obj)) { - register struct Lisp_Vector *vec; + if (XSTRING (obj)->intervals) + message ("Dropping text-properties when making string pure"); + obj = make_pure_string (SSDATA (obj), SCHARS (obj), + SBYTES (obj), + STRING_MULTIBYTE (obj)); + } + else if (COMPILEDP (obj) || VECTORP (obj) || HASH_TABLE_P (obj)) + { + struct Lisp_Vector *objp = XVECTOR (obj); + ptrdiff_t nbytes = vector_nbytes (objp); + struct Lisp_Vector *vec = pure_alloc (nbytes, Lisp_Vectorlike); register ptrdiff_t i; - ptrdiff_t size; - - size = ASIZE (obj); + ptrdiff_t size = ASIZE (obj); if (size & PSEUDOVECTOR_FLAG) size &= PSEUDOVECTOR_SIZE_MASK; - vec = XVECTOR (make_pure_vector (size)); + memcpy (vec, objp, nbytes); for (i = 0; i < size; i++) - vec->contents[i] = purecopy (AREF (obj, i)); - if (COMPILEDP (obj)) - { - XSETPVECTYPE (vec, PVEC_COMPILED); - XSETCOMPILED (obj, vec); - } - else - XSETVECTOR (obj, vec); + vec->contents[i] = purecopy (vec->contents[i]); + XSETVECTOR (obj, vec); } else if (SYMBOLP (obj)) { @@ -5422,6 +5419,7 @@ purecopy (Lisp_Object obj) XSYMBOL (obj)->pinned = true; symbol_block_pinned = symbol_block; } + /* Don't hash-cons it. */ return obj; } else @@ -6229,13 +6227,14 @@ mark_discard_killed_buffers (Lisp_Object list) void mark_object (Lisp_Object arg) { - register Lisp_Object obj = arg; + register Lisp_Object obj; void *po; #ifdef GC_CHECK_MARKED_OBJECTS struct mem_node *m; #endif ptrdiff_t cdr_count = 0; + obj = arg; loop: po = XPNTR (obj); @@ -6870,7 +6869,7 @@ sweep_symbols (void) total_free_symbols = num_free; } -NO_INLINE /* For better stack traces */ +NO_INLINE /* For better stack traces. */ static void sweep_misc (void) { From 8dfff871bdf0e420c6f5570e72afc80471d40d51 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 18 Mar 2015 10:49:55 -0400 Subject: [PATCH 325/457] * cl-generic.el (cl-generic-generalizers): Clean up after braindamage --- lisp/emacs-lisp/cl-generic.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index c9ca92d7c09..fb11a3e25a1 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -903,8 +903,8 @@ Can only be used from within the lexical body of a primary or around method." ;; take place without requiring cl-lib. (let ((class (cl--find-class type))) (and (cl-typep class 'cl-structure-class) - (when (cl--struct-class-type class) - (error "Can't dispatch on cl-struct %S: type is %S" + (or (null (cl--struct-class-type class)) + (error "Can't dispatch on cl-struct %S: type is %S" type (cl--struct-class-type class))) (progn (cl-assert (null (cl--struct-class-named class))) t) (list cl--generic-struct-generalizer)))) From 1a941d6c9eab9a35682408d6b85a1a98cfb6b01d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 18 Mar 2015 19:32:22 +0200 Subject: [PATCH 326/457] Fix incorrect usage of @key in the User Manual (Bug#20135) doc/emacs/misc.texi (Term Mode): doc/emacs/programs.texi (Basic Indent, Custom C Indent): doc/emacs/mini.texi (Minibuffer History): doc/emacs/text.texi (Org Mode): doc/emacs/display.texi (View Mode): Use @kbd where @key was mistakenly used. --- doc/emacs/ChangeLog | 9 +++++++++ doc/emacs/display.texi | 2 +- doc/emacs/mini.texi | 2 +- doc/emacs/misc.texi | 2 +- doc/emacs/programs.texi | 4 ++-- doc/emacs/text.texi | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b9c16c969e3..aba1e92bbfa 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,12 @@ +2015-03-18 Eli Zaretskii + + * misc.texi (Term Mode): + * programs.texi (Basic Indent, Custom C Indent): + * mini.texi (Minibuffer History): + * text.texi (Org Mode): + * display.texi (View Mode): Use @kbd where @key was mistakenly + used. (Bug#20135) + 2015-03-14 Eli Zaretskii * basic.texi (Moving Point): Improve indexing for HOME and END. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 34f84e7664a..4046d696b66 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -428,7 +428,7 @@ it. @xref{Disabling}. screenfuls. It provides commands for scrolling through the buffer conveniently but not for changing it. Apart from the usual Emacs cursor motion commands, you can type @key{SPC} to scroll forward one -windowful, @key{S-@key{SPC}} or @key{DEL} to scroll backward, and @kbd{s} to +windowful, @kbd{S-@key{SPC}} or @key{DEL} to scroll backward, and @kbd{s} to start an incremental search. @kindex q @r{(View mode)} diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 2a86af3ec2f..f0bedf8854d 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -622,7 +622,7 @@ typed @kbd{M-p}), Emacs tries fetching from a list of default arguments: values that you are likely to enter. You can think of this as moving through the ``future history'' list. - If you edit the text inserted by the @kbd{M-p} or @key{M-n} + If you edit the text inserted by the @kbd{M-p} or @kbd{M-n} minibuffer history commands, this does not change its entry in the history list. However, the edited argument does go at the end of the history list when you submit it. diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 0431e84b5b6..b3f83252657 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1306,7 +1306,7 @@ char mode. @table @kbd @item C-c C-c -Send a literal @key{C-c} to the sub-shell. +Send a literal @kbd{C-c} to the sub-shell. @item C-c @var{char} This is equivalent to @kbd{C-x @var{char}} in normal Emacs. For diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 329175409bf..ff7bed03ea1 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -383,7 +383,7 @@ the preceding lines; if the region is active, @key{TAB} indents each line within the region, not just the current line. The command @key{RET} (@code{newline}), which was documented in -@ref{Inserting Text}, does the same as @key{C-j} followed by +@ref{Inserting Text}, does the same as @kbd{C-j} followed by @key{TAB}: it inserts a new line, then adjusts the line's indentation. When indenting a line that starts within a parenthetical grouping, @@ -559,7 +559,7 @@ predefined styles, including @code{gnu}, @code{k&r}, @code{bsd}, styles are primarily intended for one language, but any of them can be used with any of the languages supported by these modes. To find out what a style looks like, select it and reindent some code, e.g., by -typing @key{C-M-q} at the start of a function definition. +typing @kbd{C-M-q} at the start of a function definition. @kindex C-c . @r{(C mode)} @findex c-set-style diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 11b916ab044..9bc5ade81a2 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1293,7 +1293,7 @@ executed. @kindex S-TAB @r{(Org Mode)} @findex org-shifttab - Typing @key{S-TAB} (@code{org-shifttab}) anywhere in an Org mode + Typing @kbd{S-@key{TAB}} (@code{org-shifttab}) anywhere in an Org mode buffer cycles the visibility of the entire outline structure, between (i) showing only top-level heading lines, (ii) showing all heading lines but no body lines, and (iii) showing everything. From 611a4791a4499eaaa5d1d652e538485b7c15ff0b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 18 Mar 2015 20:32:16 +0100 Subject: [PATCH 327/457] Mark apostrophs with ?/ instead of \037 in Tramp Fixes: debbugs:20117 * net/tramp-sh.el (tramp-do-directory-files-and-attributes-with-stat): Mark apostrophs with ?/ instead of \037. --- lisp/ChangeLog | 7 ++++++- lisp/net/tramp-sh.el | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2db0f9a349a..de940c304a9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-18 Michael Albinus + + * net/tramp-sh.el (tramp-do-directory-files-and-attributes-with-stat): + Mark apostrophs with ?/ instead of \037. (Bug#20117) + 2015-03-18 Stefan Monnier Add classes as run-time descriptors of cl-structs. @@ -72,7 +77,7 @@ 2015-03-17 Michael Albinus - * tramp-sh.el (tramp-maybe-send-script): Avoid leading tabs in + * net/tramp-sh.el (tramp-maybe-send-script): Avoid leading tabs in shell scripts. (Bug#20118) 2015-03-17 Eli Zaretskii diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 133d886f372..b82b4deb21a 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1719,12 +1719,12 @@ be non-negative integers." ;; "-"; this would confuse xargs. "ls -aQ" might be a solution, ;; but it does not work on all remote systems. Therefore, we ;; use \000 as file separator. - ;; Apostrophes in the stat output are masked as \037 characters, in + ;; Apostrophes in the stat output are masked as ?/ characters, in ;; order to make a proper shell escape of them in file names. "cd %s && echo \"(\"; (%s %s -a | " "xargs %s -c " - "'(\037%%n\037 (\037%%N\037) %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \037%%A\037 t %%ie0 -1)'" - " -- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/\037/\"/g'); echo \")\"") + "'(/%%n/ (/%%N/) %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 /%%A/ t %%ie0 -1)' " + "-- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/\\//\"/g'); echo \")\"") (tramp-shell-quote-argument localname) (tramp-get-ls-command vec) ;; On systems which have no quoting style, file names with @@ -1732,8 +1732,8 @@ be non-negative integers." (if (tramp-get-ls-command-with-quoting-style vec) "--quoting-style=shell" "") (tramp-get-remote-stat vec) - (if (eq id-format 'integer) "%ue0" "\037%U\037") - (if (eq id-format 'integer) "%ge0" "\037%G\037")))) + (if (eq id-format 'integer) "%ue0" "/%U/") + (if (eq id-format 'integer) "%ge0" "/%G/")))) ;; This function should return "foo/" for directories and "bar" for ;; files. From f469024eea692a163beb98a824b5cc0a4e8bcda8 Mon Sep 17 00:00:00 2001 From: Vibhav Pant Date: Thu, 19 Mar 2015 06:45:58 +0530 Subject: [PATCH 328/457] Use delete-char instead of delete-backward-char. * lisp/leim/quail/hangul.el * lisp/progmodes/cperl-mode.el: Use delete-char instead of delete-backward-char, fixes compilation warnings. --- lisp/ChangeLog | 6 ++++++ lisp/leim/quail/hangul.el | 4 ++-- lisp/progmodes/cperl-mode.el | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index de940c304a9..e75f81ba75a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-19 Vibhav Pant + + * lisp/leim/quail/hangul.el + * lisp/progmodes/cperl-mode.el: Use delete-char instead of + delete-backward-char, fixes compilation warnings. + 2015-03-18 Michael Albinus * net/tramp-sh.el (tramp-do-directory-files-and-attributes-with-stat): diff --git a/lisp/leim/quail/hangul.el b/lisp/leim/quail/hangul.el index 243fa042571..12d7358841b 100644 --- a/lisp/leim/quail/hangul.el +++ b/lisp/leim/quail/hangul.el @@ -351,7 +351,7 @@ Other parts are the same as a `hangul3-input-method-cho'." (aset hangul-queue i 0)) (if (notzerop (apply '+ (append hangul-queue nil))) (hangul-insert-character hangul-queue) - (delete-backward-char 1))) + (delete-char -1))) (defun hangul-to-hanja-conversion () "Convert the previous hangul character to the corresponding hanja character. @@ -363,7 +363,7 @@ When a Korean input method is off, convert the following hangul character." (if (and (overlayp quail-overlay) (overlay-start quail-overlay)) (progn (setq hanja-character (hangul-to-hanja-char (preceding-char))) - (setq delete-func (lambda () (delete-backward-char 1)))) + (setq delete-func (lambda () (delete-char -1)))) (setq hanja-character (hangul-to-hanja-char (following-char))) (setq delete-func (lambda () (delete-char 1)))) (when hanja-character diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 3b8742ee842..f207016187d 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -2281,8 +2281,8 @@ to nil." (search-backward ")") (if (eq last-command-event ?\() (progn ; Avoid "if (())" - (delete-backward-char 1) - (delete-backward-char -1)))) + (delete-char -1) + (delete-char 1)))) (if delete (cperl-putback-char cperl-del-back-ch)) (if cperl-message-electric-keyword @@ -2588,7 +2588,7 @@ Will untabify if `cperl-electric-backspace-untabify' is non-nil." (delete-region (point) p)) (if cperl-electric-backspace-untabify (backward-delete-char-untabify arg) - (delete-backward-char arg))))) + (delete-char (- arg)))))) (put 'cperl-electric-backspace 'delete-selection 'supersede) From 50c117fe86d94719807cbe08353c032779b3b910 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 18 Mar 2015 23:02:26 -0400 Subject: [PATCH 329/457] EIEIO: Change class's representation to unify instance & class slots * lisp/emacs-lisp/eieio-core.el (eieio--class): Change field names and order to match those of cl--class; use cl--slot for both instance slots and class slots. (eieio--object-num-slots): Use cl-struct-slot-info. (eieio--object-class): Rename from eieio--object-class-object. (eieio--object-class-name): Remove. (eieio-defclass-internal): Adjust to new slot representation. Store doc in class rather than in `variable-documentation'. (eieio--perform-slot-validation-for-default): Change API to take a slot object. (eieio--slot-override): New function. (eieio--add-new-slot): Rewrite. (eieio-copy-parents-into-subclass): Rewrite. (eieio--validate-slot-value, eieio--validate-class-slot-value) (eieio-oref-default, eieio-oset-default) (eieio--class-slot-name-index, eieio-set-defaults): Adjust to new slot representation. (eieio--c3-merge-lists): Simplify. (eieio--class/struct-parents): New function. (eieio--class-precedence-bfs): Use it. * lisp/emacs-lisp/eieio.el (with-slots): Use macroexp-let2. (object-class-fast): Change recommend replacement. (eieio-object-class): Rewrite. (slot-exists-p): Adjust to new slot representation. (initialize-instance): Adjust to new slot representation. (object-write): Adjust to new slot representation. * lisp/emacs-lisp/eieio-base.el (eieio-persistent-convert-list-to-object): Manually map initargs to slot names. (eieio-persistent-validate/fix-slot-value): Adjust to new slot representation. * lisp/emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-specializers): Extract from eieio--generic-static-symbol-generalizer. (eieio--generic-static-symbol-generalizer): Use it. * lisp/emacs-lisp/eieio-custom.el (eieio-object-value-create) (eieio-object-value-get): Adjust to new slot representation. * lisp/emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots): Declare to silence warnings. (data-debug-insert-object-button): Avoid `object-slots'. (data-debug/eieio-insert-slots): Adjust to new slot representation. * lisp/emacs-lisp/eieio-opt.el (eieio--help-print-slot): New function extracted from eieio-help-class-slots. (eieio-help-class-slots): Use it. Adjust to new slot representation. * test/automated/eieio-test-methodinvoke.el (make-instance): Use new-style `subclass' specializer for a change. * test/automated/eieio-test-persist.el (persist-test-save-and-compare): Adjust to new slot representation. * test/automated/eieio-tests.el (eieio-test-17-virtual-slot): Don't use initarg in `oset'. (eieio-test-32-slot-attribute-override-2): Adjust to new slot representation. * lisp/emacs-lisp/cl-preloaded.el (cl--class): Fix type of `parents'. --- lisp/ChangeLog | 54 ++ lisp/emacs-lisp/cl-preloaded.el | 4 +- lisp/emacs-lisp/eieio-base.el | 36 +- lisp/emacs-lisp/eieio-compat.el | 21 +- lisp/emacs-lisp/eieio-core.el | 628 +++++++++------------- lisp/emacs-lisp/eieio-custom.el | 161 +++--- lisp/emacs-lisp/eieio-datadebug.el | 68 ++- lisp/emacs-lisp/eieio-opt.el | 90 +--- lisp/emacs-lisp/eieio.el | 132 ++--- test/ChangeLog | 13 + test/automated/eieio-test-methodinvoke.el | 2 +- test/automated/eieio-test-persist.el | 17 +- test/automated/eieio-tests.el | 57 +- 13 files changed, 581 insertions(+), 702 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e75f81ba75a..7c751f4e8e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,57 @@ +2015-03-19 Stefan Monnier + + * emacs-lisp/eieio.el (with-slots): Use macroexp-let2. + (object-class-fast): Change recommend replacement. + (eieio-object-class): Rewrite. + (slot-exists-p): Adjust to new slot representation. + (initialize-instance): Adjust to new slot representation. + (object-write): Adjust to new slot representation. + + * emacs-lisp/eieio-opt.el (eieio--help-print-slot): New function + extracted from eieio-help-class-slots. + (eieio-help-class-slots): Use it. Adjust to new slot representation. + + * emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots): + Declare to silence warnings. + (data-debug-insert-object-button): Avoid `object-slots'. + (data-debug/eieio-insert-slots): Adjust to new slot representation. + + * emacs-lisp/eieio-custom.el (eieio-object-value-create) + (eieio-object-value-get): Adjust to new slot representation. + + EIEIO: Change class's representation to unify instance and class slots + * emacs-lisp/eieio-core.el (eieio--class): Change field names and order + to match those of cl--class; use cl--slot for both instance slots and + class slots. + (eieio--object-num-slots): Use cl-struct-slot-info. + (eieio--object-class): Rename from eieio--object-class-object. + (eieio--object-class-name): Remove. + (eieio-defclass-internal): Adjust to new slot representation. + Store doc in class rather than in `variable-documentation'. + (eieio--perform-slot-validation-for-default): Change API to take + a slot object. + (eieio--slot-override): New function. + (eieio--add-new-slot): Rewrite. + (eieio-copy-parents-into-subclass): Rewrite. + (eieio--validate-slot-value, eieio--validate-class-slot-value) + (eieio-oref-default, eieio-oset-default) + (eieio--class-slot-name-index, eieio-set-defaults): Adjust to new + slot representation. + (eieio--c3-merge-lists): Simplify. + (eieio--class/struct-parents): New function. + (eieio--class-precedence-bfs): Use it. + + * emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-specializers): + Extract from eieio--generic-static-symbol-generalizer. + (eieio--generic-static-symbol-generalizer): Use it. + + * emacs-lisp/eieio-base.el (eieio-persistent-convert-list-to-object): + Manually map initargs to slot names. + (eieio-persistent-validate/fix-slot-value): Adjust to new + slot representation. + + * emacs-lisp/cl-preloaded.el (cl--class): Fix type of `parents'. + 2015-03-19 Vibhav Pant * lisp/leim/quail/hangul.el diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index a18e0e57b05..ed0639b63ab 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -212,7 +212,9 @@ ;; Intended to be shared between defstruct and defclass. (name nil :type symbol) ;The type name. (docstring nil :type string) - (parents nil :type (or cl--class (list-of cl--class))) + ;; For structs there can only be one parent, but when EIEIO classes inherit + ;; from cl--class, we'll need this to hold a list. + (parents nil :type (list-of cl--class)) (slots nil :type (vector cl-slot-descriptor)) (index-table nil :type hash-table)) diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index 1cc9f895f8a..5b3d9029c53 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -254,25 +254,28 @@ malicious code. Note: This function recurses when a slot of :type of some object is identified, and needing more object creation." - (let ((objclass (nth 0 inputlist)) - ;; (objname (nth 1 inputlist)) - (slots (nthcdr 2 inputlist)) - (createslots nil)) - - ;; If OBJCLASS is an eieio autoload object, then we need to load it. - (eieio-class-un-autoload objclass) + (let* ((objclass (nth 0 inputlist)) + ;; (objname (nth 1 inputlist)) + (slots (nthcdr 2 inputlist)) + (createslots nil) + (class + (progn + ;; If OBJCLASS is an eieio autoload object, then we need to + ;; load it. + (eieio-class-un-autoload objclass) + (eieio--class-object objclass)))) (while slots - (let ((name (car slots)) + (let ((initarg (car slots)) (value (car (cdr slots)))) ;; Make sure that the value proposed for SLOT is valid. ;; In addition, strip out quotes, list functions, and update ;; object constructors as needed. (setq value (eieio-persistent-validate/fix-slot-value - (eieio--class-v objclass) name value)) + class (eieio--initarg-to-attribute class initarg) value)) - (push name createslots) + (push initarg createslots) (push value createslots) ) @@ -290,16 +293,11 @@ constructor functions are considered valid. Second, any text properties will be stripped from strings." (cond ((consp proposed-value) ;; Lists with something in them need special treatment. - (let ((slot-idx (eieio--slot-name-index class slot)) - (type nil) - (classtype nil)) - (setq slot-idx (- slot-idx + (let* ((slot-idx (- (eieio--slot-name-index class slot) (eval-when-compile eieio--object-num-slots))) - (setq type (aref (eieio--class-public-type class) - slot-idx)) - - (setq classtype (eieio-persistent-slot-type-is-class-p - type)) + (type (cl--slot-descriptor-type (aref (eieio--class-slots class) + slot-idx))) + (classtype (eieio-persistent-slot-type-is-class-p type))) (cond ((eq (car proposed-value) 'quote) (car (cdr proposed-value))) diff --git a/lisp/emacs-lisp/eieio-compat.el b/lisp/emacs-lisp/eieio-compat.el index ee8e731b043..0283704e033 100644 --- a/lisp/emacs-lisp/eieio-compat.el +++ b/lisp/emacs-lisp/eieio-compat.el @@ -124,19 +124,22 @@ Summary: (defgeneric ,method ,args) (eieio--defmethod ',method ',key ',class #',code)))) +(defun eieio--generic-static-symbol-specializers (tag) + (cl-assert (or (null tag) (eieio--class-p tag))) + (when (eieio--class-p tag) + (let ((superclasses (eieio--generic-subclass-specializers tag)) + (specializers ())) + (dolist (superclass superclasses) + (push superclass specializers) + (push `(eieio--static ,(cadr superclass)) specializers)) + (nreverse specializers)))) + (defconst eieio--generic-static-symbol-generalizer (cl-generic-make-generalizer ;; Give it a slightly higher priority than `subclass' so that the ;; interleaved list comes before subclass's non-interleaved list. 61 (lambda (name) `(and (symbolp ,name) (eieio--class-v ,name))) - (lambda (tag) - (when (eieio--class-p tag) - (let ((superclasses (eieio--generic-subclass-specializers tag)) - (specializers ())) - (dolist (superclass superclasses) - (push superclass specializers) - (push `(eieio--static ,(cadr superclass)) specializers)) - (nreverse specializers)))))) + #'eieio--generic-static-symbol-specializers)) (defconst eieio--generic-static-object-generalizer (cl-generic-make-generalizer ;; Give it a slightly higher priority than `class' so that the @@ -148,7 +151,7 @@ Summary: (let ((superclasses (eieio--class-precedence-list tag)) (specializers ())) (dolist (superclass superclasses) - (setq superclass (eieio--class-symbol superclass)) + (setq superclass (eieio--class-name superclass)) (push superclass specializers) (push `(eieio--static ,superclass) specializers)) (nreverse specializers)))))) diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 1e226c154e2..6fd9c14088e 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -85,9 +85,10 @@ Currently under control of this var: ;; Arrange for field access not to bother checking if the access is indeed ;; made to an eieio--class object. (cl-declaim (optimize (safety 0))) + (cl-defstruct (eieio--class (:constructor nil) - (:constructor eieio--class-make (symbol &aux (tag 'defclass))) + (:constructor eieio--class-make (name &aux (tag 'defclass))) (:type vector) (:copier nil)) ;; We use an untagged cl-struct, with our own hand-made tag as first field @@ -96,30 +97,16 @@ Currently under control of this var: ;; predicate for us), but that breaks compatibility with .elc files compiled ;; against older versions of EIEIO. tag - symbol ;; symbol (self-referencing) - parent children - symbol-hashtable ;; hashtable permitting fast access to variable position indexes - ;; @todo - ;; the word "public" here is leftovers from the very first version. - ;; Get rid of it! - public-a ;; class attribute index - public-d ;; class attribute defaults index - public-doc ;; class documentation strings for attributes - public-type ;; class type for a slot - public-custom ;; class custom type for a slot - public-custom-label ;; class custom group for a slot - public-custom-group ;; class custom group for a slot - public-printer ;; printer for a slot - protection ;; protection for a slot + ;; Fields we could inherit from cl--class (if we used a tagged cl-struct): + (name nil :type symbol) ;The type name. + (docstring nil :type string) + (parents nil :type (or eieio--class (list-of eieio--class))) + (slots nil :type (vector cl-slot-descriptor)) + (index-table nil :type hash-table) + ;; Fields specific to EIEIO classes: + children initarg-tuples ;; initarg tuples list - class-allocation-a ;; class allocated attributes - class-allocation-doc ;; class allocated documentation - class-allocation-type ;; class allocated value type - class-allocation-custom ;; class allocated custom descriptor - class-allocation-custom-label ;; class allocated custom descriptor - class-allocation-custom-group ;; class allocated custom group - class-allocation-printer ;; class allocated printer for a slot - class-allocation-protection ;; class allocated protection list + (class-slots nil :type eieio--slot) class-allocation-values ;; class allocated value vector default-object-cache ;; what a newly created object would look like. ; This will speed up instantiation time as @@ -142,18 +129,13 @@ Currently under control of this var: ;; object/struct in its `symbol-value' slot. class-tag) -(eval-and-compile +(eval-when-compile (defconst eieio--object-num-slots - (length (get 'eieio--object 'cl-struct-slots)))) + (length (cl-struct-slot-info 'eieio--object)))) -(defsubst eieio--object-class-object (obj) +(defsubst eieio--object-class (obj) (symbol-value (eieio--object-class-tag obj))) -(defsubst eieio--object-class-name (obj) - ;; FIXME: Most uses of this function should be changed to use - ;; eieio--object-class-object instead! - (eieio--class-symbol (eieio--object-class-object obj))) - ;;; Important macros used internally in eieio. @@ -189,7 +171,7 @@ CLASS is a symbol." ;FIXME: Is it a vector or a symbol? "Return a Lisp like symbol name for CLASS." (setq class (eieio--class-object class)) (cl-check-type class eieio--class) - (eieio--class-symbol class)) + (eieio--class-name class)) (define-obsolete-function-alias 'class-name #'eieio-class-name "24.4") (defalias 'eieio--class-constructor #'identity @@ -354,10 +336,10 @@ See `defclass' for more information." (mapc (lambda (g) (cl-pushnew g groups :test #'equal)) (eieio--class-option c :custom-groups)) ;; Save parent in child. - (push c (eieio--class-parent newc)))))) + (push c (eieio--class-parents newc)))))) ;; Reverse the list of our parents so that they are prioritized in ;; the same order as specified in the code. - (cl-callf nreverse (eieio--class-parent newc))) + (cl-callf nreverse (eieio--class-parents newc))) ;; If there is nothing to loop over, then inherit from the ;; default superclass. (unless (eq cname 'eieio-default-superclass) @@ -366,7 +348,7 @@ See `defclass' for more information." ;; save new child in parent (cl-pushnew cname (eieio--class-children eieio-default-superclass)) ;; save parent in child - (setf (eieio--class-parent newc) (list eieio-default-superclass)))) + (setf (eieio--class-parents newc) (list eieio-default-superclass)))) ;; turn this into a usable self-pointing symbol; FIXME: Why? (when eieio-backward-compatibility @@ -442,62 +424,70 @@ See `defclass' for more information." (make-obsolete-variable initarg (format "use '%s instead" initarg) "25.1")))) - ;; The customgroup should be a list of symbols - (cond ((null customg) + ;; The customgroup should be a list of symbols. + (cond ((and (null customg) custom) (setq customg '(default))) ((not (listp customg)) (setq customg (list customg)))) - ;; The customgroup better be a symbol, or list of symbols. - (mapc (lambda (cg) - (if (not (symbolp cg)) - (signal 'invalid-slot-type (list :group cg)))) - customg) + ;; The customgroup better be a list of symbols. + (dolist (cg customg) + (unless (symbolp cg) + (signal 'invalid-slot-type (list :group cg)))) ;; First up, add this slot into our new class. - (eieio--add-new-slot newc name init docstr type custom label customg printer - prot initarg alloc 'defaultoverride skip-nil) + (eieio--add-new-slot + newc (cl--make-slot-descriptor + name init type + `(,@(if docstr `((:documentation . ,docstr))) + ,@(if custom `((:custom . ,custom))) + ,@(if label `((:label . ,label))) + ,@(if customg `((:group . ,customg))) + ,@(if printer `((:printer . ,printer))) + ,@(if prot `((:protection . ,prot))))) + initarg alloc 'defaultoverride skip-nil) ;; We need to id the group, and store them in a group list attribute. (dolist (cg customg) - (cl-pushnew cg groups :test 'equal)) + (cl-pushnew cg groups :test #'equal)) )) ;; Now that everything has been loaded up, all our lists are backwards! - ;; Fix that up now. - (cl-callf nreverse (eieio--class-public-a newc)) - (cl-callf nreverse (eieio--class-public-d newc)) - (cl-callf nreverse (eieio--class-public-doc newc)) - (cl-callf (lambda (types) (apply #'vector (nreverse types))) - (eieio--class-public-type newc)) - (cl-callf nreverse (eieio--class-public-custom newc)) - (cl-callf nreverse (eieio--class-public-custom-label newc)) - (cl-callf nreverse (eieio--class-public-custom-group newc)) - (cl-callf nreverse (eieio--class-public-printer newc)) - (cl-callf nreverse (eieio--class-protection newc)) + ;; Fix that up now and then them into vectors. + (cl-callf (lambda (slots) (apply #'vector (nreverse slots))) + (eieio--class-slots newc)) (cl-callf nreverse (eieio--class-initarg-tuples newc)) ;; The storage for class-class-allocation-type needs to be turned into ;; a vector now. - (cl-callf (lambda (cat) (apply #'vector cat)) - (eieio--class-class-allocation-type newc)) + (cl-callf (lambda (slots) (apply #'vector slots)) + (eieio--class-class-slots newc)) - ;; Also, take class allocated values, and vectorize them for speed. - (cl-callf (lambda (cavs) (apply #'vector cavs)) - (eieio--class-class-allocation-values newc)) + ;; Also, setup the class allocated values. + (let* ((slots (eieio--class-class-slots newc)) + (n (length slots)) + (v (make-vector n nil))) + (dotimes (i n) + (setf (aref v i) (eieio-default-eval-maybe + (cl--slot-descriptor-initform (aref slots i))))) + (setf (eieio--class-class-allocation-values newc) v)) ;; Attach slot symbols into a hashtable, and store the index of ;; this slot as the value this table. - (let* ((cnt 0) + (let* ((slots (eieio--class-slots newc)) + ;; (cslots (eieio--class-class-slots newc)) (oa (make-hash-table :test #'eq))) - (dolist (pubsym (eieio--class-public-a newc)) - (setf (gethash pubsym oa) cnt) - (setq cnt (1+ cnt))) - (setf (eieio--class-symbol-hashtable newc) oa)) + ;; (dotimes (cnt (length cslots)) + ;; (setf (gethash (cl--slot-descriptor-name (aref cslots cnt)) oa) (- -1 cnt))) + (dotimes (cnt (length slots)) + (setf (gethash (cl--slot-descriptor-name (aref slots cnt)) oa) cnt)) + (setf (eieio--class-index-table newc) oa)) ;; Set up a specialized doc string. ;; Use stored value since it is calculated in a non-trivial way - (put cname 'variable-documentation - (eieio--class-option-assoc options :documentation)) + (let ((docstring (eieio--class-option-assoc options :documentation))) + (setf (eieio--class-docstring newc) docstring) + (when eieio-backward-compatibility + (put cname 'variable-documentation docstring))) ;; Save the file location where this class is defined. (add-to-list 'current-load-list `(eieio-defclass . ,cname)) @@ -514,10 +504,10 @@ See `defclass' for more information." ;; if this is a superclass, clear out parent (which was set to the ;; default superclass eieio-default-superclass) - (if clearparent (setf (eieio--class-parent newc) nil)) + (if clearparent (setf (eieio--class-parents newc) nil)) ;; Create the cached default object. - (let ((cache (make-vector (+ (length (eieio--class-public-a newc)) + (let ((cache (make-vector (+ (length (eieio--class-slots newc)) (eval-when-compile eieio--object-num-slots)) nil)) ;; We don't strictly speaking need to use a symbol, but the old @@ -544,239 +534,133 @@ See `defclass' for more information." "Whether the default value VAL should be evaluated for use." (and (consp val) (symbolp (car val)) (fboundp (car val)))) -(defun eieio--perform-slot-validation-for-default (slot spec value skipnil) - "For SLOT, signal if SPEC does not match VALUE. -If SKIPNIL is non-nil, then if VALUE is nil return t instead." - (if (not (or (eieio-eval-default-p value) ;FIXME: Why? - eieio-skip-typecheck - (and skipnil (null value)) - (eieio--perform-slot-validation spec value))) - (signal 'invalid-slot-type (list slot spec value)))) +(defun eieio--perform-slot-validation-for-default (slot skipnil) + "For SLOT, signal if its type does not match its default value. +If SKIPNIL is non-nil, then if default value is nil return t instead." + (let ((value (cl--slot-descriptor-initform slot)) + (spec (cl--slot-descriptor-type slot))) + (if (not (or (eieio-eval-default-p value) ;FIXME: Why? + eieio-skip-typecheck + (and skipnil (null value)) + (eieio--perform-slot-validation spec value))) + (signal 'invalid-slot-type (list (cl--slot-descriptor-name slot) spec value))))) -(defun eieio--add-new-slot (newc a d doc type cust label custg print prot init alloc +(defun eieio--slot-override (old new skipnil) + (cl-assert (eq (cl--slot-descriptor-name old) (cl--slot-descriptor-name new))) + ;; There is a match, and we must override the old value. + (let* ((a (cl--slot-descriptor-name old)) + (tp (cl--slot-descriptor-type old)) + (d (cl--slot-descriptor-initform new)) + (type (cl--slot-descriptor-type new)) + (oprops (cl--slot-descriptor-props old)) + (nprops (cl--slot-descriptor-props new)) + (custg (alist-get :group nprops))) + ;; If type is passed in, is it the same? + (if (not (eq type t)) + (if (not (equal type tp)) + (error + "Child slot type `%s' does not match inherited type `%s' for `%s'" + type tp a)) + (setf (cl--slot-descriptor-type new) tp)) + ;; If we have a repeat, only update the initarg... + (unless (eq d eieio-unbound) + (eieio--perform-slot-validation-for-default new skipnil) + (setf (cl--slot-descriptor-initform old) d)) + + ;; PLN Tue Jun 26 11:57:06 2007 : The protection is + ;; checked and SHOULD match the superclass + ;; protection. Otherwise an error is thrown. However + ;; I wonder if a more flexible schedule might be + ;; implemented. + ;; + ;; EML - We used to have (if prot... here, + ;; but a prot of 'nil means public. + ;; + (let ((super-prot (alist-get :protection oprops)) + (prot (alist-get :protection nprops))) + (if (not (eq prot super-prot)) + (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'" + prot super-prot a))) + ;; End original PLN + + ;; PLN Tue Jun 26 11:57:06 2007 : + ;; Do a non redundant combination of ancient custom + ;; groups and new ones. + (when custg + (let* ((list1 (alist-get :group oprops))) + (dolist (elt custg) + (unless (memq elt list1) + (push elt list1))) + (setf (alist-get :group (cl--slot-descriptor-props old)) list1))) + ;; End PLN + + ;; PLN Mon Jun 25 22:44:34 2007 : If a new cust is + ;; set, simply replaces the old one. + (dolist (prop '(:custom :label :documentation :printer)) + (when (alist-get prop (cl--slot-descriptor-props new)) + (setf (alist-get prop (cl--slot-descriptor-props old)) + (alist-get prop (cl--slot-descriptor-props new)))) + + ) )) + +(defun eieio--add-new-slot (newc slot init alloc &optional defaultoverride skipnil) - "Add into NEWC attribute A. -If A already exists in NEWC, then do nothing. If it doesn't exist, -then also add in D (default), DOC, TYPE, CUST, LABEL, CUSTG, PRINT, PROT, and INIT arg. + "Add into NEWC attribute SLOT. +If a slot of that name already exists in NEWC, then do nothing. If it doesn't exist, +INIT is the initarg, if any. Argument ALLOC specifies if the slot is allocated per instance, or per class. If optional DEFAULTOVERRIDE is non-nil, then if A exists in NEWC, we must override its value for a default. Optional argument SKIPNIL indicates if type checking should be skipped if default value is nil." ;; Make sure we duplicate those items that are sequences. + (let* ((a (cl--slot-descriptor-name slot)) + (d (cl--slot-descriptor-initform slot)) + (old (car (cl-member a (eieio--class-slots newc) + :key #'cl--slot-descriptor-name))) + (cold (car (cl-member a (eieio--class-class-slots newc) + :key #'cl--slot-descriptor-name)))) (condition-case nil (if (sequencep d) (setq d (copy-sequence d))) - ;; This copy can fail on a cons cell with a non-cons in the cdr. Let's skip it if it doesn't work. + ;; This copy can fail on a cons cell with a non-cons in the cdr. Let's + ;; skip it if it doesn't work. (error nil)) - (if (sequencep type) (setq type (copy-sequence type))) - (if (sequencep cust) (setq cust (copy-sequence cust))) - (if (sequencep custg) (setq custg (copy-sequence custg))) + ;; (if (sequencep type) (setq type (copy-sequence type))) + ;; (if (sequencep cust) (setq cust (copy-sequence cust))) + ;; (if (sequencep custg) (setq custg (copy-sequence custg))) ;; To prevent override information w/out specification of storage, ;; we need to do this little hack. - (if (member a (eieio--class-class-allocation-a newc)) (setq alloc :class)) + (if cold (setq alloc :class)) - (if (or (not alloc) (and (symbolp alloc) (eq alloc :instance))) + (if (memq alloc '(nil :instance)) ;; In this case, we modify the INSTANCE version of a given slot. - (progn - - ;; Only add this element if it is so-far unique - (if (not (member a (eieio--class-public-a newc))) - (progn - (eieio--perform-slot-validation-for-default a type d skipnil) - (push a (eieio--class-public-a newc)) - (push d (eieio--class-public-d newc)) - (push doc (eieio--class-public-doc newc)) - (push type (eieio--class-public-type newc)) - (push cust (eieio--class-public-custom newc)) - (push label (eieio--class-public-custom-label newc)) - (push custg (eieio--class-public-custom-group newc)) - (push print (eieio--class-public-printer newc)) - (push prot (eieio--class-protection newc)) - (setf (eieio--class-initarg-tuples newc) (cons (cons init a) (eieio--class-initarg-tuples newc))) - ) - ;; When defaultoverride is true, we are usually adding new local - ;; attributes which must override the default value of any slot - ;; passed in by one of the parent classes. - (when defaultoverride - ;; There is a match, and we must override the old value. - (let* ((ca (eieio--class-public-a newc)) - (np (member a ca)) - (num (- (length ca) (length np))) - (dp (if np (nthcdr num (eieio--class-public-d newc)) - nil)) - (tp (if np (nth num (eieio--class-public-type newc)))) - ) - (if (not np) - (error "EIEIO internal error overriding default value for %s" - a) - ;; If type is passed in, is it the same? - (if (not (eq type t)) - (if (not (equal type tp)) - (error - "Child slot type `%s' does not match inherited type `%s' for `%s'" - type tp a))) - ;; If we have a repeat, only update the initarg... - (unless (eq d eieio-unbound) - (eieio--perform-slot-validation-for-default a tp d skipnil) - (setcar dp d)) - ;; If we have a new initarg, check for it. - (when init - (let* ((inits (eieio--class-initarg-tuples newc)) - (inita (rassq a inits))) - ;; Replace the CAR of the associate INITA. - ;;(message "Initarg: %S replace %s" inita init) - (setcar inita init) - )) - - ;; PLN Tue Jun 26 11:57:06 2007 : The protection is - ;; checked and SHOULD match the superclass - ;; protection. Otherwise an error is thrown. However - ;; I wonder if a more flexible schedule might be - ;; implemented. - ;; - ;; EML - We used to have (if prot... here, - ;; but a prot of 'nil means public. - ;; - (let ((super-prot (nth num (eieio--class-protection newc))) - ) - (if (not (eq prot super-prot)) - (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'" - prot super-prot a))) - ;; End original PLN - - ;; PLN Tue Jun 26 11:57:06 2007 : - ;; Do a non redundant combination of ancient custom - ;; groups and new ones. - (when custg - (let* ((groups - (nthcdr num (eieio--class-public-custom-group newc))) - (list1 (car groups)) - (list2 (if (listp custg) custg (list custg)))) - (if (< (length list1) (length list2)) - (setq list1 (prog1 list2 (setq list2 list1)))) - (dolist (elt list2) - (unless (memq elt list1) - (push elt list1))) - (setcar groups list1))) - ;; End PLN - - ;; PLN Mon Jun 25 22:44:34 2007 : If a new cust is - ;; set, simply replaces the old one. - (when cust - ;; (message "Custom type redefined to %s" cust) - (setcar (nthcdr num (eieio--class-public-custom newc)) cust)) - - ;; If a new label is specified, it simply replaces - ;; the old one. - (when label - ;; (message "Custom label redefined to %s" label) - (setcar (nthcdr num (eieio--class-public-custom-label newc)) label)) - ;; End PLN - - ;; PLN Sat Jun 30 17:24:42 2007 : when a new - ;; doc is specified, simply replaces the old one. - (when doc - ;;(message "Documentation redefined to %s" doc) - (setcar (nthcdr num (eieio--class-public-doc newc)) - doc)) - ;; End PLN - - ;; If a new printer is specified, it simply replaces - ;; the old one. - (when print - ;; (message "printer redefined to %s" print) - (setcar (nthcdr num (eieio--class-public-printer newc)) print)) - - ))) - )) + ;; Only add this element if it is so-far unique + (if (not old) + (progn + (eieio--perform-slot-validation-for-default slot skipnil) + (push slot (eieio--class-slots newc)) + ) + ;; When defaultoverride is true, we are usually adding new local + ;; attributes which must override the default value of any slot + ;; passed in by one of the parent classes. + (when defaultoverride + (eieio--slot-override old slot skipnil))) + (when init + (cl-pushnew (cons init a) (eieio--class-initarg-tuples newc) + :test #'equal))) ;; CLASS ALLOCATED SLOTS - (let ((value (eieio-default-eval-maybe d))) - (if (not (member a (eieio--class-class-allocation-a newc))) - (progn - (eieio--perform-slot-validation-for-default a type value skipnil) - ;; Here we have found a :class version of a slot. This - ;; requires a very different approach. - (push a (eieio--class-class-allocation-a newc)) - (push doc (eieio--class-class-allocation-doc newc)) - (push type (eieio--class-class-allocation-type newc)) - (push cust (eieio--class-class-allocation-custom newc)) - (push label (eieio--class-class-allocation-custom-label newc)) - (push custg (eieio--class-class-allocation-custom-group newc)) - (push prot (eieio--class-class-allocation-protection newc)) - ;; Default value is stored in the 'values section, since new objects - ;; can't initialize from this element. - (push value (eieio--class-class-allocation-values newc))) - (when defaultoverride - ;; There is a match, and we must override the old value. - (let* ((ca (eieio--class-class-allocation-a newc)) - (np (member a ca)) - (num (- (length ca) (length np))) - (dp (if np - (nthcdr num - (eieio--class-class-allocation-values newc)) - nil)) - (tp (if np (nth num (eieio--class-class-allocation-type newc)) - nil))) - (if (not np) - (error "EIEIO internal error overriding default value for %s" - a) - ;; If type is passed in, is it the same? - (if (not (eq type t)) - (if (not (equal type tp)) - (error - "Child slot type `%s' does not match inherited type `%s' for `%s'" - type tp a))) - ;; EML - Note: the only reason to override a class bound slot - ;; is to change the default, so allow unbound in. - - ;; If we have a repeat, only update the value... - (eieio--perform-slot-validation-for-default a tp value skipnil) - (setcar dp value)) - - ;; PLN Tue Jun 26 11:57:06 2007 : The protection is - ;; checked and SHOULD match the superclass - ;; protection. Otherwise an error is thrown. However - ;; I wonder if a more flexible schedule might be - ;; implemented. - (let ((super-prot - (car (nthcdr num (eieio--class-class-allocation-protection newc))))) - (if (not (eq prot super-prot)) - (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'" - prot super-prot a))) - ;; Do a non redundant combination of ancient custom groups - ;; and new ones. - (when custg - (let* ((groups - (nthcdr num (eieio--class-class-allocation-custom-group newc))) - (list1 (car groups)) - (list2 (if (listp custg) custg (list custg)))) - (if (< (length list1) (length list2)) - (setq list1 (prog1 list2 (setq list2 list1)))) - (dolist (elt list2) - (unless (memq elt list1) - (push elt list1))) - (setcar groups list1))) - - ;; PLN Sat Jun 30 17:24:42 2007 : when a new - ;; doc is specified, simply replaces the old one. - (when doc - ;;(message "Documentation redefined to %s" doc) - (setcar (nthcdr num (eieio--class-class-allocation-doc newc)) - doc)) - ;; End PLN - - ;; If a new printer is specified, it simply replaces - ;; the old one. - (when print - ;; (message "printer redefined to %s" print) - (setcar (nthcdr num (eieio--class-class-allocation-printer newc)) print)) - - )) - )) - )) + (if (not cold) + (progn + (eieio--perform-slot-validation-for-default slot skipnil) + ;; Here we have found a :class version of a slot. This + ;; requires a very different approach. + (push slot (eieio--class-class-slots newc))) + (when defaultoverride + ;; There is a match, and we must override the old value. + (eieio--slot-override cold slot skipnil)))))) (defun eieio-copy-parents-into-subclass (newc) "Copy into NEWC the slots of PARENTS. @@ -784,63 +668,22 @@ Follow the rules of not overwriting early parents when applying to the new child class." (let ((sn (eieio--class-option-assoc (eieio--class-options newc) :allow-nil-initform))) - (dolist (pcv (eieio--class-parent newc)) + (dolist (pcv (eieio--class-parents newc)) ;; First, duplicate all the slots of the parent. - (let ((pa (eieio--class-public-a pcv)) - (pd (eieio--class-public-d pcv)) - (pdoc (eieio--class-public-doc pcv)) - (ptype (eieio--class-public-type pcv)) - (pcust (eieio--class-public-custom pcv)) - (plabel (eieio--class-public-custom-label pcv)) - (pcustg (eieio--class-public-custom-group pcv)) - (printer (eieio--class-public-printer pcv)) - (pprot (eieio--class-protection pcv)) - (pinit (eieio--class-initarg-tuples pcv)) - (i 0)) - (while pa - (eieio--add-new-slot newc - (car pa) (car pd) (car pdoc) (aref ptype i) - (car pcust) (car plabel) (car pcustg) - (car printer) - (car pprot) (car-safe (car pinit)) nil nil sn) + (let ((pslots (eieio--class-slots pcv)) + (pinit (eieio--class-initarg-tuples pcv))) + (dotimes (i (length pslots)) + (eieio--add-new-slot newc (cl--copy-slot-descriptor (aref pslots i)) + (car-safe (car pinit)) nil nil sn) ;; Increment each value. - (setq pa (cdr pa) - pd (cdr pd) - pdoc (cdr pdoc) - i (1+ i) - pcust (cdr pcust) - plabel (cdr plabel) - pcustg (cdr pcustg) - printer (cdr printer) - pprot (cdr pprot) - pinit (cdr pinit)) + (setq pinit (cdr pinit)) )) ;; while/let ;; Now duplicate all the class alloc slots. - (let ((pa (eieio--class-class-allocation-a pcv)) - (pdoc (eieio--class-class-allocation-doc pcv)) - (ptype (eieio--class-class-allocation-type pcv)) - (pcust (eieio--class-class-allocation-custom pcv)) - (plabel (eieio--class-class-allocation-custom-label pcv)) - (pcustg (eieio--class-class-allocation-custom-group pcv)) - (printer (eieio--class-class-allocation-printer pcv)) - (pprot (eieio--class-class-allocation-protection pcv)) - (pval (eieio--class-class-allocation-values pcv)) - (i 0)) - (while pa - (eieio--add-new-slot newc - (car pa) (aref pval i) (car pdoc) (aref ptype i) - (car pcust) (car plabel) (car pcustg) - (car printer) - (car pprot) nil :class sn) - ;; Increment each value. - (setq pa (cdr pa) - pdoc (cdr pdoc) - pcust (cdr pcust) - plabel (cdr plabel) - pcustg (cdr pcustg) - printer (cdr printer) - pprot (cdr pprot) - i (1+ i)) + (let ((pcslots (eieio--class-class-slots pcv))) + (dotimes (i (length pcslots)) + (eieio--add-new-slot newc (cl--copy-slot-descriptor + (aref pcslots i)) + nil :class sn) ))))) @@ -865,10 +708,11 @@ an error." nil ;; Trim off object IDX junk added in for the object index. (setq slot-idx (- slot-idx (eval-when-compile eieio--object-num-slots))) - (let ((st (aref (eieio--class-public-type class) slot-idx))) + (let ((st (cl--slot-descriptor-type (aref (eieio--class-slots class) + slot-idx)))) (if (not (eieio--perform-slot-validation st value)) (signal 'invalid-slot-type - (list (eieio--class-symbol class) slot st value)))))) + (list (eieio--class-name class) slot st value)))))) (defun eieio--validate-class-slot-value (class slot-idx value slot) "Make sure that for CLASS referencing SLOT-IDX, VALUE is valid. @@ -877,11 +721,11 @@ SLOT is the slot that is being checked, and is only used when throwing an error." (if eieio-skip-typecheck nil - (let ((st (aref (eieio--class-class-allocation-type class) - slot-idx))) + (let ((st (cl--slot-descriptor-type (aref (eieio--class-class-slots class) + slot-idx)))) (if (not (eieio--perform-slot-validation st value)) (signal 'invalid-slot-type - (list (eieio--class-symbol class) slot st value)))))) + (list (eieio--class-name class) slot st value)))))) (defun eieio-barf-if-slot-unbound (value instance slotname fn) "Throw a signal if VALUE is a representation of an UNBOUND slot. @@ -889,7 +733,7 @@ INSTANCE is the object being referenced. SLOTNAME is the offending slot. If the slot is ok, return VALUE. Argument FN is the function calling this verifier." (if (and (eq value eieio-unbound) (not eieio-skip-typecheck)) - (slot-unbound instance (eieio--object-class-object instance) slotname fn) + (slot-unbound instance (eieio--object-class instance) slotname fn) value)) @@ -904,7 +748,7 @@ Argument FN is the function calling this verifier." (let ((c (eieio--class-v obj))) (if (eieio--class-p c) (eieio-class-un-autoload obj)) c)) - (t (eieio--object-class-object obj)))) + (t (eieio--object-class obj)))) (c (eieio--slot-name-index class slot))) (if (not c) ;; It might be missing because it is a :class allocated slot. @@ -928,7 +772,7 @@ Fills in OBJ's SLOT with its default value." (cl-check-type obj (or eieio-object class)) (cl-check-type slot symbol) (let* ((cl (cond ((symbolp obj) (eieio--class-v obj)) - (t (eieio--object-class-object obj)))) + (t (eieio--object-class obj)))) (c (eieio--slot-name-index cl slot))) (if (not c) ;; It might be missing because it is a :class allocated slot. @@ -942,10 +786,11 @@ Fills in OBJ's SLOT with its default value." ;;(signal 'invalid-slot-name (list (class-name cl) slot)) ) (eieio-barf-if-slot-unbound - (let ((val (nth (- c (eval-when-compile eieio--object-num-slots)) - (eieio--class-public-d cl)))) + (let ((val (cl--slot-descriptor-initform + (aref (eieio--class-slots cl) + (- c (eval-when-compile eieio--object-num-slots)))))) (eieio-default-eval-maybe val)) - obj (eieio--class-symbol cl) 'oref-default)))) + obj (eieio--class-name cl) 'oref-default)))) (defun eieio-default-eval-maybe (val) "Check VAL, and return what `oref-default' would provide." @@ -966,7 +811,7 @@ Fills in OBJ's SLOT with its default value." Fills in OBJ's SLOT with VALUE." (cl-check-type obj eieio-object) (cl-check-type slot symbol) - (let* ((class (eieio--object-class-object obj)) + (let* ((class (eieio--object-class obj)) (c (eieio--slot-name-index class slot))) (if (not c) ;; It might be missing because it is a :class allocated slot. @@ -1001,13 +846,24 @@ Fills in the default value in CLASS' in SLOT with VALUE." (eieio--validate-class-slot-value class c value slot) (aset (eieio--class-class-allocation-values class) c value)) - (signal 'invalid-slot-name (list (eieio--class-symbol class) slot))) + (signal 'invalid-slot-name (list (eieio--class-name class) slot))) + ;; `oset-default' on an instance-allocated slot is allowed by EIEIO but + ;; not by CLOS and is mildly inconsistent with the :initform thingy, so + ;; it'd be nice to get of it. This said, it is/was used at one place by + ;; gnus/registry.el, so it might be used elsewhere as well, so let's + ;; keep it for now. + ;; FIXME: Generate a compile-time warning for it! + ;; (error "Can't `oset-default' an instance-allocated slot: %S of %S" + ;; slot class) (eieio--validate-slot-value class c value slot) ;; Set this into the storage for defaults. (if (eieio-eval-default-p value) (error "Can't set default to a sexp that gets evaluated again")) - (setcar (nthcdr (- c (eval-when-compile eieio--object-num-slots)) - (eieio--class-public-d class)) + (setf (cl--slot-descriptor-initform + ;; FIXME: Apparently we set it both in `slots' and in + ;; `object-cache', which seems redundant. + (aref (eieio--class-slots class) + (- c (eval-when-compile eieio--object-num-slots)))) value) ;; Take the value, and put it into our cache object. (eieio-oset (eieio--class-default-object-cache class) @@ -1023,11 +879,16 @@ The slot is a symbol which is installed in CLASS by the `defclass' call. If SLOT is the value created with :initarg instead, reverse-lookup that name, and recurse with the associated slot value." ;; Removed checks to outside this call - (let* ((fsi (gethash slot (eieio--class-symbol-hashtable class)))) + (let* ((fsi (gethash slot (eieio--class-index-table class)))) (if (integerp fsi) (+ (eval-when-compile eieio--object-num-slots) fsi) (let ((fn (eieio--initarg-to-attribute class slot))) - (if fn (eieio--slot-name-index class fn) nil))))) + (if fn + ;; Accessing a slot via its :initarg is accepted by EIEIO + ;; (but not CLOS) but is a bad idea (for one: it's slower). + ;; FIXME: We should emit a compile-time warning when this happens! + (eieio--slot-name-index class fn) + nil))))) (defun eieio--class-slot-name-index (class slot) "In CLASS find the index of the named SLOT. @@ -1036,13 +897,12 @@ call. If SLOT is the value created with :initarg instead, reverse-lookup that name, and recurse with the associated slot value." ;; This will happen less often, and with fewer slots. Do this the ;; storage cheap way. - (let* ((a (eieio--class-class-allocation-a class)) - (l1 (length a)) - (af (memq slot a)) - (l2 (length af))) - ;; Slot # is length of the total list, minus the remaining list of - ;; the found slot. - (if af (- l1 l2)))) + (let ((index nil) + (slots (eieio--class-class-slots class))) + (dotimes (i (length slots)) + (if (eq slot (cl--slot-descriptor-name (aref slots i))) + (setq index i))) + index)) ;;; ;; Way to assign slots based on a list. Used for constructors, or @@ -1053,12 +913,12 @@ reverse-lookup that name, and recurse with the associated slot value." If SET-ALL is non-nil, then when a default is nil, that value is reset. If SET-ALL is nil, the slots are only reset if the default is not nil." - (let ((pub (eieio--class-public-a (eieio--object-class-object obj)))) - (while pub - (let ((df (eieio-oref-default obj (car pub)))) + (let ((slots (eieio--class-slots (eieio--object-class obj)))) + (dotimes (i (length slots)) + (let* ((name (cl--slot-descriptor-name (aref slots i))) + (df (eieio-oref-default obj name))) (if (or df set-all) - (eieio-oset obj (car pub) df))) - (setq pub (cdr pub))))) + (eieio-oset obj name df)))))) (defun eieio--initarg-to-attribute (class initarg) "For CLASS, convert INITARG to the actual attribute name. @@ -1085,11 +945,8 @@ need be... May remove that later...)" (defun eieio--c3-merge-lists (reversed-partial-result remaining-inputs) "Merge REVERSED-PARTIAL-RESULT REMAINING-INPUTS in a consistent order, if possible. If a consistent order does not exist, signal an error." - (if (let ((tail remaining-inputs) - (found nil)) - (while (and tail (not found)) - (setq found (car tail) tail (cdr tail))) - (not found)) + (setq remaining-inputs (delq nil remaining-inputs)) + (if (null remaining-inputs) ;; If all remaining inputs are empty lists, we are done. (nreverse reversed-partial-result) ;; Otherwise, we try to find the next element of the result. This @@ -1100,9 +957,8 @@ If a consistent order does not exist, signal an error." (tail remaining-inputs) (next (progn (while (and tail (not found)) - (setq found (and (car tail) - (eieio--c3-candidate (caar tail) - remaining-inputs)) + (setq found (eieio--c3-candidate (caar tail) + remaining-inputs) tail (cdr tail))) found))) (if next @@ -1116,9 +972,13 @@ If a consistent order does not exist, signal an error." ;; The graph is inconsistent, give up (signal 'inconsistent-class-hierarchy (list remaining-inputs)))))) +(defsubst eieio--class/struct-parents (class) + (or (eieio--class-parents class) + `(,eieio-default-superclass))) + (defun eieio--class-precedence-c3 (class) "Return all parents of CLASS in c3 order." - (let ((parents (eieio--class-parent (eieio--class-v class)))) + (let ((parents (eieio--class-parents (eieio--class-v class)))) (eieio--c3-merge-lists (list class) (append @@ -1132,7 +992,7 @@ If a consistent order does not exist, signal an error." (defun eieio--class-precedence-dfs (class) "Return all parents of CLASS in depth-first order." - (let* ((parents (eieio--class-parent class)) + (let* ((parents (eieio--class-parents class)) (classes (copy-sequence (apply #'append (list class) @@ -1155,15 +1015,13 @@ If a consistent order does not exist, signal an error." (defun eieio--class-precedence-bfs (class) "Return all parents of CLASS in breadth-first order." (let* ((result) - (queue (or (eieio--class-parent class) - `(,eieio-default-superclass)))) + (queue (eieio--class/struct-parents class))) (while queue (let ((head (pop queue))) (unless (member head result) (push head result) (unless (eq head eieio-default-superclass) - (setq queue (append queue (or (eieio--class-parent head) - `(,eieio-default-superclass)))))))) + (setq queue (append queue (eieio--class/struct-parents head))))))) (cons class (nreverse result))) ) @@ -1177,7 +1035,7 @@ method invocation orders of the involved classes." (if (or (null class) (eq class eieio-default-superclass)) nil (unless (eieio--class-default-object-cache class) - (eieio-class-un-autoload (eieio--class-symbol class))) + (eieio-class-un-autoload (eieio--class-name class))) (cl-case (eieio--class-method-invocation-order class) (:depth-first (eieio--class-precedence-dfs class)) @@ -1211,7 +1069,7 @@ method invocation orders of the involved classes." 50 #'cl--generic-struct-tag (lambda (tag) (and (symbolp tag) (boundp tag) (eieio--class-p (symbol-value tag)) - (mapcar #'eieio--class-symbol + (mapcar #'eieio--class-name (eieio--class-precedence-list (symbol-value tag))))))) (cl-defmethod cl-generic-generalizers :extra "class" (specializer) @@ -1235,7 +1093,7 @@ method invocation orders of the involved classes." (defun eieio--generic-subclass-specializers (tag) (when (eieio--class-p tag) (mapcar (lambda (class) - `(subclass ,(eieio--class-symbol class))) + `(subclass ,(eieio--class-name class))) (eieio--class-precedence-list tag)))) (defconst eieio--generic-subclass-generalizer @@ -1247,7 +1105,7 @@ method invocation orders of the involved classes." (list eieio--generic-subclass-generalizer)) -;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "25a66814a400e7dea16bf0f3bfe245ed") +;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "0609a7bdcd6f38876b7f5647047ddca9") ;;; Generated autoloads from eieio-compat.el (autoload 'eieio--defalias "eieio-compat" "\ diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el index 0e0b31e4e7e..26fc452f7b1 100644 --- a/lisp/emacs-lisp/eieio-custom.el +++ b/lisp/emacs-lisp/eieio-custom.el @@ -193,12 +193,8 @@ Optional argument IGNORE is an extraneous parameter." (let* ((chil nil) (obj (widget-get widget :value)) (master-group (widget-get widget :eieio-group)) - (cv (eieio--object-class-object obj)) - (slots (eieio--class-public-a cv)) - (flabel (eieio--class-public-custom-label cv)) - (fgroup (eieio--class-public-custom-group cv)) - (fdoc (eieio--class-public-doc cv)) - (fcust (eieio--class-public-custom cv))) + (cv (eieio--object-class obj)) + (slots (eieio--class-slots cv))) ;; First line describes the object, but may not editable. (if (widget-get widget :eieio-show-name) (setq chil (cons (widget-create-child-and-convert @@ -208,7 +204,7 @@ Optional argument IGNORE is an extraneous parameter." chil))) ;; Display information about the group being shown (when master-group - (let ((groups (eieio--class-option (eieio--object-class-object obj) + (let ((groups (eieio--class-option (eieio--object-class obj) :custom-groups))) (widget-insert "Groups:") (while groups @@ -225,63 +221,59 @@ Optional argument IGNORE is an extraneous parameter." (setq groups (cdr groups))) (widget-insert "\n\n"))) ;; Loop over all the slots, creating child widgets. - (while slots - ;; Output this slot if it has a customize flag associated with it. - (when (and (car fcust) - (or (not master-group) (member master-group (car fgroup))) - (slot-boundp obj (car slots))) - ;; In this case, this slot has a custom type. Create its - ;; children widgets. - (let ((type (eieio-filter-slot-type widget (car fcust))) - (stuff nil)) - ;; This next bit is an evil hack to get some EDE functions - ;; working the way I like. - (if (and (listp type) - (setq stuff (member :slotofchoices type))) - (let ((choices (eieio-oref obj (car (cdr stuff)))) - (newtype nil)) - (while (not (eq (car type) :slotofchoices)) - (setq newtype (cons (car type) newtype) - type (cdr type))) - (while choices - (setq newtype (cons (list 'const (car choices)) - newtype) - choices (cdr choices))) - (setq type (nreverse newtype)))) - (setq chil (cons (widget-create-child-and-convert - widget 'object-slot - :childtype type - :sample-face 'eieio-custom-slot-tag-face - :tag - (concat - (make-string - (or (widget-get widget :indent) 0) - ? ) - (if (car flabel) - (car flabel) - (let ((s (symbol-name - (or - (eieio--class-slot-initarg - (eieio--object-class-object obj) - (car slots)) - (car slots))))) - (capitalize - (if (string-match "^:" s) - (substring s (match-end 0)) - s))))) - :value (slot-value obj (car slots)) - :doc (if (car fdoc) (car fdoc) - "Slot not Documented.") - :eieio-custom-visibility 'visible - ) - chil)) - ) - ) - (setq slots (cdr slots) - fdoc (cdr fdoc) - fcust (cdr fcust) - flabel (cdr flabel) - fgroup (cdr fgroup))) + (dotimes (i (length slots)) + (let* ((slot (aref slots i)) + (props (cl--slot-descriptor-props slot))) + ;; Output this slot if it has a customize flag associated with it. + (when (and (alist-get :custom props) + (or (not master-group) + (member master-group (alist-get :group props))) + (slot-boundp obj (cl--slot-descriptor-name slot))) + ;; In this case, this slot has a custom type. Create its + ;; children widgets. + (let ((type (eieio-filter-slot-type widget (alist-get :custom props))) + (stuff nil)) + ;; This next bit is an evil hack to get some EDE functions + ;; working the way I like. + (if (and (listp type) + (setq stuff (member :slotofchoices type))) + (let ((choices (eieio-oref obj (car (cdr stuff)))) + (newtype nil)) + (while (not (eq (car type) :slotofchoices)) + (setq newtype (cons (car type) newtype) + type (cdr type))) + (while choices + (setq newtype (cons (list 'const (car choices)) + newtype) + choices (cdr choices))) + (setq type (nreverse newtype)))) + (setq chil (cons (widget-create-child-and-convert + widget 'object-slot + :childtype type + :sample-face 'eieio-custom-slot-tag-face + :tag + (concat + (make-string + (or (widget-get widget :indent) 0) + ?\s) + (or (alist-get :label props) + (let ((s (symbol-name + (or + (eieio--class-slot-initarg + (eieio--object-class obj) + (car slots)) + (car slots))))) + (capitalize + (if (string-match "^:" s) + (substring s (match-end 0)) + s))))) + :value (slot-value obj (car slots)) + :doc (or (alist-get :documentation props) + "Slot not Documented.") + :eieio-custom-visibility 'visible + ) + chil)) + )))) (widget-put widget :children (nreverse chil)) )) @@ -289,34 +281,33 @@ Optional argument IGNORE is an extraneous parameter." "Get the value of WIDGET." (let* ((obj (widget-get widget :value)) (master-group eieio-cog) - (cv (eieio--object-class-object obj)) - (fgroup (eieio--class-public-custom-group cv)) (wids (widget-get widget :children)) (name (if (widget-get widget :eieio-show-name) (car (widget-apply (car wids) :value-inline)) nil)) (chil (if (widget-get widget :eieio-show-name) (nthcdr 1 wids) wids)) - (cv (eieio--object-class-object obj)) - (slots (eieio--class-public-a cv)) - (fcust (eieio--class-public-custom cv))) + (cv (eieio--object-class obj)) + (i 0) + (slots (eieio--class-slots cv))) ;; If there are any prefix widgets, clear them. ;; -- None yet ;; Create a batch of initargs for each slot. - (while (and slots chil) - (if (and (car fcust) - (or eieio-custom-ignore-eieio-co - (not master-group) (member master-group (car fgroup))) - (slot-boundp obj (car slots))) - (progn - ;; Only customized slots have widgets - (let ((eieio-custom-ignore-eieio-co t)) - (eieio-oset obj (car slots) - (car (widget-apply (car chil) :value-inline)))) - (setq chil (cdr chil)))) - (setq slots (cdr slots) - fgroup (cdr fgroup) - fcust (cdr fcust))) + (while (and (< i (length slots)) chil) + (let* ((slot (aref slots i)) + (props (cl--slot-descriptor-props slot)) + (cust (alist-get :custom props))) + (if (and cust + (or eieio-custom-ignore-eieio-co + (not master-group) + (member master-group (alist-get :group props))) + (slot-boundp obj (cl--slot-descriptor-name slot))) + (progn + ;; Only customized slots have widgets + (let ((eieio-custom-ignore-eieio-co t)) + (eieio-oset obj (cl--slot-descriptor-name slot) + (car (widget-apply (car chil) :value-inline)))) + (setq chil (cdr chil)))))) ;; Set any name updates on it. (if name (eieio-object-set-name-string obj name)) ;; This is the same object we had before. @@ -452,7 +443,7 @@ Must return the created widget." (vector (concat "Group " (symbol-name group)) (list 'customize-object obj (list 'quote group)) t)) - (eieio--class-option (eieio--object-class-object obj) :custom-groups))) + (eieio--class-option (eieio--object-class obj) :custom-groups))) (defvar eieio-read-custom-group-history nil "History for the custom group reader.") @@ -460,7 +451,7 @@ Must return the created widget." (cl-defmethod eieio-read-customization-group ((obj eieio-default-superclass)) "Do a completing read on the name of a customization group in OBJ. Return the symbol for the group, or nil" - (let ((g (eieio--class-option (eieio--object-class-object obj) + (let ((g (eieio--class-option (eieio--object-class obj) :custom-groups))) (if (= (length g) 1) (car g) diff --git a/lisp/emacs-lisp/eieio-datadebug.el b/lisp/emacs-lisp/eieio-datadebug.el index 82349192e5e..c820180359b 100644 --- a/lisp/emacs-lisp/eieio-datadebug.el +++ b/lisp/emacs-lisp/eieio-datadebug.el @@ -31,6 +31,9 @@ ;;; Code: +(declare-function data-debug/eieio-insert-slots "eieio-datadebug" + (obj eieio-default-superclass)) + (defun data-debug-insert-object-slots (object prefix) "Insert all the slots of OBJECT. PREFIX specifies what to insert at the start of each line." @@ -54,16 +57,17 @@ PREFIX specifies what to insert at the start of each line." "Insert a button representing OBJECT. PREFIX is the text that precedes the button. PREBUTTONTEXT is some text between PREFIX and the object button." - (let ((start (point)) - (end nil) - (str (object-print object)) - (tip (format "Object %s\nClass: %S\nParent(s): %S\n%d slots" - (eieio-object-name-string object) - (eieio-object-class object) - (eieio-class-parents (eieio-object-class object)) - (length (object-slots object)) - )) - ) + (let* ((start (point)) + (end nil) + (str (object-print object)) + (class (eieio-object-class object)) + (tip (format "Object %s\nClass: %S\nParent(s): %S\n%d slots" + (eieio-object-name-string object) + class + (eieio-class-parents class) + (length (eieio-class-slots class)) + )) + ) (insert prefix prebuttontext str) (setq end (point)) (put-text-property (- end (length str)) end 'face 'font-lock-keyword-face) @@ -80,41 +84,31 @@ PREBUTTONTEXT is some text between PREFIX and the object button." ;; Each object should have an opportunity to show stuff about itself. (cl-defmethod data-debug/eieio-insert-slots ((obj eieio-default-superclass) - prefix) + prefix) "Insert the slots of OBJ into the current DDEBUG buffer." (let ((inhibit-read-only t)) (data-debug-insert-thing (eieio-object-name-string obj) prefix "Name: ") - (let* ((cl (eieio-object-class obj)) - (cv (eieio--class-v cl))) - (data-debug-insert-thing (eieio--class-constructor cl) + (let* ((cv (eieio--object-class obj))) + (data-debug-insert-thing (eieio--class-name cv) prefix "Class: ") ;; Loop over all the public slots - (let ((publa (eieio--class-public-a cv)) - ) - (while publa - (if (slot-boundp obj (car publa)) - (let* ((i (eieio--class-slot-initarg (eieio--class-v cl) - (car publa))) - (v (eieio-oref obj (car publa)))) - (data-debug-insert-thing - v prefix (concat - (if i (symbol-name i) - (symbol-name (car publa))) - " "))) - ;; Unbound case - (let ((i (eieio--class-slot-initarg (eieio--class-v cl) - (car publa)))) - (data-debug-insert-custom - "#unbound" prefix - (concat (if i (symbol-name i) - (symbol-name (car publa))) - " ") - 'font-lock-keyword-face)) - ) - (setq publa (cdr publa))))))) + (let ((slots (eieio--class-slots cv))) + (dotimes (i (length slots)) + (let* ((slot (aref slots i)) + (sname (cl--slot-descriptor-name slot)) + (i (eieio--class-slot-initarg cv sname)) + (sstr (concat (symbol-name (or i sname)) " "))) + (if (slot-boundp obj sname) + (let* ((v (eieio-oref obj sname))) + (data-debug-insert-thing v prefix sstr)) + ;; Unbound case + (data-debug-insert-custom + "#unbound" prefix sstr + 'font-lock-keyword-face) + ))))))) ;;; Augment the Data debug thing display list. (data-debug-add-specialized-thing (lambda (thing) (eieio-object-p thing)) diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index a769ca7b536..7f98730340d 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -99,7 +99,7 @@ If CLASS is actually an object, then also display current values of that object. (when pl (insert " Inherits from ") (while (setq cur (pop pl)) - (setq cur (eieio--class-symbol cur)) + (setq cur (eieio--class-name cur)) (insert "`") (help-insert-xref-button (symbol-name cur) 'help-function cur) @@ -136,74 +136,40 @@ If CLASS is actually an object, then also display current values of that object. (or doc ""))) (insert "\n\n"))))) +(defun eieio--help-print-slot (slot) + (insert + (concat + (propertize "Slot: " 'face 'bold) + (prin1-to-string (cl--slot-descriptor-name slot)) + (unless (eq (cl--slot-descriptor-type slot) t) + (concat " type = " + (prin1-to-string (cl--slot-descriptor-type slot)))) + (unless (eq (cl--slot-descriptor-initform slot) eieio-unbound) + (concat " default = " + (prin1-to-string (cl--slot-descriptor-initform slot)))) + (when (alist-get :printer (cl--slot-descriptor-props slot)) + (concat " printer = " + (prin1-to-string + (alist-get :printer (cl--slot-descriptor-props slot))))) + (when (alist-get :documentation (cl--slot-descriptor-props slot)) + (concat "\n " (alist-get :documentation (cl--slot-descriptor-props slot)) + "\n"))) + "\n")) + (defun eieio-help-class-slots (class) "Print help description for the slots in CLASS. Outputs to the current buffer." (let* ((cv (eieio--class-v class)) - (docs (eieio--class-public-doc cv)) - (names (eieio--class-public-a cv)) - (deflt (eieio--class-public-d cv)) - (types (eieio--class-public-type cv)) - (publp (eieio--class-public-printer cv)) - (i 0) - (prot (eieio--class-protection cv)) - ) + (slots (eieio--class-slots cv)) + (cslots (eieio--class-class-slots cv))) (insert (propertize "Instance Allocated Slots:\n\n" 'face 'bold)) - (while names - (insert - (concat - (when (car prot) - (propertize "Private " 'face 'bold)) - (propertize "Slot: " 'face 'bold) - (prin1-to-string (car names)) - (unless (eq (aref types i) t) - (concat " type = " - (prin1-to-string (aref types i)))) - (unless (eq (car deflt) eieio-unbound) - (concat " default = " - (prin1-to-string (car deflt)))) - (when (car publp) - (concat " printer = " - (prin1-to-string (car publp)))) - (when (car docs) - (concat "\n " (car docs) "\n")) - "\n")) - (setq names (cdr names) - docs (cdr docs) - deflt (cdr deflt) - publp (cdr publp) - prot (cdr prot) - i (1+ i))) - (setq docs (eieio--class-class-allocation-doc cv) - names (eieio--class-class-allocation-a cv) - types (eieio--class-class-allocation-type cv) - i 0 - prot (eieio--class-class-allocation-protection cv)) - (when names + (dotimes (i (length slots)) + (eieio--help-print-slot (aref slots i))) + (when (> (length cslots) 0) (insert (propertize "\nClass Allocated Slots:\n\n" 'face 'bold))) - (while names - (insert - (concat - (when (car prot) - "Private ") - "Slot: " - (prin1-to-string (car names)) - (unless (eq (aref types i) t) - (concat " type = " - (prin1-to-string (aref types i)))) - (condition-case nil - (let ((value (eieio-oref class (car names)))) - (concat " value = " - (prin1-to-string value))) - (error nil)) - (when (car docs) - (concat "\n\n " (car docs) "\n")) - "\n")) - (setq names (cdr names) - docs (cdr docs) - prot (cdr prot) - i (1+ i))))) + (dotimes (i (length cslots)) + (eieio--help-print-slot (aref cslots i))))) (defun eieio-build-class-alist (&optional class instantiable-only buildlist) "Return an alist of all currently active classes for completion purposes. diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index cdf1992f9a5..4ba67693175 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -320,19 +320,21 @@ variable name of the same name as the slot." (declare (indent 2) (debug (sexp sexp def-body))) (require 'cl-lib) ;; Transform the spec-list into a cl-symbol-macrolet spec-list. - (let ((mappings (mapcar (lambda (entry) - (let ((var (if (listp entry) (car entry) entry)) - (slot (if (listp entry) (cadr entry) entry))) - (list var `(slot-value ,object ',slot)))) - spec-list))) - (append (list 'cl-symbol-macrolet mappings) - body))) + (macroexp-let2 nil object object + `(cl-symbol-macrolet + ,(mapcar (lambda (entry) + (let ((var (if (listp entry) (car entry) entry)) + (slot (if (listp entry) (cadr entry) entry))) + (list var `(slot-value ,object ',slot)))) + spec-list) + ,@body))) ;;; Simple generators, and query functions. None of these would do ;; well embedded into an object. ;; + (define-obsolete-function-alias - 'object-class-fast #'eieio--object-class-name "24.4") + 'object-class-fast #'eieio-object-class "24.4") (cl-defgeneric eieio-object-name-string (obj) "Return a string which is OBJ's name." @@ -342,7 +344,7 @@ variable name of the same name as the slot." "Return a printed representation for object OBJ. If EXTRA, include that in the string returned to represent the symbol." (cl-check-type obj eieio-object) - (format "#<%s %s%s>" (eieio--object-class-name obj) + (format "#<%s %s%s>" (eieio-object-class obj) (eieio-object-name-string obj) (or extra ""))) (define-obsolete-function-alias 'object-name #'eieio-object-name "24.4") @@ -370,7 +372,7 @@ If EXTRA, include that in the string returned to represent the symbol." "Return the class struct defining OBJ." ;; FIXME: We say we return a "struct" but we return a symbol instead! (cl-check-type obj eieio-object) - (eieio--object-class-name obj)) + (eieio--class-name (eieio--object-class obj))) (define-obsolete-function-alias 'object-class #'eieio-object-class "24.4") ;; CLOS name, maybe? (define-obsolete-function-alias 'class-of #'eieio-object-class "24.4") @@ -378,7 +380,7 @@ If EXTRA, include that in the string returned to represent the symbol." (defun eieio-object-class-name (obj) "Return a Lisp like symbol name for OBJ's class." (cl-check-type obj eieio-object) - (eieio-class-name (eieio--object-class-object obj))) + (eieio-class-name (eieio--object-class obj))) (define-obsolete-function-alias 'object-class-name 'eieio-object-class-name "24.4") @@ -386,7 +388,7 @@ If EXTRA, include that in the string returned to represent the symbol." "Return parent classes to CLASS. (overload of variable). The CLOS function `class-direct-superclasses' is aliased to this function." - (eieio--class-parent (eieio--class-object class))) + (eieio--class-parents (eieio--class-object class))) (define-obsolete-function-alias 'class-parents #'eieio-class-parents "24.4") @@ -414,13 +416,13 @@ The CLOS function `class-direct-subclasses' is aliased to this function." (setq class (eieio--class-object class)) (cl-check-type class eieio--class) (cl-check-type obj eieio-object) - (eq (eieio--object-class-object obj) class)) + (eq (eieio--object-class obj) class)) (defun object-of-class-p (obj class) "Return non-nil if OBJ is an instance of CLASS or CLASS' subclasses." (cl-check-type obj eieio-object) ;; class will be checked one layer down - (child-of-class-p (eieio--object-class-object obj) class)) + (child-of-class-p (eieio--object-class obj) class)) ;; Backwards compatibility (defalias 'obj-of-class-p 'object-of-class-p) @@ -428,36 +430,36 @@ The CLOS function `class-direct-subclasses' is aliased to this function." "Return non-nil if CHILD class is a subclass of CLASS." (setq child (eieio--class-object child)) (cl-check-type child eieio--class) - ;; `eieio-default-superclass' is never mentioned in eieio--class-parent, + ;; `eieio-default-superclass' is never mentioned in eieio--class-parents, ;; so we have to special case it here. (or (eq class 'eieio-default-superclass) (let ((p nil)) (setq class (eieio--class-object class)) (cl-check-type class eieio--class) (while (and child (not (eq child class))) - (setq p (append p (eieio--class-parent child)) + (setq p (append p (eieio--class-parents child)) child (pop p))) (if child t)))) -(defun eieio-slot-descriptor-name (slot) slot) +(defun eieio-slot-descriptor-name (slot) + (cl--slot-descriptor-name slot)) (defun eieio-class-slots (class) "Return list of slots available in instances of CLASS." ;; FIXME: This only gives the instance slots and ignores the ;; class-allocated slots. - ;; FIXME: It only gives the slot's *names* rather than actual - ;; slot descriptors. (setq class (eieio--class-object class)) (cl-check-type class eieio--class) - (eieio--class-public-a class)) + (mapcar #'identity (eieio--class-slots class))) (defun object-slots (obj) "Return list of slots available in OBJ." (declare (obsolete eieio-class-slots "25.1")) (cl-check-type obj eieio-object) - (eieio-class-slots (eieio--object-class-object obj))) + (eieio-class-slots (eieio--object-class obj))) -(defun eieio--class-slot-initarg (class slot) "Fetch from CLASS, SLOT's :initarg." +(defun eieio--class-slot-initarg (class slot) + "Fetch from CLASS, SLOT's :initarg." (cl-check-type class eieio--class) (let ((ia (eieio--class-initarg-tuples class)) (f nil)) @@ -507,12 +509,18 @@ OBJECT can be an instance or a class." (defun slot-exists-p (object-or-class slot) "Return non-nil if OBJECT-OR-CLASS has SLOT." (let ((cv (cond ((eieio-object-p object-or-class) - (eieio--object-class-object object-or-class)) + (eieio--object-class object-or-class)) ((eieio--class-p object-or-class) object-or-class) (t (find-class object-or-class 'error))))) - (or (memq slot (eieio--class-public-a cv)) - (memq slot (eieio--class-class-allocation-a cv))) - )) + (or (gethash slot (eieio--class-index-table cv)) + ;; FIXME: We could speed this up by adding class slots into the + ;; index-table (e.g. with a negative index?). + (let ((cs (eieio--class-class-slots cv)) + found) + (dotimes (i (length cs)) + (if (eq slot (cl--slot-descriptor-name (aref cs i))) + (setq found t))) + found)))) (defun find-class (symbol &optional errorp) "Return the class that SYMBOL represents. @@ -671,7 +679,7 @@ Called from the constructor routine.") "Set slots of OBJ with SLOTS which is a list of name/value pairs. Called from the constructor routine." (while slots - (let ((rn (eieio--initarg-to-attribute (eieio--object-class-object obj) + (let ((rn (eieio--initarg-to-attribute (eieio--object-class obj) (car slots)))) (if (not rn) (slot-missing obj (car slots) 'oset (car (cdr slots))) @@ -694,9 +702,9 @@ not taken, then new objects of your class will not have their values dynamically set from SLOTS." ;; First, see if any of our defaults are `lambda', and ;; re-evaluate them and apply the value to our slots. - (let* ((this-class (eieio--object-class-object this)) - (defaults (eieio--class-public-d this-class))) - (dolist (slot (eieio--class-public-a this-class)) + (let* ((this-class (eieio--object-class this)) + (slots (eieio--class-slots this-class))) + (dotimes (i (length slots)) ;; For each slot, see if we need to evaluate it. ;; ;; Paul Landes said in an email: @@ -704,11 +712,12 @@ dynamically set from SLOTS." ;; > the quoted thing as you already have. This is by the ;; > Sonya E. Keene book and other things I've look at on the ;; > web. - (let ((dflt (eieio-default-eval-maybe (car defaults)))) - (when (not (eq dflt (car defaults))) - (eieio-oset this slot dflt) )) - ;; Next. - (setq defaults (cdr defaults)))) + (let* ((slot (aref slots i)) + (initform (cl--slot-descriptor-initform slot)) + (dflt (eieio-default-eval-maybe initform))) + (when (not (eq dflt initform)) + ;; FIXME: We should be able to just do (aset this (+ i ) dflt)! + (eieio-oset this (cl--slot-descriptor-name slot) dflt))))) ;; Shared initialize will parse our slots for us. (shared-initialize this slots)) @@ -825,32 +834,31 @@ this object." (prin1 (eieio-object-name-string this)) (princ "\n") ;; Loop over all the public slots - (let ((publa (eieio--class-public-a cv)) - (publd (eieio--class-public-d cv)) - (publp (eieio--class-public-printer cv)) + (let ((slots (eieio--class-slots cv)) (eieio-print-depth (1+ eieio-print-depth))) - (while publa - (when (slot-boundp this (car publa)) - (let ((i (eieio--class-slot-initarg cv (car publa))) - (v (eieio-oref this (car publa))) - ) - (unless (or (not i) (equal v (car publd))) - (unless (bolp) - (princ "\n")) - (princ (make-string (* eieio-print-depth 2) ? )) - (princ (symbol-name i)) - (if (car publp) - ;; Use our public printer - (progn - (princ " ") - (funcall (car publp) v)) - ;; Use our generic override prin1 function. - (princ (if (or (eieio-object-p v) - (eieio-object-p (car-safe v))) - "\n" " ")) - (eieio-override-prin1 v))))) - (setq publa (cdr publa) publd (cdr publd) - publp (cdr publp)))) + (dotimes (i (length slots)) + (let ((slot (aref slots i))) + (when (slot-boundp this (cl--slot-descriptor-name slot)) + (let ((i (eieio--class-slot-initarg + cv (cl--slot-descriptor-name slot))) + (v (eieio-oref this (cl--slot-descriptor-name slot)))) + (unless (or (not i) (equal v (cl--slot-descriptor-initform slot))) + (unless (bolp) + (princ "\n")) + (princ (make-string (* eieio-print-depth 2) ? )) + (princ (symbol-name i)) + (if (alist-get :printer (cl--slot-descriptor-props slot)) + ;; Use our public printer + (progn + (princ " ") + (funcall (alist-get :printer + (cl--slot-descriptor-props slot)) + v)) + ;; Use our generic override prin1 function. + (princ (if (or (eieio-object-p v) + (eieio-object-p (car-safe v))) + "\n" " ")) + (eieio-override-prin1 v)))))))) (princ ")") (when (= eieio-print-depth 0) (princ "\n")))) @@ -919,7 +927,7 @@ variable PRINT-FUNCTION. Optional argument NOESCAPE is passed to ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "eieio-custom" "eieio-custom.el" "2ec91e473fcad1ff20cd76edc4aab706") +;;;### (autoloads nil "eieio-custom" "eieio-custom.el" "813d32fbf76d4248fc6b4dc97ebcd720") ;;; Generated autoloads from eieio-custom.el (autoload 'customize-object "eieio-custom" "\ @@ -930,7 +938,7 @@ Optional argument GROUP is the sub-group of slots to display. ;;;*** -;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "d1910eb455f102989fc33bb3f5a9b614") +;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "3005b815c6b30eccbf0642170b3f82a5") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ diff --git a/test/ChangeLog b/test/ChangeLog index e150aba2874..15408a3c970 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,16 @@ +2015-03-19 Stefan Monnier + + * automated/eieio-tests.el (eieio-test-17-virtual-slot): Don't use + initarg in `oset'. + (eieio-test-32-slot-attribute-override-2): Adjust to new + slot representation. + + * automated/eieio-test-persist.el (persist-test-save-and-compare): + Adjust to new slot representation. + + * automated/eieio-test-methodinvoke.el (make-instance): Use new-style + `subclass' specializer for a change. + 2015-03-17 Stefan Monnier * automated/cl-lib-tests.el: Use lexical-binding. diff --git a/test/automated/eieio-test-methodinvoke.el b/test/automated/eieio-test-methodinvoke.el index 62f5603d3b6..5263013434e 100644 --- a/test/automated/eieio-test-methodinvoke.el +++ b/test/automated/eieio-test-methodinvoke.el @@ -184,7 +184,7 @@ (if (next-method-p) (call-next-method)) ) -(defmethod make-instance :STATIC ((p C) &rest args) +(cl-defmethod make-instance ((p (subclass C)) &rest args) (eieio-test-method-store :STATIC 'C) (call-next-method) ) diff --git a/test/automated/eieio-test-persist.el b/test/automated/eieio-test-persist.el index 7bb2f1ca779..6710ead2e77 100644 --- a/test/automated/eieio-test-persist.el +++ b/test/automated/eieio-test-persist.el @@ -45,20 +45,20 @@ This is usually a symbol that starts with `:'." (eieio-persistent-save original) - (let* ((file (oref original :file)) + (let* ((file (oref original file)) (class (eieio-object-class original)) (fromdisk (eieio-persistent-read file class)) (cv (eieio--class-v class)) - (slot-names (eieio--class-public-a cv)) - (slot-deflt (eieio--class-public-d cv)) + (slots (eieio--class-slots cv)) ) (unless (object-of-class-p fromdisk class) (error "Persistent class %S != original class %S" (eieio-object-class fromdisk) class)) - (while slot-names - (let* ((oneslot (car slot-names)) + (dotimes (i (length slots)) + (let* ((slot (aref slots i)) + (oneslot (cl--slot-descriptor-name slot)) (origvalue (eieio-oref original oneslot)) (fromdiskvalue (eieio-oref fromdisk oneslot)) (initarg-p (eieio--attribute-to-initarg @@ -70,12 +70,9 @@ This is usually a symbol that starts with `:'." (error "Slot %S Original Val %S != Persistent Val %S" oneslot origvalue fromdiskvalue)) ;; Else !initarg-p - (unless (equal (car slot-deflt) fromdiskvalue) + (unless (equal (cl--slot-descriptor-initform slot) fromdiskvalue) (error "Slot %S Persistent Val %S != Default Value %S" - oneslot fromdiskvalue (car slot-deflt)))) - - (setq slot-names (cdr slot-names) - slot-deflt (cdr slot-deflt)) + oneslot fromdiskvalue (cl--slot-descriptor-initform slot)))) )))) ;;; Simple Case diff --git a/test/automated/eieio-tests.el b/test/automated/eieio-tests.el index 7532609c4c3..01131d886dd 100644 --- a/test/automated/eieio-tests.el +++ b/test/automated/eieio-tests.el @@ -406,21 +406,21 @@ METHOD is the method that was attempting to be called." (ert-deftest eieio-test-17-virtual-slot () (setq eitest-vsca (virtual-slot-class :base-value 1)) ;; Check slot values - (should (= (oref eitest-vsca :base-value) 1)) + (should (= (oref eitest-vsca base-value) 1)) (should (= (oref eitest-vsca :derived-value) 2)) - (oset eitest-vsca :derived-value 3) - (should (= (oref eitest-vsca :base-value) 2)) + (oset eitest-vsca derived-value 3) + (should (= (oref eitest-vsca base-value) 2)) (should (= (oref eitest-vsca :derived-value) 3)) - (oset eitest-vsca :base-value 3) - (should (= (oref eitest-vsca :base-value) 3)) + (oset eitest-vsca base-value 3) + (should (= (oref eitest-vsca base-value) 3)) (should (= (oref eitest-vsca :derived-value) 4)) ;; should also be possible to initialize instance using virtual slot (setq eitest-vscb (virtual-slot-class :derived-value 5)) - (should (= (oref eitest-vscb :base-value) 4)) + (should (= (oref eitest-vscb base-value) 4)) (should (= (oref eitest-vscb :derived-value) 5))) (ert-deftest eieio-test-18-slot-unbound () @@ -560,7 +560,8 @@ METHOD is the method that was attempting to be called." (setq eitest-t1 (class-c)) ;; Slot initialization (should (eq (oref eitest-t1 slot-1) 'moose)) - (should (eq (oref eitest-t1 :moose) 'moose)) + ;; Accessing via the initarg name is deprecated! + ;; (should (eq (oref eitest-t1 :moose) 'moose)) ;; Don't pass reference of private slot ;;PRIVATE (should-error (oref eitest-t1 slot-2) :type 'invalid-slot-name) ;; Check private slot accessor @@ -580,7 +581,8 @@ METHOD is the method that was attempting to be called." ;; See previous test, nor for subclass (setq eitest-t2 (class-subc)) (should (eq (oref eitest-t2 slot-1) 'moose)) - (should (eq (oref eitest-t2 :moose) 'moose)) + ;; Accessing via the initarg name is deprecated! + ;;(should (eq (oref eitest-t2 :moose) 'moose)) (should (string= (get-slot-2 eitest-t2) "linux")) ;;PRIVATE (should-error (oref eitest-t2 slot-2) :type 'invalid-slot-name) (should (string= (get-slot-2 eitest-t2) "linux")) @@ -802,30 +804,24 @@ Subclasses to override slot attributes.") (ert-deftest eieio-test-32-slot-attribute-override-2 () (let* ((cv (eieio--class-v 'slotattr-ok)) - (docs (eieio--class-public-doc cv)) - (names (eieio--class-public-a cv)) - (cust (eieio--class-public-custom cv)) - (label (eieio--class-public-custom-label cv)) - (group (eieio--class-public-custom-group cv)) - (types (eieio--class-public-type cv)) - (args (eieio--class-initarg-tuples cv)) - (i 0)) + (slots (eieio--class-slots cv)) + (args (eieio--class-initarg-tuples cv))) ;; :initarg should override for subclass (should (assoc :initblarg args)) - (while (< i (length names)) - (cond - ((eq (nth i names) 'custom) - ;; Custom slot attributes must override - (should (eq (nth i cust) 'string)) - ;; Custom label slot attribute must override - (should (string= (nth i label) "One String")) - (let ((grp (nth i group))) - ;; Custom group slot attribute must combine - (should (and (memq 'moose grp) (memq 'cow grp))))) - (t nil)) - - (setq i (1+ i))))) + (dotimes (i (length slots)) + (let* ((slot (aref slots i)) + (props (cl--slot-descriptor-props slot))) + (cond + ((eq (cl--slot-descriptor-name slot) 'custom) + ;; Custom slot attributes must override + (should (eq (alist-get :custom props) 'string)) + ;; Custom label slot attribute must override + (should (string= (alist-get :label props) "One String")) + (let ((grp (alist-get :group props))) + ;; Custom group slot attribute must combine + (should (and (memq 'moose grp) (memq 'cow grp))))) + (t nil)))))) (defvar eitest-CLONETEST1 nil) (defvar eitest-CLONETEST2 nil) @@ -891,8 +887,7 @@ Subclasses to override slot attributes.") (should (= (length (eieio-build-class-alist 'opt-test1 nil)) 2)) (should (= (length (eieio-build-class-alist 'opt-test1 t)) 1))) -(defclass eieio--testing () - ()) +(defclass eieio--testing () ()) (defmethod constructor :static ((_x eieio--testing) newname &rest _args) (list newname 2)) From 29f7f98b7c3755f8f9e9dcef60bd460794cf2104 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 19 Mar 2015 10:35:52 -0400 Subject: [PATCH 330/457] Fixes: debbugs:20141 * lisp/emacs-lisp/eieio.el (object-slots): Return slot names as before. --- lisp/ChangeLog | 42 +++++++++++++++++++++++----------------- lisp/emacs-lisp/eieio.el | 5 +++-- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c751f4e8e8..74a0988c98f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,23 +1,9 @@ 2015-03-19 Stefan Monnier - * emacs-lisp/eieio.el (with-slots): Use macroexp-let2. - (object-class-fast): Change recommend replacement. - (eieio-object-class): Rewrite. - (slot-exists-p): Adjust to new slot representation. - (initialize-instance): Adjust to new slot representation. - (object-write): Adjust to new slot representation. + * emacs-lisp/eieio.el (object-slots): Return slot names as before + (bug#20141). - * emacs-lisp/eieio-opt.el (eieio--help-print-slot): New function - extracted from eieio-help-class-slots. - (eieio-help-class-slots): Use it. Adjust to new slot representation. - - * emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots): - Declare to silence warnings. - (data-debug-insert-object-button): Avoid `object-slots'. - (data-debug/eieio-insert-slots): Adjust to new slot representation. - - * emacs-lisp/eieio-custom.el (eieio-object-value-create) - (eieio-object-value-get): Adjust to new slot representation. +2015-03-19 Stefan Monnier EIEIO: Change class's representation to unify instance and class slots * emacs-lisp/eieio-core.el (eieio--class): Change field names and order @@ -41,7 +27,27 @@ (eieio--class/struct-parents): New function. (eieio--class-precedence-bfs): Use it. - * emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-specializers): + * emacs-lisp/eieio.el (with-slots): Use macroexp-let2. + (object-class-fast): Change recommend replacement. + (eieio-object-class): Rewrite. + (slot-exists-p): Adjust to new slot representation. + (initialize-instance): Adjust to new slot representation. + (object-write): Adjust to new slot representation. + + * emacs-lisp/eieio-opt.el (eieio--help-print-slot): New function + extracted from eieio-help-class-slots. + (eieio-help-class-slots): Use it. Adjust to new slot representation. + + * emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots): + Declare to silence warnings. + (data-debug-insert-object-button): Avoid `object-slots'. + (data-debug/eieio-insert-slots): Adjust to new slot representation. + + * emacs-lisp/eieio-custom.el (eieio-object-value-create) + (eieio-object-value-get): Adjust to new slot representation. + + * emacs-lisp/eieio-compat.el + (eieio--generic-static-symbol-specializers): Extract from eieio--generic-static-symbol-generalizer. (eieio--generic-static-symbol-generalizer): Use it. diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 4ba67693175..8d76df874e5 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -453,10 +453,11 @@ The CLOS function `class-direct-subclasses' is aliased to this function." (mapcar #'identity (eieio--class-slots class))) (defun object-slots (obj) - "Return list of slots available in OBJ." + "Return list of slot names available in OBJ." (declare (obsolete eieio-class-slots "25.1")) (cl-check-type obj eieio-object) - (eieio-class-slots (eieio--object-class obj))) + (mapcar #'cl--slot-descriptor-name + (eieio-class-slots (eieio--object-class obj)))) (defun eieio--class-slot-initarg (class slot) "Fetch from CLASS, SLOT's :initarg." From 8aa13d07fe72b8a00ded10602f5c5ce773181b40 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 19 Mar 2015 13:46:36 -0400 Subject: [PATCH 331/457] * lisp/emacs-lisp/pcase.el (pcase-lambda): Rewrite. --- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/pcase.el | 35 +++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 74a0988c98f..a2500e3fadc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2015-03-19 Stefan Monnier + * emacs-lisp/pcase.el (pcase-lambda): Rewrite. + * emacs-lisp/eieio.el (object-slots): Return slot names as before (bug#20141). diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index 4706be5e57c..0e8a969a402 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -166,23 +166,26 @@ like `(,a . ,(pred (< a))) or, with more checks: ;;;###autoload (defmacro pcase-lambda (lambda-list &rest body) - "Like `lambda' but allow each argument to be a pattern. -`&rest' argument is supported." + "Like `lambda' but allow each argument to be a UPattern. +I.e. accepts the usual &optional and &rest keywords, but every +formal argument can be any pattern accepted by `pcase' (a mere +variable name being but a special case of it)." (declare (doc-string 2) (indent defun) - (debug ((&rest pcase-UPAT &optional ["&rest" pcase-UPAT]) body))) - (let ((args (make-symbol "args")) - (pats (mapcar (lambda (u) - (unless (eq u '&rest) - (if (eq (car-safe u) '\`) (cadr u) (list '\, u)))) - lambda-list)) - (body (macroexp-parse-body body))) - ;; Handle &rest - (when (eq nil (car (last pats 2))) - (setq pats (append (butlast pats 2) (car (last pats))))) - `(lambda (&rest ,args) - ,@(car body) - (pcase ,args - (,(list '\` pats) . ,(cdr body)))))) + (debug ((&rest pcase-UPAT) body))) + (let* ((bindings ()) + (parsed-body (macroexp-parse-body body)) + (args (mapcar (lambda (pat) + (if (symbolp pat) + ;; Simple vars and &rest/&optional are just passed + ;; through unchanged. + pat + (let ((arg (make-symbol + (format "arg%s" (length bindings))))) + (push `(,pat ,arg) bindings) + arg))) + lambda-list))) + `(lambda ,args ,@(car parsed-body) + (pcase-let* ,(nreverse bindings) ,@(cdr parsed-body))))) (defun pcase--let* (bindings body) (cond From ccf00107f7aa8897cde017bec3717ecc350515f7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 19 Mar 2015 12:32:42 -0700 Subject: [PATCH 332/457] Merge from gnulib This incorporates: 2015-03-19 fdopendir: port better to MinGW 2015-03-18 fdopendir: fix typo in comment 2015-02-24 glob, etc.: port to MSVC v18 on MS-Windows 8.1 * lib/dirent.in.h, lib/fdopendir.c: Update from gnulib. * lib/dirfd.c, m4/dirfd.m4: New files from gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. --- ChangeLog | 11 +++++++ lib/dirent.in.h | 2 ++ lib/dirfd.c | 32 ++++++++++++++++++ lib/fdopendir.c | 13 ++++++-- lib/gnulib.mk | 11 +++++++ m4/dirfd.m4 | 83 +++++++++++++++++++++++++++++++++++++++++++++++ m4/gnulib-comp.m4 | 20 ++++++++++++ 7 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 lib/dirfd.c create mode 100644 m4/dirfd.m4 diff --git a/ChangeLog b/ChangeLog index 4f6523ea812..9d7ba9309ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2015-03-19 Paul Eggert + + Merge from gnulib + This incorporates: + 2015-03-19 fdopendir: port better to MinGW + 2015-03-18 fdopendir: fix typo in comment + 2015-02-24 glob, etc.: port to MSVC v18 on MS-Windows 8.1 + * lib/dirent.in.h, lib/fdopendir.c: Update from gnulib. + * lib/dirfd.c, m4/dirfd.m4: New files from gnulib. + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. + 2015-03-02 Robert Pluim (tiny change) * configure.ac: Error out if with-file-notification=w32 is diff --git a/lib/dirent.in.h b/lib/dirent.in.h index ddd3b84fbb2..154d2689e3d 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -77,6 +77,7 @@ typedef struct gl_directory DIR; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef opendir # define opendir rpl_opendir +# define GNULIB_defined_opendir 1 # endif _GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); @@ -128,6 +129,7 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef closedir # define closedir rpl_closedir +# define GNULIB_defined_closedir 1 # endif _GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); diff --git a/lib/dirfd.c b/lib/dirfd.c new file mode 100644 index 00000000000..c91f8e55872 --- /dev/null +++ b/lib/dirfd.c @@ -0,0 +1,32 @@ +/* dirfd.c -- return the file descriptor associated with an open DIR* + + Copyright (C) 2001, 2006, 2008-2015 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Jim Meyering. */ + +#include + +#include +#include + +int +dirfd (DIR *dir_p) +{ + int fd = DIR_TO_FD (dir_p); + if (fd == -1) + errno = ENOTSUP; + return fd; +} diff --git a/lib/fdopendir.c b/lib/fdopendir.c index 9dc1e7b26dc..837a8219b33 100644 --- a/lib/fdopendir.c +++ b/lib/fdopendir.c @@ -93,7 +93,7 @@ fdopendir (int fd) That way, barring race conditions, fd_clone_opendir returns a stream whose file descriptor is FD. - If REPLACE_CHDIR or CWD is null, use opendir ("/proc/self/fd/...", + If REPLACE_FCHDIR or CWD is null, use opendir ("/proc/self/fd/...", falling back on fchdir metadata. Otherwise, CWD is a saved version of the working directory; use fchdir/opendir(".")/restore_cwd(CWD). */ static DIR * @@ -156,7 +156,16 @@ fd_clone_opendir (int fd, struct saved_cwd const *cwd) if (! dir && EXPECTED_ERRNO (saved_errno)) { char const *name = _gl_directory_name (fd); - return (name ? opendir (name) : NULL); + DIR *dp = name ? opendir (name) : NULL; + + /* The caller has done an elaborate dance to arrange for opendir to + consume just the right file descriptor. If dirfd returns -1, + though, we're on a system like mingw where opendir does not + consume a file descriptor. Consume it via 'dup' instead. */ + if (dp && dirfd (dp) < 0) + dup (fd); + + return dp; } # endif errno = saved_errno; diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 1b671e7f6de..7703cbfe283 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -237,6 +237,17 @@ EXTRA_DIST += dirent.in.h ## end gnulib module dirent +## begin gnulib module dirfd + +if gl_GNULIB_ENABLED_dirfd + +endif +EXTRA_DIST += dirfd.c + +EXTRA_libgnu_a_SOURCES += dirfd.c + +## end gnulib module dirfd + ## begin gnulib module dosname if gl_GNULIB_ENABLED_dosname diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 new file mode 100644 index 00000000000..ce56cff6912 --- /dev/null +++ b/m4/dirfd.m4 @@ -0,0 +1,83 @@ +# serial 22 -*- Autoconf -*- + +dnl Find out how to get the file descriptor associated with an open DIR*. + +# Copyright (C) 2001-2006, 2008-2015 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +dnl From Jim Meyering + +AC_DEFUN([gl_FUNC_DIRFD], +[ + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + + dnl Persuade glibc to declare dirfd(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS([dirfd]) + AC_CHECK_DECLS([dirfd], , , + [[#include + #include ]]) + if test $ac_cv_have_decl_dirfd = no; then + HAVE_DECL_DIRFD=0 + fi + + AC_CACHE_CHECK([whether dirfd is a macro], + gl_cv_func_dirfd_macro, + [AC_EGREP_CPP([dirent_header_defines_dirfd], [ +#include +#include +#ifdef dirfd + dirent_header_defines_dirfd +#endif], + gl_cv_func_dirfd_macro=yes, + gl_cv_func_dirfd_macro=no)]) + + # Use the replacement only if we have no function or macro with that name. + if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no; then + if test $ac_cv_have_decl_dirfd = yes; then + # If the system declares dirfd already, let's declare rpl_dirfd instead. + REPLACE_DIRFD=1 + fi + fi +]) + +dnl Prerequisites of lib/dirfd.c. +AC_DEFUN([gl_PREREQ_DIRFD], +[ + AC_CACHE_CHECK([how to get the file descriptor associated with an open DIR*], + [gl_cv_sys_dir_fd_member_name], + [ + dirfd_save_CFLAGS=$CFLAGS + for ac_expr in d_fd dd_fd; do + + CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include ]], + [[DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;]])], + [dir_fd_found=yes] + ) + CFLAGS=$dirfd_save_CFLAGS + test "$dir_fd_found" = yes && break + done + test "$dir_fd_found" = yes || ac_expr=no_such_member + + gl_cv_sys_dir_fd_member_name=$ac_expr + ] + ) + if test $gl_cv_sys_dir_fd_member_name != no_such_member; then + AC_DEFINE_UNQUOTED([DIR_FD_MEMBER_NAME], + [$gl_cv_sys_dir_fd_member_name], + [the name of the file descriptor member of DIR]) + fi + AH_VERBATIM([DIR_TO_FD], + [#ifdef DIR_FD_MEMBER_NAME +# define DIR_TO_FD(Dir_p) ((Dir_p)->DIR_FD_MEMBER_NAME) +#else +# define DIR_TO_FD(Dir_p) -1 +#endif +]) +]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 5763fae12f3..949dd0e12f1 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -56,6 +56,7 @@ AC_DEFUN([gl_EARLY], # Code from module crypto/sha256: # Code from module crypto/sha512: # Code from module dirent: + # Code from module dirfd: # Code from module dosname: # Code from module dtoastr: # Code from module dtotimespec: @@ -394,6 +395,7 @@ AC_DEFUN([gl_INIT], gl_UTIMENS AC_C_VARARRAYS gl_gnulib_enabled_260941c0e5dc67ec9e87d1fb321c300b=false + gl_gnulib_enabled_dirfd=false gl_gnulib_enabled_dosname=false gl_gnulib_enabled_euidaccess=false gl_gnulib_enabled_getdtablesize=false @@ -416,6 +418,18 @@ AC_DEFUN([gl_INIT], gl_gnulib_enabled_260941c0e5dc67ec9e87d1fb321c300b=true fi } + func_gl_gnulib_m4code_dirfd () + { + if ! $gl_gnulib_enabled_dirfd; then + gl_FUNC_DIRFD + if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no; then + AC_LIBOBJ([dirfd]) + gl_PREREQ_DIRFD + fi + gl_DIRENT_MODULE_INDICATOR([dirfd]) + gl_gnulib_enabled_dirfd=true + fi + } func_gl_gnulib_m4code_dosname () { if ! $gl_gnulib_enabled_dosname; then @@ -595,6 +609,9 @@ AC_DEFUN([gl_INIT], if test $HAVE_FDOPENDIR = 0; then func_gl_gnulib_m4code_260941c0e5dc67ec9e87d1fb321c300b fi + if test $HAVE_FDOPENDIR = 0; then + func_gl_gnulib_m4code_dirfd + fi if test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1; then func_gl_gnulib_m4code_260941c0e5dc67ec9e87d1fb321c300b fi @@ -636,6 +653,7 @@ AC_DEFUN([gl_INIT], fi m4_pattern_allow([^gl_GNULIB_ENABLED_]) AM_CONDITIONAL([gl_GNULIB_ENABLED_260941c0e5dc67ec9e87d1fb321c300b], [$gl_gnulib_enabled_260941c0e5dc67ec9e87d1fb321c300b]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_dirfd], [$gl_gnulib_enabled_dirfd]) AM_CONDITIONAL([gl_GNULIB_ENABLED_dosname], [$gl_gnulib_enabled_dosname]) AM_CONDITIONAL([gl_GNULIB_ENABLED_euidaccess], [$gl_gnulib_enabled_euidaccess]) AM_CONDITIONAL([gl_GNULIB_ENABLED_getdtablesize], [$gl_gnulib_enabled_getdtablesize]) @@ -822,6 +840,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/count-trailing-zeros.c lib/count-trailing-zeros.h lib/dirent.in.h + lib/dirfd.c lib/dosname.h lib/dtoastr.c lib/dtotimespec.c @@ -940,6 +959,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/count-one-bits.m4 m4/count-trailing-zeros.m4 m4/dirent_h.m4 + m4/dirfd.m4 m4/dup2.m4 m4/environ.m4 m4/errno_h.m4 From 3ffcf0e3dedb94e065733dc0a5923d7fef42de49 Mon Sep 17 00:00:00 2001 From: Vibhav Pant Date: Fri, 20 Mar 2015 01:43:37 +0530 Subject: [PATCH 333/457] Call delete-backward-space interactively. * lisp/progmodes/cperl-mode.el (cperl-electric-backspace): Call delete-backward-space interactively instead of delete-char. * lisp/Changelog: Fix previous changelog. --- lisp/ChangeLog | 11 +++++++++-- lisp/progmodes/cperl-mode.el | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a2500e3fadc..df2211be169 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-19 Vibhav Pant + + * lisp/progmodes/cperl-mode.el (cperl-electric-backspace): + Call delete-backward-space interactively instead of delete-char. + 2015-03-19 Stefan Monnier * emacs-lisp/pcase.el (pcase-lambda): Rewrite. @@ -62,8 +67,10 @@ 2015-03-19 Vibhav Pant - * lisp/leim/quail/hangul.el - * lisp/progmodes/cperl-mode.el: Use delete-char instead of + * lisp/leim/quail/hangul.el (hangul-delete-backward-char) + (hangul-to-hanja-conversion): + * lisp/progmodes/cperl-mode.el (cperl-electric-keyword) + (cperl-electric-backspace): Use delete-char instead of delete-backward-char, fixes compilation warnings. 2015-03-18 Michael Albinus diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index f207016187d..2acfc104cf3 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -2588,7 +2588,7 @@ Will untabify if `cperl-electric-backspace-untabify' is non-nil." (delete-region (point) p)) (if cperl-electric-backspace-untabify (backward-delete-char-untabify arg) - (delete-char (- arg)))))) + (call-interactively 'delete-backward-char))))) (put 'cperl-electric-backspace 'delete-selection 'supersede) From a68aa2e15be21297d6e8dccb2bcd86422fdebe15 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 19 Mar 2015 14:14:07 -0700 Subject: [PATCH 334/457] Better port of pthread usage to FreeBSD * configure.ac (ac_func_list): Omit pthread_sigmask, since we check for that ourselves rather than relying on gnulib. (HAVE_PTHREAD, LIB_PTHREAD, _THREAD_SAFE): Port better to FreeBSD, by also checking for pthread_create, pthread_self, pthread_sigmask. Tighten the test for pthread_atfork while we're at it. Fixes: bug#20136 --- ChangeLog | 8 +++++ configure.ac | 87 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 66 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d7ba9309ba..d268ba03494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2015-03-19 Paul Eggert + Better port of pthread usage to FreeBSD + * configure.ac (ac_func_list): Omit pthread_sigmask, since + we check for that ourselves rather than relying on gnulib. + (HAVE_PTHREAD, LIB_PTHREAD, _THREAD_SAFE): Port better to FreeBSD, + by also checking for pthread_create, pthread_self, pthread_sigmask. + Tighten the test for pthread_atfork while we're at it. + Fixes: bug#20136 + Merge from gnulib This incorporates: 2015-03-19 fdopendir: port better to MinGW diff --git a/configure.ac b/configure.ac index d65494ac675..520816b1a61 100644 --- a/configure.ac +++ b/configure.ac @@ -780,6 +780,12 @@ AC_DEFUN([gl_CRYPTO_CHECK]) # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW, # as we don't use them. AC_DEFUN([gl_FCNTL_O_FLAGS]) +# Avoid gnulib's test for pthread_sigmask. +funcs= +for func in $ac_func_list; do + test $func = pthread_sigmask || AS_VAR_APPEND([funcs], [" $func"]) +done +ac_func_list=$funcs # Use the system putenv even if it lacks GNU features, as we don't need them, # and the gnulib replacement runs afoul of a FreeBSD 10.1 bug; see Bug#19874. AC_CHECK_FUNCS_ONCE([putenv]) @@ -2179,39 +2185,62 @@ AC_CHECK_LIB(Xbsd, main, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd") dnl Check for the POSIX thread library. LIB_PTHREAD= -if test "$opsys" != "mingw32"; then AC_CHECK_HEADERS_ONCE(pthread.h) -if test "$ac_cv_header_pthread_h"; then - dnl gmalloc.c uses pthread_atfork, which is not available on older-style - dnl hosts such as MirBSD 10, so test for pthread_atfork instead of merely - dnl testing for pthread_kill if Emacs uses gmalloc.c. - if test "$GMALLOC_OBJ" = gmalloc.o; then - emacs_pthread_function=pthread_atfork - else - emacs_pthread_function=pthread_kill +if test "$ac_cv_header_pthread_h" && test "$opsys" != "mingw32"; then + AC_CACHE_CHECK([for pthread library], + [emacs_cv_pthread_lib], + [emacs_cv_pthread_lib=no + OLD_CPPFLAGS=$CPPFLAGS + OLD_LIBS=$LIBS + for emacs_pthread_lib in 'none needed' -lpthread; do + case $emacs_pthread_lib in + -*) LIBS="$OLD_LIBS $emacs_pthread_lib";; + esac + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + sigset_t old_mask, new_mask; + void noop (void) {}]], + [[pthread_t th = pthread_self (); + int status = 0; + status += pthread_create (&th, 0, 0, 0); + status += pthread_sigmask (SIG_BLOCK, &new_mask, &old_mask); + status += pthread_kill (th, 0); + #if ! (defined SYSTEM_MALLOC || defined HYBRID_MALLOC \ + || defined DOUG_LEA_MALLOC) + /* Test for pthread_atfork only if gmalloc uses it, + as older-style hosts like MirBSD 10 lack it. */ + status += pthread_atfork (noop, noop, noop); + #endif + return status;]])], + [emacs_cv_pthread_lib=$emacs_pthread_lib]) + LIBS=$OLD_LIBS + if test "$emacs_cv_pthread_lib" != no; then + break + fi + done + CPPFLAGS=$OLD_CPPFLAGS]) + if test "$emacs_cv_pthread_lib" != no; then + AC_DEFINE([HAVE_PTHREAD], 1, [Define to 1 if you have POSIX threads.]) + case $emacs_cv_pthread_lib in + -*) LIB_PTHREAD=$emacs_cv_pthread_lib;; + esac + ac_cv_func_pthread_sigmask=yes + # Some systems optimize for single-threaded programs by default, and + # need special flags to disable these optimizations. For example, the + # definition of 'errno' in . + case $opsys in + hpux* | sol*) + AC_DEFINE([_REENTRANT], 1, + [Define to 1 if your system requires this in multithreaded code.]);; + aix4-2 | darwin | freebsd) + AC_DEFINE([_THREAD_SAFE], 1, + [Define to 1 if your system requires this in multithreaded code.]);; + esac fi - OLD_LIBS=$LIBS - AC_SEARCH_LIBS([$emacs_pthread_function], [pthread], - [AC_DEFINE([HAVE_PTHREAD], [1], - [Define to 1 if you have pthread (-lpthread).]) - # Some systems optimize for single-threaded programs by default, and - # need special flags to disable these optimizations. For example, the - # definition of 'errno' in . - case $opsys in - sol*) - AC_DEFINE([_REENTRANT], 1, - [Define to 1 if your system requires this in multithreaded code.]);; - aix4-2) - AC_DEFINE([_THREAD_SAFE], 1, - [Define to 1 if your system requires this in multithreaded code.]);; - esac]) - if test "X$LIBS" != "X$OLD_LIBS"; then - eval LIB_PTHREAD=\$ac_cv_search_$emacs_pthread_function - fi - LIBS=$OLD_LIBS fi AC_SUBST([LIB_PTHREAD]) -fi dnl Check for need for bigtoc support on IBM AIX From 13eb26ad38378e0063e9c9313c3ba8af666629dc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 19 Mar 2015 18:33:59 -0700 Subject: [PATCH 335/457] * configure.ac (_THREAD_SAFE): Simplify (Bug#20136). --- ChangeLog | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d268ba03494..a79863a839e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ Better port of pthread usage to FreeBSD * configure.ac (ac_func_list): Omit pthread_sigmask, since we check for that ourselves rather than relying on gnulib. - (HAVE_PTHREAD, LIB_PTHREAD, _THREAD_SAFE): Port better to FreeBSD, + (HAVE_PTHREAD, LIB_PTHREAD): Port better to FreeBSD, by also checking for pthread_create, pthread_self, pthread_sigmask. Tighten the test for pthread_atfork while we're at it. Fixes: bug#20136 diff --git a/configure.ac b/configure.ac index 520816b1a61..40c8d2b93a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2234,7 +2234,7 @@ if test "$ac_cv_header_pthread_h" && test "$opsys" != "mingw32"; then hpux* | sol*) AC_DEFINE([_REENTRANT], 1, [Define to 1 if your system requires this in multithreaded code.]);; - aix4-2 | darwin | freebsd) + aix4-2) AC_DEFINE([_THREAD_SAFE], 1, [Define to 1 if your system requires this in multithreaded code.]);; esac From a5d1f94fec6543cbf3c6e29f034c7ed53138c677 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 20 Mar 2015 06:04:36 +0200 Subject: [PATCH 336/457] Backport: ruby-mode: Expect regexp after { or | too Fixes: debbugs:20026 * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect beginning of regexp also after open brace or vertical bar. (cherry picked from commit dad0fc589c18dd95cf1ac77869a4530e2848c328) --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/ruby-mode.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 763a8eecfbd..0b568929b22 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-20 Nobuyoshi Nakada + + * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect + beginning of regexp also after open brace or vertical bar. + (Bug#20026) + 2015-03-07 Michael Albinus * net/tramp.el (tramp-ssh-controlmaster-options): Make it a diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 3f560b9fee6..9c311cdbfb6 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1777,7 +1777,7 @@ It will be properly highlighted even when the call omits parens.") (defvar ruby-syntax-before-regexp-re (concat ;; Special tokens that can't be followed by a division operator. - "\\(^\\|[[=(,~;<>]" + "\\(^\\|[[{|=(,~;<>]" ;; Distinguish ternary operator tokens. ;; FIXME: They don't really have to be separated with spaces. "\\|[?:] " From f74843a7f1ebc767cc67cda8981247c7e46404fd Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 20 Mar 2015 06:04:54 +0200 Subject: [PATCH 337/457] Backport: ruby-mode: Change faces used for self, true, false and nil Fixes: debbugs:17733 * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use `font-lock-constant-face' for nil, true and false. Highlight `self' as a keyword. (cherry picked from commit e991af9228af77356df1e4ce7e824d5140a3bf8a) --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/ruby-mode.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b568929b22..eaf7c4653af 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-20 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use + `font-lock-constant-face' for nil, true and false. Highlight + `self' as a keyword. (Bug#17733) + 2015-03-20 Nobuyoshi Nakada * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 9c311cdbfb6..e15105eb332 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -2013,8 +2013,9 @@ See `font-lock-syntax-table'.") "rescue" "retry" "return" - "then" + "self" "super" + "then" "unless" "undef" "until" @@ -2109,8 +2110,8 @@ See `font-lock-syntax-table'.") "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$" ;; Variables. (,(concat ruby-font-lock-keyword-beg-re - "\\_<\\(nil\\|self\\|true\\|false\\)\\_>") - 1 font-lock-variable-name-face) + "\\_<\\(nil\\|true\\|false\\)\\_>") + 1 font-lock-constant-face) ;; Keywords that evaluate to certain values. ("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" (0 font-lock-builtin-face)) From 1c4900d953f11a09a9cbac6509ae659b27590a89 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 20 Mar 2015 06:05:02 +0200 Subject: [PATCH 338/457] Backport: ruby-mode: Detect regexps after `!' Fixes: debbugs:19285 * lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect regexps after `!'. (cherry picked from commit 8854b9cf5283cac3e4a5a3726325a82b88c1fcb5) --- lisp/ChangeLog | 5 +++++ lisp/progmodes/ruby-mode.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eaf7c4653af..5c72fbdf291 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-20 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect + regexps after `!'. (Bug#19285) + 2015-03-20 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index e15105eb332..39c9ca0d771 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1777,7 +1777,7 @@ It will be properly highlighted even when the call omits parens.") (defvar ruby-syntax-before-regexp-re (concat ;; Special tokens that can't be followed by a division operator. - "\\(^\\|[[{|=(,~;<>]" + "\\(^\\|[[{|=(,~;<>!]" ;; Distinguish ternary operator tokens. ;; FIXME: They don't really have to be separated with spaces. "\\|[?:] " From 8142fc97af742e083fb83e4d0470da59b123a467 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 20 Mar 2015 07:03:54 +0200 Subject: [PATCH 339/457] ruby-mode: Fix a "required arguments" confusion * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `at_exit' and `callcc' to the "methods with required arguments" section, they need a block argument. Remove a `throw' duplicate. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/ruby-mode.el | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df2211be169..0172cd052fe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-20 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `at_exit' + and `callcc' to the "methods with required arguments" section, + they need a block argument. Remove a `throw' duplicate. + 2015-03-19 Vibhav Pant * lisp/progmodes/cperl-mode.el (cperl-electric-backspace): diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 921ca314004..f2fb95ce59a 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -2069,8 +2069,10 @@ See `font-lock-syntax-table'.") ruby-font-lock-keyword-beg-re (regexp-opt '( ;; built-in methods on Kernel + "at_exit" "autoload" "autoload?" + "callcc" "catch" "eval" "exec" @@ -2124,10 +2126,8 @@ See `font-lock-syntax-table'.") "__dir__" "__method__" "abort" - "at_exit" "binding" "block_given?" - "callcc" "caller" "exit" "exit!" @@ -2143,8 +2143,7 @@ See `font-lock-syntax-table'.") "readline" "readlines" "sleep" - "srand" - "throw") + "srand") 'symbols)) (1 font-lock-builtin-face)) ;; Here-doc beginnings. From 395a76ad1c16614adf166a68658f68dd41b2aaa2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 19 Mar 2015 23:02:28 -0700 Subject: [PATCH 340/457] # ChangeLog fixes Using eg add-change-log-entry-other-window, C-x 4 a, would avoid these issues --- lisp/ChangeLog | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0172cd052fe..ac99cd5ec39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,7 +6,7 @@ 2015-03-19 Vibhav Pant - * lisp/progmodes/cperl-mode.el (cperl-electric-backspace): + * progmodes/cperl-mode.el (cperl-electric-backspace): Call delete-backward-space interactively instead of delete-char. 2015-03-19 Stefan Monnier @@ -73,9 +73,9 @@ 2015-03-19 Vibhav Pant - * lisp/leim/quail/hangul.el (hangul-delete-backward-char) + * leim/quail/hangul.el (hangul-delete-backward-char) (hangul-to-hanja-conversion): - * lisp/progmodes/cperl-mode.el (cperl-electric-keyword) + * progmodes/cperl-mode.el (cperl-electric-keyword) (cperl-electric-backspace): Use delete-char instead of delete-backward-char, fixes compilation warnings. @@ -115,7 +115,7 @@ 2015-03-18 Dima Kogan Have gud-display-line not display source buffer in gud window. - * lisp/progmodes/gud.el (gud-display-line): Make display-buffer + * progmodes/gud.el (gud-display-line): Make display-buffer not reuse selected window. (Bug#17675, Bug#19901, Bug#20034) 2015-03-17 Tassilo Horn @@ -1767,7 +1767,7 @@ 2015-01-30 Oleh Krehel - * lisp/custom.el (defface): Set `indent' to 1. + * custom.el (defface): Set `indent' to 1. 2015-01-30 Oleh Krehel @@ -1775,21 +1775,21 @@ 2015-01-30 Michal Nazarewicz - * lisp/files.el (save-buffers-kill-emacs): If `confirm-kill-emacs' + * files.el (save-buffers-kill-emacs): If `confirm-kill-emacs' is set, but user has just been asked whether they really want to kill Emacs (for example with a ‘Modified buffers exist; exit anyway?’ prompt), do not ask them for another confirmation. 2015-01-29 Jay Belanger - * lisp/calc/calc-units.el (calc-convert-exact-units): New function. + * calc/calc-units.el (calc-convert-exact-units): New function. (calc-convert-units): Check for missing units. (math-consistent-units-p): Strengthen the test for consistent units. - * lisp/calc/calc-ext.el (calc-init-extensions): Autoload + * calc/calc-ext.el (calc-init-extensions): Autoload `calc-convert-exact-units' and assign it a keybinding. - * lisp/calc/calc-help (calc-u-prefix-help): Add help for the + * calc/calc-help (calc-u-prefix-help): Add help for the "un" keybinding. 2015-01-28 Stefan Monnier From b8ea3aa9dbcc17c0a38214aebdc7cb2b579c34ff Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Fri, 20 Mar 2015 10:49:06 +0000 Subject: [PATCH 341/457] lisp/gnus/registry.el (registry-collect-prune-candidates): Fix call to cl-subseq --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/registry.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 64124bc183d..7e962f73068 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-03-19 Eric Abrahamsen + + * registry.el (registry-collect-prune-candidates): Fix call to + cl-subseq. + 2015-03-11 Stefan Monnier * gnus-registry.el (gnus-registry-handle-action) diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 1c83b939d80..6ee1c316643 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -371,7 +371,7 @@ entries first and return candidates from beginning of list." ;; list of entry keys. (when sortfunc (setq candidates (sort candidates sortfunc))) - (delq nil (cl-subseq (mapcar #'car candidates) 0 limit)))) + (cl-subseq (mapcar #'car candidates) 0 (min limit (length candidates))))) (provide 'registry) ;;; registry.el ends here From 1fcc552ac27503c502a9a6e6cf06268e6018db51 Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Fri, 20 Mar 2015 10:49:41 +0000 Subject: [PATCH 342/457] lisp/gnus/registry.el (registry-prune): Allow registry to reach full size before pruning --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/registry.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7e962f73068..63a28266e42 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-03-19 Eric Abrahamsen + + * registry.el (registry-prune): Allow registry to reach full size + before pruning. + 2015-03-19 Eric Abrahamsen * registry.el (registry-collect-prune-candidates): Fix call to diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 6ee1c316643..e0f944addc1 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -345,7 +345,7 @@ Returns the number of deleted entries." (* (oref db :max-size) (oref db :prune-factor)))) candidates) - (if (> size target-size) + (if (> size (oref db :max-size)) (progn (setq candidates (registry-collect-prune-candidates From 932d0fdb4fb217adb4e894b595c2294abc4fef3e Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Fri, 20 Mar 2015 15:39:37 +0000 Subject: [PATCH 343/457] Fix debbugs#20146 * font-lock.el (font-lock-extend-jit-lock-region-after-change): Return the calculated values, as per spec. --- lisp/ChangeLog | 7 +++++++ lisp/font-lock.el | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ac99cd5ec39..cecec469ed8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-03-20 Alan Mackenzie + + Fix debbugs#20146 + + * font-lock.el (font-lock-extend-jit-lock-region-after-change): + Return the calculated values, as per spec. + 2015-03-20 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `at_exit' diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 6ec6c9f1196..1838a0f02b4 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1325,11 +1325,13 @@ This function does 2 things: (when (memq 'font-lock-extend-region-wholelines font-lock-extend-region-functions) (goto-char beg) - (setq jit-lock-start (min jit-lock-start (line-beginning-position))) + (setq beg (min jit-lock-start (line-beginning-position))) (goto-char end) - (setq jit-lock-end + (setq end (max jit-lock-end - (if (bolp) (point) (line-beginning-position 2)))))))) + (if (bolp) (point) (line-beginning-position 2))))) + (setq jit-lock-start beg + jit-lock-end end)))) (defun font-lock-fontify-block (&optional arg) "Fontify some lines the way `font-lock-fontify-buffer' would. From 4cd31cf01964059ab29f735c7856c65631c46c28 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 20 Mar 2015 16:29:21 -0400 Subject: [PATCH 344/457] (cl-defsubst): Ignore false-positive occurrences of args via &cl-defs Fixes: debbugs:20149 * lisp/emacs-lisp/cl-macs.el (cl-defsubst): Ignore false-positive occurrences of args via &cl-defs. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/cl-macs.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cecec469ed8..ee4e021b940 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-20 Stefan Monnier + + * emacs-lisp/cl-macs.el (cl-defsubst): Ignore false-positive + occurrences of args via &cl-defs (bug#20149). + 2015-03-20 Alan Mackenzie Fix debbugs#20146 diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index d3866783447..75c6a5687c4 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2446,10 +2446,11 @@ The function's arguments should be treated as immutable. \(fn NAME ARGLIST [DOCSTRING] BODY...)" (declare (debug cl-defun) (indent 2)) (let* ((argns (cl--arglist-args args)) + (real-args (if (eq '&cl-defs (car args)) (cddr args) args)) (p argns) ;; (pbody (cons 'progn body)) ) - (while (and p (eq (cl--expr-contains args (car p)) 1)) (pop p)) + (while (and p (eq (cl--expr-contains real-args (car p)) 1)) (pop p)) `(progn ,(if p nil ; give up if defaults refer to earlier args `(cl-define-compiler-macro ,name From c9998fcbf40c533004533dee96f2eb67349d55ae Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Fri, 20 Mar 2015 23:09:06 +0100 Subject: [PATCH 345/457] Fix elisp function name font-lock bug. * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Fix false positive in function name font-locking. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/lisp-mode.el | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee4e021b940..85e62be80c2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-20 Tassilo Horn + + * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Fix + false positive in function name font-locking. + 2015-03-20 Stefan Monnier * emacs-lisp/cl-macs.el (cl-defsubst): Ignore false-positive diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 6b3077302ed..d8901ac017d 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -320,14 +320,18 @@ `( ;; Definitions. (,(concat "(" el-defs-re "\\_>" ;; Any whitespace and defined object. - "[ \t'\(]*" - "\\(\\(?:\\sw\\|\\s_\\)+\\)?") + "[ \t']*" + ;; With cl-defstruct, the name may follow a paren, + ;; e.g. (cl-defstruct (foo-struct opts)...). + "\\(([ \t']*\\)?\\(\\(?:\\sw\\|\\s_\\)+\\)?") (1 font-lock-keyword-face) - (2 (let ((type (get (intern-soft (match-string 1)) 'lisp-define-type))) - (cond ((eq type 'var) font-lock-variable-name-face) - ((eq type 'type) font-lock-type-face) - (t font-lock-function-name-face))) - nil t)) + (3 (let ((type (get (intern-soft (match-string 1)) 'lisp-define-type))) + (cond ((eq type 'var) font-lock-variable-name-face) + ((eq type 'type) font-lock-type-face) + ;; If match-string 2 is non-nil, we encountered a + ;; form like (defalias (intern (concat s "-p"))). + ((not (match-string 2)) font-lock-function-name-face))) + nil t)) ;; Emacs Lisp autoload cookies. Supports the slightly different ;; forms used by mh-e, calendar, etc. ("^;;;###\\([-a-z]*autoload\\)" 1 font-lock-warning-face prepend)) From 73b8237c19200e7d8d3739b99ef1e4dc86f51873 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Fri, 20 Mar 2015 23:35:22 +0100 Subject: [PATCH 346/457] Fix CL function name font-lock bug. * emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-1): Fix false positive in function name font-locking. --- lisp/ChangeLog | 1 + lisp/emacs-lisp/lisp-mode.el | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85e62be80c2..025941f809c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,7 @@ * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Fix false positive in function name font-locking. + (lisp-cl-font-lock-keywords-1): Ditto. 2015-03-20 Stefan Monnier diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index d8901ac017d..a3bb1a709f6 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -341,13 +341,16 @@ `( ;; Definitions. (,(concat "(" cl-defs-re "\\_>" ;; Any whitespace and defined object. - "[ \t'\(]*" - "\\(setf[ \t]+\\(?:\\sw\\|\\s_\\)+\\|\\(?:\\sw\\|\\s_\\)+\\)?") + "[ \t']*" + "\\(([ \t']*\\)?" ;; An opening paren. + "\\(\\(setf\\)[ \t]+\\(?:\\sw\\|\\s_\\)+\\|\\(?:\\sw\\|\\s_\\)+\\)?") (1 font-lock-keyword-face) - (2 (let ((type (get (intern-soft (match-string 1)) 'lisp-define-type))) + (3 (let ((type (get (intern-soft (match-string 1)) 'lisp-define-type))) (cond ((eq type 'var) font-lock-variable-name-face) ((eq type 'type) font-lock-type-face) - (t font-lock-function-name-face))) + ((or (not (match-string 2)) ;; Normal defun. + (and (match-string 2) ;; Setf-expander. + (match-string 4))) font-lock-function-name-face))) nil t))) "Subdued level highlighting for Lisp modes.") From fa734d07ab9dd00ad29d68668ed25247c9000aef Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Sat, 21 Mar 2015 08:52:34 +0100 Subject: [PATCH 347/457] Handle setf methods in elisp font-locking. * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Also recognize (cl-)defmethod with (setf method) name. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/lisp-mode.el | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 025941f809c..1cfefaa39df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-21 Tassilo Horn + + * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Also + recognize (cl-)defmethod with (setf method) name. + 2015-03-20 Tassilo Horn * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Fix diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index a3bb1a709f6..9c4194557ef 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -249,7 +249,7 @@ (eieio-tdefs '("defclass")) (eieio-kw '("with-slots")) ;; Common-Lisp constructs supported by cl-lib. - (cl-lib-fdefs '("defmacro" "defsubst" "defun")) + (cl-lib-fdefs '("defmacro" "defsubst" "defun" "defmethod")) (cl-lib-tdefs '("defstruct" "deftype")) (cl-lib-kw '("progv" "eval-when" "case" "ecase" "typecase" "etypecase" "ccase" "ctypecase" "loop" "do" "do*" @@ -321,16 +321,19 @@ (,(concat "(" el-defs-re "\\_>" ;; Any whitespace and defined object. "[ \t']*" - ;; With cl-defstruct, the name may follow a paren, - ;; e.g. (cl-defstruct (foo-struct opts)...). - "\\(([ \t']*\\)?\\(\\(?:\\sw\\|\\s_\\)+\\)?") + "\\(([ \t']*\\)?" ;; An opening paren. + "\\(\\(setf\\)[ \t]+\\(?:\\sw\\|\\s_\\)+\\|\\(?:\\sw\\|\\s_\\)+\\)?") (1 font-lock-keyword-face) (3 (let ((type (get (intern-soft (match-string 1)) 'lisp-define-type))) (cond ((eq type 'var) font-lock-variable-name-face) ((eq type 'type) font-lock-type-face) ;; If match-string 2 is non-nil, we encountered a - ;; form like (defalias (intern (concat s "-p"))). - ((not (match-string 2)) font-lock-function-name-face))) + ;; form like (defalias (intern (concat s "-p"))), + ;; unless match-string 4 is also there. Then its a + ;; defmethod with (setf foo) as name. + ((or (not (match-string 2)) ;; Normal defun. + (and (match-string 2) ;; Setf method. + (match-string 4))) font-lock-function-name-face))) nil t)) ;; Emacs Lisp autoload cookies. Supports the slightly different ;; forms used by mh-e, calendar, etc. @@ -349,7 +352,7 @@ (cond ((eq type 'var) font-lock-variable-name-face) ((eq type 'type) font-lock-type-face) ((or (not (match-string 2)) ;; Normal defun. - (and (match-string 2) ;; Setf-expander. + (and (match-string 2) ;; Setf function. (match-string 4))) font-lock-function-name-face))) nil t))) "Subdued level highlighting for Lisp modes.") From 17ad6f839e1c435ea944a0cda0b682687f194c7a Mon Sep 17 00:00:00 2001 From: Mario Lang Date: Fri, 6 Jun 2014 02:39:22 +0200 Subject: [PATCH 348/457] Fix problems caused by calling 'recenter' in auto-revert (Bug#20122) lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): Only call `recenter' if `current-buffer' is equal to `window-buffer'. (cherry picked from commit 4a8160204325c4b955647fe9e0a944c1f8c705dd) --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/tabulated-list.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5c72fbdf291..301c52d410d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-06 Mario Lang + + * emacs-lisp/tabulated-list.el (tabulated-list-print): Only call + `recenter' if `current-buffer' is equal to `window-buffer'. + 2015-03-20 Dmitry Gutov * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index 933567db993..15a0914cb17 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -323,7 +323,8 @@ to the entry with the same ID element as the current line." (if saved-pt (progn (goto-char saved-pt) (move-to-column saved-col) - (recenter)) + (when (eq (window-buffer) (current-buffer)) + (recenter))) (goto-char (point-min))))) (defun tabulated-list-print-entry (id cols) From e72edc05c3277fbf57a94daaa792635bfede7bc0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 21 Mar 2015 12:04:39 +0200 Subject: [PATCH 349/457] Fix lisp/ChangeLog entry from last commit. --- lisp/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 301c52d410d..b28517f07ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,4 @@ -2014-06-06 Mario Lang +2015-03-21 Mario Lang * emacs-lisp/tabulated-list.el (tabulated-list-print): Only call `recenter' if `current-buffer' is equal to `window-buffer'. From 70565a21765ea5f9b163e1a0ef1331df03c7fc67 Mon Sep 17 00:00:00 2001 From: Samer Masterson Date: Sat, 21 Mar 2015 12:09:30 +0200 Subject: [PATCH 350/457] Documentation and testing tips for CONTRIBUTE CONTRIBUTE (Test your changes.): New section. (Document your changes.): Add doc tips. --- CONTRIBUTE | 20 ++++++++++++++++++++ ChangeLog | 5 +++++ 2 files changed, 25 insertions(+) diff --git a/CONTRIBUTE b/CONTRIBUTE index 5cf015fe11a..7c40227b6d9 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -187,6 +187,26 @@ know it does not, mark the NEWS entry with "---". If you know that *all* the necessary documentation updates have been made, mark the entry with "+++". Otherwise do not mark it. +Please see (info "(elisp)Documentation Tips") or +https://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html +for more specific tips on Emacs's doc style. Use `checkdoc' to check +for documentation errors before submitting a patch. + +** Test your changes. + +Please test your changes before committing them or sending them to the +list. + +Emacs uses ERT, Emacs Lisp Regression Testing, for testing. See (info +"(ert)") or https://www.gnu.org/software/emacs/manual/html_node/ert/ +for more information on writing and running tests. + +To run tests on the entire Emacs tree, run "make check" from the +top-level directory. Most tests are in the directory +"test/automated". From the "test/automated" directory, run "make +" to run the tests for .el(c). See +"test/automated/Makefile" for more information. + ** Understanding Emacs Internals. The best way to understand Emacs Internals is to read the code, diff --git a/ChangeLog b/ChangeLog index a79863a839e..c155708f1f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-03-21 Samer Masterson + + * CONTRIBUTE (Test your changes.): New section. + (Document your changes.): Add doc tips. + 2015-03-19 Paul Eggert Better port of pthread usage to FreeBSD From 4a50af936e24b5f71df4079beb6dde82ed1955c2 Mon Sep 17 00:00:00 2001 From: Titus von der Malsburg Date: Sat, 21 Mar 2015 12:31:29 +0200 Subject: [PATCH 351/457] Add new functions for computing default font dimensions lisp/window.el (window-font-width, window-font-height) (window-max-chars-per-line): New functions. lisp/simple.el (default-font-height): Doc fix. (default-font-width): New function. etc/NEWS: Mention `default-font-width', `window-font-height', `window-font-width', and `window-max-chars-per-line'. --- etc/ChangeLog | 5 +++++ etc/NEWS | 18 +++++++++++++++++ lisp/ChangeLog | 8 ++++++++ lisp/simple.el | 24 +++++++++++++++++++++- lisp/window.el | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 109 insertions(+), 1 deletion(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index cd5c54037c8..c94e12296ed 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,8 @@ +2015-03-21 Titus von der Malsburg + + * NEWS: Mention `default-font-width', `window-font-height', + `window-font-width', and `window-max-chars-per-line'. + 2015-03-03 Kelvin White * NEWS.24: Add section to include ERC changes. diff --git a/etc/NEWS b/etc/NEWS index cabd0087d92..7cdb24b402e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -173,6 +173,24 @@ possible inaccuracies in the end position. In particular, it now returns the average width of the font's characters, which can be used for geometry-related calculations. +** A new function `default-font-width' returns the average width of a +character in the current buffer's default font. If the default face +is remapped (see `face-remapping-alist'), the value for the remapped +face is returned. This function complements the existing function +`default-font-height'. + +** New functions `window-font-height' and `window-font-width' return +the height and average width of characters in a specified face and +window. If FACE is remapped (see `face-remapping-alist'), the +function returns the information for the remapped face. + +** A new function `window-max-chars-per-line' returns the maximal +number of characters that can be displayed on one line. If a face +and/or window are provided, these values are used for the +calculation. This function is different from `window-body-width' in +that it accounts for (i) continuation glyphs, (ii) the size of the +font, and (iii) the specified window. + * Editing Changes in Emacs 25.1 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1cfefaa39df..2f9c430e45d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2015-03-21 Titus von der Malsburg + + * window.el (window-font-width, window-font-height) + (window-max-chars-per-line): New functions. + + * simple.el (default-font-height): Doc fix. + (default-font-width): New function. + 2015-03-21 Tassilo Horn * emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Also diff --git a/lisp/simple.el b/lisp/simple.el index 98188a07b6f..f7f35564f35 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5409,7 +5409,10 @@ lines." (declare-function font-info "font.c" (name &optional frame)) (defun default-font-height () - "Return the height in pixels of the current buffer's default face font." + "Return the height in pixels of the current buffer's default face font. + +If the default font is remapped (see `face-remapping-alist'), the +function returns the height of the remapped face." (let ((default-font (face-font 'default))) (cond ((and (display-multi-font-p) @@ -5420,6 +5423,25 @@ lines." (aref (font-info default-font) 3)) (t (frame-char-height))))) +(defun default-font-width () + "Return the width in pixels of the current buffer's default face font. + +If the default font is remapped (see `face-remapping-alist'), the +function returns the width of the remapped face." + (let ((default-font (face-font 'default))) + (cond + ((and (display-multi-font-p) + ;; Avoid calling font-info if the frame's default font was + ;; not changed since the frame was created. That's because + ;; font-info is expensive for some fonts, see bug #14838. + (not (string= (frame-parameter nil 'font) default-font))) + (let* ((info (font-info (face-font 'default))) + (width (aref info 11))) + (if (> width 0) + width + (aref info 10)))) + (t (frame-char-width))))) + (defun default-line-height () "Return the pixel height of current buffer's default-face text line. diff --git a/lisp/window.el b/lisp/window.el index cc8a7fc402f..d17605099a0 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1835,6 +1835,61 @@ optional argument PIXELWISE is passed to the functions." (window-body-width window pixelwise) (window-body-height window pixelwise))) +(defun window-font-width (&optional window face) + "Return average character width for the font of FACE used in WINDOW. +WINDOW must be a live window and defaults to the selected one. + +If FACE is nil or omitted, the default face is used. If FACE is +remapped (see `face-remapping-alist'), the function returns the +information for the remapped face." + (with-selected-window (window-normalize-window window t) + (if (display-multi-font-p) + (let* ((face (if face face 'default)) + (info (font-info (face-font face))) + (width (aref info 11))) + (if (> width 0) + width + (aref info 10))) + (frame-char-width)))) + +(defun window-font-height (&optional window face) + "Return character height for the font of FACE used in WINDOW. +WINDOW must be a live window and defaults to the selected one. + +If FACE is nil or omitted, the default face is used. If FACE is +remapped (see `face-remapping-alist'), the function returns the +information for the remapped face." + (with-selected-window (window-normalize-window window t) + (if (display-multi-font-p) + (let* ((face (if face face 'default)) + (info (font-info (face-font face)))) + (aref info 3)) + (frame-char-height)))) + +(defun window-max-chars-per-line (&optional window face) + "Return the number of characters that can be displayed on one line in WINDOW. +WINDOW must be a live window and defaults to the selected one. + +The character width of FACE is used for the calculation. If FACE +is nil or omitted, the default face is used. If FACE is +remapped (see `face-remapping-alist'), the function uses the +remapped face. + +This function is different from `window-body-width' in two +ways. First, it accounts for the portions of the line reserved +for the continuation glyph. Second, it accounts for the size of +the font." + (with-selected-window (window-normalize-window window t) + (let* ((window-width (window-body-width window t)) + (font-width (window-font-width window face)) + (ncols (/ window-width font-width))) + (if (and (display-graphic-p) + overflow-newline-into-fringe + (/= (frame-parameter nil 'left-fringe) 0) + (/= (frame-parameter nil 'right-fringe) 0)) + ncols + (1- ncols))))) + (defun window-current-scroll-bars (&optional window) "Return the current scroll bar types for WINDOW. WINDOW must be a live window and defaults to the selected one. From ad80180d0f2fc2ea422cf7ca5bdcc636c0600744 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 21 Mar 2015 17:44:00 +0200 Subject: [PATCH 352/457] Fix problems with setting system-time-locale on MS-Windows src/emacs.c (synchronize_locale) [WINDOWSNT]: Ignore 'category' and always use LC_ALL instead. Fixes problems with setting system-time-locale to something non-default. --- src/ChangeLog | 6 ++++++ src/emacs.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index bdec3c9cde1..5aa248e91b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-03-21 Eli Zaretskii + + * emacs.c (synchronize_locale) [WINDOWSNT]: Ignore 'category' and + always use LC_ALL instead. Fixes problems with setting + system-time-locale to something non-default. + 2015-03-18 Glenn Morris * frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is diff --git a/src/emacs.c b/src/emacs.c index d318fd4649a..70db900246a 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2152,6 +2152,13 @@ synchronize_locale (int category, Lisp_Object *plocale, Lisp_Object desired_loca { if (! EQ (*plocale, desired_locale)) { +#ifdef WINDOWSNT + /* Changing categories like LC_TIME usually requires to specify + an encoding suitable for the new locale, but MS-Windows's + 'setlocale' will only switch the encoding when LC_ALL is + specified. So we ignore CATEGORY and use LC_ALL instead. */ + category = LC_ALL; +#endif *plocale = desired_locale; setlocale (category, (STRINGP (desired_locale) ? SSDATA (desired_locale) From 6e1fac9bc7d28a7c7ebdc612673736c9825606e0 Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Sat, 21 Mar 2015 23:59:30 +0000 Subject: [PATCH 353/457] lisp/gnus/{registry.el,gnus-registry.el}: Use slot names in references to object slot values --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/gnus-registry.el | 2 +- lisp/gnus/registry.el | 16 ++++++++-------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 63a28266e42..762e3e7e0d0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2015-03-21 Eric Abrahamsen + + * registry.el (registry-lookup-secondary, registry-full) + (registry-prune, registry-collect-prune-candidates): + * gnus-registry.el (gnus-registry-load): Use slot names rather than + initarg names in `oref' and `oset'. + 2015-03-19 Eric Abrahamsen * registry.el (registry-prune): Allow registry to reach full size diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index 1d5887dad26..f73f21694bf 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -335,7 +335,7 @@ This is not required after changing `gnus-registry-cache-file'." old-file-name file))) (progn (gnus-registry-read old-file-name) - (setf (oref gnus-registry-db :file) file) + (setf (oref gnus-registry-db file) file) (gnus-message 1 "Registry filename changed to %s" file)) (gnus-registry-remake-db t)))) (error diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index e0f944addc1..e4ba0bc547f 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -185,8 +185,8 @@ When CREATE is not nil, create the secondary index hashtable if needed." (when create (puthash tracksym (make-hash-table :size 800 :rehash-size 2.0 :test 'equal) - (oref db :tracker)) - (gethash tracksym (oref db :tracker)))))) + (oref db tracker)) + (gethash tracksym (oref db tracker)))))) (defmethod registry-lookup-secondary-value ((db registry-db) tracksym val &optional set) @@ -282,7 +282,7 @@ This is the key count of the `data' slot." (defmethod registry-full ((db registry-db)) "Checks if registry-db THIS is full." (>= (registry-size db) - (oref db :max-size))) + (oref db max-size))) (defmethod registry-insert ((db registry-db) key entry) "Insert ENTRY under KEY into the registry-db THIS. @@ -341,11 +341,11 @@ from the front of the list are deleted first. Returns the number of deleted entries." (let ((size (registry-size db)) - (target-size (- (oref db :max-size) - (* (oref db :max-size) - (oref db :prune-factor)))) + (target-size (- (oref db max-size) + (* (oref db max-size) + (oref db prune-factor)))) candidates) - (if (> size (oref db :max-size)) + (if (> size (oref db max-size)) (progn (setq candidates (registry-collect-prune-candidates @@ -359,7 +359,7 @@ Returns the number of deleted entries." Proposes only entries without the :precious keys, and attempts to return LIMIT such candidates. If SORTFUNC is provided, sort entries first and return candidates from beginning of list." - (let* ((precious (oref db :precious)) + (let* ((precious (oref db precious)) (precious-p (lambda (entry-key) (cdr (memq (car entry-key) precious)))) (data (oref db data)) From 32315502e0335f7840cdaa68d3fa3aa385a6943d Mon Sep 17 00:00:00 2001 From: Jan D Date: Sun, 22 Mar 2015 10:14:36 +0100 Subject: [PATCH 354/457] Fixes: debbugs:20156 * src/fontset.c (fontset_pattern_regexp): Replace + 1 with + 3 for regexsize. --- src/ChangeLog | 5 +++++ src/fontset.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5aa248e91b9..79feb611f3d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-22 Jan Djärv + + * fontset.c (fontset_pattern_regexp): Replace + 1 with + 3 for + regexsize (Bug#20156). + 2015-03-21 Eli Zaretskii * emacs.c (synchronize_locale) [WINDOWSNT]: Ignore 'category' and diff --git a/src/fontset.c b/src/fontset.c index c0303fa5a34..763d84628b5 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1074,7 +1074,7 @@ fontset_pattern_regexp (Lisp_Object pattern) expression matching. */ ptrdiff_t regexsize = (SBYTES (pattern) + (ndashes < 14 ? 2 : 5) * nstars - + 2 * nescs + 1); + + 2 * nescs + 3); USE_SAFE_ALLOCA; p1 = regex = SAFE_ALLOCA (regexsize); From ae3d7333608652cc35f1d50cac9ea90b55f12a08 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sun, 22 Mar 2015 10:21:45 +0100 Subject: [PATCH 355/457] Backport 20156 fix (stack corruption) Fixes: debbugs:20156 * src/fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with + 3 in alloca (tiny change) --- src/ChangeLog | 5 +++++ src/fontset.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 90908fcf759..060486b4ab3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-22 John F Carr + + * fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with + + 3 in alloca (Bug#20156) (tiny change) + 2015-03-12 Glenn Morris * frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is diff --git a/src/fontset.c b/src/fontset.c index d9aa99d05f5..5772cc830c8 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1097,9 +1097,9 @@ fontset_pattern_regexp (Lisp_Object pattern) we convert "*" to "[^-]*" which is much faster in regular expression matching. */ if (ndashes < 14) - p1 = regex = alloca (SBYTES (pattern) + 2 * nstars + 2 * nescs + 1); + p1 = regex = alloca (SBYTES (pattern) + 2 * nstars + 2 * nescs + 3); else - p1 = regex = alloca (SBYTES (pattern) + 5 * nstars + 2 * nescs + 1); + p1 = regex = alloca (SBYTES (pattern) + 5 * nstars + 2 * nescs + 3); *p1++ = '^'; for (p0 = SDATA (pattern); *p0; p0++) From bb7b23c5cbd0659a9e913ea4c4642bffe83541ef Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sun, 22 Mar 2015 12:40:21 +0100 Subject: [PATCH 356/457] In `debug' don't try using window on inaccessible frame (Bug#17170). * emacs-lisp/debug.el (debug): Don't try using "previous" window when its not live or on an invisible frame (Bug#17170). --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/debug.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b28517f07ed..8f888e37b06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-22 Martin Rudalics + + * emacs-lisp/debug.el (debug): Don't try using "previous" window + when its not live or on an invisible frame (Bug#17170). + 2015-03-21 Mario Lang * emacs-lisp/tabulated-list.el (tabulated-list-print): Only call diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index dc0e666836e..38befeece45 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -193,8 +193,10 @@ first will be printed into the backtrace buffer." debugger-buffer `((display-buffer-reuse-window display-buffer-in-previous-window) - . (,(when debugger-previous-window - `(previous-window . ,debugger-previous-window))))) + . (,(when (and (window-live-p debugger-previous-window) + (frame-visible-p + (window-frame debugger-previous-window))) + `(previous-window . ,debugger-previous-window))))) (setq debugger-window (selected-window)) (if (eq debugger-previous-window debugger-window) (when debugger-jumping-flag From a4ff05a2172fc0c057ca9715d263c8b00fbf0218 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 22 Mar 2015 11:11:27 -0700 Subject: [PATCH 357/457] ChangeLog fix No need to merge to trunk, since it corrects a backported entry that should not appear in trunk. --- src/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 060486b4ab3..d09b9de34fa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,7 @@ -2015-03-22 John F Carr +2015-03-22 John F Carr (tiny change) * fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with - + 3 in alloca (Bug#20156) (tiny change) + + 3 in alloca (Bug#20156). 2015-03-12 Glenn Morris From c3c4b758c6d3e33d7fa7621ba4a50ec75c121247 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sun, 22 Mar 2015 19:31:46 +0100 Subject: [PATCH 358/457] Fixes: debbugs:18939 * simple.el (deactivate-mark): Only modify PRIMARY if we own PRIMARY. --- lisp/ChangeLog | 5 +++++ lisp/simple.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f888e37b06..7c7c66d24d6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-22 Jan Djärv + + * simple.el (deactivate-mark): Only modify PRIMARY if we own + PRIMARY (Bug#18939). + 2015-03-22 Martin Rudalics * emacs-lisp/debug.el (debug): Don't try using "previous" window diff --git a/lisp/simple.el b/lisp/simple.el index ae07f6237ce..5e5cd877e9b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4420,7 +4420,8 @@ run `deactivate-mark-hook'." ;; the region prior to the last command modifying the buffer. ;; Set the selection to that, or to the current region. (cond (saved-region-selection - (x-set-selection 'PRIMARY saved-region-selection) + (if (x-selection-owner-p 'PRIMARY) + (x-set-selection 'PRIMARY saved-region-selection)) (setq saved-region-selection nil)) ;; If another program has acquired the selection, region ;; deactivation should not clobber it (Bug#11772). From 2a954e8aa6917572cbf9431f7b1a9ae19be18d7c Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Sun, 22 Mar 2015 19:29:57 +0000 Subject: [PATCH 359/457] * menu-bar.el (menu-bar-update-buffers): Properly count buffers. --- lisp/ChangeLog | 5 +++++ lisp/menu-bar.el | 22 +++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2f9c430e45d..52c6a726432 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-22 Artur Malabarba + + * menu-bar.el (menu-bar-update-buffers): Count displayed buffers + for `buffers-menu-max-size', not total buffers. + 2015-03-21 Titus von der Malsburg * window.el (window-font-width, window-font-height) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 5fdb9377a48..2ace3162c90 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1949,20 +1949,20 @@ It must accept a buffer as its only required argument.") (let ((buffers (buffer-list)) (frames (frame-list)) buffers-menu) - ;; If requested, list only the N most recently selected buffers. - (if (and (integerp buffers-menu-max-size) - (> buffers-menu-max-size 1)) - (if (> (length buffers) buffers-menu-max-size) - (setcdr (nthcdr buffers-menu-max-size buffers) nil))) ;; Make the menu of buffers proper. (setq buffers-menu - (let (alist) + (let ((i 0) + (limit (if (and (integerp buffers-menu-max-size) + (> buffers-menu-max-size 1)) + buffers-menu-max-size most-positive-fixnum)) + alist) ;; Put into each element of buffer-list ;; the name for actual display, ;; perhaps truncated in the middle. - (dolist (buf buffers) - (let ((name (buffer-name buf))) + (while buffers + (let* ((buf (pop buffers)) + (name (buffer-name buf))) (unless (eq ?\s (aref name 0)) (push (menu-bar-update-buffers-1 (cons buf @@ -1976,7 +1976,11 @@ It must accept a buffer as its only required argument.") name (- (/ buffers-menu-buffer-name-length 2)))) name) )) - alist)))) + alist) + ;; If requested, list only the N most recently + ;; selected buffers. + (when (= limit (setq i (1+ i))) + (setq buffers nil))))) (list (menu-bar-buffer-vector alist)))) ;; Make a Frames menu if we have more than one frame. From a3b6c249e9757761404c1f7a57de4217dcc2e583 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 23 Mar 2015 00:50:58 +0200 Subject: [PATCH 360/457] Rewrite json-encode-string Fixes: debbugs:20154 * lisp/json.el (json-decode-char0): Delete this alias. (json-encode-string): Rewrite to improve performance. (json-encode-char): Fold into `json-encode-string'. --- lisp/ChangeLog | 6 ++++++ lisp/json.el | 37 ++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 52c6a726432..2fc318a3b89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-22 Dmitry Gutov + + * json.el (json-decode-char0): Delete this alias. + (json-encode-string): Rewrite to improve performance (bug#20154). + (json-encode-char): Fold into `json-encode-string'. + 2015-03-22 Artur Malabarba * menu-bar.el (menu-bar-update-buffers): Count displayed buffers diff --git a/lisp/json.el b/lisp/json.el index 98974e67b7e..fb0f62c8777 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -55,7 +55,6 @@ ;; Compatibility code -(defalias 'json-encode-char0 'encode-char) (defalias 'json-decode-char0 'decode-char) @@ -313,24 +312,28 @@ representation will be parsed correctly." ;; String encoding -(defun json-encode-char (char) - "Encode CHAR as a JSON string." - (setq char (json-encode-char0 char 'ucs)) - (let ((control-char (car (rassoc char json-special-chars)))) - (cond - ;; Special JSON character (\n, \r, etc.). - (control-char - (format "\\%c" control-char)) - ;; ASCIIish printable character. - ((and (> char 31) (< char 127)) - (format "%c" char)) - ;; Fallback: UCS code point in \uNNNN form. - (t - (format "\\u%04x" char))))) - (defun json-encode-string (string) "Return a JSON representation of STRING." - (format "\"%s\"" (mapconcat 'json-encode-char string ""))) + ;; Reimplement the meat of `replace-regexp-in-string', for + ;; performance (bug#20154). + (let ((l (length string)) + (start 0) + res mb) + ;; Skip over ASCIIish printable characters. + (while (setq mb (string-match "[\"\\/\b\f\n\r\t]\\|[^ -~]" string start)) + (let* ((c (aref string mb)) + (special (rassq c json-special-chars))) + (push (substring string start mb) res) + (push (if special + ;; Special JSON character (\n, \r, etc.). + (string ?\\ (car special)) + ;; Fallback: UCS code point in \uNNNN form. + (format "\\u%04x" c)) + res) + (setq start (1+ mb)))) + (push (substring string start l) res) + (push "\"" res) + (apply #'concat "\"" (nreverse res)))) (defun json-encode-key (object) "Return a JSON representation of OBJECT. From 127377c7113d1f01bafbb09b6d6730e9d8e5ac2e Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 23 Mar 2015 00:52:07 +0200 Subject: [PATCH 361/457] Add a few tests for jsone.el * test/automated/json-tests.el: New file. --- test/ChangeLog | 4 ++++ test/automated/json-tests.el | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 test/automated/json-tests.el diff --git a/test/ChangeLog b/test/ChangeLog index 15408a3c970..b12e9c044f5 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2015-03-22 Dmitry Gutov + + * automated/json-tests.el: New file. + 2015-03-19 Stefan Monnier * automated/eieio-tests.el (eieio-test-17-virtual-slot): Don't use diff --git a/test/automated/json-tests.el b/test/automated/json-tests.el new file mode 100644 index 00000000000..378472e19e5 --- /dev/null +++ b/test/automated/json-tests.el @@ -0,0 +1,46 @@ +;;; json-tests.el --- Test suite for json.el + +;; Copyright (C) 2015 Dmitry Gutov + +;; Author: Dmitry Gutov + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Code: + +(require 'ert) +(require 'json) + +(ert-deftest json-encode-simple-alist () + (should (equal (json-encode '((a . 1) + (b . 2))) + "{\"a\":1,\"b\":2}"))) + +(ert-deftest json-read-simple-alist () + (should (equal (json-read-from-string "{\"a\": 1, \"b\": 2}") + '((b . 2) + (a . 1))))) + +(ert-deftest json-encode-string-with-special-chars () + (should (equal (json-encode-string "a\n\fb") + "\"a\\n\\fb\"")) + (should (equal (json-encode-string "\nasdфывfgh\t") + "\"\\nasd\\u0444\\u044b\\u0432fgh\\t\""))) + +(ert-deftest json-read-string-with-special-chars () + (should (equal (json-read-from-string "\"\\nasd\\u0444\\u044b\\u0432fgh\\t\"") + "\nasdфывfgh\t"))) + +(provide 'json-tests) +;;; json-tests.el ends here From 70a8bbe4437abe9166ba5522437c70791869fc95 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 22 Mar 2015 16:50:00 -0700 Subject: [PATCH 362/457] json-tests.el: Fix copyright --- test/automated/json-tests.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/automated/json-tests.el b/test/automated/json-tests.el index 378472e19e5..881c237261c 100644 --- a/test/automated/json-tests.el +++ b/test/automated/json-tests.el @@ -1,6 +1,6 @@ ;;; json-tests.el --- Test suite for json.el -;; Copyright (C) 2015 Dmitry Gutov +;; Copyright (C) 2015 Free Software Foundation, Inc. ;; Author: Dmitry Gutov From 0bfe915be7e31f556624f3f9bcae93a2d33e69a6 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 22 Mar 2015 17:10:10 -0700 Subject: [PATCH 363/457] * etc/PROBLEMS: Add entry about dir-locals and some auto-mounters. --- etc/PROBLEMS | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index c701ec4c8a6..8e5505ea74e 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1,7 +1,6 @@ Known Problems with GNU Emacs -Copyright (C) 1987-1989, 1993-1999, 2001-2015 Free Software Foundation, -Inc. +Copyright (C) 1987-1989, 1993-1999, 2001-2015 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -469,6 +468,18 @@ full qualified domain name, FQDN. You should have your FQDN in the The way to set this up may vary on non-GNU systems. +*** Visiting files in some auto-mounted directories causes Emacs to print +`Error reading dir-locals: (file-error "Read error" "is a directory" ...' + +This can happen if the auto-mounter mistakenly reports that +.dir-locals.el exists and is a directory. There is nothing Emacs can +do about this, but you can avoid the issue by adding a suitable entry +to the variable `locate-dominating-stop-dir-regexp'. For example, if +the problem relates to "/smb/.dir-locals.el", set that variable +to a new value where you replace "net\\|afs" with "net\\|afs\\|smb". +(The default value already matches common auto-mount prefixes.) +See http://lists.gnu.org/archive/html/help-gnu-emacs/2015-02/msg00461.html . + *** Attempting to visit remote files via ange-ftp fails. If the error message is "ange-ftp-file-modtime: Specified time is not From e7f92aa3d3fb7d5cf88eef374eaeba4dc6b8984f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 22 Mar 2015 17:33:49 -0700 Subject: [PATCH 364/457] authors.el small additions * lisp/emacs-lisp/authors.el (authors-aliases) (authors-obsolete-files-regexps): Additions. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/authors.el | 2 ++ 2 files changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c7c66d24d6..40f1e9ff279 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Glenn Morris + + * emacs-lisp/authors.el (authors-aliases) + (authors-obsolete-files-regexps): Additions. + 2015-03-22 Jan Djärv * simple.el (deactivate-mark): Only modify PRIMARY if we own diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index b44f7aa7146..7d6169d9029 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -85,6 +85,7 @@ files.") ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen") ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard") ("Johan Bockgård" "Johan Bockgard") + ("John F. Carr" "John F Carr") ("John J Foerch" "John Foerch") ("John W. Eaton" "John Eaton") ("Jonathan I. Kamens" "Jonathan Kamens") @@ -242,6 +243,7 @@ If REALNAME is nil, ignore that author.") '(".*loaddefs.el$" ; not obsolete, but auto-generated "\\.\\(bzr\\|cvs\\|git\\)ignore$" ; obsolete or uninteresting "\\.arch-inventory$" + "ChangeLog\\(\\.[0-9]+\\)?\\'" "automated/data/" ; not interesting ;; TODO lib/? Matches other things? "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'" From f4c23f458367769ba9a701792fa5720e58827fb4 Mon Sep 17 00:00:00 2001 From: Jackson Ray Hamilton Date: Sun, 22 Mar 2015 08:22:29 -0700 Subject: [PATCH 365/457] Have `sgml-attribute-offset' control SGML attribute indentation Fixes: debbugs:20161 * textmodes/sgml-mode.el (sgml-attribute-offset): New defcustom. (sgml-calculate-indent): Use `sgml-attribute-offset' for attribute indentation. --- lisp/ChangeLog | 6 ++++++ lisp/textmodes/sgml-mode.el | 23 +++++++++++++++++++++-- test/indent/sgml-mode-attribute.html | 14 ++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 test/indent/sgml-mode-attribute.html diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2fc318a3b89..1b8a4d3ce12 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-22 Jackson Ray Hamilton + + * textmodes/sgml-mode.el (sgml-attribute-offset): New defcustom. + (sgml-calculate-indent): Use `sgml-attribute-offset' for attribute + indentation (bug#20161). + 2015-03-22 Dmitry Gutov * json.el (json-decode-char0): Delete this alias. diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 12d98c8238a..82666478d59 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -46,6 +46,25 @@ :type 'integer :group 'sgml) +(defcustom sgml-attribute-offset 0 + "Specifies a delta for attribute indentation in `sgml-indent-line'. + +When 0, attribute indentation looks like this: + + + + +When 2, attribute indentation looks like this: + + + " + :version "25.1" + :type 'integer + :safe 'integerp + :group 'sgml) + (defcustom sgml-xml-mode nil "When non-nil, tag insertion functions will be XML-compliant. It is set to be buffer-local when the file has @@ -1510,13 +1529,13 @@ LCON is the lexical context, if any." (`pi nil) (`tag - (goto-char (1+ (cdr lcon))) + (goto-char (+ (cdr lcon) sgml-attribute-offset)) (skip-chars-forward "^ \t\n") ;Skip tag name. (skip-chars-forward " \t") (if (not (eolp)) (current-column) ;; This is the first attribute: indent. - (goto-char (1+ (cdr lcon))) + (goto-char (+ (cdr lcon) sgml-attribute-offset)) (+ (current-column) sgml-basic-offset))) (`text diff --git a/test/indent/sgml-mode-attribute.html b/test/indent/sgml-mode-attribute.html new file mode 100644 index 00000000000..4cbec0af2c6 --- /dev/null +++ b/test/indent/sgml-mode-attribute.html @@ -0,0 +1,14 @@ + + + + + + + + From 165bea78008ec7545698f2e893821b4090f20c79 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sun, 22 Mar 2015 21:09:21 -0700 Subject: [PATCH 366/457] Automatically adjust process window sizes * lisp/window.el (window-adjust-process-window-size-function): New customizable variable. (window-adjust-process-window-size) (window-adjust-process-window-size-smallest) (window-adjust-process-window-size-largest) (window--process-window-list, window--adjust-process-windows): New functions. (window-configuration-change-hook): Add `window--adjust-process-windows'. * lisp/term.el (term-mode): Observe result of `window-adjust-process-window-size-function'. (term-check-size): Delete. --- lisp/ChangeLog | 17 +++++++++ lisp/term.el | 33 +++++++--------- lisp/window.el | 102 ++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 132 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b8a4d3ce12..596b6e2ccb5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2015-03-23 Daniel Colascione + + Automatically adjust process window sizes. + + * window.el (window-adjust-process-window-size-function): New + customizable variable. + (window-adjust-process-window-size) + (window-adjust-process-window-size-smallest) + (window-adjust-process-window-size-largest) + (window--process-window-list, window--adjust-process-windows): + New functions. + (window-configuration-change-hook): Add + `window--adjust-process-windows'. + * term.el (term-mode): Observe result of + `window-adjust-process-window-size-function'. + (term-check-size): Delete. + 2015-03-22 Jackson Ray Hamilton * textmodes/sgml-mode.el (sgml-attribute-offset): New defcustom. diff --git a/lisp/term.el b/lisp/term.el index a629af90d3e..43138fa6dd8 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -1145,7 +1145,7 @@ Entry to this mode runs the hooks on `term-mode-hook'." (make-local-variable 'term-scroll-show-maximum-output) (make-local-variable 'term-ptyp) (make-local-variable 'term-exec-hook) - (make-local-variable 'term-vertical-motion) + (set (make-local-variable 'term-vertical-motion) 'vertical-motion) (set (make-local-variable 'term-pending-delete-marker) (make-marker)) (make-local-variable 'term-current-face) (term-ansi-reset) @@ -1155,6 +1155,13 @@ Entry to this mode runs the hooks on `term-mode-hook'." (set (make-local-variable 'font-lock-defaults) '(nil t)) + (add-function :filter-return + (local 'window-adjust-process-window-size-function) + (lambda (size) + (when size + (term-reset-size (cdr size) (car size))) + size)) + (easy-menu-add term-terminal-menu) (easy-menu-add term-signals-menu) (or term-input-ring @@ -1197,12 +1204,6 @@ Entry to this mode runs the hooks on `term-mode-hook'." (goto-char save-point))) found)) -(defun term-check-size (process) - (when (or (/= term-height (window-text-height)) - (/= term-width (term-window-width))) - (term-reset-size (window-text-height) (term-window-width)) - (set-process-window-size process term-height term-width))) - (defun term-send-raw-string (chars) (deactivate-mark) (let ((proc (get-buffer-process (current-buffer)))) @@ -2772,15 +2773,11 @@ See `term-prompt-regexp'." (when (/= (point) (process-mark proc)) (setq save-point (point-marker))) - ;; Note if the window size has changed. We used to reset - ;; point too, but that gives incorrect results (Bug#4635). - (if (eq (window-buffer) (current-buffer)) - (progn - (setq term-vertical-motion (symbol-function 'vertical-motion)) - (term-check-size proc)) - (setq term-vertical-motion - (symbol-function 'term-buffer-vertical-motion))) - (setq save-marker (copy-marker (process-mark proc))) + (setf term-vertical-motion + (if (eq (window-buffer) (current-buffer)) + 'vertical-motion + 'term-buffer-vertical-motion)) + (setq save-marker (copy-marker (process-mark proc))) (goto-char (process-mark proc)) (save-restriction @@ -3082,9 +3079,7 @@ See `term-prompt-regexp'." (eq (window-buffer selected) (current-buffer))) (term-display-line (car term-pending-frame) (cdr term-pending-frame)) - (setq term-pending-frame nil) - ;; We have created a new window, so check the window size. - (term-check-size proc)) + (setq term-pending-frame nil)) ;; Scroll each window displaying the buffer but (by default) ;; only if the point matches the process-mark we started with. diff --git a/lisp/window.el b/lisp/window.el index d17605099a0..94fe521b733 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -8029,7 +8029,107 @@ Otherwise, consult the value of `truncate-partial-width-windows' (window-buffer window)))) (if (integerp t-p-w-w) (< (window-width window) t-p-w-w) - t-p-w-w)))) + t-p-w-w)))) + + +;; Automatically inform subprocesses of changes to window size. + +(defcustom window-adjust-process-window-size-function + 'window-adjust-process-window-size-smallest + "Control how Emacs chooses inferior process window sizes. +Emacs uses this function to tell processes the space they have +available for displaying their output. After each window +configuration change, Emacs calls the value of +`window-adjust-process-window-size-function' for each process +with a buffer being displayed in at least one window. +This function is responsible for combining the sizes of the +displayed windows and returning a cons (WIDTH . HEIGHT) +describing the width and height with which Emacs will call +`set-process-window-size' for that process. If the function +returns `nil', Emacs does not call `set-process-window-size'. + +This function is called with the process buffer as the current +buffer and with two arguments: the process and a list of windows +displaying process. Modes can make this variable buffer-local; +additionally, the `adjust-window-size-function' process property +overrides the global or buffer-local value of +`window-adjust-process-window-size-function'." + :type '(choice + (const :tag "Minimum area of any window" + window-adjust-process-window-size-smallest) + (const :tag "Maximum area of any window" + window-adjust-process-window-size-largest) + (const :tag "Do not adjust process window sizes" ignore) + function) + :group 'windows + :version "25.1") + +(defun window-adjust-process-window-size (reducer process windows) + "Adjust the process window size of PROCESS. +WINDOWS is a list of windows associated with PROCESS. REDUCER is +a two-argument function used to combine the widths and heights of +the given windows." + (when windows + (let ((width (window-body-width (car windows))) + (height (window-body-height (car windows)))) + (dolist (window (cdr windows)) + (setf width (funcall reducer width (window-body-width window))) + (setf height (funcall reducer height (window-body-height window)))) + (cons width height)))) + +(defun window-adjust-process-window-size-smallest (process windows) + "Adjust the process window size of PROCESS. +WINDOWS is a list of windows associated with PROCESS. Choose the +smallest area availabe for displaying PROCESS's output." + (window-adjust-process-window-size #'min process windows)) + +(defun window-adjust-process-window-size-largest (process windows) + "Adjust the process window size of PROCESS. +WINDOWS is a list of windows associated with PROCESS. Choose the +largest area availabe for displaying PROCESS's output." + (window-adjust-process-window-size #'max process windows)) + +(defun window--process-window-list () + "Return an alist mapping processes to associated windows. +A window is associated with a process if that window is +displaying that processes's buffer." + (let ((processes (process-list)) + (process-windows nil)) + (walk-windows + (lambda (window) + (let ((buffer (window-buffer window)) + (iter processes)) + (while (let ((process (car iter))) + (if (and (process-live-p process) + (eq buffer (process-buffer process))) + (let ((procwin (assq process process-windows))) + ;; Add this window to the list of windows + ;; displaying process. + (if procwin + (push window (cdr procwin)) + (push (list process window) process-windows)) + ;; We found our process for this window, so + ;; stop iterating over the process list. + nil) + (setf iter (cdr iter))))))) + 1 t) + process-windows)) + +(defun window--adjust-process-windows () + "Update process window sizes to match the current window configuration." + (dolist (procwin (window--process-window-list)) + (let ((process (car procwin))) + (with-demoted-errors "Error adjusting window size: %S" + (with-current-buffer (process-buffer process) + (let ((size (funcall + (or (process-get process 'adjust-window-size-function) + window-adjust-process-window-size-function) + process (cdr procwin)))) + (when size + (set-process-window-size process (cdr size) (car size))))))))) + +(add-hook 'window-configuration-change-hook 'window--adjust-process-windows) + ;; Some of these are in tutorial--default-keys, so update that if you ;; change these. From 47e0e319329a1ecf9da4fa1afd2b9f2738fada67 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 23 Mar 2015 12:40:29 +0900 Subject: [PATCH 367/457] Generalize start-process with keyword args * src/process.c (Fmake_process): New function. (create_process, create_pty): Check p->pty_flag instead of Vprocess_connection_type. (syms_of_process): Register QCcommand, QCconnection_type, Qpty, Qpipe, and Smake_process. Unregister Sstart_process. * lisp/subr.el (start-process): New function, ported from the C implementation. * doc/lispref/processes.texi (Asynchronous Processes): Mention `make-process'. * etc/NEWS: Mention `make-process'. --- doc/lispref/ChangeLog | 4 + doc/lispref/processes.texi | 55 ++++++++++++ etc/ChangeLog | 4 + etc/NEWS | 5 ++ lisp/ChangeLog | 5 ++ lisp/subr.el | 24 +++++ src/ChangeLog | 8 ++ src/process.c | 175 ++++++++++++++++++++++++++++--------- 8 files changed, 237 insertions(+), 43 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 3644d40fabf..ff1f8148e81 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Daiki Ueno + + * processes.texi (Asynchronous Processes): Mention `make-process'. + 2015-03-18 Eli Zaretskii * minibuf.texi (Basic Completion): Fix a typo. (Bug#20108) diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 177cd684f5c..3e9cc50de52 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -692,6 +692,61 @@ use the function @code{process-tty-name} (@pxref{Process Information}). @end defvar +@defun make-process &rest args +This function is like @code{start-process}, but takes keyword arguments. + +The arguments @var{args} are a list of keyword/argument pairs. +Omitting a keyword is always equivalent to specifying it with value +@code{nil}. Here are the meaningful keywords: + +@table @asis +@item :name @var{name} +Use the string @var{name} as the process name. It is modified if +necessary to make it unique. + +@item :buffer @var{buffer} +Use @var{buffer} as the process buffer. + +@item :command @var{command} +Use @var{command} as the command line of the process. @var{command} +is a list starting with the program's executable file name, followed +by strings to give to program as arguments. + +@item :coding @var{coding} +If @var{coding} is a symbol, it specifies the coding system to be +used for both reading and writing of data from and to the +connection. If @var{coding} is a cons cell +@w{@code{(@var{decoding} . @var{encoding})}}, then @var{decoding} +will be used for reading and @var{encoding} for writing. + +If @var{coding} is @code{nil}, the default rules for finding the +coding system will apply. @xref{Default Coding Systems}. + +@item :connection-type @var{TYPE} +Initialize the type of device used to communicate with the subprocess. +Possible values are @code{pty} to use a pty, @code{pipe} to use a +pipe, or @code{nil} to use the default derived from the value of +the @code{process-connection-type} variable. + +@item :noquery @var{query-flag} +Initialize the process query flag to @var{query-flag}. +@xref{Query Before Exit}. + +@item :stop @var{stopped} +If @var{stopped} is non-@code{nil}, start the process in the +``stopped'' state. + +@item :filter @var{filter} +Initialize the process filter to @var{filter}. + +@item :sentinel @var{sentinel} +Initialize the process sentinel to @var{sentinel}. +@end table + +The original argument list, modified with the actual connection +information, is available via the @code{process-contact} function. +@end defun + @node Deleting Processes @section Deleting Processes @cindex deleting processes diff --git a/etc/ChangeLog b/etc/ChangeLog index c94e12296ed..e146f786f6f 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Daiki Ueno + + * NEWS: Mention `make-process'. + 2015-03-21 Titus von der Malsburg * NEWS: Mention `default-font-width', `window-font-height', diff --git a/etc/NEWS b/etc/NEWS index 7cdb24b402e..3b848dc6539 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -651,6 +651,11 @@ word syntax, use `\sw' instead. * Lisp Changes in Emacs 25.1 +** New function `make-process' provides an alternative interface to +`start-process'. It allows programs to set process parameters such as +process filter, sentinel, etc., through keyword arguments (similar to +`make-network-process'). + ** `read-buffer' takes a new `predicate' argument. ** Emacs Lisp now supports generators. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 596b6e2ccb5..8f1534a3284 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Daiki Ueno + + * subr.el (start-process): New function, ported from the C + implementation. + 2015-03-23 Daniel Colascione Automatically adjust process window sizes. diff --git a/lisp/subr.el b/lisp/subr.el index deadca6efa0..163a1c419d4 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1901,6 +1901,30 @@ and the file name is displayed in the echo area." ;;;; Process stuff. +(defun start-process (name buffer program &rest program-args) + "Start a program in a subprocess. Return the process object for it. +NAME is name for process. It is modified if necessary to make it unique. +BUFFER is the buffer (or buffer name) to associate with the process. + +Process output (both standard output and standard error streams) goes +at end of BUFFER, unless you specify an output stream or filter +function to handle the output. BUFFER may also be nil, meaning that +this process is not associated with any buffer. + +PROGRAM is the program file name. It is searched for in `exec-path' +\(which see). If nil, just associate a pty with the buffer. Remaining +arguments are strings to give program as arguments. + +If you want to separate standard output from standard error, invoke +the command through a shell and redirect one of them using the shell +syntax." + (unless (fboundp 'make-process) + (error "Emacs was compiled without subprocess support")) + (apply #'make-process + (append (list :name name :buffer buffer) + (if program + (list :command (cons program program-args)))))) + (defun process-lines (program &rest args) "Execute PROGRAM with ARGS, returning its output as a list of lines. Signal an error if the program returns with a non-zero exit status." diff --git a/src/ChangeLog b/src/ChangeLog index 79feb611f3d..6c7955a2fc0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2015-03-23 Daiki Ueno + + * process.c (Fmake_process): New function. + (create_process, create_pty): Check p->pty_flag instead of + Vprocess_connection_type. + (syms_of_process): Register QCcommand, QCconnection_type, Qpty, + Qpipe, and Smake_process. Unregister Sstart_process. + 2015-03-22 Jan Djärv * fontset.c (fontset_pattern_regexp): Replace + 1 with + 3 for diff --git a/src/process.c b/src/process.c index 1d935ba8a3e..5abe7489d0d 100644 --- a/src/process.c +++ b/src/process.c @@ -1355,34 +1355,63 @@ DEFUN ("process-list", Fprocess_list, Sprocess_list, 0, 0, 0, static void start_process_unwind (Lisp_Object proc); -DEFUN ("start-process", Fstart_process, Sstart_process, 3, MANY, 0, +DEFUN ("make-process", Fmake_process, Smake_process, 0, MANY, 0, doc: /* Start a program in a subprocess. Return the process object for it. -NAME is name for process. It is modified if necessary to make it unique. -BUFFER is the buffer (or buffer name) to associate with the process. -Process output (both standard output and standard error streams) goes -at end of BUFFER, unless you specify an output stream or filter -function to handle the output. BUFFER may also be nil, meaning that -this process is not associated with any buffer. +This is similar to `start-process', but arguments are specified as +keyword/argument pairs. The following arguments are defined: -PROGRAM is the program file name. It is searched for in `exec-path' -(which see). If nil, just associate a pty with the buffer. Remaining -arguments are strings to give program as arguments. +:name NAME -- NAME is name for process. It is modified if necessary +to make it unique. -If you want to separate standard output from standard error, invoke -the command through a shell and redirect one of them using the shell -syntax. +:buffer BUFFER -- BUFFER is the buffer (or buffer-name) to associate +with the process. Process output goes at end of that buffer, unless +you specify an output stream or filter function to handle the output. +BUFFER may be also nil, meaning that this process is not associated +with any buffer. -usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) +:command COMMAND -- COMMAND is a list starting with the program file +name, followed by strings to give to the program as arguments. + +:coding CODING -- If CODING is a symbol, it specifies the coding +system used for both reading and writing for this process. If CODING +is a cons (DECODING . ENCODING), DECODING is used for reading, and +ENCODING is used for writing. + +:noquery BOOL -- When exiting Emacs, query the user if BOOL is nil and +the process is running. If BOOL is not given, query before exiting. + +:stop BOOL -- Start process in the `stopped' state if BOOL non-nil. +In the stopped state, a process does not accept incoming data, but you +can send outgoing data. The stopped state is cleared by +`continue-process' and set by `stop-process'. + +:connection-type TYPE -- TYPE is control type of device used to +communicate with subprocesses. Values are `pipe' to use a pipe, `pty' +to use a pty, or nil to use the default specified through +`process-connection-type'. + +:filter FILTER -- Install FILTER as the process filter. + +:sentinel SENTINEL -- Install SENTINEL as the process sentinel. + +usage: (make-process &rest ARGS) */) (ptrdiff_t nargs, Lisp_Object *args) { - Lisp_Object buffer, name, program, proc, current_dir, tem; - unsigned char **new_argv; + Lisp_Object buffer, name, command, program, proc, contact, current_dir, tem; ptrdiff_t i; ptrdiff_t count = SPECPDL_INDEX (); + struct gcpro gcpro1; USE_SAFE_ALLOCA; - buffer = args[1]; + if (nargs == 0) + return Qnil; + + /* Save arguments for process-contact and clone-process. */ + contact = Flist (nargs, args); + GCPRO1 (contact); + + buffer = Fplist_get (contact, QCbuffer); if (!NILP (buffer)) buffer = Fget_buffer_create (buffer); @@ -1402,10 +1431,14 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) UNGCPRO; } - name = args[0]; + name = Fplist_get (contact, QCname); CHECK_STRING (name); - program = args[2]; + command = Fplist_get (contact, QCcommand); + if (CONSP (command)) + program = XCAR (command); + else + program = Qnil; if (!NILP (program)) CHECK_STRING (program); @@ -1423,7 +1456,22 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) pset_buffer (XPROCESS (proc), buffer); pset_sentinel (XPROCESS (proc), Qinternal_default_process_sentinel); pset_filter (XPROCESS (proc), Qinternal_default_process_filter); - pset_command (XPROCESS (proc), Flist (nargs - 2, args + 2)); + pset_command (XPROCESS (proc), Fcopy_sequence (command)); + + if (tem = Fplist_get (contact, QCnoquery), !NILP (tem)) + XPROCESS (proc)->kill_without_query = 1; + if (tem = Fplist_get (contact, QCstop), !NILP (tem)) + pset_command (XPROCESS (proc), Qt); + + tem = Fplist_get (contact, QCconnection_type); + if (EQ (tem, Qpty)) + XPROCESS (proc)->pty_flag = true; + else if (EQ (tem, Qpipe)) + XPROCESS (proc)->pty_flag = false; + else if (NILP (tem)) + XPROCESS (proc)->pty_flag = !NILP (Vprocess_connection_type); + else + report_file_error ("Unknown connection type", tem); #ifdef HAVE_GNUTLS /* AKA GNUTLS_INITSTAGE(proc). */ @@ -1453,15 +1501,29 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) Lisp_Object val, *args2; struct gcpro gcpro1, gcpro2; - val = Vcoding_system_for_read; + tem = Fplist_get (contact, QCcoding); + if (!NILP (tem)) + { + val = tem; + if (CONSP (val)) + val = XCAR (val); + } + else + val = Vcoding_system_for_read; if (NILP (val)) { - SAFE_ALLOCA_LISP (args2, nargs + 1); - args2[0] = Qstart_process; - for (i = 0; i < nargs; i++) args2[i + 1] = args[i]; + ptrdiff_t nargs2 = 3 + XINT (Flength (command)); + Lisp_Object tem2; + SAFE_ALLOCA_LISP (args2, nargs2); + i = 0; + args2[i++] = Qstart_process; + args2[i++] = name; + args2[i++] = buffer; + for (tem2 = command; CONSP (tem2); tem2 = XCDR (tem2)) + args2[i++] = XCAR (tem2); GCPRO2 (proc, current_dir); if (!NILP (program)) - coding_systems = Ffind_operation_coding_system (nargs + 1, args2); + coding_systems = Ffind_operation_coding_system (nargs2, args2); UNGCPRO; if (CONSP (coding_systems)) val = XCAR (coding_systems); @@ -1470,17 +1532,30 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) } pset_decode_coding_system (XPROCESS (proc), val); - val = Vcoding_system_for_write; + if (!NILP (tem)) + { + val = tem; + if (CONSP (val)) + val = XCDR (val); + } + else + val = Vcoding_system_for_write; if (NILP (val)) { if (EQ (coding_systems, Qt)) { - SAFE_ALLOCA_LISP (args2, nargs + 1); - args2[0] = Qstart_process; - for (i = 0; i < nargs; i++) args2[i + 1] = args[i]; + ptrdiff_t nargs2 = 3 + XINT (Flength (command)); + Lisp_Object tem2; + SAFE_ALLOCA_LISP (args2, nargs2); + i = 0; + args2[i++] = Qstart_process; + args2[i++] = name; + args2[i++] = buffer; + for (tem2 = command; CONSP (tem2); tem2 = XCDR (tem2)) + args2[i++] = XCAR (tem2); GCPRO2 (proc, current_dir); if (!NILP (program)) - coding_systems = Ffind_operation_coding_system (nargs + 1, args2); + coding_systems = Ffind_operation_coding_system (nargs2, args2); UNGCPRO; } if (CONSP (coding_systems)) @@ -1506,16 +1581,20 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) if (!NILP (program)) { + Lisp_Object program_args = XCDR (command); + unsigned char **new_argv; + ptrdiff_t new_argc; + /* If program file name is not absolute, search our path for it. Put the name we will really use in TEM. */ if (!IS_DIRECTORY_SEP (SREF (program, 0)) && !(SCHARS (program) > 1 && IS_DEVICE_SEP (SREF (program, 1)))) { - struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; + struct gcpro gcpro1, gcpro2; tem = Qnil; - GCPRO4 (name, program, buffer, current_dir); + GCPRO2 (buffer, current_dir); openp (Vexec_path, program, Vexec_suffixes, &tem, make_number (X_OK), false); UNGCPRO; @@ -1534,7 +1613,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) tem = remove_slash_colon (tem); { - Lisp_Object arg_encoding = Qnil; + Lisp_Object arg_encoding = Qnil, tem2; struct gcpro gcpro1; GCPRO1 (tem); @@ -1547,9 +1626,9 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) systems for encoding arguments and for encoding data sent to the process. */ - for (i = 3; i < nargs; i++) + for (tem2 = program_args; CONSP (tem2); tem2 = XCDR (tem2)) { - tem = Fcons (args[i], tem); + tem = Fcons (XCAR (tem2), tem); CHECK_STRING (XCAR (tem)); if (STRING_MULTIBYTE (XCAR (tem))) { @@ -1567,10 +1646,11 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) /* Now that everything is encoded we can collect the strings into NEW_ARGV. */ - SAFE_NALLOCA (new_argv, 1, nargs - 1); - new_argv[nargs - 2] = 0; + new_argc = XINT (Flength (tem)); + SAFE_NALLOCA (new_argv, 1, new_argc + 1); + new_argv[new_argc] = 0; - for (i = nargs - 2; i-- != 0; ) + for (i = new_argc - 1; i >= 0; i--) { new_argv[i] = SDATA (XCAR (tem)); tem = XCDR (tem); @@ -1581,6 +1661,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) else create_pty (proc); + UNGCPRO; SAFE_FREE (); return unbind_to (count, proc); } @@ -1648,7 +1729,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) inchannel = outchannel = -1; - if (!NILP (Vprocess_connection_type)) + if (p->pty_flag) outchannel = inchannel = allocate_pty (pty_name); if (inchannel >= 0) @@ -1701,8 +1782,12 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) p->pty_flag = pty_flag; pset_status (p, Qrun); - FD_SET (inchannel, &input_wait_mask); - FD_SET (inchannel, &non_keyboard_wait_mask); + if (!EQ (p->command, Qt)) + { + FD_SET (inchannel, &input_wait_mask); + FD_SET (inchannel, &non_keyboard_wait_mask); + } + if (inchannel > max_process_desc) max_process_desc = inchannel; @@ -1894,7 +1979,7 @@ create_pty (Lisp_Object process) { struct Lisp_Process *p = XPROCESS (process); char pty_name[PTY_NAME_SIZE]; - int pty_fd = NILP (Vprocess_connection_type) ? -1 : allocate_pty (pty_name); + int pty_fd = !p->pty_flag ? -1 : allocate_pty (pty_name); if (pty_fd >= 0) { @@ -7269,6 +7354,10 @@ syms_of_process (void) DEFSYM (QCstop, ":stop"); DEFSYM (QCoptions, ":options"); DEFSYM (QCplist, ":plist"); + DEFSYM (QCcommand, ":command"); + DEFSYM (QCconnection_type, ":connection-type"); + DEFSYM (Qpty, "pty"); + DEFSYM (Qpipe, "pipe"); DEFSYM (Qlast_nonmenu_event, "last-nonmenu-event"); @@ -7371,7 +7460,7 @@ The variable takes effect when `start-process' is called. */); defsubr (&Sprocess_plist); defsubr (&Sset_process_plist); defsubr (&Sprocess_list); - defsubr (&Sstart_process); + defsubr (&Smake_process); defsubr (&Sserial_process_configure); defsubr (&Smake_serial_process); defsubr (&Sset_network_process_option); From 90b46f5b54b8eda06e2c5bcd13d9c6475afe767b Mon Sep 17 00:00:00 2001 From: Ben Bacarisse Date: Mon, 23 Mar 2015 08:02:01 +0000 Subject: [PATCH 368/457] lisp/gnus/nnmh.el (nnmh-request-expire-articles): Work for the case nnmail-expiry-target is an nnmh group (bug#20170) --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnmh.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 592f34d6fbf..1c8dff615d8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Ben Bacarisse (tiny change) + + * nnmh.el (nnmh-request-expire-articles): + Work for the case nnmail-expiry-target is an nnmh group (bug#20170). + 2015-01-29 Lars Ingebrigtsen * message.el (message-smtpmail-send-it): Remove the mail header diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el index 9be0c14884e..04270a554cf 100644 --- a/lisp/gnus/nnmh.el +++ b/lisp/gnus/nnmh.el @@ -259,12 +259,12 @@ as unread by Gnus.") &optional server force) (nnmh-possibly-change-directory newsgroup server) (let ((is-old t) + (dir nnmh-current-directory) article rest mod-time) (nnheader-init-server-buffer) (while (and articles is-old) - (setq article (concat nnmh-current-directory - (int-to-string (car articles)))) + (setq article (concat dir (int-to-string (car articles)))) (when (setq mod-time (nth 5 (file-attributes article))) (if (and (nnmh-deletable-article-p newsgroup (car articles)) (setq is-old From d235b1d261ae9f275ac1f412dd8a8ad3f1c45e51 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Mon, 23 Mar 2015 01:38:12 -0700 Subject: [PATCH 369/457] Try to avoid fontifying macros in funcall position * lisp/emacs-lisp/lisp-mode.el (lisp--el-non-funcall-position-p): New function. (lisp--el-match-keyword): Use it. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/lisp-mode.el | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f1534a3284..630265a0f4c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Daniel Colascione + + * emacs-lisp/lisp-mode.el (lisp--el-non-funcall-position-p): New function. + (lisp--el-match-keyword): Use it. + 2015-03-23 Daiki Ueno * subr.el (start-process): New function, ported from the C diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 9c4194557ef..52bc6a5405b 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -181,13 +181,47 @@ nil))) res)) +(defun lisp--el-non-funcall-position-p (&optional pos) + "Heuristically determine whether POS is an evaluated position." + (setf pos (or pos (point))) + (save-match-data + (save-excursion + (goto-char pos) + (or (eql (char-before) ?\') + (let ((parent + (ignore-errors + (up-list -1) + (cond + ((looking-at (rx "(" (* (syntax -)) "(")) + (up-list -1) + (when (looking-at "(\\_") + (goto-char (match-end 0)) + 'let)) + ((looking-at + (rx "(" + (group-n 1 (+ (or (syntax w) (syntax _)))) + symbol-end)) + (prog1 (intern-soft (match-string-no-properties 1)) + (goto-char (match-end 1)))))))) + (or (eq parent 'declare) + (and (eq parent 'let) + (progn + (forward-sexp 1) + (< pos (point)))) + (and (eq parent 'condition-case) + (progn + (forward-sexp 2) + (< (point) pos))))))))) + (defun lisp--el-match-keyword (limit) (catch 'found (while (re-search-forward "(\\(\\(?:\\sw\\|\\s_\\)+\\)\\_>" limit t) (let ((sym (intern-soft (match-string 1)))) (when (or (special-form-p sym) (and (macrop sym) - (not (get sym 'no-font-lock-keyword)))) + (not (get sym 'no-font-lock-keyword)) + (not (lisp--el-non-funcall-position-p + (match-beginning 0))))) (throw 'found t)))))) (defun lisp--el-font-lock-flush-elisp-buffers (&optional file) From b8d7d7e8e6b3f5542b52b57f2514960d7184210a Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Mon, 23 Mar 2015 01:42:56 -0700 Subject: [PATCH 370/457] Fix previous commit --- lisp/emacs-lisp/lisp-mode.el | 50 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 52bc6a5405b..e96c8ed5cef 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -186,32 +186,32 @@ (setf pos (or pos (point))) (save-match-data (save-excursion - (goto-char pos) - (or (eql (char-before) ?\') - (let ((parent - (ignore-errors + (ignore-errors + (goto-char pos) + (or (eql (char-before) ?\') + (let ((parent (up-list -1) - (cond - ((looking-at (rx "(" (* (syntax -)) "(")) - (up-list -1) - (when (looking-at "(\\_") - (goto-char (match-end 0)) - 'let)) - ((looking-at - (rx "(" - (group-n 1 (+ (or (syntax w) (syntax _)))) - symbol-end)) - (prog1 (intern-soft (match-string-no-properties 1)) - (goto-char (match-end 1)))))))) - (or (eq parent 'declare) - (and (eq parent 'let) - (progn - (forward-sexp 1) - (< pos (point)))) - (and (eq parent 'condition-case) - (progn - (forward-sexp 2) - (< (point) pos))))))))) + (cond + ((looking-at (rx "(" (* (syntax -)) "(")) + (up-list -1) + (when (looking-at "(\\_") + (goto-char (match-end 0)) + 'let)) + ((looking-at + (rx "(" + (group-n 1 (+ (or (syntax w) (syntax _)))) + symbol-end)) + (prog1 (intern-soft (match-string-no-properties 1)) + (goto-char (match-end 1))))))) + (or (eq parent 'declare) + (and (eq parent 'let) + (progn + (forward-sexp 1) + (< pos (point)))) + (and (eq parent 'condition-case) + (progn + (forward-sexp 2) + (< (point) pos)))))))))) (defun lisp--el-match-keyword (limit) (catch 'found From bad7308e0c7bfe0192ac05d7aea72e1f7bea7b08 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Mon, 23 Mar 2015 01:50:42 -0700 Subject: [PATCH 371/457] Fix previous commit (again) --- lisp/emacs-lisp/lisp-mode.el | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index e96c8ed5cef..4c9a39fe174 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -190,19 +190,22 @@ (goto-char pos) (or (eql (char-before) ?\') (let ((parent - (up-list -1) - (cond - ((looking-at (rx "(" (* (syntax -)) "(")) - (up-list -1) - (when (looking-at "(\\_") - (goto-char (match-end 0)) - 'let)) - ((looking-at - (rx "(" - (group-n 1 (+ (or (syntax w) (syntax _)))) - symbol-end)) - (prog1 (intern-soft (match-string-no-properties 1)) - (goto-char (match-end 1))))))) + (progn + (up-list -1) + (cond + ((ignore-errors + (and (eql (char-after) ?\() + (progn + (up-list -1) + (looking-at "(\\_")))) + (goto-char (match-end 0)) + 'let) + ((looking-at + (rx "(" + (group-n 1 (+ (or (syntax w) (syntax _)))) + symbol-end)) + (prog1 (intern-soft (match-string-no-properties 1)) + (goto-char (match-end 1)))))))) (or (eq parent 'declare) (and (eq parent 'let) (progn From ff3878d749591ebf78da532ec1eb6fa00cb5757d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 23 Mar 2015 11:55:24 +0100 Subject: [PATCH 372/457] * configure.ac: Fix jpeg version check to work with gcc >= 5. --- ChangeLog | 4 ++++ configure.ac | 18 +++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4abd9d6e047..b578d0867b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Andreas Schwab + + * configure.ac: Fix jpeg version check to work with gcc >= 5. + 2015-01-20 Eli Zaretskii * configure.ac (HAVE_W32): Abort with error message if diff --git a/configure.ac b/configure.ac index 209bae9eef9..dd1ab324688 100644 --- a/configure.ac +++ b/configure.ac @@ -3075,10 +3075,12 @@ if test "${opsys}" = "mingw32"; then AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl if test "${HAVE_JPEG}" = "yes"; then AC_DEFINE(HAVE_JPEG) - AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])], - [#include - version=JPEG_LIB_VERSION -], + AC_EGREP_CPP([version 6b or later], + [#include + #if JPEG_LIB_VERSION >= 62 + version 6b or later + #endif + ], [AC_DEFINE(HAVE_JPEG)], [AC_MSG_WARN([libjpeg found, but not version 6b or later]) HAVE_JPEG=no]) @@ -3094,10 +3096,12 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl if test "${HAVE_JPEG}" = "yes"; then AC_DEFINE(HAVE_JPEG) - AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])], + AC_EGREP_CPP([version 6b or later], [#include - version=JPEG_LIB_VERSION -], + #if JPEG_LIB_VERSION >= 62 + version 6b or later + #endif + ], [AC_DEFINE(HAVE_JPEG)], [AC_MSG_WARN([libjpeg found, but not version 6b or later]) HAVE_JPEG=no]) From 33e2236f8f3e4f8dcace1cf0bed46ea6f2c7a925 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 23 Mar 2015 09:12:52 -0400 Subject: [PATCH 373/457] * display.texi (Useless Whitespace): Fix thinko. Reported by Fabio Pesari. --- doc/emacs/display.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 4046d696b66..5d5fbb05fcf 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1188,7 +1188,7 @@ Highlight space and non-breaking space characters. @item lines @vindex whitespace-line-column -Highlight lines longer than 80 lines. To change the column limit, +Highlight lines longer than 80 columns. To change the column limit, customize the variable @code{whitespace-line-column}. @item newline From 24960fc72c5a6b7e97a25416ed986ca7054d1260 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 23 Mar 2015 08:55:25 -0700 Subject: [PATCH 374/457] Minor refactoring of new Fmake_process code * process.c (Fmake_process): Refactor to avoid call to Flength, to avoid cast to 'char **', and to reduce indenting and reuse of locals. --- src/ChangeLog | 6 +++++ src/process.c | 68 ++++++++++++++++++++++++--------------------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6c7955a2fc0..99b7ec731fe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-03-23 Paul Eggert + + Minor refactoring of new Fmake_process code + * process.c (Fmake_process): Refactor to avoid call to Flength, to + avoid cast to 'char **', and to reduce indenting and reuse of locals. + 2015-03-23 Daiki Ueno * process.c (Fmake_process): New function. diff --git a/src/process.c b/src/process.c index 5abe7489d0d..dd61f3008de 100644 --- a/src/process.c +++ b/src/process.c @@ -1399,7 +1399,6 @@ usage: (make-process &rest ARGS) */) (ptrdiff_t nargs, Lisp_Object *args) { Lisp_Object buffer, name, command, program, proc, contact, current_dir, tem; - ptrdiff_t i; ptrdiff_t count = SPECPDL_INDEX (); struct gcpro gcpro1; USE_SAFE_ALLOCA; @@ -1515,7 +1514,7 @@ usage: (make-process &rest ARGS) */) ptrdiff_t nargs2 = 3 + XINT (Flength (command)); Lisp_Object tem2; SAFE_ALLOCA_LISP (args2, nargs2); - i = 0; + ptrdiff_t i = 0; args2[i++] = Qstart_process; args2[i++] = name; args2[i++] = buffer; @@ -1547,7 +1546,7 @@ usage: (make-process &rest ARGS) */) ptrdiff_t nargs2 = 3 + XINT (Flength (command)); Lisp_Object tem2; SAFE_ALLOCA_LISP (args2, nargs2); - i = 0; + ptrdiff_t i = 0; args2[i++] = Qstart_process; args2[i++] = name; args2[i++] = buffer; @@ -1582,8 +1581,6 @@ usage: (make-process &rest ARGS) */) if (!NILP (program)) { Lisp_Object program_args = XCDR (command); - unsigned char **new_argv; - ptrdiff_t new_argc; /* If program file name is not absolute, search our path for it. Put the name we will really use in TEM. */ @@ -1612,51 +1609,50 @@ usage: (make-process &rest ARGS) */) /* Remove "/:" from TEM. */ tem = remove_slash_colon (tem); - { - Lisp_Object arg_encoding = Qnil, tem2; - struct gcpro gcpro1; - GCPRO1 (tem); + Lisp_Object arg_encoding = Qnil; + struct gcpro gcpro1; + GCPRO1 (tem); - /* Encode the file name and put it in NEW_ARGV. - That's where the child will use it to execute the program. */ - tem = list1 (ENCODE_FILE (tem)); + /* Encode the file name and put it in NEW_ARGV. + That's where the child will use it to execute the program. */ + tem = list1 (ENCODE_FILE (tem)); + ptrdiff_t new_argc = 1; - /* Here we encode arguments by the coding system used for sending - data to the process. We don't support using different coding - systems for encoding arguments and for encoding data sent to the - process. */ + /* Here we encode arguments by the coding system used for sending + data to the process. We don't support using different coding + systems for encoding arguments and for encoding data sent to the + process. */ - for (tem2 = program_args; CONSP (tem2); tem2 = XCDR (tem2)) - { - tem = Fcons (XCAR (tem2), tem); - CHECK_STRING (XCAR (tem)); - if (STRING_MULTIBYTE (XCAR (tem))) - { - if (NILP (arg_encoding)) - arg_encoding = (complement_process_encoding_system - (XPROCESS (proc)->encode_coding_system)); - XSETCAR (tem, - code_convert_string_norecord - (XCAR (tem), arg_encoding, 1)); - } - } + for (Lisp_Object tem2 = program_args; CONSP (tem2); tem2 = XCDR (tem2)) + { + Lisp_Object arg = XCAR (tem2); + CHECK_STRING (arg); + if (STRING_MULTIBYTE (arg)) + { + if (NILP (arg_encoding)) + arg_encoding = (complement_process_encoding_system + (XPROCESS (proc)->encode_coding_system)); + arg = code_convert_string_norecord (arg, arg_encoding, 1); + } + tem = Fcons (arg, tem); + new_argc++; + } - UNGCPRO; - } + UNGCPRO; /* Now that everything is encoded we can collect the strings into NEW_ARGV. */ - new_argc = XINT (Flength (tem)); + char **new_argv; SAFE_NALLOCA (new_argv, 1, new_argc + 1); new_argv[new_argc] = 0; - for (i = new_argc - 1; i >= 0; i--) + for (ptrdiff_t i = new_argc - 1; i >= 0; i--) { - new_argv[i] = SDATA (XCAR (tem)); + new_argv[i] = SSDATA (XCAR (tem)); tem = XCDR (tem); } - create_process (proc, (char **) new_argv, current_dir); + create_process (proc, new_argv, current_dir); } else create_pty (proc); From a50c95dbd24eb0e56ad0eb0f8ff2c013b5f92285 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 23 Mar 2015 18:00:39 +0200 Subject: [PATCH 375/457] Get rid of json-decode-char0 as well Fixes: debbugs:20154 * lisp/json.el (json-decode-char0): Delete this alias as well. (json-read-escaped-char): Don't call it. --- lisp/ChangeLog | 7 ++++++- lisp/json.el | 8 +------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 630265a0f4c..9448e0514e6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Dmitry Gutov + + * json.el (json-decode-char0): Delete this alias as well. + (json-read-escaped-char): Don't call it (bug#20154). + 2015-03-23 Daniel Colascione * emacs-lisp/lisp-mode.el (lisp--el-non-funcall-position-p): New function. @@ -33,7 +38,7 @@ 2015-03-22 Dmitry Gutov - * json.el (json-decode-char0): Delete this alias. + * json.el (json-encode-char0): Delete this alias. (json-encode-string): Rewrite to improve performance (bug#20154). (json-encode-char): Fold into `json-encode-string'. diff --git a/lisp/json.el b/lisp/json.el index fb0f62c8777..a1e9bb78d11 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -52,12 +52,6 @@ ;;; Code: - -;; Compatibility code - -(defalias 'json-decode-char0 'decode-char) - - ;; Parameters (defvar json-object-type 'alist @@ -286,7 +280,7 @@ representation will be parsed correctly." ((looking-at "[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]") (let ((hex (match-string 0))) (json-advance 4) - (json-decode-char0 'ucs (string-to-number hex 16)))) + (string-to-number hex 16))) (t (signal 'json-string-escape (list (point))))))) From 1291ce180ee0a8e8fcbc57975b55968f9e7162bc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Mar 2015 18:23:47 +0200 Subject: [PATCH 376/457] Minor documentation fix in ELisp manual (Bug#20174) doc/lispref/commands.texi (Event Input Misc): Fix incorrect usage of @code. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/commands.texi | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 319386d9f6c..1dae36ade34 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Eli Zaretskii + + * commands.texi (Event Input Misc): Fix incorrect usage of @code. + (Bug#20174) + 2015-03-14 Eli Zaretskii * minibuf.texi (Basic Completion): Fix a typo. (Bug#20108) diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 5ea1a48b262..4b69ed32709 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2807,7 +2807,7 @@ most recently unread will be reread first. Events read from this list are not normally added to the current command's key sequence (as returned by, e.g., @code{this-command-keys}), as the events will already have been added once as they were read for -the first time. An element of the form @code{(@code{t} . @var{event})} +the first time. An element of the form @w{@code{(t . @var{event})}} forces @var{event} to be added to the current command's key sequence. @end defvar From 5e2951be4ac50da48bb82e74db87930e9d9d127d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Mar 2015 18:35:03 +0200 Subject: [PATCH 377/457] Improve docs of 'posn-actual-col-row' (Bug#20169) doc/lispref/commands.texi (Accessing Mouse): Expand documentation of 'posn-actual-col-row'. --- doc/lispref/ChangeLog | 2 ++ doc/lispref/commands.texi | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 1dae36ade34..970d16322b3 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -2,6 +2,8 @@ * commands.texi (Event Input Misc): Fix incorrect usage of @code. (Bug#20174) + (Accessing Mouse): Expand documentation of 'posn-actual-col-row'. + (Bug#20169) 2015-03-14 Eli Zaretskii diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 4b69ed32709..6cb032c2635 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2081,7 +2081,13 @@ Return the actual row and column in @var{position}, as a cons cell @code{(@var{col} . @var{row})}. The values are the actual row and column numbers in the window given by @var{position}. @xref{Click Events}, for details. The function returns @code{nil} if -@var{position} does not include actual position values. +@var{position} does not include actual position values; in that case +@code{posn-col-row} can be used to get approximate values. + +Note that this function doesn't account for the visual width of +characters on display, like the number of visual columns taken by a +tab character or an image. If you need the coordinates in canonical +character units, use @code{posn-col-row} instead. @end defun @defun posn-string position From ad89f85067d068494009948e76f89c902f043513 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Mar 2015 18:39:38 +0200 Subject: [PATCH 378/457] Another minor improvement in ELisp manual (Bug#20168) doc/lispref/commands.texi (Accessing Mouse): More accurate description of 'posn-object-x-y'. --- doc/lispref/ChangeLog | 1 + doc/lispref/commands.texi | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 970d16322b3..a0a2b2b4d05 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -4,6 +4,7 @@ (Bug#20174) (Accessing Mouse): Expand documentation of 'posn-actual-col-row'. (Bug#20169) + More accurate description of 'posn-object-x-y'. (Bug#20168) 2015-03-14 Eli Zaretskii diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 6cb032c2635..b565909085e 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2109,8 +2109,9 @@ Return the image or string object in @var{position}, either @defun posn-object-x-y position Return the pixel-based x and y coordinates relative to the upper left corner of the object in @var{position} as a cons cell @code{(@var{dx} -. @var{dy})}. If the @var{position} is a buffer position, return the -relative position in the character at that position. +. @var{dy})}. If the @var{position} is on buffer text, return the +relative position of the buffer-text character closest to that +position. @end defun @defun posn-object-width-height position From 1b5c411e6a4dffd6a8dec9846da0d1650a85b879 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 23 Mar 2015 19:55:23 +0200 Subject: [PATCH 379/457] doc/misc/efaq-w32.texi: Fix comments about font dialog. --- doc/misc/efaq-w32.texi | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index d95fa7e4790..ab5eb066918 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -1091,9 +1091,7 @@ Normally Emacs should initialize @code{locale-coding-system} appropriately based on your locale, which will let Emacs use font names in your local language successfully. -@c This feature disappeared in Emacs 23, but I'm keeping its -@c description here, since I think it was a mistake to remove it, and -@c resurrecting it doesn't sound too problematic. +@c This feature disappeared in Emacs 23, and was resurrected in 25.1. @node Font menu @section How can I have Emacs use a font menu like on X? @cindex fonts, displaying a menu @@ -1111,8 +1109,8 @@ Place the following in your init file: * Add fonts to menu:: @end menu -@c This variable still exists, but will have no effect until -@c w32-use-w32-font-dialog support is resurrected, see above. +@c This variable had no effect between v23 and v25.1, where +@c w32-use-w32-font-dialog support was resurrected, see above. @node Add fonts to menu @subsection How can I add my font to the font menu? @cindex font menu, adding fonts From ae277259b1cf8d913893417e4ca284040f5a543f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 23 Mar 2015 18:24:30 -0400 Subject: [PATCH 380/457] Add new `cl-struct' and `eieio' pcase patterns. * lisp/emacs-lisp/cl-macs.el (cl-struct): New pcase pattern. * lisp/emacs-lisp/eieio.el (eieio-pcase-slot-index-table) (eieio-pcase-slot-index-from-index-table): New functions. (eieio): New pcase pattern. * lisp/emacs-lisp/pcase.el (pcase--make-docstring): New function. (pcase): Use it to build the docstring. (pcase-defmacro): Make sure the macro is lazy-loaded. (\`): Move its docstring from `pcase'. --- etc/NEWS | 2 +- lisp/ChangeLog | 12 +++++++++ lisp/emacs-lisp/cl-lib.el | 1 - lisp/emacs-lisp/cl-macs.el | 22 ++++++++++++++++ lisp/emacs-lisp/eieio.el | 38 ++++++++++++++++++++++++++++ lisp/emacs-lisp/pcase.el | 52 ++++++++++++++++++++++++++++---------- 6 files changed, 112 insertions(+), 15 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 3b848dc6539..a8b8c55a50a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -346,7 +346,7 @@ invalid certificates are marked in red. transformed into multipart/related messages before sending. ** pcase -*** New UPatterns `quote' and `app'. +*** New UPatterns `quote', `app', `cl-struct', and `eieio'. *** New UPatterns can be defined with `pcase-defmacro'. +++ *** New vector QPattern. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 248f24d6490..8670e450e28 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2015-03-23 Stefan Monnier + + Add new `cl-struct' and `eieio' pcase patterns. + * emacs-lisp/cl-macs.el (cl-struct): New pcase pattern. + * emacs-lisp/eieio.el (eieio-pcase-slot-index-table) + (eieio-pcase-slot-index-from-index-table): New functions. + (eieio): New pcase pattern. + * emacs-lisp/pcase.el (pcase--make-docstring): New function. + (pcase): Use it to build the docstring. + (pcase-defmacro): Make sure the macro is lazy-loaded. + (\`): Move its docstring from `pcase'. + 2015-03-23 Glenn Morris * emacs-lisp/authors.el (authors-aliases) diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 4b124951446..10651cc29bd 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -629,7 +629,6 @@ the process stops as soon as KEYS or VALUES run out. If ALIST is non-nil, the new pairs are prepended to it." (nconc (cl-mapcar 'cons keys values) alist)) - ;;; Generalized variables. ;; These used to be in cl-macs.el since all macros that use them (like setf) diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 75c6a5687c4..a81d217e4ee 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2768,6 +2768,28 @@ non-nil value, that slot cannot be set via `setf'. ',print-auto)) ',name))) +;;; Add cl-struct support to pcase + +;;;###autoload +(pcase-defmacro cl-struct (type &rest fields) + "Pcase patterns to match cl-structs. +Elements of FIELDS can be of the form (NAME UPAT) in which case the contents of +field NAME is matched against UPAT, or they can be of the form NAME which +is a shorthand for (NAME NAME)." + ;; FIXME: This works well for a destructuring pcase-let, but for straight + ;; pcase, it suffers seriously from a lack of support for cl-typep in + ;; pcase--mutually-exclusive-p. + `(and (pred (pcase--swap cl-typep ',type)) + ,@(mapcar + (lambda (field) + (let* ((name (if (consp field) (car field) field)) + (pat (if (consp field) (cadr field) field))) + `(app ,(if (eq (cl-struct-sequence-type type) 'list) + `(nth ,(cl-struct-slot-offset type name)) + `(pcase--flip aref ,(cl-struct-slot-offset type name))) + ,pat))) + fields))) + (defun cl-struct-sequence-type (struct-type) "Return the sequence used to build STRUCT-TYPE. STRUCT-TYPE is a symbol naming a struct type. Return 'vector or diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 8d76df874e5..27725148ff6 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -328,6 +328,44 @@ variable name of the same name as the slot." (list var `(slot-value ,object ',slot)))) spec-list) ,@body))) + +;; Keep it as a non-inlined function, so the internals of object don't get +;; hard-coded in random .elc files. +(defun eieio-pcase-slot-index-table (obj) + "Return some data structure from which can be extracted the slot offset." + (eieio--class-index-table + (symbol-value (eieio--object-class-tag obj)))) + +(defun eieio-pcase-slot-index-from-index-table (index-table slot) + "Find the index to pass to `aref' to access SLOT." + (let ((index (gethash slot index-table))) + (if index (+ (eval-when-compile + (length (cl-struct-slot-info 'eieio--object))) + index)))) + +(pcase-defmacro eieio (&rest fields) + "Pcase patterns to match EIEIO objects. +Elements of FIELDS can be of the form (NAME UPAT) in which case the contents of +field NAME is matched against UPAT, or they can be of the form NAME which +is a shorthand for (NAME NAME)." + (let ((is (make-symbol "table"))) + ;; FIXME: This generates a horrendous mess of redundant let bindings. + ;; `pcase' needs to be improved somehow to introduce let-bindings more + ;; sparingly, or the byte-compiler needs to be taught to optimize + ;; them away. + ;; FIXME: `pcase' does not do a good job here of sharing tests&code among + ;; various branches. + `(and (pred eieio-object-p) + (app eieio-pcase-slot-index-table ,is) + ,@(mapcar (lambda (field) + (let* ((name (if (consp field) (car field) field)) + (pat (if (consp field) (cadr field) field)) + (i (make-symbol "index"))) + `(and (let (and ,i (pred natnump)) + (eieio-pcase-slot-index-from-index-table + ,is ',name)) + (app (pcase--flip aref ,i) ,pat)))) + fields)))) ;;; Simple generators, and query functions. None of these would do ;; well embedded into an object. diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index 0e8a969a402..a9933e46bbd 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -103,7 +103,6 @@ UPatterns can take the following forms: (or UPAT...) matches if any of the patterns matches. (and UPAT...) matches if all the patterns match. 'VAL matches if the object is `equal' to VAL - `QPAT matches if the QPattern QPAT matches. (pred FUN) matches if FUN applied to the object returns non-nil. (guard BOOLEXP) matches if BOOLEXP evaluates to non-nil. (let UPAT EXP) matches if EXP matches UPAT. @@ -111,14 +110,6 @@ UPatterns can take the following forms: If a SYMBOL is used twice in the same pattern (i.e. the pattern is \"non-linear\"), then the second occurrence is turned into an `eq'uality test. -QPatterns can take the following forms: - (QPAT1 . QPAT2) matches if QPAT1 matches the car and QPAT2 the cdr. - [QPAT1 QPAT2..QPATn] matches a vector of length n and QPAT1..QPATn match - its 0..(n-1)th elements, respectively. - ,UPAT matches if the UPattern UPAT matches. - STRING matches if the object is `equal' to STRING. - ATOM matches if the object is `eq' to ATOM. - FUN can take the form SYMBOL or (lambda ARGS BODY) in which case it's called with one argument. (F ARG1 .. ARGn) in which case F gets called with an n+1'th argument @@ -129,7 +120,10 @@ FUN is assumed to be pure, i.e. it can be dropped if its result is not used, and two identical calls can be merged into one. E.g. you can match pairs where the cdr is larger than the car with a pattern like `(,a . ,(pred (< a))) or, with more checks: -`(,(and a (pred numberp)) . ,(and (pred numberp) (pred (< a))))" +`(,(and a (pred numberp)) . ,(and (pred numberp) (pred (< a)))) + +Additional patterns can be defined via `pcase-defmacro'. +Currently, the following patterns are provided this way:" (declare (indent 1) (debug (form &rest (pcase-UPAT body)))) ;; We want to use a weak hash table as a cache, but the key will unavoidably ;; be based on `exp' and `cases', yet `cases' is a fresh new list each time @@ -154,6 +148,26 @@ like `(,a . ,(pred (< a))) or, with more checks: ;; (puthash (car cases) `(,exp ,cases ,@expansion) pcase--memoize-2) expansion)))) +;; FIXME: Obviously, this will collide with nadvice's use of +;; function-documentation if we happen to advise `pcase'. +(put 'pcase 'function-documentation '(pcase--make-docstring)) +(defun pcase--make-docstring () + (let* ((main (documentation (symbol-function 'pcase) 'raw)) + (ud (help-split-fundoc main 'pcase))) + (with-temp-buffer + (insert (or (cdr ud) main)) + (mapatoms + (lambda (symbol) + (let ((me (get symbol 'pcase-macroexpander))) + (when me + (insert "\n\n-- ") + (let* ((doc (documentation me 'raw))) + (setq doc (help-fns--signature symbol doc me + (indirect-function me))) + (insert "\n" (or doc "Not documented."))))))) + (let ((combined-doc (buffer-string))) + (if ud (help-add-fundoc-usage combined-doc (car ud)) combined-doc))))) + ;;;###autoload (defmacro pcase-exhaustive (exp &rest cases) "The exhaustive version of `pcase' (which see)." @@ -347,9 +361,13 @@ of the form (UPAT EXP)." ;;;###autoload (defmacro pcase-defmacro (name args &rest body) "Define a pcase UPattern macro." - (declare (indent 2) (debug (def-name sexp def-body)) (doc-string 3)) - `(put ',name 'pcase-macroexpander - (lambda ,args ,@body))) + (declare (indent 2) (debug defun) (doc-string 3)) + (let ((fsym (intern (format "%s--pcase-macroexpander" name)))) + ;; Add the function via `fsym', so that an autoload cookie placed + ;; on a pcase-defmacro will cause the macro to be loaded on demand. + `(progn + (defun ,fsym ,args ,@body) + (put ',name 'pcase-macroexpander #',fsym)))) (defun pcase--match (val upat) "Build a MATCH structure, hoisting all `or's and `and's outside." @@ -810,6 +828,14 @@ Otherwise, it defers to REST which is a list of branches of the form (t (error "Incorrect MATCH %S" (car matches))))) (pcase-defmacro \` (qpat) + "Backquote-style pcase patterns. +QPAT can take the following forms: + (QPAT1 . QPAT2) matches if QPAT1 matches the car and QPAT2 the cdr. + [QPAT1 QPAT2..QPATn] matches a vector of length n and QPAT1..QPATn match + its 0..(n-1)th elements, respectively. + ,UPAT matches if the UPattern UPAT matches. + STRING matches if the object is `equal' to STRING. + ATOM matches if the object is `eq' to ATOM." (cond ((eq (car-safe qpat) '\,) (cadr qpat)) ((vectorp qpat) From d7d72624b29f0eeb2c242e976703e4755c6d7bef Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 23 Mar 2015 23:40:06 -0400 Subject: [PATCH 381/457] Add cl-struct specific optimizations to pcase. * lisp/emacs-lisp/cl-macs.el (cl--struct-all-parents) (cl--pcase-mutually-exclusive-p): New functions. (pcase--mutually-exclusive-p): Advise to optimize cl-struct patterns. * lisp/emacs-lisp/pcase.el (pcase--split-pred): Handle quoted string. --- lisp/ChangeLog | 9 +++++++ lisp/emacs-lisp/cl-macs.el | 52 +++++++++++++++++++++++++++++++++++--- lisp/emacs-lisp/pcase.el | 1 + 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8670e450e28..25ac7ae6782 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-03-24 Stefan Monnier + + Add cl-struct specific optimizations to pcase. + * emacs-lisp/cl-macs.el (cl--struct-all-parents) + (cl--pcase-mutually-exclusive-p): New functions. + (pcase--mutually-exclusive-p): Advise to optimize cl-struct patterns. + + * emacs-lisp/pcase.el (pcase--split-pred): Handle quoted string. + 2015-03-23 Stefan Monnier Add new `cl-struct' and `eieio' pcase patterns. diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index a81d217e4ee..5d55a1d4579 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2770,16 +2770,25 @@ non-nil value, that slot cannot be set via `setf'. ;;; Add cl-struct support to pcase +(defun cl--struct-all-parents (class) + (when (cl--struct-class-p class) + (let ((res ()) + (classes (list class))) + ;; BFS precedence. + (while (let ((class (pop classes))) + (push class res) + (setq classes + (append classes + (cl--class-parents class))))) + (nreverse res)))) + ;;;###autoload (pcase-defmacro cl-struct (type &rest fields) "Pcase patterns to match cl-structs. Elements of FIELDS can be of the form (NAME UPAT) in which case the contents of field NAME is matched against UPAT, or they can be of the form NAME which is a shorthand for (NAME NAME)." - ;; FIXME: This works well for a destructuring pcase-let, but for straight - ;; pcase, it suffers seriously from a lack of support for cl-typep in - ;; pcase--mutually-exclusive-p. - `(and (pred (pcase--swap cl-typep ',type)) + `(and (pred (pcase--flip cl-typep ',type)) ,@(mapcar (lambda (field) (let* ((name (if (consp field) (car field) field)) @@ -2790,6 +2799,41 @@ is a shorthand for (NAME NAME)." ,pat))) fields))) +(defun cl--pcase-mutually-exclusive-p (orig pred1 pred2) + "Extra special cases for `cl-typep' predicates." + (let* ((x1 pred1) (x2 pred2) + (t1 + (and (eq 'pcase--flip (car-safe x1)) (setq x1 (cdr x1)) + (eq 'cl-typep (car-safe x1)) (setq x1 (cdr x1)) + (null (cdr-safe x1)) (setq x1 (car x1)) + (eq 'quote (car-safe x1)) (cadr x1))) + (t2 + (and (eq 'pcase--flip (car-safe x2)) (setq x2 (cdr x2)) + (eq 'cl-typep (car-safe x2)) (setq x2 (cdr x2)) + (null (cdr-safe x2)) (setq x2 (car x2)) + (eq 'quote (car-safe x2)) (cadr x2)))) + (or + (and (symbolp t1) (symbolp t2) + (let ((c1 (cl--find-class t1)) + (c2 (cl--find-class t2))) + (and c1 c2 + (not (or (memq c1 (cl--struct-all-parents c2)) + (memq c2 (cl--struct-all-parents c1))))))) + (let ((c1 (and (symbolp t1) (cl--find-class t1)))) + (and c1 (cl--struct-class-p c1) + (funcall orig (if (eq 'list (cl-struct-sequence-type t1)) + 'consp 'vectorp) + pred2))) + (let ((c2 (and (symbolp t2) (cl--find-class t2)))) + (and c2 (cl--struct-class-p c2) + (funcall orig pred1 + (if (eq 'list (cl-struct-sequence-type t2)) + 'consp 'vectorp)))) + (funcall orig pred1 pred2)))) +(advice-add 'pcase--mutually-exclusive-p + :around #'cl--pcase-mutually-exclusive-p) + + (defun cl-struct-sequence-type (struct-type) "Return the sequence used to build STRUCT-TYPE. STRUCT-TYPE is a symbol naming a struct type. Return 'vector or diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index a9933e46bbd..3a2fa4fdc81 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -582,6 +582,7 @@ MATCH is the pattern that needs to be matched, of the form: (cond ((eq 'pred (car-safe pat)) (cadr pat)) ((not (eq 'quote (car-safe pat))) nil) ((consp (cadr pat)) #'consp) + ((stringp (cadr pat)) #'stringp) ((vectorp (cadr pat)) #'vectorp) ((byte-code-function-p (cadr pat)) #'byte-code-function-p)))) From e5ce95fa4a0b311792b9b9dcc3b8901fc1f24a0d Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 24 Mar 2015 14:46:35 +0900 Subject: [PATCH 382/457] Add tests for epg.el * automated/epg-tests.el: New file. * automated/data/epg/pubkey.asc: New file. * automated/data/epg/seckey.asc: New file. --- test/ChangeLog | 6 + test/automated/data/epg/pubkey.asc | 20 ++++ test/automated/data/epg/seckey.asc | 33 ++++++ test/automated/epg-tests.el | 170 +++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+) create mode 100644 test/automated/data/epg/pubkey.asc create mode 100644 test/automated/data/epg/seckey.asc create mode 100644 test/automated/epg-tests.el diff --git a/test/ChangeLog b/test/ChangeLog index b12e9c044f5..9949e2c1efb 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-03-24 Daiki Ueno + + * automated/epg-tests.el: New file. + * automated/data/epg/pubkey.asc: New file. + * automated/data/epg/seckey.asc: New file. + 2015-03-22 Dmitry Gutov * automated/json-tests.el: New file. diff --git a/test/automated/data/epg/pubkey.asc b/test/automated/data/epg/pubkey.asc new file mode 100644 index 00000000000..c0bf28f6200 --- /dev/null +++ b/test/automated/data/epg/pubkey.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mI0EVRDxCAEEALcScrRmxq5N+Hh+NxPg75RJJdtEi824pwtqMlT/3wG1esmP5gNu +ZIPVaTTSGNZkEzeYdhaLXBUe5qD+RQIQVh+MLt9nisF9nD35imyOrhHwAHnglOPx +GdylH8nQ/tIO5p/lfUlw+iCBlPH7eZHqFJhwP0hJML4PKE8ArWG6RtsxABEBAAG0 +J0pvZSBUZXN0ZXIgKHRlc3Qga2V5KSA8am9lQGV4YW1wbGUuY29tPoi4BBMBAgAi +BQJVEPEIAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAoscCWMvu4GGYO +A/0Zzoc2z/dvAtFVLh4ovKqP2qliQt2qschJHVP30hJnKT7dmJfJl7kz9mXmMfSt +Ym0luYmeSzdeWORM9SygLRYXuDfN6G4ZPJTlsRhgnARhNzNhSx+YlcFh48Z+a5zR +goBMn7DgYVqfU4UteZOSXMlnuA2Z5ao1qgGhVqESSJgU5riNBFUQ8QgBBADacLkK +D0U11nmlsScxPGkrDr0aJPrG8MEaDRnKjHJKNp3XTp1psGBUpWF/ErjQAIu+psFt +LO8owCGsg/vJM7CzTv2dVBRbrZXjIKvdq7HdivosTMaHArQBpEtSO9rmgVHO+jaQ +q/M2oGvNEB86zo3nfTWhOgBiB32m8kttWRiuWQARAQABiJ8EGAECAAkFAlUQ8QgC +GwwACgkQKLHAljL7uBj44AQAkMJRm7VJUryrDKFtfIfytQx/vmyU/cZcVV6IpKqP +KhztgR+QD9czlHvQhz+y3hqtLRShu2Eyf75dNexcUvKs/lS4LIDXg5V7pWSRk9eQ +G403muqR/NGu6+QmUx09rJl72trdaGxNkyHA7Zy7ZDGkcMvQsd3qoSNGsPR5TKes +w7Q= +=NMxb +-----END PGP PUBLIC KEY BLOCK----- diff --git a/test/automated/data/epg/seckey.asc b/test/automated/data/epg/seckey.asc new file mode 100644 index 00000000000..4ac7ba4a502 --- /dev/null +++ b/test/automated/data/epg/seckey.asc @@ -0,0 +1,33 @@ +-----BEGIN PGP PRIVATE KEY BLOCK----- +Version: GnuPG v1 + +lQHYBFUQ8QgBBAC3EnK0ZsauTfh4fjcT4O+USSXbRIvNuKcLajJU/98BtXrJj+YD +bmSD1Wk00hjWZBM3mHYWi1wVHuag/kUCEFYfjC7fZ4rBfZw9+Ypsjq4R8AB54JTj +8RncpR/J0P7SDuaf5X1JcPoggZTx+3mR6hSYcD9ISTC+DyhPAK1hukbbMQARAQAB +AAP9Hs9agZTobA5QOksXjt9kwqJ63gePtbwVVNz3AoobaGi39PMkRUCPZwaEEbEo +H/CwsUMV4J5sjVtpef/A8mN4csai7NYp82mbo+dPim4p+SUtBg4Ms8ujGVcQeRQd +1CXtIkixDu6fw4wDtNw03ZyNJOhBOXVTgAyOTSlIz3D+6n8CAMeCqEFBHQIVoQpf +Bza4YvFtJRdfGMTix3u7Cb6y9CHGBok7uUgQAeWnzQvMGTCHc3e8iHGAYBQ88GPF +v1TpiusCAOroRe69Aiid5JMVTjWoJ0SHKd47nIj0gQFiDfa5de0BNq9gYj7JLg+R +EjsJbJN39z+Z9HWjIOCUOIXDvucmM1MB/iNxW1Z8mEMflEYK5rop+PDxwqUbr8uZ +kzogw98ZdmuEuN0bheGWUiJI+0Pd8jb40zlR1KgOEMx1mZchToAJdtybMLQnSm9l +IFRlc3RlciAodGVzdCBrZXkpIDxqb2VAZXhhbXBsZS5jb20+iLgEEwECACIFAlUQ +8QgCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJECixwJYy+7gYZg4D/RnO +hzbP928C0VUuHii8qo/aqWJC3aqxyEkdU/fSEmcpPt2Yl8mXuTP2ZeYx9K1ibSW5 +iZ5LN15Y5Ez1LKAtFhe4N83obhk8lOWxGGCcBGE3M2FLH5iVwWHjxn5rnNGCgEyf +sOBhWp9ThS15k5JcyWe4DZnlqjWqAaFWoRJImBTmnQHYBFUQ8QgBBADacLkKD0U1 +1nmlsScxPGkrDr0aJPrG8MEaDRnKjHJKNp3XTp1psGBUpWF/ErjQAIu+psFtLO8o +wCGsg/vJM7CzTv2dVBRbrZXjIKvdq7HdivosTMaHArQBpEtSO9rmgVHO+jaQq/M2 +oGvNEB86zo3nfTWhOgBiB32m8kttWRiuWQARAQABAAP7B8uNtb/DLvGoRfL+mA0Q +REhgOJ1WpRcU6rvKYNPh8xTkKMvM+EK0nVU/znBedEpXjb0pY1WRT0uvXs2pzY2V +YeaugyKIkdUpPWnyWoEQwI8hFvHOWmU2rNHyXLW0MY7bxcGgqv2XbkL4m7/D6VQS +SR8hQ2CxBbW+9ov6aBMwv/UCAOW89+5xxuzkv48AVraWlMnaU0ggVOf6ht0Qa40+ ++uw2yziNlD403gAAAycoICiB/oqwslx61B2xOHn0laCKrgsCAPNpIsHRlAwWbAsq +uCtfIQxg+C3mPXkqsNTMjeK5NjLNytrmO49NXco36zVEG6q7qz5Zj9d9IPYoGOSa +I+dQZ6sB/RKF5aonR5/e7IHJgc8BG7I0yiya4llE0AB9ghnRI/3uHwnCBnmo/32a +n4+rQkx6vm+rg3JA/09Gi7W4R9SwV+ane4ifBBgBAgAJBQJVEPEIAhsMAAoJECix +wJYy+7gY+OAEAJDCUZu1SVK8qwyhbXyH8rUMf75slP3GXFVeiKSqjyoc7YEfkA/X +M5R70Ic/st4arS0UobthMn++XTXsXFLyrP5UuCyA14OVe6VkkZPXkBuNN5rqkfzR +ruvkJlMdPayZe9ra3WhsTZMhwO2cu2QxpHDL0LHd6qEjRrD0eUynrMO0 +=iCIm +-----END PGP PRIVATE KEY BLOCK----- diff --git a/test/automated/epg-tests.el b/test/automated/epg-tests.el new file mode 100644 index 00000000000..a7fa5a1da58 --- /dev/null +++ b/test/automated/epg-tests.el @@ -0,0 +1,170 @@ +;;; epg-tests.el --- Test suite for epg.el -*- lexical-binding: t -*- + +;; Copyright (C) 2013-2015 Free Software Foundation, Inc. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +;;; Code: + +(require 'ert) +(require 'epg) + +(defvar epg-tests-context nil) + +(defvar epg-tests-data-directory + (expand-file-name "data/epg" (getenv "EMACS_TEST_DIRECTORY")) + "Directory containing epg test data.") + +(defun epg-tests-gpg-usable (&optional require-passphrase) + (and (executable-find epg-gpg-program) + (condition-case nil + (progn + (epg-check-configuration (epg-configuration)) + (if require-passphrase + (string-match "\\`1\\." + (cdr (assq 'version (epg-configuration)))) + t)) + (error nil)))) + +(defun epg-tests-passphrase-callback (_c _k _d) + ;; Need to create a copy here, since the string will be wiped out + ;; after the use. + (copy-sequence "test0123456789")) + +(cl-defmacro with-epg-tests ((&optional &key require-passphrase + require-public-key + require-secret-key) + &rest body) + "Set up temporary locations and variables for testing." + (declare (indent 1)) + `(let* ((epg-tests-home-directory (make-temp-file "epg-tests-homedir" t))) + (unwind-protect + (let ((context (epg-make-context 'OpenPGP))) + (setf (epg-context-home-directory context) + epg-tests-home-directory) + (setenv "GPG_AGENT_INFO") + ,(if require-passphrase + `(epg-context-set-passphrase-callback + context + #'epg-tests-passphrase-callback)) + ,(if require-public-key + `(epg-import-keys-from-file + context + (expand-file-name "pubkey.asc" epg-tests-data-directory))) + ,(if require-secret-key + `(epg-import-keys-from-file + context + (expand-file-name "seckey.asc" epg-tests-data-directory))) + (with-temp-buffer + (make-local-variable 'epg-tests-context) + (setq epg-tests-context context) + ,@body)) + (when (file-directory-p epg-tests-home-directory) + (delete-directory epg-tests-home-directory t))))) + +(ert-deftest epg-decrypt-1 () + (skip-unless (epg-tests-gpg-usable 'require-passphrase)) + (with-epg-tests (:require-passphrase t) + (should (equal "test" + (epg-decrypt-string epg-tests-context "\ +-----BEGIN PGP MESSAGE----- +Version: GnuPG v2 + +jA0EAwMCE19JBLTvvmhgyRrGGglRbnKkK9PJG8fDwO5ccjysrR7IcdNcnA== +=U8z7 +-----END PGP MESSAGE-----"))))) + +(ert-deftest epg-roundtrip-1 () + (skip-unless (epg-tests-gpg-usable 'require-passphrase)) + (with-epg-tests (:require-passphrase t) + (let ((cipher (epg-encrypt-string epg-tests-context "symmetric" nil))) + (should (equal "symmetric" + (epg-decrypt-string epg-tests-context cipher)))))) + +(ert-deftest epg-roundtrip-2 () + (skip-unless (epg-tests-gpg-usable 'require-passphrase)) + (with-epg-tests (:require-passphrase t + :require-public-key t + :require-secret-key t) + (let* ((recipients (epg-list-keys epg-tests-context "joe@example.com")) + (cipher (epg-encrypt-string epg-tests-context "public key" + recipients nil t))) + (should (equal "public key" + (epg-decrypt-string epg-tests-context cipher)))))) + +(ert-deftest epg-sign-verify-1 () + (skip-unless (epg-tests-gpg-usable 'require-passphrase)) + (with-epg-tests (:require-passphrase t + :require-public-key t + :require-secret-key t) + (let (signature verify-result) + (setf (epg-context-signers epg-tests-context) + (epg-list-keys epg-tests-context "joe@example.com")) + (setq signature (epg-sign-string epg-tests-context "signed" t)) + (epg-verify-string epg-tests-context signature "signed") + (setq verify-result (epg-context-result-for context 'verify)) + (should (= 1 (length verify-result))) + (should (eq 'good (epg-signature-status (car verify-result))))))) + +(ert-deftest epg-sign-verify-2 () + (skip-unless (epg-tests-gpg-usable 'require-passphrase)) + (with-epg-tests (:require-passphrase t + :require-public-key t + :require-secret-key t) + (let (signature verify-result) + (setf (epg-context-signers epg-tests-context) + (epg-list-keys epg-tests-context "joe@example.com")) + (setq signature (epg-sign-string epg-tests-context "clearsigned" 'clear)) + ;; Clearsign signature always ends with a new line. + (should (equal "clearsigned\n" + (epg-verify-string epg-tests-context signature))) + (setq verify-result (epg-context-result-for context 'verify)) + (should (= 1 (length verify-result))) + (should (eq 'good (epg-signature-status (car verify-result))))))) + +(ert-deftest epg-sign-verify-3 () + (skip-unless (epg-tests-gpg-usable 'require-passphrase)) + (with-epg-tests (:require-passphrase t + :require-public-key t + :require-secret-key t) + (let (signature verify-result) + (setf (epg-context-signers epg-tests-context) + (epg-list-keys epg-tests-context "joe@example.com")) + (setq signature (epg-sign-string epg-tests-context "normal signed")) + (should (equal "normal signed" + (epg-verify-string epg-tests-context signature))) + (setq verify-result (epg-context-result-for context 'verify)) + (should (= 1 (length verify-result))) + (should (eq 'good (epg-signature-status (car verify-result))))))) + +(ert-deftest epg-import-1 () + (skip-unless (epg-tests-gpg-usable 'require-passphrase)) + (with-epg-tests (:require-passphrase nil) + (should (= 0 (length (epg-list-keys epg-tests-context)))) + (should (= 0 (length (epg-list-keys epg-tests-context nil t))))) + (with-epg-tests (:require-passphrase nil + :require-public-key t) + (should (= 1 (length (epg-list-keys epg-tests-context)))) + (should (= 0 (length (epg-list-keys epg-tests-context nil t))))) + (with-epg-tests (:require-public-key nil + :require-public-key t + :require-secret-key t) + (should (= 1 (length (epg-list-keys epg-tests-context)))) + (should (= 1 (length (epg-list-keys epg-tests-context nil t)))))) + +(provide 'epg-tests) + +;;; epg-tests.el ends here From 71fdbd770bf06ad48bcb165e85b59778abc9ed06 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 24 Mar 2015 16:32:08 +0900 Subject: [PATCH 383/457] epg: Fix key generation interface * epg.el (epg-start-generate-key): Fix typo in "gpg --gen-key" invocation; make the PARAMETERS documentation clearer. --- lisp/ChangeLog | 5 +++++ lisp/epg.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25ac7ae6782..e91d2bc0464 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-24 Daiki Ueno + + * epg.el (epg-start-generate-key): Fix typo in "gpg --gen-key" + invocation; make the PARAMETERS documentation clearer. + 2015-03-24 Stefan Monnier Add cl-struct specific optimizations to pcase. diff --git a/lisp/epg.el b/lisp/epg.el index f66545306da..1b75b50df0e 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -2051,7 +2051,9 @@ If you are unsure, use synchronous version of this function (defun epg-start-generate-key (context parameters) "Initiate a key generation. -PARAMETERS specifies parameters for the key. +PARAMETERS is a string which specifies parameters of the generated key. +See Info node `(gnupg) Unattended GPG key generation' in the +GnuPG manual for the format. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call @@ -2061,9 +2063,9 @@ If you are unsure, use synchronous version of this function (setf (epg-context-operation context) 'generate-key) (setf (epg-context-result context) nil) (if (epg-data-file parameters) - (epg--start context (list "--batch" "--genkey" "--" + (epg--start context (list "--batch" "--gen-key" "--" (epg-data-file parameters))) - (epg--start context '("--batch" "--genkey")) + (epg--start context '("--batch" "--gen-key")) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) (epg-data-string parameters))) From 23a98c7a538fd6da43eba522c3db8e53c1edd1ac Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Tue, 24 Mar 2015 10:23:14 -0700 Subject: [PATCH 384/457] Make process-running-child-p return foreground process group ID * etc/NEWS: Mention change to `process-running-child-p`. * src/process.c (Fprocess_running_child_p): Return number identifier of the foreground process group if we know it. --- etc/ChangeLog | 4 ++++ etc/NEWS | 3 +++ src/ChangeLog | 5 +++++ src/process.c | 9 ++++++--- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index e146f786f6f..d6b6e299113 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2015-03-24 Daniel Colascione + + * NEWS: Mention change to `process-running-child-p`. + 2015-03-23 Daiki Ueno * NEWS: Mention `make-process'. diff --git a/etc/NEWS b/etc/NEWS index a8b8c55a50a..cb319340678 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -628,6 +628,9 @@ active region handling. ** `cl-the' now asserts that its argument is of the given type. +** `process-running-child-p` may now return a numeric process +group ID instead of `t'. + +++ ** Mouse click events on mode line or header line no longer include any reference to a buffer position. The 6th member of the mouse diff --git a/src/ChangeLog b/src/ChangeLog index 99b7ec731fe..815c117308b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-24 Daniel Colascione + + * process.c (Fprocess_running_child_p): Return number identifier of + the foreground process group if we know it. + 2015-03-23 Paul Eggert Minor refactoring of new Fmake_process code diff --git a/src/process.c b/src/process.c index dd61f3008de..3fe8644b48a 100644 --- a/src/process.c +++ b/src/process.c @@ -5739,9 +5739,10 @@ emacs_get_tty_pgrp (struct Lisp_Process *p) DEFUN ("process-running-child-p", Fprocess_running_child_p, Sprocess_running_child_p, 0, 1, 0, - doc: /* Return t if PROCESS has given the terminal to a child. -If the operating system does not make it possible to find out, -return t unconditionally. */) + doc: /* Return non-nil if PROCESS has given the terminal to a +child. If the operating system does not make it possible to find out, +return t. If we can find out, return the numeric ID of the foreground +process group. */) (Lisp_Object process) { /* Initialize in case ioctl doesn't exist or gives an error, @@ -5764,6 +5765,8 @@ return t unconditionally. */) if (gid == p->pid) return Qnil; + if (gid != -1) + return make_number (gid); return Qt; } From 1e043f5e79bf67c9ebfa35623edcff0633d37a75 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 24 Mar 2015 13:58:46 -0400 Subject: [PATCH 385/457] epg-tests.el: Standardize license notice. --- test/automated/epg-tests.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/automated/epg-tests.el b/test/automated/epg-tests.el index a7fa5a1da58..a958d82bd03 100644 --- a/test/automated/epg-tests.el +++ b/test/automated/epg-tests.el @@ -2,18 +2,20 @@ ;; Copyright (C) 2013-2015 Free Software Foundation, Inc. -;; This program is free software; you can redistribute it and/or modify +;; This file is part of GNU Emacs. + +;; 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 ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . +;; along with GNU Emacs. If not, see . ;;; Commentary: From 711770da9101a94ada42881cb86a976d323e9348 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 24 Mar 2015 11:42:53 -0700 Subject: [PATCH 386/457] Fix minor ldexp issues * doc/lispref/numbers.texi (Float Basics): Improve ldexp documentation. * src/floatfns.c (Fldexp): Require 2 args. Avoid undefined behavior if the exponent is out of 'int' range. Improve documentation. Fixes: bug#20185 --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/numbers.texi | 12 +++++++++--- src/ChangeLog | 7 +++++++ src/floatfns.c | 10 +++++----- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index a546306f9e4..9b1bbb357a5 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2015-03-24 Paul Eggert + + * numbers.texi (Float Basics): Improve ldexp documentation. + 2015-03-23 Eli Zaretskii * commands.texi (Event Input Misc): Fix incorrect usage of @code. diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index 8d1d3a798eb..7b4a0a6d407 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -265,9 +265,15 @@ If @var{x} is a NaN, then @var{s} is also a NaN@. If @var{x} is zero, then @var{e} is 0. @end defun -@defun ldexp sig &optional exp -This function returns a floating-point number corresponding to the -significand @var{sig} and exponent @var{exp}. +@defun ldexp s e +Given a numeric significand @var{s} and an integer exponent @var{e}, +this function returns the floating point number +@ifnottex +@var{s} * 2**@var{e}. +@end ifnottex +@tex +@math{s 2^e}. +@end tex @end defun @defun copysign x1 x2 diff --git a/src/ChangeLog b/src/ChangeLog index 815c117308b..23f125c567d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-03-24 Paul Eggert + + Fix minor ldexp issues + * floatfns.c (Fldexp): Require 2 args. Avoid undefined behavior + if the exponent is out of 'int' range. Improve documentation. + Fixes: bug#20185 + 2015-03-24 Daniel Colascione * process.c (Fprocess_running_child_p): Return number identifier of diff --git a/src/floatfns.c b/src/floatfns.c index c68b9bd3a65..072e85776b5 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -185,14 +185,14 @@ If X is zero, both parts (SGNFCAND and EXP) are zero. */) return Fcons (make_float (sgnfcand), make_number (exponent)); } -DEFUN ("ldexp", Fldexp, Sldexp, 1, 2, 0, - doc: /* Construct number X from significand SGNFCAND and exponent EXP. -Returns the floating point value resulting from multiplying SGNFCAND -(the significand) by 2 raised to the power of EXP (the exponent). */) +DEFUN ("ldexp", Fldexp, Sldexp, 2, 2, 0, + doc: /* Return X * 2**EXP, as a floating point number. +EXP must be an integer. */) (Lisp_Object sgnfcand, Lisp_Object exponent) { CHECK_NUMBER (exponent); - return make_float (ldexp (XFLOATINT (sgnfcand), XINT (exponent))); + int e = min (max (INT_MIN, XINT (exponent)), INT_MAX); + return make_float (ldexp (XFLOATINT (sgnfcand), e)); } DEFUN ("exp", Fexp, Sexp, 1, 1, 0, From 444975fa5493b962851b9a01749c22c99d2b0992 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 24 Mar 2015 20:05:00 +0100 Subject: [PATCH 387/457] Improve special char handling in Tramp * net/tramp-sh.el (tramp-do-file-attributes-with-ls) (tramp-do-file-attributes-with-stat): Quote file names in output. (tramp-do-directory-files-and-attributes-with-stat): Use "//" as marker. --- lisp/ChangeLog | 6 ++++++ lisp/net/tramp-sh.el | 51 +++++++++++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e91d2bc0464..3b8fa7d66c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-24 Michael Albinus + + * net/tramp-sh.el (tramp-do-file-attributes-with-ls) + (tramp-do-file-attributes-with-stat): Quote file names in output. + (tramp-do-directory-files-and-attributes-with-stat): Use "//" as marker. + 2015-03-24 Daiki Ueno * epg.el (epg-start-generate-key): Fix typo in "gpg --gen-key" diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index b82b4deb21a..f59c5fbdf67 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1175,15 +1175,19 @@ target of the symlink differ." (tramp-message vec 5 "file attributes with ls: %s" localname) (tramp-send-command vec - (format "(%s %s || %s -h %s) && %s %s %s" + (format "(%s %s || %s -h %s) && %s %s %s %s" (tramp-get-file-exists-command vec) (tramp-shell-quote-argument localname) (tramp-get-test-command vec) (tramp-shell-quote-argument localname) (tramp-get-ls-command vec) + ;; On systems which have no quoting style, file names + ;; with special characters could fail. + (if (tramp-get-ls-command-with-quoting-style vec) + "--quoting-style=c" "") (if (eq id-format 'integer) "-ildn" "-ild") (tramp-shell-quote-argument localname))) - ;; parse `ls -l' output ... + ;; Parse `ls -l' output ... (with-current-buffer (tramp-get-buffer vec) (when (> (buffer-size) 0) (goto-char (point-min)) @@ -1222,11 +1226,14 @@ target of the symlink differ." ;; From the file modes, figure out other stuff. (setq symlinkp (eq ?l (aref res-filemodes 0))) (setq dirp (eq ?d (aref res-filemodes 0))) - ;; if symlink, find out file name pointed to + ;; If symlink, find out file name pointed to. (when symlinkp (search-forward "-> ") - (setq res-symlink-target (buffer-substring (point) (point-at-eol)))) - ;; return data gathered + (setq res-symlink-target + (if (tramp-get-ls-command-with-quoting-style vec) + (read (current-buffer)) + (buffer-substring (point) (point-at-eol))))) + ;; Return data gathered. (list ;; 0. t for directory, string (name linked to) for symbolic ;; link, or nil. @@ -1249,9 +1256,9 @@ target of the symlink differ." ;; 8. File modes, as a string of ten letters or dashes as in ls -l. res-filemodes ;; 9. t if file's gid would change if file were deleted and - ;; recreated. Will be set in `tramp-convert-file-attributes' + ;; recreated. Will be set in `tramp-convert-file-attributes'. t - ;; 10. inode number. + ;; 10. Inode number. res-inode ;; 11. Device number. Will be replaced by a virtual device number. -1 @@ -1275,16 +1282,21 @@ target of the symlink differ." (tramp-send-command-and-read vec (format - ;; On Opsware, pdksh (which is the true name of ksh there) doesn't - ;; parse correctly the sequence "((". Therefore, we add a space. - "( (%s %s || %s -h %s) && %s -c '((\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)' \"%s\" || echo nil)" + (concat + ;; On Opsware, pdksh (which is the true name of ksh there) + ;; doesn't parse correctly the sequence "((". Therefore, we add + ;; a space. Apostrophes in the stat output are masked as "//", + ;; in order to make a proper shell escape of them in file names. + "( (%s %s || %s -h %s) && (%s -c " + "'((//%%N//) %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 //%%A// t %%ie0 -1)' " + "%s | sed -e 's/\"/\\\\\"/g' -e 's/\\/\\//\"/g') || echo nil)") (tramp-get-file-exists-command vec) (tramp-shell-quote-argument localname) (tramp-get-test-command vec) (tramp-shell-quote-argument localname) (tramp-get-remote-stat vec) - (if (eq id-format 'integer) "%ue0" "\"%U\"") - (if (eq id-format 'integer) "%ge0" "\"%G\"") + (if (eq id-format 'integer) "%ue0" "//%U//") + (if (eq id-format 'integer) "%ge0" "//%G//") (tramp-shell-quote-argument localname)))) (defun tramp-sh-handle-set-visited-file-modtime (&optional time-list) @@ -1717,14 +1729,13 @@ be non-negative integers." (concat ;; We must care about file names with spaces, or starting with ;; "-"; this would confuse xargs. "ls -aQ" might be a solution, - ;; but it does not work on all remote systems. Therefore, we - ;; use \000 as file separator. - ;; Apostrophes in the stat output are masked as ?/ characters, in - ;; order to make a proper shell escape of them in file names. + ;; but it does not work on all remote systems. Apostrophes in + ;; the stat output are masked as "//", in order to make a proper + ;; shell escape of them in file names. "cd %s && echo \"(\"; (%s %s -a | " "xargs %s -c " - "'(/%%n/ (/%%N/) %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 /%%A/ t %%ie0 -1)' " - "-- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/\\//\"/g'); echo \")\"") + "'(//%%n// (//%%N//) %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 //%%A// t %%ie0 -1)' " + "-- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/\\/\\//\"/g'); echo \")\"") (tramp-shell-quote-argument localname) (tramp-get-ls-command vec) ;; On systems which have no quoting style, file names with @@ -1732,8 +1743,8 @@ be non-negative integers." (if (tramp-get-ls-command-with-quoting-style vec) "--quoting-style=shell" "") (tramp-get-remote-stat vec) - (if (eq id-format 'integer) "%ue0" "/%U/") - (if (eq id-format 'integer) "%ge0" "/%G/")))) + (if (eq id-format 'integer) "%ue0" "//%U//") + (if (eq id-format 'integer) "%ge0" "//%G//")))) ;; This function should return "foo/" for directories and "bar" for ;; files. From 9d70310b02bd901b1fcb04df5635a21266953c08 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 24 Mar 2015 20:08:52 +0100 Subject: [PATCH 388/457] Extend Tramp tests * automated/tramp-tests.el (tramp-test18-file-attributes) (tramp--test-check-files): Extend tests. (tramp-test31-utf8): Do not skip for tramp-adb.el. --- test/ChangeLog | 6 +++ test/automated/tramp-tests.el | 85 ++++++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 9949e2c1efb..a9cad319ead 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2015-03-24 Michael Albinus + + * automated/tramp-tests.el (tramp-test18-file-attributes) + (tramp--test-check-files): Extend tests. + (tramp-test31-utf8): Do not skip for tramp-adb.el. + 2015-03-24 Daiki Ueno * automated/epg-tests.el: New file. diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 9ba67430960..cc2c753b9d5 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -124,8 +124,7 @@ shall not contain a timeout." (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil (with-current-buffer (tramp-get-connection-buffer v) (message "%s" (buffer-string))) - (with-current-buffer - (tramp-get-debug-buffer v) + (with-current-buffer (tramp-get-debug-buffer v) (message "%s" (buffer-string)))))))) (ert-deftest tramp-test00-availability () @@ -982,17 +981,18 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." This tests also `file-readable-p' and `file-regular-p'." (skip-unless (tramp--test-enabled)) - (let ((tmp-name (tramp--test-make-temp-name)) + (let ((tmp-name1 (tramp--test-make-temp-name)) + (tmp-name2 (tramp--test-make-temp-name)) attr) (unwind-protect (progn - (write-region "foo" nil tmp-name) - (should (file-exists-p tmp-name)) - (setq attr (file-attributes tmp-name)) + (write-region "foo" nil tmp-name1) + (should (file-exists-p tmp-name1)) + (setq attr (file-attributes tmp-name1)) (should (consp attr)) - (should (file-exists-p tmp-name)) - (should (file-readable-p tmp-name)) - (should (file-regular-p tmp-name)) + (should (file-exists-p tmp-name1)) + (should (file-readable-p tmp-name1)) + (should (file-regular-p tmp-name1)) ;; We do not test inodes and device numbers. (should (null (car attr))) (should (numberp (nth 1 attr))) ;; Link. @@ -1007,18 +1007,33 @@ This tests also `file-readable-p' and `file-regular-p'." (should (numberp (nth 7 attr))) ;; Size. (should (stringp (nth 8 attr))) ;; Modes. - (setq attr (file-attributes tmp-name 'string)) + (setq attr (file-attributes tmp-name1 'string)) (should (stringp (nth 2 attr))) ;; Uid. (should (stringp (nth 3 attr))) ;; Gid. - (delete-file tmp-name) - (make-directory tmp-name) - (should (file-exists-p tmp-name)) - (should (file-readable-p tmp-name)) - (should-not (file-regular-p tmp-name)) - (setq attr (file-attributes tmp-name)) + (condition-case err + (progn + (make-symbolic-link tmp-name1 tmp-name2) + (should (file-exists-p tmp-name2)) + (should (file-symlink-p tmp-name2)) + (setq attr (file-attributes tmp-name2)) + (should (string-equal + (car attr) + (file-remote-p (file-truename tmp-name1) 'localname))) + (delete-file tmp-name2)) + (file-error + (should (string-equal (error-message-string err) + "make-symbolic-link not supported")))) + (delete-file tmp-name1) + + (make-directory tmp-name1) + (should (file-exists-p tmp-name1)) + (should (file-readable-p tmp-name1)) + (should-not (file-regular-p tmp-name1)) + (setq attr (file-attributes tmp-name1)) (should (eq (car attr) t))) - (ignore-errors (delete-directory tmp-name))))) + + (ignore-errors (delete-directory tmp-name1))))) (ert-deftest tramp-test19-directory-files-and-attributes () "Check `directory-files-and-attributes'." @@ -1530,7 +1545,7 @@ This requires restrictions of file name syntax." (dolist (elt files) (let* ((file1 (expand-file-name elt tmp-name1)) (file2 (expand-file-name elt tmp-name2)) - (file3 (concat file1 "foo"))) + (file3 (expand-file-name (concat elt "foo") tmp-name1))) (write-region elt nil file1) (should (file-exists-p file1)) @@ -1557,6 +1572,10 @@ This requires restrictions of file name syntax." (should (string-equal (expand-file-name file1) (file-truename file3))) + (should + (string-equal + (car (file-attributes file3)) + (file-remote-p (file-truename file1) 'localname))) ;; Check file contents. (with-temp-buffer (insert-file-contents file3) @@ -1596,8 +1615,10 @@ This requires restrictions of file name syntax." ;; Check directory creation. We use a subdirectory "foo" ;; in order to avoid conflicts with previous file name tests. (dolist (elt files) - (let* ((file1 (expand-file-name (concat "foo/" elt) tmp-name1)) - (file2 (expand-file-name elt file1))) + (let* ((elt1 (concat elt "foo")) + (file1 (expand-file-name (concat "foo/" elt) tmp-name1)) + (file2 (expand-file-name elt file1)) + (file3 (expand-file-name elt1 file1))) (make-directory file1 'parents) (should (file-directory-p file1)) (write-region elt nil file2) @@ -1611,6 +1632,28 @@ This requires restrictions of file name syntax." (caar (directory-files-and-attributes file1 nil directory-files-no-dot-files-regexp)) elt)) + + ;; Check symlink in `directory-files-and-attributes'. + (condition-case err + (progn + (make-symbolic-link file2 file3) + (should (file-symlink-p file3)) + (should + (string-equal + (caar (directory-files-and-attributes + file1 nil (regexp-quote elt1))) + elt1)) + (should + (string-equal + (cadr (car (directory-files-and-attributes + file1 nil (regexp-quote elt1)))) + (file-remote-p (file-truename file2) 'localname))) + (delete-file file3) + (should-not (file-exists-p file3))) + (file-error + (should (string-equal (error-message-string err) + "make-symbolic-link not supported")))) + (delete-file file2) (should-not (file-exists-p file2)) (delete-directory file1) @@ -1725,7 +1768,6 @@ Use the `ls' command." (ert-deftest tramp-test31-utf8 () "Check UTF8 encoding in file names and file contents." (skip-unless (tramp--test-enabled)) - (skip-unless (not (tramp--test-adb-p))) (tramp--test-utf8)) @@ -1920,7 +1962,6 @@ Since it unloads Tramp, it shall be the last test to run." (not (string-match "^tramp--?test" (symbol-name x))) (not (string-match "unload-hook$" (symbol-name x))) (ert-fail (format "`%s' still bound" x))))) -; (progn (message "`%s' still bound" x))))) ;; There shouldn't be left a hook function containing a Tramp ;; function. We do not regard the Tramp unload hooks. (mapatoms From b28753b55ce83215b15661d16bfbafe3c8964b2a Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Tue, 24 Mar 2015 22:12:58 +0000 Subject: [PATCH 389/457] lisp/gnus/nnimap.el: Don't split imap messages back into original group --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnimap.el | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4903796a7ff..724112fe3a5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2015-03-24 Eric Abrahamsen + + * nnimap.el (nnimap-split-incoming-mail): If a message is already + in the group it should be split to, don't re-copy it into the group. + 2015-03-23 Ben Bacarisse (tiny change) * nnmh.el (nnmh-request-expire-articles): diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 369d9d36418..c476be6bc8d 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -2086,12 +2086,15 @@ Return the server's response to the SELECT or EXAMINE command." (ranges (cdr spec))) (if (eq group 'junk) (setq junk-articles ranges) - (push (list (nnimap-send-command - "UID COPY %s %S" - (nnimap-article-ranges ranges) - (utf7-encode group t)) - ranges) - sequences)))) + ;; Don't copy if the message is already in its + ;; target group. + (unless (string= group nnimap-inbox) + (push (list (nnimap-send-command + "UID COPY %s %S" + (nnimap-article-ranges ranges) + (utf7-encode group t)) + ranges) + sequences))))) ;; Wait for the last COPY response... (when sequences (nnimap-wait-for-response (caar sequences)) From c2385c6f36d346d6524a4119109f52d4fd975244 Mon Sep 17 00:00:00 2001 From: Olaf Rogalsky Date: Tue, 24 Mar 2015 21:04:00 -0400 Subject: [PATCH 390/457] * lisp/xt-mouse.el: Add mouse-tracking support. Fixes: debbugs:19416 * lisp/xt-mouse.el: Add mouse-tracking support. (xterm-mouse-translate-1): Handle mouse-movement events. (xterm-mouse--read-event-sequence-1000) (xterm-mouse--read-event-sequence-1006): Delete functions. (xterm-mouse--read-event-sequence): New function that handles both at the same time. Handle mouse-movements. (xterm-mouse--read-utf8-char, xterm-mouse--read-number-from-terminal): New functions. (xterm-mouse-event): Simplify. (xterm-mouse-tracking-enable-sequence) (xterm-mouse-tracking-disable-sequence): Enable mouse tracking. * lisp/mouse.el (mouse-drag-line): Also ignore `vertical-line' prefix events. --- etc/NEWS | 2 + lisp/ChangeLog | 16 +++++ lisp/mouse.el | 3 +- lisp/xt-mouse.el | 183 +++++++++++++++++++++++++++++------------------ 4 files changed, 135 insertions(+), 69 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index cb319340678..5a19fc391e7 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -217,6 +217,8 @@ Unicode standards. * Changes in Specialized Modes and Packages in Emacs 25.1 +** xterm-mouse-mode now supports mouse-tracking (if your xterm supports it). + ** package.el *** `package-install-from-buffer' and `package-install-file' work on directories. This follows the same rules as installing from a .tar file, except the diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3b8fa7d66c7..0d2f59227e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2015-03-25 Olaf Rogalsky + + * xt-mouse.el: Add mouse-tracking support (bug#19416). + (xterm-mouse-translate-1): Handle mouse-movement events. + (xterm-mouse--read-event-sequence-1000) + (xterm-mouse--read-event-sequence-1006): Delete functions. + (xterm-mouse--read-event-sequence): New function that handles both at + the same time. Handle mouse-movements. + (xterm-mouse--read-utf8-char, xterm-mouse--read-number-from-terminal): + New functions. + (xterm-mouse-event): Simplify. + (xterm-mouse-tracking-enable-sequence) + (xterm-mouse-tracking-disable-sequence): Enable mouse tracking. + + * mouse.el (mouse-drag-line): Also ignore `vertical-line' prefix events. + 2015-03-24 Michael Albinus * net/tramp-sh.el (tramp-do-file-attributes-with-ls) diff --git a/lisp/mouse.el b/lisp/mouse.el index c50913f4636..5f3fa5d7694 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -486,9 +486,10 @@ must be one of the symbols `header', `mode', or `vertical'." `(menu-item "" ,(lambda () (interactive) (funcall exitfun)) :filter ,(lambda (cmd) (if dragged cmd))))) ;; Some of the events will of course end up looked up - ;; with a mode-line or header-line prefix ... + ;; with a mode-line, header-line or vertical-line prefix ... (define-key map [mode-line] map) (define-key map [header-line] map) + (define-key map [vertical-line] map) ;; ... and some maybe even with a right- or bottom-divider ;; prefix. (define-key map [right-divider] map) diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index b87c1a28937..7f1e72260ae 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -60,6 +60,7 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." (ev-data (nth 1 event)) (ev-where (nth 1 ev-data)) (vec (vector event)) + (is-move (eq 'mouse-movement ev-command)) (is-down (string-match "down-" (symbol-name ev-command)))) ;; Mouse events symbols must have an 'event-kind property with @@ -71,6 +72,7 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." (is-down (setf (terminal-parameter nil 'xterm-mouse-last-down) event) vec) + (is-move vec) (t (let* ((down (terminal-parameter nil 'xterm-mouse-last-down)) (down-data (nth 1 down)) @@ -132,65 +134,89 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." (fdiff (- f (* 1.0 maxwrap dbig)))) (+ (truncate fdiff) (* maxwrap dbig)))))) -;; Normal terminal mouse click reporting: expect three bytes, of the -;; form . Return a list (EVENT-TYPE X Y). -(defun xterm-mouse--read-event-sequence-1000 () - (let* ((code (- (read-event) 32)) - (type - ;; For buttons > 3, the release-event looks differently - ;; (see xc/programs/xterm/button.c, function EditorButton), - ;; and come in a release-event only, no down-event. - (cond ((>= code 64) - (format "mouse-%d" (- code 60))) - ((memq code '(8 9 10)) - (format "M-down-mouse-%d" (- code 7))) - ((memq code '(3 11)) - (let ((down (car (terminal-parameter - nil 'xterm-mouse-last-down)))) - (when (and down (string-match "[0-9]" (symbol-name down))) - (format (if (eq code 3) "mouse-%s" "M-mouse-%s") - (match-string 0 (symbol-name down)))))) - ((memq code '(0 1 2)) - (format "down-mouse-%d" (+ 1 code))))) - (x (- (read-event) 33)) - (y (- (read-event) 33))) - (and type (wholenump x) (wholenump y) - (list (intern type) x y)))) +(defun xterm-mouse--read-utf8-char (&optional prompt seconds) + "Read an utf-8 encoded character from the current terminal. +This function reads and returns an utf-8 encoded character of +command input. If the user generates an event which is not a +character (i.e., a mouse click or function key event), read-char +signals an error. -;; XTerm's 1006-mode terminal mouse click reporting has the form -;;