commit f6c3965074dbf5f355ecce739104fb89fb4d90f8 (HEAD, refs/remotes/origin/master) Author: Juri Linkov Date: Sat Dec 6 01:55:20 2014 +0200 Better support for milti-line shell input. * lisp/comint.el (comint-history-isearch-search) (comint-history-isearch-wrap): Use field-beginning instead of comint-line-beginning-position. (comint-send-input): Go to the end of the field instead of the end of the line to accept whole multi-line input. http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5cc530c..b3cb2fa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,14 @@ 2014-12-05 Juri Linkov + * comint.el (comint-history-isearch-search) + (comint-history-isearch-wrap): Use field-beginning instead of + comint-line-beginning-position. + (comint-send-input): Go to the end of the field instead of the end + of the line to accept whole multi-line input. + http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html + +2014-12-05 Juri Linkov + * minibuffer.el (minibuffer-completion-help): Compare selected-window with minibuffer-window to check whether completions should be displayed near the minibuffer. (Bug#17809) diff --git a/lisp/comint.el b/lisp/comint.el index da37827..3085052 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 (comint-line-beginning-position)) + (if isearch-forward bound (field-beginning)) 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 (comint-line-beginning-position))) + (goto-char (field-beginning))) (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 - (comint-line-beginning-position)) + (field-beginning)) noerror))) ;; Return point of the new search result (point)) @@ -1557,7 +1557,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 (comint-line-beginning-position) (point-max)))) + (goto-char (if isearch-forward (field-beginning) (point-max)))) (defun comint-history-isearch-push-state () "Save a function restoring the state of input history search. @@ -1781,7 +1781,7 @@ Similarly for Soar, Scheme, etc." (widen) (let* ((pmark (process-mark proc)) (intxt (if (>= (point) (marker-position pmark)) - (progn (if comint-eol-on-send (end-of-line)) + (progn (if comint-eol-on-send (goto-char (field-end))) (buffer-substring pmark (point))) (let ((copy (funcall comint-get-old-input))) (goto-char pmark) commit 0ffa34951a2c45afa7857b7a970459d0189b4313 Author: Juri Linkov Date: Sat Dec 6 01:42:11 2014 +0200 Better check for displaying completions near the minibuffer. * lisp/minibuffer.el (minibuffer-completion-help): Compare selected-window with minibuffer-window to check whether completions should be displayed near the minibuffer. http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00311.html Fixes: debbugs:17809 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7cbacec..5cc530c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-12-05 Juri Linkov + + * minibuffer.el (minibuffer-completion-help): Compare + selected-window with minibuffer-window to check whether + completions should be displayed near the minibuffer. (Bug#17809) + http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00311.html + 2014-12-05 Michael Albinus * vc/vc-mtn.el (vc-mtn-root): diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 0bee13b..ee97174 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1815,13 +1815,9 @@ variables.") ;; Use `display-buffer-below-selected' for inline completions, ;; but not in the minibuffer (e.g. in `eval-expression') ;; for which `display-buffer-at-bottom' is used. - ;; Compare `this-command' with `completion-at-point' - ;; since `completion--in-region-1' sets `this-command' - ;; to this value for region completion commands. - ,(if (and (eq this-command 'completion-at-point) - (not (minibuffer-selected-window))) - 'display-buffer-below-selected - 'display-buffer-at-bottom)) + ,(if (eq (selected-window) (minibuffer-window)) + 'display-buffer-at-bottom + 'display-buffer-below-selected)) (window-height . fit-window-to-buffer)) nil ;; Remove the base-size tail because `sort' requires a properly commit 7409a79b1b2acf1229dd763f5eb7b96abc17113a Author: Stephen Leake Date: Fri Dec 5 13:13:55 2014 -0600 preparing for further changes/cleanup to developers/contributors docs * etc/CONTRIBUTE: renamed to ./CONTRIBUTE, (my first commit to emacs trunk ever :) diff --git a/CONTRIBUTE b/CONTRIBUTE new file mode 100644 index 0000000..b07b6c6 --- /dev/null +++ b/CONTRIBUTE @@ -0,0 +1,227 @@ +Copyright (C) 2006-2014 Free Software Foundation, Inc. +See end for license conditions. + + + Contributing to Emacs + +Emacs is a collaborative project and we encourage contributions from +anyone and everyone. If you want to contribute in the way that will +help us most, we recommend (1) fixing reported bugs and (2) +implementing the feature ideas in etc/TODO. However, if you think of +new features to add, please suggest them too -- we might like your +idea. Porting to new platforms is also useful, when there is a new +platform, but that is not common nowadays. + +For documentation on how to develop Emacs changes, refer to the Emacs +Manual and the Emacs Lisp Reference Manual (both included in the Emacs +distribution). The web pages in http://www.gnu.org/software/emacs +contain additional information. + +You may also want to submit your change so that can be considered for +inclusion in a future version of Emacs (see below). + +If you don't feel up to hacking Emacs, there are many other ways to +help. You can answer questions on the mailing lists, write +documentation, find and report bugs, check if existing bug reports +are fixed in newer versions of Emacs, contribute to the Emacs web +pages, or develop a package that works with Emacs. + +Here are some style and legal conventions for contributors to Emacs: + + +* Coding Standards + +Contributed code should follow the GNU Coding Standards. + +If it doesn't, we'll need to find someone to fix the code before we +can use it. + +Emacs has certain additional style and coding conventions. + +Ref: http://www.gnu.org/prep/standards/ +Ref: GNU Coding Standards Info Manual +Ref: The "Tips" Appendix in the Emacs Lisp Reference. + + +* Copyright Assignment + +The FSF (Free Software Foundation) is the copyright holder for GNU Emacs. +The FSF is a nonprofit with a worldwide mission to promote computer +user freedom and to defend the rights of all free software users. +For general information, see the website 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 +behind this, see: http://www.gnu.org/licenses/why-assign.html . + +Copyright assignment is a simple process. Residents of some countries +can do it entirely electronically. We can help you get started, and +answer any questions you may have (or point you to the people with the +answers), at the emacs-devel@gnu.org mailing list. + +(Please note: general discussion about why some GNU projects ask +for a copyright assignment is off-topic for emacs-devel. +See gnu-misc-discuss instead.) + +A copyright disclaimer is also a possibility, but we prefer an assignment. +Note that the disclaimer, like an assignment, involves you sending +signed paperwork to the FSF (simply saying "this is in the public domain" +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 +patches) over all your contributions. + +* Getting the Source Code + +The latest version of the Emacs source code can be downloaded from the +Savannah web site. It is important to write your patch based on the +latest version. If you start from an older version, your patch may be +outdated (so that maintainers will have a hard time applying it), or +changes in Emacs may have made your patch unnecessary. + +After you have downloaded the repository source, you should read the file +INSTALL.REPO for build instructions (they differ to some extent from a +normal build). + +Ref: http://savannah.gnu.org/projects/emacs + + +* Submitting Patches + +Every patch must have several pieces of information before we +can properly evaluate it. + +When you have all these pieces, bundle them up in a mail message and +send it to the developers. Sending it to bug-gnu-emacs@gnu.org +(which is the bug/feature list) is recommended, because that list +is coupled to a tracking system that makes it easier to locate patches. +If your patch is not complete and you think it needs more discussion, +you might want to send it to emacs-devel@gnu.org instead. If you +revise your patch, send it as a followup to the initial topic. + +** Description + +For bug fixes, a description of the bug and how your patch fixes it. + +For new features, a description of the feature and your implementation. + +** ChangeLog + +A ChangeLog entry as plaintext (separate from the patch). + +See the existing ChangeLog files for format and content. Note that, +unlike some other projects, we do require ChangeLogs also for +documentation, i.e. Texinfo files. + +Ref: "Change Log Concepts" node of the GNU Coding Standards Info +Manual, for how to write good log entries. + +When using git, commit messages should use ChangeLog format, with a +single short line explaining the change, then an empty line, then +unindented ChangeLog entries. (Essentially, a commit message should +be a duplicate of what the patch adds to the ChangeLog files. We are +planning to automate this better, to avoid the duplication.) + +** The patch itself. + +If you are accessing the Emacs repository, make sure your copy is +up-to-date (e.g. with 'git pull'). You can commit your changes +to a private branch and generate a patch from the master version +by using + git format-patch master +Or you can leave your changes uncommitted and use + git diff +With no repository, you can use + diff -u OLD NEW + +** Mail format. + +We prefer to get the patches as plain text, either inline (be careful +your mail client does not change line breaks) or as MIME attachments. + +** Please reread your patch before submitting it. + +** Do not mix changes. + +If you send several unrelated changes together, we will ask you to +separate them so we can consider each of the changes by itself. + +** Do not make formatting changes. + +Making cosmetic formatting changes (indentation, etc) makes it harder +to see what you have really changed. + + +* Coding style and conventions. + +** Mandatory reading: + +The "Tips and Conventions" Appendix of the Emacs Lisp Reference. + +** Avoid using `defadvice' or `eval-after-load' for Lisp code to be +included in Emacs. + +** Remove all trailing whitespace in all source and text files. + +** Use ?\s instead of ? in Lisp code for a space character. + + +* Supplemental information for Emacs Developers. + +** Write access to the Emacs repository. + +Once you become a frequent contributor to Emacs, we can consider +giving you write access to the version-control repository. + + +** Emacs Mailing lists. + +Discussion about Emacs development takes place on emacs-devel@gnu.org. + +Bug reports and fixes, feature requests and implementations should be +sent to bug-gnu-emacs@gnu.org, the bug/feature list. This is coupled +to the tracker at http://debbugs.gnu.org . + +You can subscribe to the mailing lists, or see the list archives, +by following links from http://savannah.gnu.org/mail/?group=emacs . + +** Document your changes. + +Any change that matters to end-users should have a NEWS entry. + +Think about whether your change requires updating the documentation +(both manuals and doc-strings). If you 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. + +** Understanding Emacs Internals. + +The best way to understand Emacs Internals is to read the code, +but the nodes "Tips" and "GNU Emacs Internals" in the Appendix +of the Emacs Lisp Reference Manual may also help. + +The file etc/DEBUG describes how to debug Emacs bugs. + + + +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 . + +Local variables: +mode: outline +paragraph-separate: "[ ]*$" +end: diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE deleted file mode 100644 index b07b6c6..0000000 --- a/etc/CONTRIBUTE +++ /dev/null @@ -1,227 +0,0 @@ -Copyright (C) 2006-2014 Free Software Foundation, Inc. -See end for license conditions. - - - Contributing to Emacs - -Emacs is a collaborative project and we encourage contributions from -anyone and everyone. If you want to contribute in the way that will -help us most, we recommend (1) fixing reported bugs and (2) -implementing the feature ideas in etc/TODO. However, if you think of -new features to add, please suggest them too -- we might like your -idea. Porting to new platforms is also useful, when there is a new -platform, but that is not common nowadays. - -For documentation on how to develop Emacs changes, refer to the Emacs -Manual and the Emacs Lisp Reference Manual (both included in the Emacs -distribution). The web pages in http://www.gnu.org/software/emacs -contain additional information. - -You may also want to submit your change so that can be considered for -inclusion in a future version of Emacs (see below). - -If you don't feel up to hacking Emacs, there are many other ways to -help. You can answer questions on the mailing lists, write -documentation, find and report bugs, check if existing bug reports -are fixed in newer versions of Emacs, contribute to the Emacs web -pages, or develop a package that works with Emacs. - -Here are some style and legal conventions for contributors to Emacs: - - -* Coding Standards - -Contributed code should follow the GNU Coding Standards. - -If it doesn't, we'll need to find someone to fix the code before we -can use it. - -Emacs has certain additional style and coding conventions. - -Ref: http://www.gnu.org/prep/standards/ -Ref: GNU Coding Standards Info Manual -Ref: The "Tips" Appendix in the Emacs Lisp Reference. - - -* Copyright Assignment - -The FSF (Free Software Foundation) is the copyright holder for GNU Emacs. -The FSF is a nonprofit with a worldwide mission to promote computer -user freedom and to defend the rights of all free software users. -For general information, see the website 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 -behind this, see: http://www.gnu.org/licenses/why-assign.html . - -Copyright assignment is a simple process. Residents of some countries -can do it entirely electronically. We can help you get started, and -answer any questions you may have (or point you to the people with the -answers), at the emacs-devel@gnu.org mailing list. - -(Please note: general discussion about why some GNU projects ask -for a copyright assignment is off-topic for emacs-devel. -See gnu-misc-discuss instead.) - -A copyright disclaimer is also a possibility, but we prefer an assignment. -Note that the disclaimer, like an assignment, involves you sending -signed paperwork to the FSF (simply saying "this is in the public domain" -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 -patches) over all your contributions. - -* Getting the Source Code - -The latest version of the Emacs source code can be downloaded from the -Savannah web site. It is important to write your patch based on the -latest version. If you start from an older version, your patch may be -outdated (so that maintainers will have a hard time applying it), or -changes in Emacs may have made your patch unnecessary. - -After you have downloaded the repository source, you should read the file -INSTALL.REPO for build instructions (they differ to some extent from a -normal build). - -Ref: http://savannah.gnu.org/projects/emacs - - -* Submitting Patches - -Every patch must have several pieces of information before we -can properly evaluate it. - -When you have all these pieces, bundle them up in a mail message and -send it to the developers. Sending it to bug-gnu-emacs@gnu.org -(which is the bug/feature list) is recommended, because that list -is coupled to a tracking system that makes it easier to locate patches. -If your patch is not complete and you think it needs more discussion, -you might want to send it to emacs-devel@gnu.org instead. If you -revise your patch, send it as a followup to the initial topic. - -** Description - -For bug fixes, a description of the bug and how your patch fixes it. - -For new features, a description of the feature and your implementation. - -** ChangeLog - -A ChangeLog entry as plaintext (separate from the patch). - -See the existing ChangeLog files for format and content. Note that, -unlike some other projects, we do require ChangeLogs also for -documentation, i.e. Texinfo files. - -Ref: "Change Log Concepts" node of the GNU Coding Standards Info -Manual, for how to write good log entries. - -When using git, commit messages should use ChangeLog format, with a -single short line explaining the change, then an empty line, then -unindented ChangeLog entries. (Essentially, a commit message should -be a duplicate of what the patch adds to the ChangeLog files. We are -planning to automate this better, to avoid the duplication.) - -** The patch itself. - -If you are accessing the Emacs repository, make sure your copy is -up-to-date (e.g. with 'git pull'). You can commit your changes -to a private branch and generate a patch from the master version -by using - git format-patch master -Or you can leave your changes uncommitted and use - git diff -With no repository, you can use - diff -u OLD NEW - -** Mail format. - -We prefer to get the patches as plain text, either inline (be careful -your mail client does not change line breaks) or as MIME attachments. - -** Please reread your patch before submitting it. - -** Do not mix changes. - -If you send several unrelated changes together, we will ask you to -separate them so we can consider each of the changes by itself. - -** Do not make formatting changes. - -Making cosmetic formatting changes (indentation, etc) makes it harder -to see what you have really changed. - - -* Coding style and conventions. - -** Mandatory reading: - -The "Tips and Conventions" Appendix of the Emacs Lisp Reference. - -** Avoid using `defadvice' or `eval-after-load' for Lisp code to be -included in Emacs. - -** Remove all trailing whitespace in all source and text files. - -** Use ?\s instead of ? in Lisp code for a space character. - - -* Supplemental information for Emacs Developers. - -** Write access to the Emacs repository. - -Once you become a frequent contributor to Emacs, we can consider -giving you write access to the version-control repository. - - -** Emacs Mailing lists. - -Discussion about Emacs development takes place on emacs-devel@gnu.org. - -Bug reports and fixes, feature requests and implementations should be -sent to bug-gnu-emacs@gnu.org, the bug/feature list. This is coupled -to the tracker at http://debbugs.gnu.org . - -You can subscribe to the mailing lists, or see the list archives, -by following links from http://savannah.gnu.org/mail/?group=emacs . - -** Document your changes. - -Any change that matters to end-users should have a NEWS entry. - -Think about whether your change requires updating the documentation -(both manuals and doc-strings). If you 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. - -** Understanding Emacs Internals. - -The best way to understand Emacs Internals is to read the code, -but the nodes "Tips" and "GNU Emacs Internals" in the Appendix -of the Emacs Lisp Reference Manual may also help. - -The file etc/DEBUG describes how to debug Emacs bugs. - - - -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 . - -Local variables: -mode: outline -paragraph-separate: "[ ]*$" -end: commit 7d043d590d4fa7d702a7a12d437e90ec3b4fb069 Author: Michael Albinus Date: Fri Dec 5 21:36:47 2014 +0100 Fix minor bugs in vc. * vc/vc-mtn.el (vc-mtn-root): * vc/vc-svn.el (vc-svn-registered): Make FILE absolute. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 79ee9d7..7cbacec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-05 Michael Albinus + + * vc/vc-mtn.el (vc-mtn-root): + * vc/vc-svn.el (vc-svn-registered): Make FILE absolute. + 2014-12-05 Stefan Monnier * progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning @@ -5,7 +10,6 @@ Generalize this treatment to opening keywords like "while" (bug#18031). 2014-12-05 Stefan Monnier -2014-12-05 Stefan Monnier * simple.el (newline): Place the hook buffer-locally, to make sure it's first. diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index f35e87e..57225f5 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -79,7 +79,8 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (defun vc-mtn-checkout-model (_files) 'implicit) (defun vc-mtn-root (file) - (setq file (if (file-directory-p file) + (setq file (expand-file-name file) + file (if (file-directory-p file) (file-name-as-directory file) (file-name-directory file))) (or (vc-file-getprop file 'vc-mtn-root) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index e29dae4..c36e90b 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -135,6 +135,7 @@ If you want to force an empty list of arguments, use t." (defun vc-svn-registered (file) "Check if FILE is SVN registered." + (setq file (expand-file-name file)) (when (vc-svn-root file) (with-temp-buffer (cd (file-name-directory file)) commit 4fda400e58339cdf962b5679bf05ebe62c6189c5 Merge: 0d7b2c9 c1c2cee Author: Stefan Monnier Date: Fri Dec 5 15:30:09 2014 -0500 Merge from emacs-24 commit 0d7b2c96d388f5a9b539df3cb7f4ef115e7010b7 Merge: fca389d f9f2509 Author: Stefan Monnier Date: Fri Dec 5 15:22:15 2014 -0500 Merge from origin/emacs-24 The following commit was skipped: f9f2509 Auto-commit of loaddefs files. commit fca389d1d3253c58e198efaa28d175106ce5022a Merge: 0c3f76c e97b6e6 Author: Stefan Monnier Date: Fri Dec 5 15:20:02 2014 -0500 Merge from emacs-24 commit 0c3f76c6335de0a2d44db37c9ddf953654ca7f32 Merge: 0bb24df babb0ca Author: Stefan Monnier Date: Fri Dec 5 15:12:00 2014 -0500 Merge from origin/emacs-24 The following commit was skipped: babb0ca ChangeLog fix (do not merge to master) commit 0bb24df135e9c44d2e5a78b58b10719eea9e413b Merge: be30748 bb19b22 Author: Stefan Monnier Date: Fri Dec 5 15:12:00 2014 -0500 Merge from origin/emacs-24 bb19b22 Python.el: Update commentary on RET-behavior commit be307485f722be57985da979296fa37569c2a5a9 Author: Stefan Monnier Date: Fri Dec 5 12:49:53 2014 -0500 * lisp: Prefer inlinable functions to macros. * lisp/fringe.el (fringe-bitmap-p): Make it a plain function. * lisp/tooltip.el (tooltip-region-active-p): Remove. * lisp/net/shr.el (shr-char-breakable-p, shr-char-kinsoku-bol-p) (shr-char-kinsoku-eol-p, shr-char-nospace-p): Use define-inline. * lisp/url/url-future.el (url-future-done-p, url-future-completed-p) (url-future-errored-p, url-future-cancelled-p): * lisp/url/url-dav.el (url-dav-http-success-p): Use define-inline. * lisp/vc/ediff-init.el (ediff-odd-p): Remove. (ediff-background-face): Use cl-oddp instead. (ediff-buffer-live-p): Make it a defsubst. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 54e0804..2c6c377 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,16 @@ 2014-12-05 Stefan Monnier + * vc/ediff-init.el (ediff-odd-p): Remove. + (ediff-background-face): Use cl-oddp instead. + (ediff-buffer-live-p): Make it a defsubst. + + * tooltip.el (tooltip-region-active-p): Remove. + + * net/shr.el (shr-char-breakable-p, shr-char-kinsoku-bol-p) + (shr-char-kinsoku-eol-p, shr-char-nospace-p): Use define-inline. + + * fringe.el (fringe-bitmap-p): Make it a plain function. + * emacs-lisp/eieio-core.el: Prefer inlinable functions over macros. (class-p, generic-p, eieio-object-p, class-abstract-p): Make them defsubst, so as to avoid corner case problems where diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index d6163f2..e0cdd33 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3820,6 +3820,10 @@ that suppresses all warnings during execution of BODY." ;; If things not being bound at all is ok, so must them being ;; obsolete. Note that we add to the existing lists since Tramp ;; (ab)uses this feature. + ;; FIXME: If `foo' is obsoleted by `bar', the code below + ;; correctly arranges to silence the warnings after testing + ;; existence of `foo', but the warning should also be + ;; silenced after testing the existence of `bar'. (let ((byte-compile-not-obsolete-vars (append byte-compile-not-obsolete-vars bound-list)) (byte-compile-not-obsolete-funcs diff --git a/lisp/fringe.el b/lisp/fringe.el index ff60804..97a0393 100644 --- a/lisp/fringe.el +++ b/lisp/fringe.el @@ -83,7 +83,7 @@ (hollow-small . hollow-square)))) -(defmacro fringe-bitmap-p (symbol) +(defun fringe-bitmap-p (symbol) "Return non-nil if SYMBOL is a fringe bitmap." `(get ,symbol 'fringe)) diff --git a/lisp/net/shr.el b/lisp/net/shr.el index a2a122c..e23fd0b 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -412,25 +412,25 @@ size, and full-buffer size." (cdr (assq 'color shr-stylesheet)) (cdr (assq 'background-color shr-stylesheet)))))))) -(defmacro shr-char-breakable-p (char) +(define-inline shr-char-breakable-p (char) "Return non-nil if a line can be broken before and after CHAR." - `(aref fill-find-break-point-function-table ,char)) -(defmacro shr-char-nospace-p (char) + (inline-quote (aref fill-find-break-point-function-table ,char))) +(define-inline shr-char-nospace-p (char) "Return non-nil if no space is required before and after CHAR." - `(aref fill-nospace-between-words-table ,char)) + (inline-quote (aref fill-nospace-between-words-table ,char))) ;; KINSOKU is a Japanese word meaning a rule that should not be violated. ;; In Emacs, it is a term used for characters, e.g. punctuation marks, ;; parentheses, and so on, that should not be placed in the beginning ;; of a line or the end of a line. -(defmacro shr-char-kinsoku-bol-p (char) +(define-inline shr-char-kinsoku-bol-p (char) "Return non-nil if a line ought not to begin with CHAR." - `(let ((char ,char)) - (and (not (eq char ?')) - (aref (char-category-set char) ?>)))) -(defmacro shr-char-kinsoku-eol-p (char) + (inline-letevals (char) + (inline-quote (and (not (eq ,char ?')) + (aref (char-category-set ,char) ?>))))) +(define-inline shr-char-kinsoku-eol-p (char) "Return non-nil if a line ought not to end with CHAR." - `(aref (char-category-set ,char) ?<)) + (inline-quote (aref (char-category-set ,char) ?<))) (unless (shr-char-kinsoku-bol-p (make-char 'japanese-jisx0208 33 35)) (load "kinsoku" nil t)) diff --git a/lisp/tooltip.el b/lisp/tooltip.el index 26cce41..973e74b 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -284,10 +284,6 @@ is based on the current syntax table." (when (> (point) start) (buffer-substring start (point))))))) -(defmacro tooltip-region-active-p () - "Value is non-nil if the region should override command actions." - `(use-region-p)) - (defun tooltip-expr-to-print (event) "Return an expression that should be printed for EVENT. If a region is active and the mouse is inside the region, print @@ -295,7 +291,7 @@ the region. Otherwise, figure out the identifier around the point where the mouse is." (with-current-buffer (tooltip-event-buffer event) (let ((point (posn-point (event-end event)))) - (if (tooltip-region-active-p) + (if (use-region-p) (when (and (<= (region-beginning) point) (<= point (region-end))) (buffer-substring (region-beginning) (region-end))) (tooltip-identifier-from-point point))))) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 7ba9de0..18fc2a1 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,9 @@ +2014-12-05 Stefan Monnier + + * url-future.el (url-future-done-p, url-future-completed-p) + (url-future-errored-p, url-future-cancelled-p): + * url-dav.el (url-dav-http-success-p): Use define-inline. + 2014-11-23 Lars Magne Ingebrigtsen * url-http.el (url-http): Respect `url-request-noninteractive'. diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el index 6adb2d9..24b20ab 100644 --- a/lisp/url/url-dav.el +++ b/lisp/url/url-dav.el @@ -479,9 +479,9 @@ names (ie: DAV:resourcetype)." " ") depth nil namespaces)) -(defmacro url-dav-http-success-p (status) +(define-inline url-dav-http-success-p (status) "Return whether STATUS was the result of a successful DAV request." - `(= (/ (or ,status 500) 100) 2)) + (inline-quote (= (/ (or ,status 500) 100) 2))) ;;; Locking support diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el index 0505218..490e6f7 100644 --- a/lisp/url/url-future.el +++ b/lisp/url/url-future.el @@ -44,17 +44,17 @@ (cl-defstruct url-future callback errorback status value) -(defmacro url-future-done-p (url-future) - `(url-future-status ,url-future)) +(define-inline url-future-done-p (url-future) + (inline-quote (url-future-status ,url-future))) -(defmacro url-future-completed-p (url-future) - `(eq (url-future-status ,url-future) t)) +(define-inline url-future-completed-p (url-future) + (inline-quote (eq (url-future-status ,url-future) t))) -(defmacro url-future-errored-p (url-future) - `(eq (url-future-status ,url-future) 'error)) +(define-inline url-future-errored-p (url-future) + (inline-quote (eq (url-future-status ,url-future) 'error))) -(defmacro url-future-cancelled-p (url-future) - `(eq (url-future-status ,url-future) 'cancel)) +(define-inline url-future-cancelled-p (url-future) + (inline-quote (eq (url-future-status ,url-future) 'cancel))) (defun url-future-finish (url-future &optional status) (if (url-future-done-p url-future) diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 589ea45..9669e2c 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -24,6 +24,8 @@ ;;; Code: +(require 'cl-lib) + ;; Start compiler pacifier (defvar ediff-metajob-name) (defvar ediff-meta-buffer) @@ -118,11 +120,8 @@ It needs to be killed when we quit the session.") (?C . ediff-buffer-C))) ;;; Macros -(defmacro ediff-odd-p (arg) - `(eq (logand ,arg 1) 1)) - -(defmacro ediff-buffer-live-p (buf) - `(and ,buf (get-buffer ,buf) (buffer-name (get-buffer ,buf)))) +(defsubst ediff-buffer-live-p (buf) + (and buf (get-buffer buf) (buffer-name (get-buffer buf)))) (defmacro ediff-get-buffer (arg) `(cond ((eq ,arg 'A) ediff-buffer-A) @@ -1456,7 +1455,7 @@ This default should work without changes." ;; The value of dif-num is always 1- the one that user sees. ;; This is why even face is used when dif-num is odd. (ediff-get-symbol-from-alist - buf-type (if (ediff-odd-p dif-num) + buf-type (if (cl-oddp dif-num) ediff-even-diff-face-alist ediff-odd-diff-face-alist) )) commit 887fa622851c7db45ccacedb1c88e13e27be5d26 Author: Stefan Monnier Date: Fri Dec 5 12:13:09 2014 -0500 * lisp/emacs-lisp/eieio-core.el: Prefer inlinable functions over macros. (class-p, generic-p, eieio-object-p, class-abstract-p): Make them defsubst, so as to avoid corner case problems where the arg might be evaluated in the condition-case, or it can't be passed to higher-order functions like `cl-some'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 72adfb1..54e0804 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-12-05 Stefan Monnier + + * emacs-lisp/eieio-core.el: Prefer inlinable functions over macros. + (class-p, generic-p, eieio-object-p, class-abstract-p): + Make them defsubst, so as to avoid corner case problems where + the arg might be evaluated in the condition-case, or it can't be passed + to higher-order functions like `cl-some'. + 2014-12-05 Nicolas Richard * wid-edit.el (widget-choose): Let numeric keypad work (bug#19268) diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 4aae990..2897ce9 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -206,14 +206,14 @@ Stored outright without modifications or stripping."))) ;; No check: If eieio gets this far, it has probably been checked already. `(get ,class 'eieio-class-definition)) -(defmacro class-p (class) - "Return t if CLASS is a valid class vector. +(defsubst class-p (class) + "Return non-nil if CLASS is a valid class vector. CLASS is a symbol." ;; this new method is faster since it doesn't waste time checking lots of ;; things. - `(condition-case nil - (eq (aref (class-v ,class) 0) 'defclass) - (error nil))) + (condition-case nil + (eq (aref (class-v class) 0) 'defclass) + (error nil))) (defun eieio-class-name (class) "Return a Lisp like symbol name for CLASS." (eieio--check-type class-p class) @@ -237,11 +237,11 @@ CLASS is a symbol." "Return the symbol representing the constructor of CLASS." `(eieio--class-symbol (class-v ,class))) -(defmacro generic-p (method) - "Return t if symbol METHOD is a generic function. +(defsubst generic-p (method) + "Return non-nil if symbol METHOD is a generic function. Only methods have the symbol `eieio-method-obarray' as a property \(which contains a list of all bindings to that method type.)" - `(and (fboundp ,method) (get ,method 'eieio-method-obarray))) + (and (fboundp method) (get method 'eieio-method-obarray))) (defun generic-primary-only-p (method) "Return t if symbol METHOD is a generic function with only primary methods. @@ -284,19 +284,18 @@ Methods with only primary implementations are executed in an optimized way." Return nil if that option doesn't exist." `(class-option-assoc (eieio--class-options (class-v ,class)) ',option)) -(defmacro eieio-object-p (obj) +(defsubst eieio-object-p (obj) "Return non-nil if OBJ is an EIEIO object." - `(condition-case nil - (let ((tobj ,obj)) - (and (eq (aref tobj 0) 'object) - (class-p (eieio--object-class tobj)))) - (error nil))) + (condition-case nil + (and (eq (aref obj 0) 'object) + (class-p (eieio--object-class obj))) + (error nil))) (defalias 'object-p 'eieio-object-p) -(defmacro class-abstract-p (class) +(defsubst class-abstract-p (class) "Return non-nil if CLASS is abstract. Abstract classes cannot be instantiated." - `(class-option ,class :abstract)) + (class-option class :abstract)) (defmacro class-method-invocation-order (class) "Return the invocation order of CLASS. commit 2a06fc15b2a3e6287f18025806fb2eabec801fc0 Author: Nicolas Richard Date: Fri Dec 5 07:29:26 2014 +0100 (widget-choose) Let numeric keypad work Fixes: debbugs:19268 * wid-edit.el (widget-choose): Let numeric keypad work and remove old menu-related code. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2fc3562..72adfb1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-05 Nicolas Richard + + * wid-edit.el (widget-choose): Let numeric keypad work (bug#19268) + and remove old menu-related code. + 2014-12-05 Lars Magne Ingebrigtsen * net/eww.el (eww-display-pdf): Let mailcap determine how to diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 92e52bf..e901431 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -232,23 +232,20 @@ minibuffer." (t ;; Construct a menu of the choices ;; and then use it for prompting for a single character. - (let* ((overriding-terminal-local-map (make-sparse-keymap)) - (next-digit ?0) - map choice some-choice-enabled value) - ;; Define SPC as a prefix char to get to this menu. - (define-key overriding-terminal-local-map " " - (setq map (make-sparse-keymap title))) + (let* ((next-digit ?0) + (map (make-sparse-keymap)) + choice some-choice-enabled value) (with-current-buffer (get-buffer-create " widget-choose") (erase-buffer) (insert "Available choices:\n\n") (while items - (setq choice (car items) items (cdr items)) - (if (consp choice) - (let* ((name (car choice)) - (function (cdr choice))) - (insert (format "%c = %s\n" next-digit name)) - (define-key map (vector next-digit) function) - (setq some-choice-enabled t))) + (setq choice (pop items)) + (when (consp choice) + (let* ((name (car choice)) + (function (cdr choice))) + (insert (format "%c = %s\n" next-digit name)) + (define-key map (vector next-digit) function) + (setq some-choice-enabled t))) ;; Allocate digits to disabled alternatives ;; so that the digit of a given alternative never varies. (setq next-digit (1+ next-digit))) @@ -257,43 +254,29 @@ minibuffer." (forward-line)) (or some-choice-enabled (error "None of the choices is currently meaningful")) - (define-key map [?\C-g] 'keyboard-quit) - (define-key map [t] 'keyboard-quit) (define-key map [?\M-\C-v] 'scroll-other-window) (define-key map [?\M--] 'negative-argument) - (setcdr map (nreverse (cdr map))) - ;; Read a char with the menu, and return the result - ;; that corresponds to it. (save-window-excursion (let ((buf (get-buffer " widget-choose"))) (fit-window-to-buffer (display-buffer buf)) (let ((cursor-in-echo-area t) - keys - (char 0) (arg 1)) - (while (not (or (and (integerp char) - (>= char ?0) (< char next-digit)) - (eq value 'keyboard-quit))) - ;; Unread a SPC to lead to our new menu. - (setq unread-command-events (cons ?\s unread-command-events)) - (setq keys (read-key-sequence title)) - (setq value - (lookup-key overriding-terminal-local-map keys t) - char (aref keys 1)) - (cond ((eq value 'scroll-other-window) - (let ((minibuffer-scroll-window - (get-buffer-window buf))) - (if (> 0 arg) - (scroll-other-window-down - (window-height minibuffer-scroll-window)) - (scroll-other-window)) - (setq arg 1))) - ((eq value 'negative-argument) - (setq arg -1)) - (t - (setq arg 1))))))) - (when (eq value 'keyboard-quit) - (error "Canceled")) + (while (not value) + (setq value (lookup-key map (read-key-sequence (format "%s: " title)))) + (unless value + (user-error "Canceled")) + (when + (cond ((eq value 'scroll-other-window) + (let ((minibuffer-scroll-window + (get-buffer-window buf))) + (if (> 0 arg) + (scroll-other-window-down + (window-height minibuffer-scroll-window)) + (scroll-other-window)) + (setq arg 1))) + ((eq value 'negative-argument) + (setq arg -1))) + (setq value nil)))))) value)))) ;;; Widget text specifications. commit 3f199630bdd2d000b2901dd5319ae528887e015f Author: Lars Magne Ingebrigtsen Date: Fri Dec 5 17:05:09 2014 +0100 * NEWS: Add some doc markers to the eww stuff. diff --git a/etc/ChangeLog b/etc/ChangeLog index 84a1c48..2ec0e5c 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-12-05 Lars Magne Ingebrigtsen + + * NEWS: Add some doc markers to the eww stuff. + 2014-12-04 Eli Zaretskii * NEWS: Mention 'buffer-substring-with-bidi-context'. diff --git a/etc/NEWS b/etc/NEWS index bb749e8..5a95133 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -49,12 +49,14 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to. * Changes in Emacs 25.1 ++++ ** Network security (TLS/SSL certificate validity and the like) is added via the new Network Security Manager (NSM) and controlled via the `network-security-level' variable. ** C-h l now also lists the commands that were run. +--- ** The new M-s M-w key binding uses eww to search the web for the text in the region. @@ -192,24 +194,30 @@ result of the calculation into the current buffer. ** eww ++++ *** A new command `R' (`eww-readable') will try do identify the main textual parts of a web page and display only that, leaving menus and the like off the page. +--- *** You can now use several eww buffers in parallel by renaming eww buffers you want to keep separate. ++++ *** Partial state of the eww buffers (the URIs and the titles of the pages visited) is now preserved in the desktop file. ++++ *** `eww-after-render-hook' is now called after eww has rendered the data in the buffer. ++++ *** The DOM shr and eww uses has been changed to the general Emacs xml.el/libxml2 DOM, and a new package dom.el has been added to interact with this DOM. See the Emacs Lisp manual for interface details. ++++ *** `mailcap-mime-data' is now consulted when displaying PDF files. ** Message mode commit 9860da5137ddf4367313401def2d30b8dde96171 Author: Lars Magne Ingebrigtsen Date: Fri Dec 5 17:01:24 2014 +0100 * eww.texi (Basics): Document eww PDF viewing. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 76545b2..4d8f690 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-12-05 Lars Magne Ingebrigtsen + + * eww.texi (Basics): Document eww PDF viewing. + 2014-11-23 Ivan Shmakov * eww.texi (Advanced): Mention the Desktop stuff (bug#18010). diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi index 8261b27..dd460cc 100644 --- a/doc/misc/eww.texi +++ b/doc/misc/eww.texi @@ -135,6 +135,12 @@ keep their number within a set limit, as specified by also be set to @code{nil} to allow for the history list to grow indefinitely. +@cindex PDF + PDFs are viewed inline, by default, with @code{doc-view-mode}, but +this can be customized by using the mailcap (@pxref{mailcap,,, +emacs-mime, Emacs MIME Manual}) +mechanism, in particular @code{mailcap-mime-data}. + @findex eww-add-bookmark @findex eww-list-bookmarks @kindex b commit bee76e566c0e8d9f0b9fc6a48a36cf53e5408f91 Author: Lars Magne Ingebrigtsen Date: Fri Dec 5 16:51:51 2014 +0100 Make eww use mailcap when displaying PDF files Fixes: debbugs:19270 * net/eww.el (eww-display-pdf): Let mailcap determine how to display PDF files. diff --git a/etc/NEWS b/etc/NEWS index 9d204cf..bb749e8 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -210,6 +210,8 @@ xml.el/libxml2 DOM, and a new package dom.el has been added to interact with this DOM. See the Emacs Lisp manual for interface details. +*** `mailcap-mime-data' is now consulted when displaying PDF files. + ** Message mode *** text/html messages that contain inline image parts will be diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26572c3..2fc3562 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-05 Lars Magne Ingebrigtsen + + * net/eww.el (eww-display-pdf): Let mailcap determine how to + display PDF files (bug#19270). + 2014-12-05 Juri Linkov Compare with the most recent window by default. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 73abd26..e88afb5 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -493,6 +493,7 @@ See the `eww-search-prefix' variable for the search engine used." (shr-put-image data nil)) (goto-char (point-min))))) +(declare-function mailcap-view-mime "mailcap" (type)) (defun eww-display-pdf () (let ((data (buffer-substring (point) (point-max)))) (switch-to-buffer (get-buffer-create "*eww pdf*")) @@ -500,7 +501,7 @@ See the `eww-search-prefix' variable for the search engine used." (inhibit-read-only t)) (erase-buffer) (insert data) - (doc-view-mode))) + (mailcap-view-mime "application/pdf"))) (goto-char (point-min))) (defun eww-setup-buffer () commit 7747e23ecd6c7b140a67812ad22421ef426a7a24 Author: Lars Magne Ingebrigtsen Date: Fri Dec 5 16:40:45 2014 +0100 Make it easier to use mailcap for viewing single files * mailcap.el (mailcap-mime-data): Add doc-view-mode as a viewer for PDFs. (mailcap-view-mime): New function. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index c526b53..0909418 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2014-12-05 Lars Magne Ingebrigtsen + + * mailcap.el (mailcap-mime-data): Add doc-view-mode as a viewer for + PDFs. + (mailcap-view-mime): New function. + 2014-12-01 Glenn Morris * gnus-cloud.el (gnus-cloud): Add :version tag. diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el index 4f1bdf4..1a1a992 100644 --- a/lisp/gnus/mailcap.el +++ b/lisp/gnus/mailcap.el @@ -153,6 +153,10 @@ This is a compatibility function for different Emacsen." (type . "application/zip") ("copiousoutput")) ("pdf" + (viewer . doc-view-mode) + (type . "application/pdf") + (test . (eq window-system 'x))) + ("pdf" (viewer . "gv -safer %s") (type . "application/pdf") (test . window-system) @@ -1060,6 +1064,18 @@ If FORCE, re-parse even if already parsed." common-mime-info))))) commands)) +(defun mailcap-view-mime (type) + "View the data in the current buffer that has MIME type TYPE. +`mailcap-mime-data' determines the method to use." + (let ((method (mailcap-mime-info type))) + (if (stringp method) + (shell-command-on-region (point-min) (point-max) + ;; Use stdin as the "%s". + (format method "-") + (current-buffer) + t) + (funcall method)))) + (provide 'mailcap) ;;; mailcap.el ends here commit d2fab6bf584b967940e7f0a6d6a457933cc4a972 Author: Sam Steingold Date: Fri Dec 5 10:31:25 2014 -0500 fix last patch * nextstep/Makefile.in (links): Use abs_top_builddir et al; link over DOC. diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 8b44d5c..3f731a5 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,7 @@ +2014-12-05 Sam Steingold + + * Makefile.in (links): Use abs_top_builddir et al; link over DOC. + 2014-12-03 Sam Steingold * Makefile.in (links): New phony target to create a fake diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index c07fe85..3bf1f5b 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -23,8 +23,13 @@ SHELL = @SHELL@ srcdir = @srcdir@ +abs_builddir = @abs_builddir@ +abs_top_builddir = @abs_top_builddir@ EXEEXT = @EXEEXT@ +# abs_top_srcdir may contain ".." +top_srcdir_abs = $(shell cd @top_srcdir@; pwd -P) + @SET_MAKE@ MKDIR_P = @MKDIR_P@ @@ -58,15 +63,17 @@ all: ${ns_appdir} ${ns_appbindir}/Emacs # to run GUI Emacs in-place links : ../src/emacs${EXEEXT} | ${ns_appbindir} for d in $(shell cd ${srcdir}/${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done - for f in $(shell cd ${srcdir}/${ns_appsrc}; find . -type f); do ln -s $(shell cd ${srcdir}; pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done + for f in $(shell cd ${srcdir}/${ns_appsrc}; find . -type f); do ln -s $(abs_builddir)/${ns_appsrc}/$$f ${ns_appdir}; done for d in $(shell cd ${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done - for f in $(shell cd ${ns_appsrc}; find . -type f); do ln -s $(shell pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done - ln -s ../../../../../lisp ${ns_appdir}/Contents/Resources - ln -s ../../../../../etc ${ns_appdir}/Contents/Resources - ln -s ../../../../../info ${ns_appdir}/Contents/Resources - ln -s ../../../../src/emacs${EXEEXT} ${ns_appbindir}/Emacs - ln -s ../../../../lib-src ${ns_appbindir}/bin - ln -s ../../../../lib-src ${ns_appbindir}/libexec + for f in $(shell cd ${ns_appsrc}; find . -type f); do ln -s $(shell pwd -P)/${ns_appsrc}/$$f ${ns_appdir}; done + ln -s $(top_srcdir_abs)/lisp ${ns_appdir}/Contents/Resources + ln -s $(top_srcdir_abs)/info ${ns_appdir}/Contents/Resources + ln -s $(abs_top_builddir)/src/emacs${EXEEXT} ${ns_appbindir}/Emacs + ln -s $(abs_top_builddir)/lib-src ${ns_appbindir}/bin + ln -s $(abs_top_builddir)/lib-src ${ns_appbindir}/libexec + ${MKDIR_P} ${ns_appdir}/Contents/Resources/etc + for f in $(shell cd $(top_srcdir_abs)/etc; ls); do ln -s $(top_srcdir_abs)/etc/$$f ${ns_appdir}/Contents/Resources/etc; done + ln -s $(abs_top_builddir)/etc/DOC ${ns_appdir}/Contents/Resources/etc .PHONY: clean distclean bootstrap-clean maintainer-clean commit 9c72233e631d8a41234522f832fd162782f0a587 Author: Sam Steingold Date: Fri Dec 5 09:39:59 2014 -0500 fix a typo in doc string diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index b45638b..62a60b2 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -3082,7 +3082,7 @@ images if any to the browser, and deletes them when exiting the group (gnus-summary-show-article))))) (defun article-hide-list-identifiers () - "Remove list identifies from the Subject header. + "Remove list identifiers from the Subject header. The `gnus-list-identifiers' variable specifies what to do." (interactive) (let ((inhibit-point-motion-hooks t) commit 933107f290d47c202aadd1465d4774a4d5fcb10d Author: Eli Zaretskii Date: Fri Dec 5 13:19:14 2014 +0200 .gitignore: Ignore test/biditest.txt. diff --git a/.gitignore b/.gitignore index 71ded39..ff0e5ed 100644 --- a/.gitignore +++ b/.gitignore @@ -143,6 +143,7 @@ src/*.map # Tests. test/indent/*.new +test/biditest.txt # ctags, etags. TAGS diff --git a/ChangeLog b/ChangeLog index cd7698c..56e7520 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-12-05 Eli Zaretskii + + * .gitignore: Ignore test/biditest.txt. + 2014-12-01 Lars Magne Ingebrigtsen * .gitignore: Ignore loaddefs directly under lisp, and in commit fcc4da3e5227f64b57e5e7ac497df28229b88f7d Author: Eli Zaretskii Date: Fri Dec 5 12:17:15 2014 +0200 Reduce memory footprint of struct bidi_it by a factor of 5. src/dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero. (struct bidi_stack): Reduce size by using bit fields and by packing sos, override, and isolate_status into a single 8-bit byte called 'flags'. src/bidi.c (ISOLATE_STATUS, OVERRIDE): New macros. (bidi_push_embedding_level): Construct flags from individual bits. Adapt to changes in prev_for_neutral and next_for_neutral members. (bidi_pop_embedding_level): Use ISOLATE_STATUS. Extract 'sos' from flags. Adapt to changes in prev_for_neutral, next_for_neutral, and last_strong members. (bidi_line_init): Initialize flags to zero. (bidi_resolve_explicit, bidi_resolve_weak, bidi_resolve_brackets) (bidi_resolve_neutral): Use ISOLATE_STATUS and OVERRIDE. diff --git a/src/ChangeLog b/src/ChangeLog index 2f64a97..82aabb3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,21 @@ +2014-12-05 Eli Zaretskii + + * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero. + (struct bidi_stack): Reduce size by using bit fields and by + packing sos, override, and isolate_status into a single 8-bit + byte called 'flags'. + + * bidi.c (ISOLATE_STATUS, OVERRIDE): New macros. + (bidi_push_embedding_level): Construct flags from individual + bits. Adapt to changes in prev_for_neutral and next_for_neutral + members. + (bidi_pop_embedding_level): Use ISOLATE_STATUS. Extract 'sos' + from flags. Adapt to changes in prev_for_neutral, + next_for_neutral, and last_strong members. + (bidi_line_init): Initialize flags to zero. + (bidi_resolve_explicit, bidi_resolve_weak, bidi_resolve_brackets) + (bidi_resolve_neutral): Use ISOLATE_STATUS and OVERRIDE. + 2014-12-04 Stefan Monnier * eval.c (backtrace_eval_unrewind): Rewind also the excursions. diff --git a/src/bidi.c b/src/bidi.c index a0bcf52..cc70d08 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -433,6 +433,9 @@ bidi_set_sos_type (struct bidi_it *bidi_it, int level_before, int level_after) = bidi_it->next_for_neutral.orig_type = UNKNOWN_BT; } +#define ISOLATE_STATUS(BIDI_IT, IDX) ((BIDI_IT)->level_stack[IDX].flags & 1) +#define OVERRIDE(BIDI_IT, IDX) (((BIDI_IT)->level_stack[IDX].flags >> 1) & 3) + /* Push the current embedding level and override status; reset the current level to LEVEL and the current override status to OVERRIDE. */ static void @@ -447,14 +450,14 @@ bidi_push_embedding_level (struct bidi_it *bidi_it, st = &bidi_it->level_stack[bidi_it->stack_idx]; eassert (level <= (1 << 7)); st->level = level; - st->override = override; - st->isolate_status = isolate_status; + st->flags = (((override & 3) << 1) | (isolate_status != 0)); if (isolate_status) { - st->last_strong = bidi_it->last_strong; - st->prev_for_neutral = bidi_it->prev_for_neutral; - st->next_for_neutral = bidi_it->next_for_neutral; - st->sos = bidi_it->sos; + st->last_strong_type = bidi_it->last_strong.type; + st->prev_for_neutral_type = bidi_it->prev_for_neutral.type; + st->next_for_neutral_type = bidi_it->next_for_neutral.type; + st->next_for_neutral_pos = bidi_it->next_for_neutral.charpos; + st->flags |= ((bidi_it->sos == L2R ? 0 : 1) << 3); } /* We've got a new isolating sequence, compute the directional type of sos and initialize per-sequence variables (UAX#9, clause X10). */ @@ -473,8 +476,7 @@ bidi_pop_embedding_level (struct bidi_it *bidi_it) and PDIs (X6a, 2nd bullet). */ if (bidi_it->stack_idx > 0) { - bool isolate_status - = bidi_it->level_stack[bidi_it->stack_idx].isolate_status; + bool isolate_status = ISOLATE_STATUS (bidi_it, bidi_it->stack_idx); int old_level = bidi_it->level_stack[bidi_it->stack_idx].level; struct bidi_stack st; @@ -482,6 +484,7 @@ bidi_pop_embedding_level (struct bidi_it *bidi_it) st = bidi_it->level_stack[bidi_it->stack_idx]; if (isolate_status) { + bidi_dir_t sos = ((st.flags >> 3) & 1); /* PREV is used in W1 for resolving WEAK_NSM. By the time we get to an NSM, we must have gotten past at least one character: the PDI that ends the isolate from which we @@ -490,10 +493,11 @@ bidi_pop_embedding_level (struct bidi_it *bidi_it) UNKNOWN_BT to be able to catch any blunders in this logic. */ bidi_it->prev.orig_type = bidi_it->prev.type = UNKNOWN_BT; - bidi_it->last_strong = st.last_strong; - bidi_it->prev_for_neutral = st.prev_for_neutral; - bidi_it->next_for_neutral = st.next_for_neutral; - bidi_it->sos = st.sos; + bidi_it->last_strong.type = st.last_strong_type; + bidi_it->prev_for_neutral.type = st.prev_for_neutral_type; + bidi_it->next_for_neutral.type = st.next_for_neutral_type; + bidi_it->next_for_neutral.charpos = st.next_for_neutral_pos; + bidi_it->sos = (sos == 0 ? L2R : R2L); } else bidi_set_sos_type (bidi_it, old_level, @@ -1104,8 +1108,7 @@ bidi_line_init (struct bidi_it *bidi_it) bidi_it->scan_dir = 1; /* FIXME: do we need to have control on this? */ bidi_it->stack_idx = 0; bidi_it->resolved_level = bidi_it->level_stack[0].level; - bidi_it->level_stack[0].override = NEUTRAL_DIR; /* X1 */ - bidi_it->level_stack[0].isolate_status = false; /* X1 */ + bidi_it->level_stack[0].flags = 0; /* NEUTRAL_DIR, false per X1 */ bidi_it->invalid_levels = 0; bidi_it->isolate_level = 0; /* X1 */ bidi_it->invalid_isolates = 0; /* X1 */ @@ -1858,8 +1861,8 @@ bidi_resolve_explicit (struct bidi_it *bidi_it) prev_type = NEUTRAL_B; current_level = bidi_it->level_stack[bidi_it->stack_idx].level; /* X1 */ - override = bidi_it->level_stack[bidi_it->stack_idx].override; - isolate_status = bidi_it->level_stack[bidi_it->stack_idx].isolate_status; + isolate_status = ISOLATE_STATUS (bidi_it, bidi_it->stack_idx); + override = OVERRIDE (bidi_it, bidi_it->stack_idx); new_level = current_level; if (bidi_it->charpos >= (string_p ? bidi_it->string.schars : ZV)) @@ -2033,7 +2036,7 @@ bidi_resolve_explicit (struct bidi_it *bidi_it) else if (bidi_it->isolate_level > 0) { bidi_it->invalid_levels = 0; - while (!bidi_it->level_stack[bidi_it->stack_idx].isolate_status) + while (!ISOLATE_STATUS (bidi_it, bidi_it->stack_idx)) bidi_pop_embedding_level (bidi_it); eassert (bidi_it->stack_idx > 0); new_level = bidi_pop_embedding_level (bidi_it); @@ -2041,12 +2044,15 @@ bidi_resolve_explicit (struct bidi_it *bidi_it) } bidi_it->resolved_level = new_level; /* Unicode 8.0 correction. */ - if (bidi_it->level_stack[bidi_it->stack_idx].override == L2R) - bidi_it->type_after_wn = STRONG_L; - else if (bidi_it->level_stack[bidi_it->stack_idx].override == R2L) - bidi_it->type_after_wn = STRONG_R; - else - bidi_it->type_after_wn = type; + { + bidi_dir_t stack_override = OVERRIDE (bidi_it, bidi_it->stack_idx); + if (stack_override == L2R) + bidi_it->type_after_wn = STRONG_L; + else if (stack_override == R2L) + bidi_it->type_after_wn = STRONG_R; + else + bidi_it->type_after_wn = type; + } break; case PDF: /* X7 */ bidi_it->type_after_wn = type; @@ -2089,7 +2095,7 @@ bidi_resolve_weak (struct bidi_it *bidi_it) ? bidi_it->string.schars : ZV); type = bidi_it->type; - override = bidi_it->level_stack[bidi_it->stack_idx].override; + override = OVERRIDE (bidi_it, bidi_it->stack_idx); eassert (!(type == UNKNOWN_BT || type == LRE @@ -2557,9 +2563,9 @@ bidi_find_bracket_pairs (struct bidi_it *bidi_it) /* Skip level runs excluded from this isolating run sequence. */ new_sidx = bidi_it->stack_idx; if (bidi_it->level_stack[new_sidx].level > current_level - && (bidi_it->level_stack[new_sidx].isolate_status + && (ISOLATE_STATUS (bidi_it, new_sidx) || (new_sidx > old_sidx + 1 - && bidi_it->level_stack[new_sidx - 1].isolate_status))) + && ISOLATE_STATUS (bidi_it, new_sidx - 1)))) { while (bidi_it->level_stack[bidi_it->stack_idx].level > current_level) @@ -2729,7 +2735,7 @@ bidi_resolve_brackets (struct bidi_it *bidi_it) the prev_for_neutral and next_for_neutral information, so that it will be picked up when we advance to that next run. */ if (bidi_it->level_stack[bidi_it->stack_idx].level > prev_level - && bidi_it->level_stack[bidi_it->stack_idx].isolate_status) + && ISOLATE_STATUS (bidi_it, bidi_it->stack_idx)) { bidi_record_type_for_neutral (&prev_for_neutral, prev_level, 0); bidi_record_type_for_neutral (&next_for_neutral, prev_level, 1); @@ -2919,14 +2925,14 @@ bidi_resolve_neutral (struct bidi_it *bidi_it) /* Skip level runs excluded from this isolating run sequence. */ new_sidx = bidi_it->stack_idx; if (bidi_it->level_stack[new_sidx].level > current_level - && (bidi_it->level_stack[new_sidx].isolate_status + && (ISOLATE_STATUS (bidi_it, new_sidx) /* This is for when we have an isolate initiator immediately followed by an embedding or override initiator, in which case we get the level stack pushed twice by the single call to bidi_resolve_weak above. */ || (new_sidx > old_sidx + 1 - && bidi_it->level_stack[new_sidx - 1].isolate_status))) + && ISOLATE_STATUS (bidi_it, new_sidx - 1)))) { while (bidi_it->level_stack[bidi_it->stack_idx].level > current_level) diff --git a/src/dispextern.h b/src/dispextern.h index 0ee5fd6..5510a1f 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1908,7 +1908,7 @@ typedef enum { } bidi_bracket_type_t; /* The basic directionality data type. */ -typedef enum { NEUTRAL_DIR, L2R, R2L } bidi_dir_t; +typedef enum { NEUTRAL_DIR = 0, L2R, R2L } bidi_dir_t; /* Data type for storing information about characters we need to remember. */ @@ -1920,15 +1920,16 @@ struct bidi_saved_info { /* Data type for keeping track of information about saved embedding levels, override status, isolate status, and isolating sequence - runs. */ + runs. This should be as tightly packed as possible, because there + are 127 such entries in each iterator state, and so the size of + cache is directly affected by the size of this struct. */ struct bidi_stack { - struct bidi_saved_info last_strong; - struct bidi_saved_info next_for_neutral; - struct bidi_saved_info prev_for_neutral; - unsigned level : 7; - bool_bf isolate_status : 1; - unsigned override : 2; - unsigned sos : 2; + ptrdiff_t next_for_neutral_pos; + unsigned next_for_neutral_type : 3; + unsigned last_strong_type : 3; + unsigned prev_for_neutral_type : 3; + unsigned char level; + unsigned char flags; /* sos, override, isolate_status */ }; /* Data type for storing information about a string being iterated on. */ commit 96e6fd3c155b1851e0acd477789535a45b8d3187 Author: Juri Linkov Date: Fri Dec 5 02:50:41 2014 +0200 Compare with the most recently used window by default. * lisp/vc/compare-w.el (compare-windows-get-window-function): New defcustom. (compare-windows-get-recent-window) (compare-windows-get-next-window): New functions. (compare-windows, compare-windows-sync-default-function): Use `compare-windows-get-window-function' instead of `next-window'. (compare-windows): Add diff/match messages with region boundaries. Fixes: debbugs:19170 diff --git a/etc/NEWS b/etc/NEWS index ae92fa9..9d204cf 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -329,6 +329,10 @@ and comments. the color range from `vc-annotate-color-map' is applied to the background or to the foreground. +*** compare-windows now compares text with the most recently used window +instead of the next window. The new option `compare-windows-get-window-function' +allows to customize this. + ** 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 19a3020..26572c3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2014-12-05 Juri Linkov + + Compare with the most recent window by default. + * vc/compare-w.el (compare-windows-get-window-function): New defcustom. + (compare-windows-get-recent-window) + (compare-windows-get-next-window): New functions. + (compare-windows, compare-windows-sync-default-function): + Use `compare-windows-get-window-function' instead of `next-window'. + (compare-windows): Add diff/match messages with region boundaries. + (Bug#19170) + 2014-12-04 Stefan Monnier * subr.el (filter): Remove. Use `cl-remove-if-not' or `seq-filter'. diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el index 25d4cf7..3b8293c 100644 --- a/lisp/vc/compare-w.el +++ b/lisp/vc/compare-w.el @@ -140,9 +140,43 @@ out all highlighting later with the command `compare-windows-dehighlight'." (defvar compare-windows-overlays2 nil) (defvar compare-windows-sync-point nil) +(defcustom compare-windows-get-window-function 'compare-windows-get-recent-window + "Function that provides the window to compare with." + :type '(choice + (function-item :tag "Most recently used window" + compare-windows-get-recent-window) + (function-item :tag "Next window" + compare-windows-get-next-window) + (function :tag "Your function")) + :group 'compare-windows + :version "25.0") + +(defun compare-windows-get-recent-window () + "Return the most recently used window. +First try to get the most recently used window on a visible frame, +then try to get a window on an iconified frame, and finally +consider all existing frames." + (or (get-mru-window 'visible t t) + (get-mru-window 0 t t) + (get-mru-window t t t))) + +(defun compare-windows-get-next-window () + "Return the window next in the cyclic ordering of windows. +In the selected frame contains only one window, consider windows +on all visible frames." + (let ((w2 (next-window))) + (if (eq w2 (selected-window)) + (setq w2 (next-window (selected-window) nil 'visible))) + (if (eq w2 (selected-window)) + (error "No other window")) + w2)) + ;;;###autoload (defun compare-windows (ignore-whitespace) - "Compare text in current window with text in next window. + "Compare text in current window with text in another window. +The option `compare-windows-get-window-function' defines how +to get another window. + Compares the text starting at point in each window, moving over text in each one as far as they match. @@ -179,11 +213,7 @@ on third call it again advances points to the next difference and so on." 'compare-windows-sync-regexp compare-windows-sync))) (setq p1 (point) b1 (current-buffer)) - (setq w2 (next-window)) - (if (eq w2 (selected-window)) - (setq w2 (next-window (selected-window) nil 'visible))) - (if (eq w2 (selected-window)) - (error "No other window")) + (setq w2 (funcall compare-windows-get-window-function)) (setq p2 (window-point w2) b2 (window-buffer w2)) (setq opoint2 p2) @@ -212,7 +242,7 @@ on third call it again advances points to the next difference and so on." ;; optionally skip over it. (and skip-func-1 (save-excursion - (let (p1a p2a w1 w2 result1 result2) + (let (p1a p2a result1 result2) (setq result1 (funcall skip-func-1 opoint1)) (setq p1a (point)) (set-buffer b2) @@ -255,12 +285,15 @@ on third call it again advances points to the next difference and so on." (recenter (car compare-windows-recenter)) (with-selected-window w2 (recenter (cadr compare-windows-recenter)))) ;; If points are still not synchronized, then ding - (when (and (= p1 opoint1) (= p2 opoint2)) - ;; Display error message when current points in two windows - ;; are unmatched and next matching points can't be found. - (compare-windows-dehighlight) - (ding) - (message "No more matching points")))))) + (if (and (= p1 opoint1) (= p2 opoint2)) + (progn + ;; Display error message when current points in two windows + ;; are unmatched and next matching points can't be found. + (compare-windows-dehighlight) + (ding) + (message "No more matches with %s" b2)) + (message "Diff -%s,%s +%s,%s with %s" opoint2 p2 opoint1 p1 b2))) + (message "Match -%s,%s +%s,%s with %s" opoint2 p2 opoint1 p1 b2)))) ;; Move forward over whatever might be called whitespace. ;; compare-windows-whitespace is a regexp that matches whitespace. @@ -303,7 +336,7 @@ on third call it again advances points to the next difference and so on." (defun compare-windows-sync-default-function () (if (not compare-windows-sync-point) (let* ((w1 (selected-window)) - (w2 (next-window w1)) + (w2 (funcall compare-windows-get-window-function)) (b2 (window-buffer w2)) (point-max2 (with-current-buffer b2 (point-max))) (op2 (window-point w2)) commit d08f4f8fc5219324ac352c6d89f0db5c6a18ce32 Author: Stefan Monnier Date: Thu Dec 4 15:57:23 2014 -0500 * lisp/subr.el (filter): Remove. Use `cl-remove-if-not' or `seq-filter'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f0d752..19a3020 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-04 Stefan Monnier + + * subr.el (filter): Remove. Use `cl-remove-if-not' or `seq-filter'. + 2014-12-04 Lars Magne Ingebrigtsen * net/shr.el (shr--extract-best-source): Ignore non-text children. diff --git a/lisp/subr.el b/lisp/subr.el index 4cc80e9..6ce02b7 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -222,11 +222,6 @@ Then evaluate RESULT to get return value, default nil. ,@(if (cdr (cdr spec)) `((setq ,(car spec) nil) ,@(cdr (cdr spec)))))))) -(defmacro filter (condp lst) - "Return the list consisting of elements in LST for which CONDP is not nil." - `(delq nil - (mapcar (lambda (x) (and (funcall ,condp x) x)) ,lst))) - (defmacro dotimes (spec &rest body) "Loop a certain number of times. Evaluate BODY with VAR bound to successive integers running from 0, commit 6194477a622ce9293162d16a7ba98c9cfc18d124 Author: Stefan Monnier Date: Thu Dec 4 14:16:59 2014 -0500 * src/eval.c (backtrace_eval_unrewind): Rewind also the excursions. (Fapply): Try and simplify the control flow. diff --git a/src/ChangeLog b/src/ChangeLog index a487883..2f64a97 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-12-04 Stefan Monnier + + * eval.c (backtrace_eval_unrewind): Rewind also the excursions. + (Fapply): Try and simplify the control flow. + 2014-12-03 Chris Zheng (tiny change) * gnutls.c (init_gnutls_functions, gnutls_certificate_details): diff --git a/src/eval.c b/src/eval.c index 77b1db9..8a83fdb 100644 --- a/src/eval.c +++ b/src/eval.c @@ -27,6 +27,7 @@ along with GNU Emacs. If not, see . */ #include "commands.h" #include "keyboard.h" #include "dispextern.h" +#include "buffer.h" /* Chain of condition and catch handlers currently in effect. */ @@ -2272,14 +2273,12 @@ usage: (apply FUNCTION &rest ARGUMENTS) */) (ptrdiff_t nargs, Lisp_Object *args) { ptrdiff_t i, numargs, funcall_nargs; - register Lisp_Object spread_arg; - register Lisp_Object *funcall_args; - Lisp_Object fun, retval; + register Lisp_Object *funcall_args = NULL; + register Lisp_Object spread_arg = args[nargs - 1]; + Lisp_Object fun = args[0]; + Lisp_Object retval; USE_SAFE_ALLOCA; - fun = args [0]; - funcall_args = 0; - spread_arg = args [nargs - 1]; CHECK_LIST (spread_arg); numargs = XINT (Flength (spread_arg)); @@ -2297,34 +2296,27 @@ usage: (apply FUNCTION &rest ARGUMENTS) */) /* Optimize for no indirection. */ if (SYMBOLP (fun) && !NILP (fun) && (fun = XSYMBOL (fun)->function, SYMBOLP (fun))) - fun = indirect_function (fun); - if (NILP (fun)) { - /* Let funcall get the error. */ - fun = args[0]; - goto funcall; + fun = indirect_function (fun); + if (NILP (fun)) + /* Let funcall get the error. */ + fun = args[0]; } - if (SUBRP (fun)) + if (SUBRP (fun) && XSUBR (fun)->max_args > numargs + /* Don't hide an error by adding missing arguments. */ + && numargs >= XSUBR (fun)->min_args) { - if (numargs < XSUBR (fun)->min_args - || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs)) - goto funcall; /* Let funcall get the error. */ - else if (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args > numargs) - { - /* Avoid making funcall cons up a yet another new vector of arguments - by explicitly supplying nil's for optional values. */ - SAFE_ALLOCA_LISP (funcall_args, 1 + XSUBR (fun)->max_args); - for (i = numargs; i < XSUBR (fun)->max_args; /* nothing */) - funcall_args[++i] = Qnil; - funcall_nargs = 1 + XSUBR (fun)->max_args; - } + /* Avoid making funcall cons up a yet another new vector of arguments + by explicitly supplying nil's for optional values. */ + SAFE_ALLOCA_LISP (funcall_args, 1 + XSUBR (fun)->max_args); + for (i = numargs; i < XSUBR (fun)->max_args; /* nothing */) + funcall_args[++i] = Qnil; + funcall_nargs = 1 + XSUBR (fun)->max_args; } - funcall: - /* We add 1 to numargs because funcall_args includes the - function itself as well as its arguments. */ - if (!funcall_args) - { + else + { /* We add 1 to numargs because funcall_args includes the + function itself as well as its arguments. */ SAFE_ALLOCA_LISP (funcall_args, 1 + numargs); funcall_nargs = 1 + numargs; } @@ -3420,6 +3412,18 @@ backtrace_eval_unrewind (int distance) unwind_protect, but the problem is that we don't know how to rewind them afterwards. */ case SPECPDL_UNWIND: + { + Lisp_Object oldarg = tmp->unwind.arg; + if (tmp->unwind.func == set_buffer_if_live) + tmp->unwind.arg = Fcurrent_buffer (); + else if (tmp->unwind.func == save_excursion_restore) + tmp->unwind.arg = save_excursion_save (); + else + break; + tmp->unwind.func (oldarg); + break; + } + case SPECPDL_UNWIND_PTR: case SPECPDL_UNWIND_INT: case SPECPDL_UNWIND_VOID: commit c1c2cee7c5ae1eff6edb198814423e55cb11cc73 Author: Lee Duhem Date: Thu Dec 4 14:13:13 2014 -0500 * src/eval.c (Fsignal): Remove duplicate test. (Fautoload_do_load): Fix up docstring. diff --git a/src/ChangeLog b/src/ChangeLog index 952e4ab..0a8acf9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-12-04 Lee Duhem (tiny change) + + * eval.c (Fsignal): Remove duplicate test. + (Fautoload_do_load): Fix up docstring. + 2014-12-02 Jan Djärv * nsterm.m (represented_filename, represented_frame): New variables. diff --git a/src/eval.c b/src/eval.c index 929b98e..f0ad999 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1536,8 +1536,7 @@ See also the function `condition-case'. */) || NILP (clause) /* A `debug' symbol in the handler list disables the normal suppression of the debugger. */ - || (CONSP (clause) && CONSP (clause) - && !NILP (Fmemq (Qdebug, clause))) + || (CONSP (clause) && !NILP (Fmemq (Qdebug, clause))) /* Special handler that means "print a message and run debugger if requested". */ || EQ (h->tag_or_ch, Qerror))) @@ -1921,7 +1920,7 @@ DEFUN ("autoload-do-load", Fautoload_do_load, Sautoload_do_load, 1, 3, 0, If non-nil, FUNNAME should be the symbol whose function value is FUNDEF, in which case the function returns the new autoloaded function value. If equal to `macro', MACRO-ONLY specifies that FUNDEF should only be loaded if -it is defines a macro. */) +it defines a macro. */) (Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only) { ptrdiff_t count = SPECPDL_INDEX (); @@ -3502,7 +3501,6 @@ backtrace_eval_unrewind (int distance) for (; distance > 0; distance--) { tmp += step; - /* */ switch (tmp->kind) { /* FIXME: Ideally we'd like to "temporarily unwind" (some of) those commit e3c24b171bfff16fb808cb02d3fc5eaff017c1bc Author: Stefan Monnier Date: Thu Dec 4 10:09:08 2014 -0500 * lisp/progmodes/sh-script.el: Fix indentation rule of "| while". Fixes: debbugs:18031 * lisp/progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning of the whole pipe when indenting an opening keyword after a |. Generalize this treatment to opening keywords like "while". diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12e5ef0..26b09a6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-12-04 Stefan Monnier + + * progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning + of the whole pipe when indenting an opening keyword after a |. + Generalize this treatment to opening keywords like "while" (bug#18031). + 2014-12-01 Stefan Monnier * simple.el (newline): Place the hook buffer-locally, diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 724d22a..1165144 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1988,12 +1988,12 @@ May return nil if the line should not be treated as continued." (and (numberp indent) (numberp initial) (<= indent initial))))) `(column . ,(+ initial sh-indentation))) - (`(:before . ,(or `"(" `"{" `"[")) + (`(:before . ,(or `"(" `"{" `"[" "while" "if" "for" "case")) (if (not (smie-rule-prev-p "&&" "||" "|")) (when (smie-rule-hanging-p) (smie-rule-parent)) (unless (smie-rule-bolp) - (smie-backward-sexp 'halfexp) + (while (equal "|" (nth 2 (smie-backward-sexp 'halfexp)))) `(column . ,(smie-indent-virtual))))) ;; FIXME: Maybe this handling of ;; should be made into ;; a smie-rule-terminator function that takes the substitute ";" as arg. diff --git a/test/indent/shell.sh b/test/indent/shell.sh index e361905..14f6774 100755 --- a/test/indent/shell.sh +++ b/test/indent/shell.sh @@ -54,6 +54,17 @@ filter_3 () # bug#17842 grep -v "^," | sort -t, -k2,2 } +foo | bar | { + toto +} + +grep -e "^$userregexp:" /etc/passwd | cut -d : -f 1 | while read user ; do + print -u2 "user=$user" # bug#18031 + sudo -U $user -ll | while read line ; do + : + done +done + echo -n $(( 5 << 2 )) # This should not be treated as a heredoc (bug#12770). 2 commit 64755ed3add17e10a4bd3e4e270cae51cfe1d8c7 Author: Lars Magne Ingebrigtsen Date: Thu Dec 4 14:42:57 2014 +0100 * net/shr.el (shr--extract-best-source): Ignore non-text children. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 157b2b4..1f0d752 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-04 Lars Magne Ingebrigtsen + + * net/shr.el (shr--extract-best-source): Ignore non-text children. + 2014-12-04 Eli Zaretskii Implement copying of a buffer portion while preserving visual order. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 3ad8bd1..a2a122c 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1184,7 +1184,7 @@ The preference is a float determined from `shr-prefer-media-type'." "Extract the best `:src' property from blocks in DOM." (setq pref (or pref -1.0)) (let (new-pref) - (dolist (elem (dom-children dom)) + (dolist (elem (dom-non-text-children dom)) (when (and (eq (dom-tag elem) 'source) (< pref (setq new-pref @@ -1193,7 +1193,7 @@ The preference is a float determined from `shr-prefer-media-type'." url (dom-attr elem 'src)) ;; libxml's html parser isn't HTML5 compliant and non terminated ;; source tags might end up as children. So recursion it is... - (dolist (child (dom-children elem)) + (dolist (child (dom-non-text-children elem)) (when (eq (dom-tag child) 'source) (let ((ret (shr--extract-best-source (list child) url pref))) (when (< pref (cdr ret)) commit f1827846d715cfef05afe52ad2a9df2289df6952 Author: Eli Zaretskii Date: Thu Dec 4 11:31:33 2014 +0200 Implement copying of a buffer portion while preserving visual order. See http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02203.html and http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00063.html for the rationale. lisp/simple.el (bidi-directional-controls-chars) (bidi-directional-non-controls-chars): New variables. (squeeze-bidi-context-1, squeeze-bidi-context) (line-substring-with-bidi-context) (buffer-substring-with-bidi-context): New functions. doc/lispref/display.texi (Bidirectional Display): Document 'buffer-substring-with-bidi-context'. doc/lispref/text.texi (Buffer Contents): Mention 'buffer-substring-with-bidi-context' with a cross-reference. etc/NEWS: Mention 'buffer-substring-with-bidi-context'. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f98e457..d8215be 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,11 @@ +2014-12-04 Eli Zaretskii + + * display.texi (Bidirectional Display): Document + 'buffer-substring-with-bidi-context'. + + * text.texi (Buffer Contents): Mention + 'buffer-substring-with-bidi-context' with a cross-reference. + 2014-12-02 Eli Zaretskii * display.texi (Bidirectional Display): Document diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 59f7322..90aa979 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -6854,3 +6854,27 @@ allows it to correctly account for window-specific overlays, which might change the result of the function if some text in the buffer is covered by overlays. @end defun + +@cindex copying bidirectional text, preserve visual order +@cindex visual order, preserve when copying bidirectional text + When text that includes mixed right-to-left and left-to-right +characters and bidirectional controls is copied into a different +location, it can change its visual appearance, and also can affect the +visual appearance of the surrounding text at destination. This is +because reordering of bidirectional text specified by the +@acronym{UBA} has non-trivial context-dependent effects both on the +copied text and on the text at copy destination that will surround it. + + Sometimes, a Lisp program may need to preserve the exact visual +appearance of the copied text at destination, and of the text that +surrounds the copy. Lisp programs can use the following function to +achieve that effect. + +@defun buffer-substring-with-bidi-context start end &optional no-properties +This function works similar to @code{buffer-substring} (@pxref{Buffer +Contents}), but it prepends and appends to the copied text bidi +directional control characters necessary to preserve the visual +appearance of the text when it is inserted at another place. Optional +argument @var{no-properties}, if non-@code{nil}, means remove the text +properties from the copy of the text. +@end defun diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 9c878a0..720343c 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -219,6 +219,12 @@ This function returns the contents of the entire accessible portion of the current buffer, as a string. @end defun + If you need to make sure the resulting string, when copied to a +different location, will not change its visual appearance due to +reordering of bidirectional text, use the +@code{buffer-substring-with-bidi-context} function +(@pxref{Bidirectional Display, buffer-substring-with-bidi-context}). + @defun filter-buffer-substring start end &optional delete This function filters the buffer text between @var{start} and @var{end} using a function specified by the variable diff --git a/etc/ChangeLog b/etc/ChangeLog index 4f672df..84a1c48 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-12-04 Eli Zaretskii + + * NEWS: Mention 'buffer-substring-with-bidi-context'. + 2014-12-02 Eli Zaretskii * NEWS: Mention 'bidi-find-overridden-directionality'. diff --git a/etc/NEWS b/etc/NEWS index f3890a5..ae92fa9 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -105,6 +105,13 @@ overridden by directional override control characters. Lisp programs can use this to detect potential phishing of URLs and other links that exploits bidirectional display reordering. ++++ +** The new function `buffer-substring-with-bidi-context' allows to +copy a portion of a buffer into a different location while preserving +the visual appearance both of the copied text and the text at +destination, even when the copied text includes mixed bidirectional +text and directional control characters. + *** The ls-lisp package uses `string-collate-lessp' to sort file names. If you want the old, locale-independent sorting, customize the new option `ls-lisp-use-string-collate' to a nil value. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c729bc..157b2b4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2014-12-04 Eli Zaretskii + Implement copying of a buffer portion while preserving visual order. + * simple.el (bidi-directional-controls-chars) + (bidi-directional-non-controls-chars): New variables. + (squeeze-bidi-context-1, squeeze-bidi-context) + (line-substring-with-bidi-context) + (buffer-substring-with-bidi-context): New functions. + * files.el (file-tree-walk): Doc fix. 2014-12-04 Rupert Swarbrick (tiny change) diff --git a/lisp/simple.el b/lisp/simple.el index 16db05a..46b346a 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4126,6 +4126,144 @@ The argument is used for internal purposes; do not supply one." (setq this-command 'kill-region) (message "If the next command is a kill, it will append")) (setq last-command 'kill-region))) + +(defvar bidi-directional-controls-chars "\x202a-\x202e\x2066-\x2069" + "Character set that matches bidirectional formatting control characters.") + +(defvar bidi-directional-non-controls-chars "^\x202a-\x202e\x2066-\x2069" + "Character set that matches any character except bidirectional controls.") + +(defun squeeze-bidi-context-1 (from to category replacement) + "A subroutine of `squeeze-bidi-context'. +FROM and TO should be markers, CATEGORY and REPLACEMENT should be strings." + (let ((pt (copy-marker from)) + (limit (copy-marker to)) + (old-pt 0) + lim1) + (setq lim1 limit) + (goto-char pt) + (while (< pt limit) + (if (> pt old-pt) + (move-marker lim1 + (save-excursion + ;; L and R categories include embedding and + ;; override controls, but we don't want to + ;; replace them, because that might change + ;; the visual order. Likewise with PDF and + ;; isolate controls. + (+ pt (skip-chars-forward + bidi-directional-non-controls-chars + limit))))) + ;; Replace any run of non-RTL characters by a single LRM. + (if (null (re-search-forward category lim1 t)) + ;; No more characters of CATEGORY, we are done. + (setq pt limit) + (replace-match replacement nil t) + (move-marker pt (point))) + (setq old-pt pt) + ;; Skip directional controls, if any. + (move-marker + pt (+ pt (skip-chars-forward bidi-directional-controls-chars limit)))))) + +(defun squeeze-bidi-context (from to) + "Replace characters between FROM and TO while keeping bidi context. + +This function replaces the region of text with as few characters +as possible, while preserving the effect that region will have on +bidirectional display before and after the region." + (let ((start (set-marker (make-marker) + (if (> from 0) from (+ (point-max) from)))) + (end (set-marker (make-marker) to)) + ;; This is for when they copy text with read-only text + ;; properties. + (inhibit-read-only t)) + (if (null (marker-position end)) + (setq end (point-max-marker))) + ;; Replace each run of non-RTL characters with a single LRM. + (squeeze-bidi-context-1 start end "\\CR+" "\x200e") + ;; Replace each run of non-LTR characters with a single RLM. Note + ;; that the \cR category includes both the Arabic Letter (AL) and + ;; R characters; here we ignore the distinction between them, + ;; because that distinction only affects Arabic Number (AN) + ;; characters, which are weak and don't affect the reordering. + (squeeze-bidi-context-1 start end "\\CL+" "\x200f"))) + +(defun line-substring-with-bidi-context (start end &optional no-properties) + "Return buffer text between START and END with its bidi context. + +START and END are assumed to belong to the same physical line +of buffer text. This function prepends and appends to the text +between START and END bidi control characters that preserve the +visual order of that text when it is inserted at some other place." + (if (or (< start (point-min)) + (> end (point-max))) + (signal 'args-out-of-range (list (current-buffer) start end))) + (let ((buf (current-buffer)) + substr para-dir from to) + (save-excursion + (goto-char start) + (setq para-dir (current-bidi-paragraph-direction)) + (setq from (line-beginning-position) + to (line-end-position)) + (goto-char from) + ;; If we don't have any mixed directional characters in the + ;; entire line, we can just copy the substring without adding + ;; any context. + (if (or (looking-at-p "\\CR*$") + (looking-at-p "\\CL*$")) + (setq substr (if no-properties + (buffer-substring-no-properties start end) + (buffer-substring start end))) + (setq substr + (with-temp-buffer + (if no-properties + (insert-buffer-substring-no-properties buf from to) + (insert-buffer-substring buf from to)) + (squeeze-bidi-context 1 (1+ (- start from))) + (squeeze-bidi-context (- end to) nil) + (buffer-substring 1 (point-max))))) + + ;; Wrap the string in LRI/RLI..PDI pair to achieve 2 effects: + ;; (1) force the string to have the same base embedding + ;; direction as the paragraph direction at the source, no matter + ;; what is the paragraph direction at destination; and (2) avoid + ;; affecting the visual order of the surrounding text at + ;; destination if there are characters of different + ;; directionality there. + (concat (if (eq para-dir 'left-to-right) "\x2066" "\x2067") + substr "\x2069")))) + +(defun buffer-substring-with-bidi-context (start end &optional no-properties) + "Return portion of current buffer between START and END with bidi context. + +This function works similar to `buffer-substring', but it prepends and +appends to the text bidi directional control characters necessary to +preserve the visual appearance of the text if it is inserted at another +place. This is useful when the buffer substring includes bidirectional +text and control characters that cause non-trivial reordering on display. +If copied verbatim, such text can have a very different visual appearance, +and can also change the visual appearance of the surrounding text at the +destination of the copy. + +Optional argument NO-PROPERTIES, if non-nil, means copy the text without +the text properties." + (let (line-end substr) + (if (or (< start (point-min)) + (> end (point-max))) + (signal 'args-out-of-range (list (current-buffer) start end))) + (save-excursion + (goto-char start) + (setq line-end (min end (line-end-position))) + (while (< start end) + (setq substr + (concat substr + (if substr "\n" "") + (line-substring-with-bidi-context start line-end + no-properties))) + (forward-line 1) + (setq start (point)) + (setq line-end (min end (line-end-position)))) + substr))) ;; Yanking. commit 2bef807c322b44cf63db85e4b60001a76cbe3d9f Author: Eli Zaretskii Date: Thu Dec 4 09:58:19 2014 +0200 lisp/files.el (file-tree-walk): Doc fix. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 819e0d0..9c729bc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-04 Eli Zaretskii + + * files.el (file-tree-walk): Doc fix. + 2014-12-04 Rupert Swarbrick (tiny change) Rüdiger Sonderfeld diff --git a/lisp/files.el b/lisp/files.el index 740a00a..0f54a22 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -730,10 +730,17 @@ The path separator is colon in GNU and GNU-like systems." (error "No such directory found via CDPATH environment variable")))) (defun file-tree-walk (dir action &rest args) - "Walk DIR executing ACTION on each path, with ARGS as additional arguments. -Each call gets as arguments DIR, a file path, and optional ARGS. + "Walk DIR executing ACTION on each file, with ARGS as additional arguments. +For each file, the function calls ACTION as follows: + + \(ACTION DIRECTORY BASENAME ARGS\) + +Where DIRECTORY is the leading directory of the file, + BASENAME is the basename of the file, + and ARGS are as specified in the call to this function, or nil if omitted. + The ACTION is applied to each subdirectory before descending into -it, and if nil is returned at that point the descent will be +it, and if nil is returned at that point, the descent will be prevented. Directory entries are sorted with string-lessp." (cond ((file-directory-p dir) (or (char-equal ?/ (aref dir (1- (length dir)))) commit a0363ffa9931cf751a92577ab1b0a7acbae4c4e7 Author: Rüdiger Sonderfeld Date: Thu Dec 4 07:08:18 2014 +0100 lisp/autoinsert.el: Change default of auto-insert-alist. * lisp/autoinsert.el (auto-insert-alist): Update C/C++ header and program support to match more extensions. Replace non-alnum characters when generating include guards (headers) and check for more extensions when generating includes (programs) (bug#19254). diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2ff0a2d..819e0d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2014-12-04 Rupert Swarbrick (tiny change) + Rüdiger Sonderfeld + + * autoinsert.el (auto-insert-alist): Update C/C++ header and + program support to match more extensions. Replace non-alnum + characters when generating include guards (headers) and check for + more extensions when generating includes (programs) + (bug#19254). + 2014-12-03 Eric S. Raymond * files.el (file-tree-walk): Fix docstring. diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index 5eb5170..a6104cc 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -91,23 +91,24 @@ If this contains a %s, that will be replaced by the matching rule." (defcustom auto-insert-alist - '((("\\.\\([Hh]\\|hh\\|hpp\\)\\'" . "C / C++ header") - (upcase (concat (file-name-nondirectory - (file-name-sans-extension buffer-file-name)) - "_" - (file-name-extension buffer-file-name))) + '((("\\.\\([Hh]\\|hh\\|hpp\\|hxx\\|h\\+\\+\\)\\'" . "C / C++ header") + (replace-regexp-in-string + "[^A-Z0-9]" "_" + (replace-regexp-in-string + "\\+" "P" + (upcase (file-name-nondirectory buffer-file-name)))) "#ifndef " str \n "#define " str "\n\n" _ "\n\n#endif") - (("\\.\\([Cc]\\|cc\\|cpp\\)\\'" . "C / C++ program") + (("\\.\\([Cc]\\|cc\\|cpp\\|cxx\\|c\\+\\+\\)\\'" . "C / C++ program") nil "#include \"" - (let ((stem (file-name-sans-extension buffer-file-name))) - (cond ((file-exists-p (concat stem ".h")) - (file-name-nondirectory (concat stem ".h"))) - ((file-exists-p (concat stem ".hh")) - (file-name-nondirectory (concat stem ".hh"))))) + (let ((stem (file-name-sans-extension buffer-file-name)) + ret) + (dolist (ext '("H" "h" "hh" "hpp" "hxx" "h++") ret) + (when (file-exists-p (concat stem "." ext)) + (setq ret (file-name-nondirectory (concat stem "." ext)))))) & ?\" | -10) (("[Mm]akefile\\'" . "Makefile") . "makefile.inc") @@ -305,6 +306,7 @@ file-name or one relative to `auto-insert-directory' or a function to call. ACTION may also be a vector containing several successive single actions as described above, e.g. [\"header.insert\" date-and-author-update]." :type 'sexp + :version "25.1" :group 'auto-insert) commit de909179393f2052eeb5dd0738bcdc582e654b14 Author: Eric S. Raymond Date: Wed Dec 3 18:26:34 2014 -0500 Fix punctuation glitches in file-tree-walk docstring. * files.el (file-tree-walk): Fix docstring. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2309fc5..2ff0a2d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-03 Eric S. Raymond + + * files.el (file-tree-walk): Fix docstring. + 2014-12-03 Karl Fogel Fix bug whereby saving files hung in VC hook. diff --git a/lisp/files.el b/lisp/files.el index 720a633..740a00a 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -730,11 +730,11 @@ The path separator is colon in GNU and GNU-like systems." (error "No such directory found via CDPATH environment variable")))) (defun file-tree-walk (dir action &rest args) - "Walk DIR executing ACTION. Each call gets as arguments DIR, a file path, -and optional ARGS. The ACTION is applied to each subdirectory -before descending into it, and if nil is returned at that point -the descent will be prevented. Directory entries are sorted with -string-lessp" + "Walk DIR executing ACTION on each path, with ARGS as additional arguments. +Each call gets as arguments DIR, a file path, and optional ARGS. +The ACTION is applied to each subdirectory before descending into +it, and if nil is returned at that point the descent will be +prevented. Directory entries are sorted with string-lessp." (cond ((file-directory-p dir) (or (char-equal ?/ (aref dir (1- (length dir)))) (setq dir (file-name-as-directory dir))) commit 3f33f2210cae26d332141a6aeb9abb9e34f97fc7 Author: Sam Steingold Date: Wed Dec 3 15:45:23 2014 -0500 enable in-place GUI * nextstep/Makefile.in (links): New phony target to create a fake installation pointing back to the source tree to run GUI Emacs in-place (http://article.gmane.org/gmane.emacs.devel:178330). diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 4bb84bc..8b44d5c 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,9 @@ +2014-12-03 Sam Steingold + + * Makefile.in (links): New phony target to create a fake + installation pointing back to the source tree to run GUI Emacs + in-place (http://article.gmane.org/gmane.emacs.devel:178330). + 2014-11-22 Glenn Morris * templates/Info-gnustep.plist.in: Let configure set URL. diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 52f3211..c07fe85 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -8,12 +8,12 @@ ## 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 . @@ -50,10 +50,23 @@ ${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} | \ ${ns_appbindir} cp -f ../src/emacs${EXEEXT} $@ -.PHONY: all +.PHONY: all links all: ${ns_appdir} ${ns_appbindir}/Emacs +# create a fake installation pointing back to the source tree +# to run GUI Emacs in-place +links : ../src/emacs${EXEEXT} | ${ns_appbindir} + for d in $(shell cd ${srcdir}/${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done + for f in $(shell cd ${srcdir}/${ns_appsrc}; find . -type f); do ln -s $(shell cd ${srcdir}; pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done + for d in $(shell cd ${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done + for f in $(shell cd ${ns_appsrc}; find . -type f); do ln -s $(shell pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done + ln -s ../../../../../lisp ${ns_appdir}/Contents/Resources + ln -s ../../../../../etc ${ns_appdir}/Contents/Resources + ln -s ../../../../../info ${ns_appdir}/Contents/Resources + ln -s ../../../../src/emacs${EXEEXT} ${ns_appbindir}/Emacs + ln -s ../../../../lib-src ${ns_appbindir}/bin + ln -s ../../../../lib-src ${ns_appbindir}/libexec .PHONY: clean distclean bootstrap-clean maintainer-clean commit b3298507f92f8cc17dc35090e4036aac787af682 Author: Karl Fogel Date: Wed Dec 3 14:23:26 2014 -0600 Fix bug whereby saving files hung in VC hook. Saving a buffer visiting a file under SVN control would hang if the remote repository were unreachable, because the VC hooks tried to run "svn status -u" on the file, where the "-u" tells svn to get update information from the remote repository. http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00174.html * vc/vc-svn.el (vc-svn-state): Remove optional `localp' argument and always pass "-v" to "svn status", never "-u". diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9f9834..2309fc5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2014-12-03 Karl Fogel + + Fix bug whereby saving files hung in VC hook. + + Saving a buffer visiting a file under SVN control would hang if + the remote repository were unreachable, because the VC hooks tried + to run "svn status -u" on the file, where the "-u" tells svn to + get update information from the remote repository. + http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00174.html + + * vc/vc-svn.el (vc-svn-state): Remove optional `localp' + argument and always pass "-v" to "svn status", never "-u". + 2014-12-03 Stefan Monnier * emacs-lisp/inline.el: Fix up copyright header. diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index abeeac0..e29dae4 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -153,12 +153,12 @@ If you want to force an empty list of arguments, use t." (let ((parsed (vc-svn-parse-status file))) (and parsed (not (memq parsed '(ignored unregistered)))))))))) -(defun vc-svn-state (file &optional localp) +(defun vc-svn-state (file) "SVN-specific version of `vc-state'." (let (process-file-side-effects) (with-temp-buffer (cd (file-name-directory file)) - (vc-svn-command t 0 file "status" (if localp "-v" "-u")) + (vc-svn-command t 0 file "status" "-v") (vc-svn-parse-status file)))) ;; FIXME it would be better not to have the "remote" argument, commit c263a40a9ac76a87b919ca8d425736797c3c399c Author: Stefan Monnier Date: Wed Dec 3 13:51:36 2014 -0500 * lisp/emacs-lisp/inline.el: Cosmetic and minor fixes. * lisp/emacs-lisp/inline.el: Fix up copyright header. (inline-quote, inline-const-p, inline-const-val, inline-error): Silence compiler warnings. (inline-letevals): Fix edebug spec. (inline--testconst-p): Consider lambda expressions as const-p. (inline--getconst-val): Use inline--testconst-p. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a70917e..e9f9834 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2014-12-03 Stefan Monnier + * emacs-lisp/inline.el: Fix up copyright header. + (inline-quote, inline-const-p, inline-const-val, inline-error): + Silence compiler warnings. + (inline-letevals): Fix edebug spec. + (inline--testconst-p): Consider lambda expressions as const-p. + (inline--getconst-val): Use inline--testconst-p. + * minibuffer.el (completion-table-dynamic): Add arg `switch-buffer' and change default to stay in the minibuffer when called from the minibuffer (bug#19250). diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el index 3f11781..679e875 100644 --- a/lisp/emacs-lisp/inline.el +++ b/lisp/emacs-lisp/inline.el @@ -1,21 +1,23 @@ ;;; inline.el --- Define functions by their inliner -*- lexical-binding:t; -*- -;; Copyright (C) 2014 Stefan Monnier +;; Copyright (C) 2014 Free Software Foundation, Inc. ;; Author: Stefan Monnier -;; 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: @@ -67,22 +69,22 @@ (require 'macroexp) -(defmacro inline-quote (exp) +(defmacro inline-quote (_exp) "Similar to backquote, but quotes code and only accepts , and not ,@." (declare (debug t)) (error "inline-quote can only be used within define-inline")) -(defmacro inline-const-p (exp) +(defmacro inline-const-p (_exp) "Return non-nil if the value of EXP is already known." (declare (debug t)) (error "inline-const-p can only be used within define-inline")) -(defmacro inline-const-val (exp) +(defmacro inline-const-val (_exp) "Return the value of EXP." (declare (debug t)) (error "inline-const-val can only be used within define-inline")) -(defmacro inline-error (format &rest args) +(defmacro inline-error (_format &rest _args) "Signal an error." (declare (debug t)) (error "inline-error can only be used within define-inline")) @@ -104,14 +106,21 @@ of arguments,in which case each argument is evaluated and the resulting new list is re-bound to VAR. After VARS is handled, BODY is evaluated in the new environment." - (declare (indent 1) (debug (sexp &rest body))) + (declare (indent 1) (debug (sexp &rest form))) (cond ((consp vars) `(inline--leteval ,(pop vars) (inline-letevals ,vars ,@body))) (vars `(inline--letlisteval ,vars ,@body)) (t (macroexp-progn body)))) - + +;; (defmacro inline-if (testfun testexp then else) +;; (declare (indent 2) (debug (sexp symbolp form form))) +;; (macroexp-let2 macroexp-copyable-p testsym testexp +;; `(if (inline-const-p ,testexp) +;; (if (,testfun (inline-const-val ,testexp)) ,then ,else) +;; (inline-quote (if (,testfun ,testexp) ,(list '\, then) +;; ,(list '\, else)))))) ;;;###autoload (defmacro define-inline (name args &rest body) @@ -220,7 +229,9 @@ After VARS is handled, BODY is evaluated in the new environment." (macroexp-progn body)) (defun inline--testconst-p (exp) - `(macroexp-const-p ,exp)) + (macroexp-let2 macroexp-copyable-p exp exp + `(or (macroexp-const-p ,exp) + (eq (car-safe ,exp) 'function)))) (defun inline--alwaysconst-p (_exp) t) @@ -228,7 +239,7 @@ After VARS is handled, BODY is evaluated in the new environment." (defun inline--getconst-val (exp) (macroexp-let2 macroexp-copyable-p exp exp `(cond - ((not (macroexp-const-p ,exp)) + ((not ,(inline--testconst-p exp)) (throw 'inline--just-use inline--form)) ((consp ,exp) (cadr ,exp)) (t ,exp)))) commit 41bb375cc71c70fbe9b405272abf0d5f345eee2a Author: Stefan Monnier Date: Wed Dec 3 13:42:20 2014 -0500 Fixes: debbugs:19250 * lisp/minibuffer.el (completion-table-dynamic): Add arg `switch-buffer' and change default to stay in the minibuffer when called from the minibuffer. (lazy-completion-table): Use this new argument to preserve the old behavior. * lisp/progmodes/elisp-mode.el (elisp--local-variables): Don't burp on incorrect lexical elements (bug#19250). diff --git a/etc/NEWS b/etc/NEWS index 9786f3a..f3890a5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -363,6 +363,11 @@ helper functions) obsolete. * Incompatible Lisp Changes in Emacs 25.1 +** 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 +`switch-buffer'. + ** window-configurations no longer record the buffers's marks. ** inhibit-modification-hooks now also inhibits lock-file checks, as well as diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b79b918..a70917e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2014-12-03 Stefan Monnier + + * minibuffer.el (completion-table-dynamic): Add arg `switch-buffer' + and change default to stay in the minibuffer when called from + the minibuffer (bug#19250). + (lazy-completion-table): Use this new argument to preserve the + old behavior. + + * progmodes/elisp-mode.el (elisp--local-variables): Don't burp on + incorrect lexical elements (bug#19250). + 2014-12-03 Eric S. Raymond * files.el (file-tree-walk): Lisp translation of ANSI ftw(3). @@ -23,8 +34,7 @@ * vc-hooks.el: Bind vc-delete-file to Ctrl-x v delete. * vc.el (vc-expand-dirs): Now takes a second BACKEND argument, - improving behavior on directories using multiple file-oriented - VCSes. + improving behavior on directories using multiple file-oriented VCSes. * vc/vc.el and all backends: API simplification; clear-headers is no longer a public method. It is now local to the one place diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index c9ce381..0bee13b 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -169,13 +169,15 @@ ACTION can be one of nil, t or `lambda'." (t 'test-completion)) string table pred)))) -(defun completion-table-dynamic (fun) +(defun completion-table-dynamic (fun &optional switch-buffer) "Use function FUN as a dynamic completion table. FUN is called with one argument, the string for which completion is required, and it should return an alist containing all the intended possible completions. This alist may be a full list of possible completions so that FUN can ignore -the value of its argument. If completion is performed in the minibuffer, -FUN will be called in the buffer from which the minibuffer was entered. +the value of its argument. +If SWITCH-BUFFER is non-nil and completion is performed in the +minibuffer, FUN will be called in the buffer from which the minibuffer +was entered. The result of the `completion-table-dynamic' form is a function that can be used as the COLLECTION argument to `try-completion' and @@ -187,9 +189,10 @@ See also the related function `completion-table-with-cache'." ;; `fun' is not supposed to return another function but a plain old ;; completion table, whose boundaries are always trivial. nil - (with-current-buffer (let ((win (minibuffer-selected-window))) - (if (window-live-p win) (window-buffer win) - (current-buffer))) + (with-current-buffer (if (not switch-buffer) (current-buffer) + (let ((win (minibuffer-selected-window))) + (if (window-live-p win) (window-buffer win) + (current-buffer)))) (complete-with-action action (funcall fun string) string pred))))) (defun completion-table-with-cache (fun &optional ignore-case) @@ -228,7 +231,8 @@ You should give VAR a non-nil `risky-local-variable' property." (lambda (,str) (when (functionp ,var) (setq ,var (funcall #',fun))) - ,var)))) + ,var) + 'do-switch-buffer))) (defun completion-table-case-fold (table &optional dont-fold) "Return new completion TABLE that is case insensitive. diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el index bcab1f7..3d769b1 100644 --- a/lisp/pcmpl-gnu.el +++ b/lisp/pcmpl-gnu.el @@ -323,8 +323,8 @@ (let ((file (pcomplete-arg 1))) (completion-table-dynamic (lambda (_string) - (pcmpl-gnu-with-file-buffer file - (mapcar #'tar-header-name tar-parse-info))))) + (pcmpl-gnu-with-file-buffer + file (mapcar #'tar-header-name tar-parse-info))))) (pcomplete-entries)) nil 'identity)))) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 2be81a5..ba70f90 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -293,7 +293,7 @@ Blank lines separate paragraphs. Semicolons start comments. (let* ((sexp (condition-case nil (car (read-from-string (concat txt "elisp--witness--lisp" closer))) - (end-of-file nil))) + ((invalid-read-syntax end-of-file) nil))) (macroexpand-advice (lambda (expander form &rest args) (condition-case nil (apply expander form args) diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index 25b0815..7d96363 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -45,13 +45,13 @@ (defun completion-table-with-cache (fun &optional ignore-case) ;; See eg bug#11906. (let* (last-arg last-result - (new-fun - (lambda (arg) - (if (and last-arg (string-prefix-p last-arg arg ignore-case)) - last-result - (prog1 - (setq last-result (funcall fun arg)) - (setq last-arg arg)))))) + (new-fun + (lambda (arg) + (if (and last-arg (string-prefix-p last-arg arg ignore-case)) + last-result + (prog1 + (setq last-result (funcall fun arg)) + (setq last-arg arg)))))) (completion-table-dynamic new-fun))))) (eval-when-compile (unless (fboundp 'setq-local) commit e148a1eacaaa6d6e67db09188f66dab06937ae0d Author: Eli Zaretskii Date: Wed Dec 3 20:24:58 2014 +0200 etc/NEWS: Mention 'file-tree-walk'. diff --git a/etc/NEWS b/etc/NEWS index bb016ee..9786f3a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -121,9 +121,13 @@ non-native NS fullscreen. The default is nil. Set to t to enable animation when entering and leaving fullscreen. For native OSX fullscreen this has no effect. -*** A new text property `inhibit-read-only' can be used in read-only +** A new text property `inhibit-read-only' can be used in read-only buffers to allow certain parts of the text to be writable. +** A new function `file-tree-walk' allows to apply a certain action +to all the files and subdirectories of a directory, similarly to the C +library function `ftw'. + * Editing Changes in Emacs 25.1 commit 38aaf904c7f0feda58a1c321af6042ab29ee7716 Author: Chris Zheng Date: Wed Dec 3 15:38:39 2014 +0100 Fix gnutls.c build on MinGW Fixes: debbugs:19231 * gnutls.c (init_gnutls_functions, gnutls_certificate_details): Use gnutls_sign_get_name directly because gnutls_sign_algorithm_get_name is a macro on MinGW. (init_gnutls_functions): Load missing gnutls_server_name_set. diff --git a/src/ChangeLog b/src/ChangeLog index 7dc2b92..a487883 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-12-03 Chris Zheng (tiny change) + + * gnutls.c (init_gnutls_functions, gnutls_certificate_details): + Use gnutls_sign_get_name directly because + gnutls_sign_algorithm_get_name is a macro on MinGW (bug#19231). + (init_gnutls_functions): Load missing gnutls_server_name_set. + 2014-12-02 Eli Zaretskii * bidi.c (bidi_find_first_overridden): New function. diff --git a/src/gnutls.c b/src/gnutls.c index 752df3c..7c61445 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -185,7 +185,7 @@ DEF_GNUTLS_FN (int, gnutls_x509_crt_get_key_id, (gnutls_x509_crt_t, unsigned int, unsigned char *, size_t *_size)); DEF_GNUTLS_FN (const char*, gnutls_sec_param_get_name, (gnutls_sec_param_t)); -DEF_GNUTLS_FN (const char*, gnutls_sign_algorithm_get_name, +DEF_GNUTLS_FN (const char*, gnutls_sign_get_name, (gnutls_sign_algorithm_t)); DEF_GNUTLS_FN (int, gnutls_server_name_set, (gnutls_session_t, gnutls_server_name_type_t, @@ -265,7 +265,8 @@ init_gnutls_functions (void) LOAD_GNUTLS_FN (library, gnutls_x509_crt_get_signature); LOAD_GNUTLS_FN (library, gnutls_x509_crt_get_key_id); LOAD_GNUTLS_FN (library, gnutls_sec_param_get_name); - LOAD_GNUTLS_FN (library, gnutls_sign_algorithm_get_name); + LOAD_GNUTLS_FN (library, gnutls_sign_get_name); + LOAD_GNUTLS_FN (library, gnutls_server_name_set); max_log_level = global_gnutls_log_level; @@ -337,7 +338,7 @@ init_gnutls_functions (void) #define fn_gnutls_x509_crt_get_signature gnutls_x509_crt_get_signature #define fn_gnutls_x509_crt_get_key_id gnutls_x509_crt_get_key_id #define fn_gnutls_sec_param_get_name gnutls_sec_param_get_name -#define fn_gnutls_sign_algorithm_get_name gnutls_sign_algorithm_get_name +#define fn_gnutls_sign_get_name gnutls_sign_get_name #define fn_gnutls_server_name_set gnutls_server_name_set #endif /* !WINDOWSNT */ @@ -928,7 +929,7 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) err = fn_gnutls_x509_crt_get_signature_algorithm (cert); if (err >= GNUTLS_E_SUCCESS) { - const char *name = fn_gnutls_sign_algorithm_get_name (err); + const char *name = fn_gnutls_sign_get_name (err); if (name) res = nconc2 (res, list2 (intern (":signature-algorithm"), build_string (name))); commit e820f16c06a5a6be4bc87910b349c7c3c6eca0f4 Author: Eric S. Raymond Date: Wed Dec 3 09:28:09 2014 -0500 Added file-tree-walk to files.el. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 10d4888..b79b918 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-03 Eric S. Raymond + + * files.el (file-tree-walk): Lisp translation of ANSI ftw(3). + 2014-12-02 Glenn Morris * whitespace.el (whitespace-big-indent-regexp): Add :version. diff --git a/lisp/files.el b/lisp/files.el index c9d1d2d..720a633 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -729,6 +729,32 @@ The path separator is colon in GNU and GNU-like systems." (lambda (f) (and (file-directory-p f) 'dir-ok))) (error "No such directory found via CDPATH environment variable")))) +(defun file-tree-walk (dir action &rest args) + "Walk DIR executing ACTION. Each call gets as arguments DIR, a file path, +and optional ARGS. The ACTION is applied to each subdirectory +before descending into it, and if nil is returned at that point +the descent will be prevented. Directory entries are sorted with +string-lessp" + (cond ((file-directory-p dir) + (or (char-equal ?/ (aref dir (1- (length dir)))) + (setq dir (file-name-as-directory dir))) + (let ((lst (directory-files dir nil nil t)) + fullname file) + (while lst + (setq file (car lst)) + (setq lst (cdr lst)) + (cond ((member file '("." ".."))) + (t + (and (apply action dir file args) + (setq fullname (concat dir file)) + (file-directory-p fullname) + (apply 'file-tree-walk fullname action args))))))) + (t + (apply action + (file-name-directory dir) + (file-name-nondirectory dir) + args)))) + (defun load-file (file) "Load the Lisp file named FILE." ;; This is a case where .elc makes a lot of sense. commit eb608f9ef2d018191d614bac5cd247d998b6fdfb Author: Michael Albinus Date: Wed Dec 3 09:58:20 2014 +0100 * automated/tramp-tests.el (tramp-test29-vc-registered): Fallback for changed `vc-register' argument list. diff --git a/test/ChangeLog b/test/ChangeLog index fea4078..cc62818 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2014-12-03 Michael Albinus + + * automated/tramp-tests.el (tramp-test29-vc-registered): + Fallback for changed `vc-register' argument list. + 2014-12-03 Glenn Morris * automated/tramp-tests.el (tramp-test29-vc-registered): diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 2b2074c..c03b746 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1469,9 +1469,15 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (vc-create-repo (car vc-handled-backends)) ;; The structure of VC-FILESET is not documented. Let's ;; hope it won't change. - (vc-register - (list (car vc-handled-backends) - (list (file-name-nondirectory tmp-name2))))) + (condition-case nil + (vc-register + (list (car vc-handled-backends) + (list (file-name-nondirectory tmp-name2)))) + ;; `vc-register' has changed its arguments in Emacs 25.1. + (error + (vc-register + nil (list (car vc-handled-backends) + (list (file-name-nondirectory tmp-name2))))))) (should (vc-registered tmp-name2))) (ignore-errors (delete-directory tmp-name1 'recursive))))) commit 7385c3e643cbdac22ad7c5e4d36c41678716b4c5 Author: Glenn Morris Date: Tue Dec 2 22:15:54 2014 -0800 Fix tramp-tests, broken by incompatible vc.el change * test/automated/tramp-tests.el (tramp-test29-vc-registered): Update for recent incompatible change in vc-register. diff --git a/test/ChangeLog b/test/ChangeLog index c2c2d9b..fea4078 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2014-12-03 Glenn Morris + + * automated/tramp-tests.el (tramp-test29-vc-registered): + Update for recent incompatible change in vc-register. + 2014-11-29 Fabián Ezequiel Gallina * automated/python-tests.el diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 864a43d..2b2074c 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1470,8 +1470,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." ;; The structure of VC-FILESET is not documented. Let's ;; hope it won't change. (vc-register - nil (list (car vc-handled-backends) - (list (file-name-nondirectory tmp-name2))))) + (list (car vc-handled-backends) + (list (file-name-nondirectory tmp-name2))))) (should (vc-registered tmp-name2))) (ignore-errors (delete-directory tmp-name1 'recursive))))) commit e9b68bc258f30aa7d4c38ddf0a3e5bfa88c9d01d Author: Glenn Morris Date: Tue Dec 2 18:37:27 2014 -0500 * lisp/whitespace.el (whitespace-big-indent-regexp): Add :version. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c76a721..10d4888 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-02 Glenn Morris + + * whitespace.el (whitespace-big-indent-regexp): Add :version. + 2014-12-02 Eric S. Raymond * subr.el (filter): New macro. Because it's just silly for a Lisp diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 4edeff9..e4577d8 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -866,6 +866,7 @@ NOTE: Enclose always by \\\\( and \\\\) the elements to highlight. Use exactly one pair of enclosing \\\\( and \\\\). Used when `whitespace-style' includes `big-indent'." + :version "25.1" :type '(regexp :tag "Detect too much indentation at the beginning of a line") :group 'whitespace) commit 176a61738c8f393f288946d6142b5fdc1809921c Author: Eric S. Raymond Date: Tue Dec 2 16:18:06 2014 -0500 Add filter macro, which does what you expect. * subr.el (filter): New macro. Because it's just silly for a Lisp not to have this in 2014. And VC mode needs it. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 364d28e..c76a721 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,9 @@ 2014-12-02 Eric S. Raymond - * vc.el, all backends: API simplification: Abolish dir-status. + * subr.el (filter): New macro. Because it's just silly for a Lisp + not to have this in 2014. And VC needs it. + + * vc.el, all backends: API simplification: Abolish dir-status. It's replaced by dir-status-files. * vc.el, all backends: API simplification: Remove 4th diff --git a/lisp/subr.el b/lisp/subr.el index 6ce02b7..4cc80e9 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -222,6 +222,11 @@ Then evaluate RESULT to get return value, default nil. ,@(if (cdr (cdr spec)) `((setq ,(car spec) nil) ,@(cdr (cdr spec)))))))) +(defmacro filter (condp lst) + "Return the list consisting of elements in LST for which CONDP is not nil." + `(delq nil + (mapcar (lambda (x) (and (funcall ,condp x) x)) ,lst))) + (defmacro dotimes (spec &rest body) "Loop a certain number of times. Evaluate BODY with VAR bound to successive integers running from 0, commit b1a765b3a8586cd53c21579982c8fbc0ce534336 Author: Eric S. Raymond Date: Tue Dec 2 10:10:55 2014 -0500 In vc, abolish the dir-status method. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8226b3d..364d28e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-12-02 Eric S. Raymond + * vc.el, all backends: API simplification: Abolish dir-status. + It's replaced by dir-status-files. + * vc.el, all backends: API simplification: Remove 4th 'default-state' argument from vc-dir-status files and its backend methods - no backend method ever set it. It was used only in the diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index 1bdad2a..d1344f2 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el @@ -310,10 +310,11 @@ Only the value `maybe' can be trusted :-(." 'up-to-date 'edited))))))))) -;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher. +;; dir-status-files called from vc-dir, which loads vc, +;; which loads vc-dispatcher. (declare-function vc-exec-after "vc-dispatcher" (code)) -(defun vc-arch-dir-status (dir callback) +(defun vc-arch-dir-status-files (dir _files callback) "Run 'tla inventory' for DIR and pass results to CALLBACK. CALLBACK expects (ENTRIES &optional MORE-TO-COME); see `vc-dir-refresh'." diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index a534a1c..1963f4e 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -967,9 +967,9 @@ stream. Standard error output is discarded." (forward-line)) (funcall update-function result))) -(defun vc-bzr-dir-status (dir update-function) +(defun vc-bzr-dir-status-files (dir files update-function) "Return a list of conses (file . state) for DIR." - (vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S") + (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files) (vc-run-delayed (vc-bzr-after-dir-status update-function ;; "bzr status" results are relative to @@ -981,13 +981,6 @@ stream. Standard error output is discarded." ;; frob the results accordingly. (file-relative-name dir (vc-bzr-root dir))))) -(defun vc-bzr-dir-status-files (dir files update-function) - "Return a list of conses (file . state) for DIR." - (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files) - (vc-run-delayed - (vc-bzr-after-dir-status update-function - (file-relative-name dir (vc-bzr-root dir))))) - (defvar vc-bzr-shelve-map (let ((map (make-sparse-keymap))) ;; Turn off vc-dir marking diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index b07a05c..a5b50c1 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -1069,13 +1069,14 @@ state." (if basedir result (funcall update-function result)))) -(defun vc-cvs-dir-status (dir update-function) - "Create a list of conses (file . state) for DIR." - ;; FIXME check all files in DIR instead? +(defun vc-cvs-dir-status-files (dir files update-function) + "Create a list of conses (file . state) for FILES in DIR. +Query all files in DIR if files is nil." (let ((local (vc-cvs-stay-local-p dir))) - (if (and local (not (eq local 'only-file))) + (if (and (not files) local (not (eq local 'only-file))) (vc-cvs-dir-status-heuristic dir update-function) - (vc-cvs-command (current-buffer) 'async dir "-f" "status") + (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS))) + (vc-cvs-command (current-buffer) 'async dir "-f" "status" files) ;; Alternative implementation: use the "update" command instead of ;; the "status" command. ;; (vc-cvs-command (current-buffer) 'async @@ -1084,12 +1085,6 @@ state." (vc-run-delayed (vc-cvs-after-dir-status update-function))))) -(defun vc-cvs-dir-status-files (dir files update-function) - "Create a list of conses (file . state) for DIR." - (apply 'vc-cvs-command (current-buffer) 'async dir "-f" "status" files) - (vc-run-delayed - (vc-cvs-after-dir-status update-function))) - (defun vc-cvs-file-to-string (file) "Read the content of FILE and return it as a string." (condition-case nil diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index d97b9cd..7e4bc13 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -1097,7 +1097,7 @@ Throw an error if another update process is in progress." (setq default-directory def-dir) (erase-buffer) (vc-call-backend - backend 'dir-status def-dir + backend 'dir-status-files def-dir nil (lambda (entries &optional more-to-come) ;; ENTRIES is a list of (FILE VC_STATE EXTRA) items. ;; If MORE-TO-COME is true, then more updates will come from diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index fad834b..048857b 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -50,8 +50,7 @@ ;; STATE-QUERYING FUNCTIONS ;; * registered (file) OK ;; * state (file) OK -;; * dir-status (dir update-function) OK -;; - dir-status-files (dir files uf) NOT NEEDED +;; - dir-status-files (dir files uf) OK ;; * working-revision (file) OK ;; - latest-on-branch-p (file) NOT NEEDED ;; * checkout-model (files) OK @@ -474,15 +473,11 @@ or an empty string if none." (vc-run-delayed (vc-git-after-dir-status-stage stage files update-function))) -(defun vc-git-dir-status (_dir update-function) +(defun vc-git-dir-status-files (_dir files update-function) "Return a list of (FILE STATE EXTRA) entries for DIR." ;; Further things that would have to be fixed later: ;; - how to handle unregistered directories ;; - how to support vc-dir on a subdir of the project tree - (vc-git-dir-status-goto-stage 'update-index nil update-function)) - -(defun vc-git-dir-status-files (_dir files update-function) - "Return a list of (FILE STATE EXTRA) entries for FILES in DIR." (vc-git-dir-status-goto-stage 'update-index files update-function)) (defvar vc-git-stash-map diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index bfd1447..7099def 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -43,7 +43,6 @@ ;; STATE-QUERYING FUNCTIONS ;; * registered (file) OK ;; * state (file) OK -;; - dir-status (dir update-function) OK ;; - dir-status-files (dir files uf) OK ;; - dir-extra-headers (dir) OK ;; - dir-printer (fileinfo) OK @@ -613,11 +612,6 @@ REV is the revision to check out into WORKFILE." ;; Follows vc-exec-after. (declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) -(defun vc-hg-dir-status (dir update-function) - (vc-hg-command (current-buffer) 'async dir "status" "-C") - (vc-run-delayed - (vc-hg-after-dir-status update-function))) - (defun vc-hg-dir-status-files (dir files update-function) (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files) (vc-run-delayed diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 85aaf3d..f35e87e 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -126,10 +126,11 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ((match-end 2) (push (list (match-string 3) 'added) result)))) (funcall update-function result))) -;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher. +;; dir-status-files called from vc-dir, which loads vc, +;; which loads vc-dispatcher. (declare-function vc-exec-after "vc-dispatcher" (code)) -(defun vc-mtn-dir-status (dir update-function) +(defun vc-mtn-dir-status-files (dir _files update-function) (vc-mtn-command (current-buffer) 'async dir "status") (vc-run-delayed (vc-mtn-after-dir-status update-function))) diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 5b37586..20b292f 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -157,12 +157,10 @@ For a description of possible values, see `vc-check-master-templates'." (autoload 'vc-expand-dirs "vc") -(defun vc-rcs-dir-status (dir update-function) - ;; Doing individual vc-state calls is painful but there - ;; is no better way in RCS-land. - (let ((flist (vc-expand-dirs (list dir) 'RCS)) - (result nil)) - (dolist (file flist) +(defun vc-rcs-dir-status-files (dir files update-function) + (if (not files) (setq files (vc-expand-dirs (list dir) 'RCS))) + (let ((result nil)) + (dolist (file files) (let ((state (vc-state file)) (frel (file-relative-name file))) (when (and (eq (vc-backend file) 'RCS) diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 514748e..c7144c0 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -134,12 +134,10 @@ For a description of possible values, see `vc-check-master-templates'." (autoload 'vc-expand-dirs "vc") -(defun vc-sccs-dir-status (dir update-function) - ;; Doing lots of individual VC-state calls is painful, but - ;; there is no better option in SCCS-land. - (let ((flist (vc-expand-dirs (list dir) 'SCCS)) - (result nil)) - (dolist (file flist) +(defun vc-sccs-dir-status-files (dir files update-function) + (if (not files) (setq files (vc-expand-dirs (list dir) 'RCS))) + (let ((result nil)) + (dolist (file files) (let ((state (vc-state file)) (frel (file-relative-name file))) (when (and (eq (vc-backend file) 'SCCS) diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index a2ebeef..3186d72 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -31,8 +31,7 @@ ;; STATE-QUERYING FUNCTIONS ;; * registered (file) OK ;; * state (file) OK -;; * dir-status (dir update-function) OK -;; - dir-status-files (dir files uf) ?? +;; - dir-status-files (dir files uf) OK ;; - dir-extra-headers (dir) NOT NEEDED ;; - dir-printer (fileinfo) ?? ;; * working-revision (file) OK @@ -179,11 +178,11 @@ For a description of possible values, see `vc-check-master-templates'." (autoload 'vc-expand-dirs "vc") -(defun vc-src-dir-status (dir update-function) +(defun vc-src-dir-status-files (dir files update-function) ;; FIXME: Use one src status -a call for this - (let ((flist (vc-expand-dirs (list dir) 'SRC)) - (result nil)) - (dolist (file flist) + (if (not files) (setq files (vc-expand-dirs (list dir) 'RCS))) + (let ((result nil)) + (dolist (file files) (let ((state (vc-state file)) (frel (file-relative-name file))) (when (and (eq (vc-backend file) 'SRC) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 8ca8a09..abeeac0 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -195,22 +195,20 @@ If you want to force an empty list of arguments, use t." (setq result (cons (list filename state) result))))) (funcall callback result))) -;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher. +;; dir-status-files called from vc-dir, which loads vc, +;; which loads vc-dispatcher. (declare-function vc-exec-after "vc-dispatcher" (code)) -(defun vc-svn-dir-status (_dir callback) +(autoload 'vc-expand-dirs "vc") + +(defun vc-svn-dir-status-files (dir files callback) "Run 'svn status' for DIR and update BUFFER via CALLBACK. CALLBACK is called as (CALLBACK RESULT BUFFER), where RESULT is a list of conses (FILE . STATE) for directory DIR." - ;; FIXME should this rather be all the files in dir? - (vc-svn-command (current-buffer) 'async nil "status" "-u") + (if (not files) (setq files (vc-expand-dirs (list dir) 'SVN))) + (vc-svn-command (current-buffer) 'async nil "status" "-u" files) (vc-run-delayed (vc-svn-after-dir-status callback))) -(defun vc-svn-dir-status-files (_dir files callback) - (apply 'vc-svn-command (current-buffer) 'async nil "status" files) - (vc-run-delayed - (vc-svn-after-dir-status callback))) - (defun vc-svn-dir-extra-headers (_dir) "Generate extra status headers for a Subversion working copy." (let (process-file-side-effects) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index c4810cf..6e0e2c6 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -130,31 +130,32 @@ ;; reliable state computation; it is usually called immediately after ;; C-x v v. ;; -;; - dir-status (dir update-function) +;; - dir-status-files (dir files update-function) ;; ;; Produce RESULT: a list of lists of the form (FILE VC-STATE EXTRA) -;; for the files in DIR. +;; for FILES in DIR. If FILES is nil. report on all files in DIR. +;; (It is OK, though possibly inefficient, to ignore the FILES argument +;; and always report on all files in DIR.) +;; ;; EXTRA can be used for backend specific information about FILE. ;; If a command needs to be run to compute this list, it should be ;; run asynchronously using (current-buffer) as the buffer for the -;; command. When RESULT is computed, it should be passed back by -;; doing: (funcall UPDATE-FUNCTION RESULT nil). -;; If the backend uses a process filter, hence it produces partial results, -;; they can be passed back by doing: -;; (funcall UPDATE-FUNCTION RESULT t) -;; and then do a (funcall UPDATE-FUNCTION RESULT nil) -;; when all the results have been computed. +;; command. +;; +;; When RESULT is computed, it should be passed back by doing: +;; (funcall UPDATE-FUNCTION RESULT nil). If the backend uses a +;; process filter, hence it produces partial results, they can be +;; passed back by doing: (funcall UPDATE-FUNCTION RESULT t) and then +;; do a (funcall UPDATE-FUNCTION RESULT nil) when all the results +;; have been computed. +;; ;; To provide more backend specific functionality for `vc-dir' ;; the following functions might be needed: `dir-extra-headers', -;; `dir-printer', `extra-dir-menu' and `dir-status-files'. +;; `dir-printer', and `extra-dir-menu'. ;; -;; - dir-status-files (dir files update-function) -;; -;; This function is identical to dir-status except that it should -;; only report status for the specified FILES. Also it needs to -;; report on all requested files, including up-to-date or ignored -;; files. If not provided, the default is to consider that the files -;; are in 'up-to-date state. +;; This function should report on all requested files, including +;; up-to-date or ignored files. If it is not provided, the default is to +;; consider that all files are in 'up-to-date state. ;; ;; - dir-extra-headers (dir) ;; @@ -389,7 +390,6 @@ ;; the backend command. It should return a status of either 0 (no ;; differences found), or 1 (either non-empty diff or the diff is ;; run asynchronously). - ;; ;; - revision-completion-table (files) ;; @@ -580,6 +580,9 @@ ;; - INCOMPATIBLE CHANGE: The old fourth 'default-state' argument of ;; vc-dir-status-files is gone; none of the back ends actually used it. ;; +;; - vc-dir-status is no longer a public method; it has been replaced +;; by vc-dir-status-files. +;; ;; - vc-state-heuristic is no longer a public method (the CVS backend ;; retains it as a private one). ;; @@ -632,12 +635,13 @@ ;; ;;;; Internal cleanups: ;; -;; - Another important thing: merge all the status-like backend operations. -;; We should remove dir-status, state, and dir-status-files, and -;; replace them with just `status' which takes a fileset and a continuation -;; (like dir-status) and returns a buffer in which the process(es) are run -;; (or nil if it worked synchronously). Hopefully we can define the old -;; 4 operations in term of this one. +;; - Another important thing: merge all the status-like backend +;; operations. We should remove dir-status-files and state and +;; replace them with just `status' which takes a fileset and a +;; continuation (like dir-status-files) and returns a buffer in +;; which the process(es) are run (or nil if it worked +;; synchronously). Hopefully we can define the old operations in +;; term of this one. ;; ;;;; Unify two different versions of the amend capability ;; commit dd601050e7db69f322eea09d99751d8e6363b153 Author: Eli Zaretskii Date: Tue Dec 2 16:13:47 2014 +0200 Allow to search for characters whose bidi directionality was overridden. src/bidi.c (bidi_find_first_overridden): New function. src/xdisp.c (Fbidi_find_overridden_directionality): New function. (syms_of_xdisp): Defsubr it. src/dispextern.h (bidi_find_first_overridden): Add prototype. doc/lispref/display.texi (Bidirectional Display): Document 'bidi-find-overridden-directionality'. etc/NEWS: Mention 'bidi-find-overridden-directionality'. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 31a9cbf..f98e457 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2014-12-02 Eli Zaretskii + + * display.texi (Bidirectional Display): Document + 'bidi-find-overridden-directionality'. + 2014-11-29 Paul Eggert Lessen focus on ChangeLog files, as opposed to change log entries. diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 4cb06dd..59f7322 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -6800,3 +6800,57 @@ affect all Emacs frames and windows. appropriate mirrored character in the reordered text. Lisp programs can affect the mirrored display by changing this property. Again, any such changes affect all of Emacs display. + +@cindex overriding bidirectional properties +@cindex directional overrides +@cindex LRO +@cindex RLO + The bidirectional properties of characters can be overridden by +inserting into the text special directional control characters, +LEFT-TO-RIGHT OVERRIDE (@acronym{LRO}) and RIGHT-TO-LEFT OVERRIDE +(@acronym{RLO}). Any characters between a @acronym{RLO} and the +following newline or POP DIRECTIONAL FORMATTING (@acronym{PDF}) +control character, whichever comes first, will be displayed as if they +were strong right-to-left characters, i.e.@: they will be reversed on +display. Similarly, any characters between @acronym{LRO} and +@acronym{PDF} or newline will display as if they were strong +left-to-right, and will @emph{not} be reversed even if they are strong +right-to-left characters. + +@cindex phishing using directional overrides +@cindex malicious use of directional overrides + These overrides are useful when you want to make some text +unaffected by the reordering algorithm, and instead directly control +the display order. But they can also be used for malicious purposes, +known as @dfn{phishing}. Specifically, a URL on a Web page or a link +in an email message can be manipulated to make its visual appearance +unrecognizable, or similar to some popular benign location, while the +real location, interpreted by a browser in the logical order, is very +different. + + Emacs provides a primitive that applications can use to detect +instances of text whose bidirectional properties were overridden so as +to make a left-to-right character display as if it were a +right-to-left character, or vise versa. + +@defun bidi-find-overridden-directionality from to &optional object +This function looks at the text of the specified @var{object} between +positions @var{from} (inclusive) and @var{to} (exclusive), and returns +the first position where it finds a strong left-to-right character +whose directional properties were forced to display the character as +right-to-left, or for a strong right-to-left character that was forced +to display as left-to-right. If it finds no such characters in the +specified region of text, it returns @code{nil}. + +The optional argument @var{object} specifies which text to search, and +defaults to the current buffer. If @var{object} is non-@code{nil}, it +can be some other buffer, or it can be a string or a window. If it is +a string, the function searches that string. If it is a window, the +function searches the buffer displayed in that window. If a buffer +whose text you want to examine is displayed in some window, we +recommend to specify it by that window, rather than pass the buffer to +the function. This is because telling the function about the window +allows it to correctly account for window-specific overlays, which +might change the result of the function if some text in the buffer is +covered by overlays. +@end defun diff --git a/etc/ChangeLog b/etc/ChangeLog index 09dfd7f..4f672df 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-12-02 Eli Zaretskii + + * NEWS: Mention 'bidi-find-overridden-directionality'. + 2014-11-29 Paul Eggert Lessen focus on ChangeLog files, as opposed to change log entries. diff --git a/etc/NEWS b/etc/NEWS index 6c636cf..bb016ee 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -98,6 +98,13 @@ environment. For the time being this is implemented for modern POSIX systems and for MS-Windows, for other systems they fall back to their counterparts `string-lessp' and `string-equal'. ++++ +** The new function `bidi-find-overridden-directionality' allows to +find characters whose directionality was, perhaps maliciously, +overridden by directional override control characters. Lisp programs +can use this to detect potential phishing of URLs and other links that +exploits bidirectional display reordering. + *** The ls-lisp package uses `string-collate-lessp' to sort file names. If you want the old, locale-independent sorting, customize the new option `ls-lisp-use-string-collate' to a nil value. diff --git a/src/ChangeLog b/src/ChangeLog index 5c33765..7dc2b92 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2014-12-02 Eli Zaretskii + + * bidi.c (bidi_find_first_overridden): New function. + + * xdisp.c (Fbidi_find_overridden_directionality): New function. + (syms_of_xdisp): Defsubr it. + + * dispextern.h (bidi_find_first_overridden): Add prototype. + 2014-12-02 Jan Djärv * nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep diff --git a/src/bidi.c b/src/bidi.c index 225acd9..a0bcf52 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -3376,6 +3376,33 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it) UNGCPRO; } +/* Utility function for looking for strong directional characters + whose bidi type was overridden by a directional override. */ +ptrdiff_t +bidi_find_first_overridden (struct bidi_it *bidi_it) +{ + ptrdiff_t found_pos = ZV; + + do + { + /* Need to call bidi_resolve_weak, not bidi_resolve_explicit, + because the directional overrides are applied by the + former. */ + bidi_type_t type = bidi_resolve_weak (bidi_it); + + if ((type == STRONG_R && bidi_it->orig_type == STRONG_L) + || (type == STRONG_L + && (bidi_it->orig_type == STRONG_R + || bidi_it->orig_type == STRONG_AL))) + found_pos = bidi_it->charpos; + } while (found_pos == ZV + && bidi_it->charpos < ZV + && bidi_it->ch != BIDI_EOB + && bidi_it->ch != '\n'); + + return found_pos; +} + /* This is meant to be called from within the debugger, whenever you wish to examine the cache contents. */ void bidi_dump_cached_states (void) EXTERNALLY_VISIBLE; diff --git a/src/dispextern.h b/src/dispextern.h index 0dd0887..0ee5fd6 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3173,6 +3173,7 @@ extern void bidi_push_it (struct bidi_it *); extern void bidi_pop_it (struct bidi_it *); extern void *bidi_shelve_cache (void); extern void bidi_unshelve_cache (void *, bool); +extern ptrdiff_t bidi_find_first_overridden (struct bidi_it *); /* Defined in xdisp.c */ diff --git a/src/xdisp.c b/src/xdisp.c index 989cbd1..0d31468 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21032,6 +21032,143 @@ See also `bidi-paragraph-direction'. */) } } +DEFUN ("bidi-find-overridden-directionality", + Fbidi_find_overridden_directionality, + Sbidi_find_overridden_directionality, 2, 3, 0, + doc: /* Return position between FROM and TO where directionality was overridden. + +This function returns the first character position in the specified +region of OBJECT where there is a character whose `bidi-class' property +is `L', but which was forced to display as `R' by a directional +override, and likewise with characters whose `bidi-class' is `R' +or `AL' that were forced to display as `L'. + +If no such character is found, the function returns nil. + +OBJECT is a Lisp string or buffer to search for overridden +directionality, and defaults to the current buffer if nil or omitted. +OBJECT can also be a window, in which case the function will search +the buffer displayed in that window. Passing the window instead of +a buffer is preferable when the buffer is displayed in some window, +because this function will then be able to correctly account for +window-specific overlays, which can affect the results. + +Strong directional characters `L', `R', and `AL' can have their +intrinsic directionality overridden by directional override +control characters RLO \(u+202e) and LRO \(u+202d). See the +function `get-char-code-property' for a way to inquire about +the `bidi-class' property of a character. */) + (Lisp_Object from, Lisp_Object to, Lisp_Object object) +{ + struct buffer *buf = current_buffer; + struct buffer *old = buf; + struct window *w = NULL; + bool frame_window_p = FRAME_WINDOW_P (SELECTED_FRAME ()); + struct bidi_it itb; + ptrdiff_t from_pos, to_pos, from_bpos; + void *itb_data; + + if (!NILP (object)) + { + if (BUFFERP (object)) + buf = XBUFFER (object); + else if (WINDOWP (object)) + { + w = decode_live_window (object); + buf = XBUFFER (w->contents); + frame_window_p = FRAME_WINDOW_P (XFRAME (w->frame)); + } + else + CHECK_STRING (object); + } + + if (STRINGP (object)) + { + /* Characters in unibyte strings are always treated by bidi.c as + strong LTR. */ + if (!STRING_MULTIBYTE (object) + /* When we are loading loadup.el, the character property + tables needed for bidi iteration are not yet + available. */ + || !NILP (Vpurify_flag)) + return Qnil; + + validate_subarray (object, from, to, SCHARS (object), &from_pos, &to_pos); + if (from_pos >= SCHARS (object)) + return Qnil; + + /* Set up the bidi iterator. */ + itb_data = bidi_shelve_cache (); + itb.paragraph_dir = NEUTRAL_DIR; + itb.string.lstring = object; + itb.string.s = NULL; + itb.string.schars = SCHARS (object); + itb.string.bufpos = 0; + itb.string.from_disp_str = 0; + itb.string.unibyte = 0; + itb.w = w; + bidi_init_it (0, 0, frame_window_p, &itb); + } + else + { + /* Nothing this fancy can happen in unibyte buffers, or in a + buffer that disabled reordering, or if FROM is at EOB. */ + if (NILP (BVAR (buf, bidi_display_reordering)) + || NILP (BVAR (buf, enable_multibyte_characters)) + /* When we are loading loadup.el, the character property + tables needed for bidi iteration are not yet + available. */ + || !NILP (Vpurify_flag)) + return Qnil; + + set_buffer_temp (buf); + validate_region (&from, &to); + from_pos = XINT (from); + to_pos = XINT (to); + if (from_pos >= ZV) + return Qnil; + + /* Set up the bidi iterator. */ + itb_data = bidi_shelve_cache (); + from_bpos = CHAR_TO_BYTE (from_pos); + if (from_pos == BEGV) + { + itb.charpos = BEGV; + itb.bytepos = BEGV_BYTE; + } + else if (FETCH_CHAR (from_bpos - 1) == '\n') + { + itb.charpos = from_pos; + itb.bytepos = from_bpos; + } + else + itb.charpos = find_newline_no_quit (from_pos, CHAR_TO_BYTE (from_pos), + -1, &itb.bytepos); + itb.paragraph_dir = NEUTRAL_DIR; + itb.string.s = NULL; + itb.string.lstring = Qnil; + itb.string.bufpos = 0; + itb.string.from_disp_str = 0; + itb.string.unibyte = 0; + itb.w = w; + bidi_init_it (itb.charpos, itb.bytepos, frame_window_p, &itb); + } + + ptrdiff_t found; + do { + /* For the purposes of this function, the actual base direction of + the paragraph doesn't matter, so just set it to L2R. */ + bidi_paragraph_init (L2R, &itb, 0); + while ((found = bidi_find_first_overridden (&itb)) < from_pos) + ; + } while (found == ZV && itb.ch == '\n' && itb.charpos < to_pos); + + bidi_unshelve_cache (itb_data, 0); + set_buffer_temp (old); + + return (from_pos <= found && found < to_pos) ? make_number (found) : Qnil; +} + DEFUN ("move-point-visually", Fmove_point_visually, Smove_point_visually, 1, 1, 0, doc: /* Move point in the visual order in the specified DIRECTION. @@ -30461,6 +30598,7 @@ syms_of_xdisp (void) defsubr (&Scurrent_bidi_paragraph_direction); defsubr (&Swindow_text_pixel_size); defsubr (&Smove_point_visually); + defsubr (&Sbidi_find_overridden_directionality); DEFSYM (Qmenu_bar_update_hook, "menu-bar-update-hook"); DEFSYM (Qoverriding_terminal_local_map, "overriding-terminal-local-map"); commit a92789b1fccf7ae9a39ec1cc9316a18e01d905bb Author: Jan Djärv Date: Tue Dec 2 14:30:47 2014 +0100 Fixes: debbugs:9133 * nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep to nil after release. diff --git a/src/ChangeLog b/src/ChangeLog index c977eb4..5c33765 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-12-02 Jan Djärv + + * nsimage.m (initFromSkipXBM:width:height:flip:length:): Set bmRep + to nil after release (Bug#9133). + 2014-11-30 Paul Eggert Port better to AddressSanitizer. diff --git a/src/nsimage.m b/src/nsimage.m index 580d8f3..7b67da0 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -247,6 +247,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a) if (s >= bits + length) { [bmRep release]; + bmRep = nil; return nil; } #define hexchar(x) ('0' <= (x) && (x) <= '9' ? (x) - '0' : (x) - 'a' + 10) commit d9d383147219f8e6a90d4c177e1b454e19acfac9 Author: Jan Djärv Date: Tue Dec 2 14:05:27 2014 +0100 More flicker fixes for OSX, related to bug 18757. * nsfns.m (ns_set_name_as_filename): Don't set represented filename at once, call ns_set_represented_filename instead. * nsterm.h: Declare ns_set_represented_filename. * nsterm.m (represented_filename, represented_frame): New variables. (ns_set_represented_filename): New function. (sendEvent:): Set represented filename here to avoid flicker, related to Bug#18757. diff --git a/src/ChangeLog b/src/ChangeLog index 5ecb022..952e4ab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2014-12-02 Jan Djärv + + * nsterm.m (represented_filename, represented_frame): New variables. + (ns_set_represented_filename): New function. + (sendEvent:): Set represented filename here to avoid flicker, + related to Bug#18757. + + * nsterm.h: Declare ns_set_represented_filename. + + * nsfns.m (ns_set_name_as_filename): Don't set represented filename + at once, call ns_set_represented_filename instead. + 2014-11-27 Eli Zaretskii * xdisp.c (handle_single_display_spec): When ignoring a fringe diff --git a/src/nsfns.m b/src/nsfns.m index e0f8cfe..ec4761b 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -621,18 +621,11 @@ ns_set_name_as_filename (struct frame *f) fstr = [NSString stringWithUTF8String: SSDATA (encoded_filename)]; if (fstr == nil) fstr = @""; -#ifdef NS_IMPL_COCOA - /* work around a bug observed on 10.3 and later where - setTitleWithRepresentedFilename does not clear out previous state - if given filename does not exist */ - if (! [[NSFileManager defaultManager] fileExistsAtPath: fstr]) - [[view window] setRepresentedFilename: @""]; -#endif } else fstr = @""; - [[view window] setRepresentedFilename: fstr]; + ns_set_represented_filename (fstr, f); [[view window] setTitle: str]; fset_name (f, name); } diff --git a/src/nsterm.h b/src/nsterm.h index 1c3fda8..115d7ac 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -895,11 +895,15 @@ extern int ns_select (int nfds, fd_set *readfds, fd_set *writefds, extern unsigned long ns_get_rgb_color (struct frame *f, float r, float g, float b, float a); -/* From nsterm.m, needed in nsfont.m. */ #ifdef __OBJC__ +/* From nsterm.m, needed in nsfont.m. */ extern void ns_draw_text_decoration (struct glyph_string *s, struct face *face, NSColor *defaultCol, CGFloat width, CGFloat x); +/* Needed in nsfns.m. */ +extern void +ns_set_represented_filename (NSString* fstr, struct frame *f); + #endif #ifdef NS_IMPL_GNUSTEP diff --git a/src/nsterm.m b/src/nsterm.m index 7e2d4be..656d866 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -290,6 +290,9 @@ static struct { NULL, 0, 0 }; +static NSString *represented_filename = nil; +static struct frame *represented_frame = 0; + #ifdef NS_IMPL_COCOA /* * State for pending menu activation: @@ -396,6 +399,14 @@ void x_set_frame_alpha (struct frame *f); ========================================================================== */ +void +ns_set_represented_filename (NSString* fstr, struct frame *f) +{ + represented_filename = [fstr retain]; + represented_frame = f; +} + + static void hold_event (struct input_event *event) { @@ -4560,6 +4571,23 @@ ns_term_shutdown (int sig) } #endif + if (represented_filename != nil && represented_frame) + { + NSString *fstr = represented_filename; + NSView *view = FRAME_NS_VIEW (represented_frame); +#ifdef NS_IMPL_COCOA + /* work around a bug observed on 10.3 and later where + setTitleWithRepresentedFilename does not clear out previous state + if given filename does not exist */ + if (! [[NSFileManager defaultManager] fileExistsAtPath: fstr]) + [[view window] setRepresentedFilename: @""]; +#endif + [[view window] setRepresentedFilename: fstr]; + [represented_filename release]; + represented_filename = nil; + represented_frame = NULL; + } + if (type == NSApplicationDefined) { switch ([theEvent data2]) commit d4767877aca091ee1a04608e2b50b346745661d4 Author: Eric S. Raymond Date: Tue Dec 2 08:01:46 2014 -0500 Eliminate an unuted function argument. * vc.el, all backends: API simplification: Remove 4th 'default-state' argument from vc-dir-status files and its backend methods - no backend method ever set it. It was used only in the fallback method to to set a default of 'up-to-date, though a convoluted call chain obscured this. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ffdd0a..8226b3d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2014-12-02 Eric S. Raymond + * vc.el, all backends: API simplification: Remove 4th + 'default-state' argument from vc-dir-status files and its backend + methods - no backend method ever set it. It was used only in the + fallback method to to set a default of 'up-to-date, though a + convoluted call chain obscured this. + * vc-hooks.el: Bind vc-delete-file to Ctrl-x v delete. * vc.el (vc-expand-dirs): Now takes a second BACKEND argument, @@ -21,7 +27,7 @@ global. * vc-bzr.el: Restore vc-bzr-state-heuristic as a private method. - VC randomly/unpredictable fails without it; cause not yet established. + VC randomly/unpredictably fails without it; cause not yet established. 2014-12-01 Stefan Monnier diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index de6ae21..a534a1c 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -981,7 +981,7 @@ stream. Standard error output is discarded." ;; frob the results accordingly. (file-relative-name dir (vc-bzr-root dir))))) -(defun vc-bzr-dir-status-files (dir files _default-state update-function) +(defun vc-bzr-dir-status-files (dir files update-function) "Return a list of conses (file . state) for DIR." (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files) (vc-run-delayed diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 41c5326..b07a05c 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -1084,7 +1084,7 @@ state." (vc-run-delayed (vc-cvs-after-dir-status update-function))))) -(defun vc-cvs-dir-status-files (dir files _default-state update-function) +(defun vc-cvs-dir-status-files (dir files update-function) "Create a list of conses (file . state) for DIR." (apply 'vc-cvs-command (current-buffer) 'async dir "-f" "status" files) (vc-run-delayed diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index a26287a..d97b9cd 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -1014,8 +1014,8 @@ specific headers." (vc-call-backend backend 'dir-extra-headers dir) "\n")) -(defun vc-dir-refresh-files (files default-state) - "Refresh some files in the *VC-dir* buffer." +(defun vc-dir-refresh-files (files) + "Refresh some fies in the *VC-dir* buffer." (let ((def-dir default-directory) (backend vc-dir-backend)) (vc-set-mode-line-busy-indicator) @@ -1032,7 +1032,7 @@ specific headers." (setq default-directory def-dir) (erase-buffer) (vc-call-backend - backend 'dir-status-files def-dir files default-state + backend 'dir-status-files def-dir files (lambda (entries &optional more-to-come) ;; ENTRIES is a list of (FILE VC_STATE EXTRA) items. ;; If MORE-TO-COME is true, then more updates will come from @@ -1110,8 +1110,7 @@ Throw an error if another update process is in progress." vc-ewoc 'vc-dir-fileinfo->needs-update))) (if remaining (vc-dir-refresh-files - (mapcar 'vc-dir-fileinfo->name remaining) - 'up-to-date) + (mapcar 'vc-dir-fileinfo->name remaining)) (setq mode-line-process nil)))))))))))) (defun vc-dir-show-fileentry (file) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 3538f2c..fad834b 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -51,7 +51,7 @@ ;; * registered (file) OK ;; * state (file) OK ;; * dir-status (dir update-function) OK -;; - dir-status-files (dir files ds uf) NOT NEEDED +;; - dir-status-files (dir files uf) NOT NEEDED ;; * working-revision (file) OK ;; - latest-on-branch-p (file) NOT NEEDED ;; * checkout-model (files) OK @@ -481,7 +481,7 @@ or an empty string if none." ;; - how to support vc-dir on a subdir of the project tree (vc-git-dir-status-goto-stage 'update-index nil update-function)) -(defun vc-git-dir-status-files (_dir files _default-state update-function) +(defun vc-git-dir-status-files (_dir files update-function) "Return a list of (FILE STATE EXTRA) entries for FILES in DIR." (vc-git-dir-status-goto-stage 'update-index files update-function)) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 35f5354..bfd1447 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -44,7 +44,7 @@ ;; * registered (file) OK ;; * state (file) OK ;; - dir-status (dir update-function) OK -;; - dir-status-files (dir files ds uf) OK +;; - dir-status-files (dir files uf) OK ;; - dir-extra-headers (dir) OK ;; - dir-printer (fileinfo) OK ;; * working-revision (file) OK @@ -618,7 +618,7 @@ REV is the revision to check out into WORKFILE." (vc-run-delayed (vc-hg-after-dir-status update-function))) -(defun vc-hg-dir-status-files (dir files _default-state update-function) +(defun vc-hg-dir-status-files (dir files update-function) (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files) (vc-run-delayed (vc-hg-after-dir-status update-function))) diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 9e17d05..a2ebeef 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -32,7 +32,7 @@ ;; * registered (file) OK ;; * state (file) OK ;; * dir-status (dir update-function) OK -;; - dir-status-files (dir files ds uf) ?? +;; - dir-status-files (dir files uf) ?? ;; - dir-extra-headers (dir) NOT NEEDED ;; - dir-printer (fileinfo) ?? ;; * working-revision (file) OK diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 55b8f11..8ca8a09 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -206,7 +206,7 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." (vc-svn-command (current-buffer) 'async nil "status" "-u") (vc-run-delayed (vc-svn-after-dir-status callback))) -(defun vc-svn-dir-status-files (_dir files _default-state callback) +(defun vc-svn-dir-status-files (_dir files callback) (apply 'vc-svn-command (current-buffer) 'async nil "status" files) (vc-run-delayed (vc-svn-after-dir-status callback))) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 1b82bfd..c4810cf 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -148,13 +148,13 @@ ;; the following functions might be needed: `dir-extra-headers', ;; `dir-printer', `extra-dir-menu' and `dir-status-files'. ;; -;; - dir-status-files (dir files default-state update-function) +;; - dir-status-files (dir files update-function) ;; ;; This function is identical to dir-status except that it should ;; only report status for the specified FILES. Also it needs to ;; report on all requested files, including up-to-date or ignored ;; files. If not provided, the default is to consider that the files -;; are in DEFAULT-STATE. +;; are in 'up-to-date state. ;; ;; - dir-extra-headers (dir) ;; @@ -577,6 +577,9 @@ ;; (This fixes a layer violation that produced bad behavior under ;; SVN.) ;; +;; - INCOMPATIBLE CHANGE: The old fourth 'default-state' argument of +;; vc-dir-status-files is gone; none of the back ends actually used it. +;; ;; - vc-state-heuristic is no longer a public method (the CVS backend ;; retains it as a private one). ;; @@ -2884,9 +2887,9 @@ to provide the `find-revision' operation instead." (defalias 'vc-default-revision-completion-table 'ignore) (defalias 'vc-default-mark-resolved 'ignore) -(defun vc-default-dir-status-files (_backend _dir files default-state update-function) +(defun vc-default-dir-status-files (_backend _dir files update-function) (funcall update-function - (mapcar (lambda (file) (list file default-state)) files))) + (mapcar (lambda (file) (list file 'up-to-date)) files))) (defun vc-check-headers () "Check if the current file has any headers in it." commit e6fe301afe4bbc707d2fde44a5250b84418d2b1b Author: Eric S. Raymond Date: Tue Dec 2 05:31:04 2014 -0500 Another longstanding to-do: bind vc-delete-file. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d005cbe..6ffdd0a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2014-12-02 Eric S. Raymond + * vc-hooks.el: Bind vc-delete-file to Ctrl-x v delete. + + * vc.el (vc-expand-dirs): Now takes a second BACKEND argument, + improving behavior on directories using multiple file-oriented + VCSes. + * vc/vc.el and all backends: API simplification; clear-headers is no longer a public method. It is now local to the one place it's used, in the RCS steal-lock method. diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index c4acef9..61918c9 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -893,6 +893,7 @@ current, and kill the buffer that visits the link." (define-key map "=" 'vc-diff) (define-key map "D" 'vc-root-diff) (define-key map "~" 'vc-revision-other-window) + (define-key map "[delete]" 'vc-delete-file) map)) (fset 'vc-prefix-map vc-prefix-map) (define-key ctl-x-map "v" 'vc-prefix-map) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index ad3a2c4..1b82bfd 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -602,15 +602,13 @@ ;;; Todo: -;; - Add key-binding for vc-delete-file. - ;;;; New Primitives: ;; ;; - deal with push operations. ;; ;;;; Primitives that need changing: ;; -;; - vc-update/vc-merge should deal with VC systems that don't +;; - vc-update/vc-merge should deal with VC systems that don't do ;; update/merge on a file basis, but on a whole repository basis. ;; vc-update and vc-merge assume the arguments are always files, ;; they don't deal with directories. Make sure the *vc-dir* buffer commit 92411a0d2e8a78e2eb05fa26e8a9bd978d5e01fe Author: Eric S. Raymond Date: Tue Dec 2 04:38:08 2014 -0500 Clean up a longstanding to-do item. * vc.el (vc-expand-dirs): Now takes a second BACKEND argument, improving behavior on directories using multiple file-oriented VCSEs. diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 40a1027..5b37586 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -158,14 +158,9 @@ For a description of possible values, see `vc-check-master-templates'." (autoload 'vc-expand-dirs "vc") (defun vc-rcs-dir-status (dir update-function) - ;; FIXME: this function should be rewritten or `vc-expand-dirs' - ;; should be changed to take a backend parameter. Using - ;; `vc-expand-dirs' is not TRTD because it returns files from - ;; multiple backends. It should also return 'unregistered files. - ;; Doing individual vc-state calls is painful but there ;; is no better way in RCS-land. - (let ((flist (vc-expand-dirs (list dir))) + (let ((flist (vc-expand-dirs (list dir) 'RCS)) (result nil)) (dolist (file flist) (let ((state (vc-state file)) @@ -319,7 +314,7 @@ whether to remove it." "RCS-specific version of `vc-backend-checkin'." (let (rev (switches (vc-switches 'RCS 'checkin))) ;; Now operate on the files - (dolist (file (vc-expand-dirs files)) + (dolist (file (vc-expand-dirs files 'RCS)) (let ((old-version (vc-working-revision file)) new-version (default-branch (vc-file-getprop file 'vc-rcs-default-branch))) ;; Force branch creation if an appropriate @@ -378,7 +373,7 @@ whether to remove it." "Retrieve a copy of a saved version of FILE. If FILE is a directory, attempt the checkout for all registered files beneath it." (if (file-directory-p file) - (mapc 'vc-rcs-checkout (vc-expand-dirs (list file))) + (mapc 'vc-rcs-checkout (vc-expand-dirs (list file) 'RCS)) (let ((file-buffer (get-file-buffer file)) switches) (message "Checking out %s..." file) @@ -445,7 +440,7 @@ attempt the checkout for all registered files beneath it." expanded to all registered subfiles in them." (if (not files) (error "RCS backend doesn't support directory-level rollback")) - (dolist (file (vc-expand-dirs files)) + (dolist (file (vc-expand-dirs files 'RCS)) (let* ((discard (vc-working-revision file)) (previous (if (vc-rcs-trunk-p discard) "" (vc-branch-part discard))) (config (current-window-configuration)) @@ -481,7 +476,7 @@ expanded to all registered subfiles in them." "Revert FILE to the version it was based on. If FILE is a directory, revert all registered files beneath it." (if (file-directory-p file) - (mapc 'vc-rcs-revert (vc-expand-dirs (list file))) + (mapc 'vc-rcs-revert (vc-expand-dirs (list file) 'RCS)) (vc-do-command "*vc*" 0 "co" (vc-master-name file) "-f" (concat (if (eq (vc-state file) 'edited) "-u" "-r") (vc-working-revision file))))) @@ -524,7 +519,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." If FILE is a directory, steal the lock on all registered files beneath it. Needs RCS 5.6.2 or later for -M." (if (file-directory-p file) - (mapc 'vc-rcs-steal-lock (vc-expand-dirs (list file))) + (mapc 'vc-rcs-steal-lock (vc-expand-dirs (list file) 'RCS)) (vc-do-command "*vc*" 0 "rcs" (vc-master-name file) "-M" (concat "-u" rev)) ;; Do a real checkout after stealing the lock, so that we see ;; expanded headers. @@ -548,7 +543,7 @@ Needs RCS 5.6.2 or later for -M." (defun vc-rcs-modify-change-comment (files rev comment) "Modify the change comments change on FILES on a specified REV. If FILE is a directory the operation is applied to all registered files beneath it." - (dolist (file (vc-expand-dirs files)) + (dolist (file (vc-expand-dirs files 'RCS)) (vc-do-command "*vc*" 0 "rcs" (vc-master-name file) (concat "-m" rev ":" comment)))) @@ -575,7 +570,7 @@ Remaining arguments are ignored. If FILE is a directory the operation is applied to all registered files beneath it." (vc-do-command (or buffer "*vc*") 0 "rlog" - (mapcar 'vc-master-name (vc-expand-dirs files))) + (mapcar 'vc-master-name (vc-expand-dirs files 'RCS))) (with-current-buffer (or buffer "*vc*") (vc-rcs-print-log-cleanup)) (when limit 'limit-unsupported)) @@ -584,7 +579,7 @@ files beneath it." "Get a difference report using RCS between two sets of files." (apply #'vc-do-command (or buffer "*vc-diff*") (if async 'async 1) - "rcsdiff" (vc-expand-dirs files) + "rcsdiff" (vc-expand-dirs files 'RCS) (append (list "-q" (and oldvers (concat "-r" oldvers)) (and newvers (concat "-r" newvers))) diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 8a9e0b1..514748e 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -135,13 +135,9 @@ For a description of possible values, see `vc-check-master-templates'." (autoload 'vc-expand-dirs "vc") (defun vc-sccs-dir-status (dir update-function) - ;; FIXME: this function should be rewritten, using `vc-expand-dirs' - ;; is not TRTD because it returns files from multiple backends. - ;; It should also return 'unregistered files. - ;; Doing lots of individual VC-state calls is painful, but ;; there is no better option in SCCS-land. - (let ((flist (vc-expand-dirs (list dir))) + (let ((flist (vc-expand-dirs (list dir) 'SCCS)) (result nil)) (dolist (file flist) (let ((state (vc-state file)) @@ -232,7 +228,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." (defun vc-sccs-checkin (files comment) "SCCS-specific version of `vc-backend-checkin'." - (dolist (file (vc-expand-dirs files)) + (dolist (file (vc-expand-dirs files 'SCCS)) (apply 'vc-sccs-do-command nil 0 "delta" (vc-master-name file) (concat "-y" comment) (vc-switches 'SCCS 'checkin)) @@ -255,7 +251,7 @@ If FILE is a directory, all version-controlled files beneath are checked out. EDITABLE non-nil means that the file should be writable and locked. REV is the revision to check out." (if (file-directory-p file) - (mapc 'vc-sccs-checkout (vc-expand-dirs (list file))) + (mapc 'vc-sccs-checkout (vc-expand-dirs (list file) 'SCCS)) (let ((file-buffer (get-file-buffer file)) switches) (message "Checking out %s..." file) @@ -284,7 +280,7 @@ locked. REV is the revision to check out." (defun vc-sccs-rollback (files) "Roll back, undoing the most recent checkins of FILES. Directories are expanded to all version-controlled subfiles." - (setq files (vc-expand-dirs files)) + (setq files (vc-expand-dirs files 'SCCS)) (if (not files) (error "SCCS backend doesn't support directory-level rollback")) (dolist (file files) @@ -301,7 +297,7 @@ are expanded to all version-controlled subfiles." "Revert FILE to the version it was based on. If FILE is a directory, revert all subfiles." (if (file-directory-p file) - (mapc 'vc-sccs-revert (vc-expand-dirs (list file))) + (mapc 'vc-sccs-revert (vc-expand-dirs (list file) 'SCCS)) (vc-sccs-do-command nil 0 "unget" (vc-master-name file)) (vc-sccs-do-command nil 0 "get" (vc-master-name file)) ;; Checking out explicit revisions is not supported under SCCS, yet. @@ -312,7 +308,7 @@ revert all subfiles." (defun vc-sccs-steal-lock (file &optional rev) "Steal the lock on the current workfile for FILE and revision REV." (if (file-directory-p file) - (mapc 'vc-sccs-steal-lock (vc-expand-dirs (list file))) + (mapc 'vc-sccs-steal-lock (vc-expand-dirs (list file) 'SCCS)) (vc-sccs-do-command nil 0 "unget" (vc-master-name file) "-n" (if rev (concat "-r" rev))) (vc-sccs-do-command nil 0 "get" @@ -320,7 +316,7 @@ revert all subfiles." (defun vc-sccs-modify-change-comment (files rev comment) "Modify (actually, append to) the change comments for FILES on a specified REV." - (dolist (file (vc-expand-dirs files)) + (dolist (file (vc-expand-dirs files 'SCCS)) (vc-sccs-do-command nil 0 "cdc" (vc-master-name file) (concat "-y" comment) (concat "-r" rev)))) @@ -332,7 +328,7 @@ revert all subfiles." (defun vc-sccs-print-log (files buffer &optional _shortlog _start-revision-ignored limit) "Print commit log associated with FILES into specified BUFFER. Remaining arguments are ignored." - (setq files (vc-expand-dirs files)) + (setq files (vc-expand-dirs files 'SCCS)) (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-master-name files)) (when limit 'limit-unsupported)) @@ -344,7 +340,7 @@ Remaining arguments are ignored." ;; FIXME use sccsdiff if present? (defun vc-sccs-diff (files &optional _async oldvers newvers buffer) "Get a difference report using SCCS between two filesets." - (setq files (vc-expand-dirs files)) + (setq files (vc-expand-dirs files 'SCCS)) (setq oldvers (vc-sccs-lookup-triple (car files) oldvers)) (setq newvers (vc-sccs-lookup-triple (car files) newvers)) (or buffer (setq buffer "*vc-diff*")) diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index f3d0585..9e17d05 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -180,13 +180,8 @@ For a description of possible values, see `vc-check-master-templates'." (autoload 'vc-expand-dirs "vc") (defun vc-src-dir-status (dir update-function) - ;; FIXME: this function should be rewritten or `vc-expand-dirs' - ;; should be changed to take a backend parameter. Using - ;; `vc-expand-dirs' is not TRTD because it returns files from - ;; multiple backends. It should also return 'unregistered files. - ;; FIXME: Use one src status -a call for this - (let ((flist (vc-expand-dirs (list dir))) + (let ((flist (vc-expand-dirs (list dir) 'SRC)) (result nil)) (dolist (file flist) (let ((state (vc-state file)) @@ -253,13 +248,13 @@ REV is the revision to check out into WORKFILE." "Revert FILE to the version it was based on. If FILE is a directory, revert all registered files beneath it." (if (file-directory-p file) - (mapc 'vc-src-revert (vc-expand-dirs (list file))) + (mapc 'vc-src-revert (vc-expand-dirs (list file) 'SRC)) (vc-src-command nil file "co"))) (defun vc-src-modify-change-comment (files rev comment) "Modify the change comments change on FILES on a specified REV. If FILE is a directory the operation is applied to all registered files beneath it." - (dolist (file (vc-expand-dirs files)) + (dolist (file (vc-expand-dirs files 'SRC)) (vc-src-command nil file "amend" "-m" comment rev))) ;; History functions @@ -271,7 +266,7 @@ directory the operation is applied to all registered files beneath it." (repeat :tag "Argument List" :value ("") string)) :group 'vc-src) -(defun vc-src-print-log (files buffer &optional shortlog start-revision limit) +(defun vc-src-print-log (files buffer &optional shortlog _start-revision limit) "Print commit log associated with FILES into specified BUFFER. If SHORTLOG is non-nil, use the list method. If START-REVISION is non-nil, it is the newest revision to show. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 52deb13..ad3a2c4 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -631,9 +631,6 @@ ;; ;;;; Internal cleanups: ;; -;; - vc-expand-dirs should take a backend parameter and only look for -;; files managed by that backend. -;; ;; - Another important thing: merge all the status-like backend operations. ;; We should remove dir-status, state, and dir-status-files, and ;; replace them with just `status' which takes a fileset and a continuation @@ -955,14 +952,14 @@ responsible for FILE is returned." (throw 'found backend)))) (error "No VC backend is responsible for %s" file))) -(defun vc-expand-dirs (file-or-dir-list) +(defun vc-expand-dirs (file-or-dir-list backend) "Expands directories in a file list specification. Within directories, only files already under version control are noticed." (let ((flattened '())) (dolist (node file-or-dir-list) (when (file-directory-p node) (vc-file-tree-walk - node (lambda (f) (when (vc-backend f) (push f flattened))))) + node (lambda (f) (when (eq (vc-backend f) backend) (push f flattened))))) (unless (file-directory-p node) (push node flattened))) (nreverse flattened))) @@ -1000,8 +997,8 @@ Otherwise, throw an error. STATE-MODEL-ONLY-FILES if non-nil, means that the caller needs the FILESET-ONLY-FILES STATE and MODEL info. Otherwise, that part may be skipped. -BEWARE: this function may change the -current buffer." + +BEWARE: this function may change the current buffer." ;; FIXME: OBSERVER is unused. The name is not intuitive and is not ;; documented. It's set to t when called from diff and print-log. (let (backend) commit 2fb8b146f74791d7cbe702292b8197913d437c75 Author: Eric S. Raymond Date: Mon Dec 1 23:49:35 2014 -0500 Remove clear-headers from VC's public method set. * vc/vc.el and all backends: API simplification; clear-headers is no longer a public method. It is now local to the one place it's used, in the RCS steal-lock method. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c2b33e..d005cbe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-12-02 Eric S. Raymond + + * vc/vc.el and all backends: API simplification; clear-headers + is no longer a public method. It is now local to the one place + it's used, in the RCS steal-lock method. + 2014-12-01 Eric S. Raymond * vc/vc.el and all backends: API simplification; could-register diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 93c5ff8..3538f2c 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -95,7 +95,6 @@ ;; - previous-revision (file rev) OK ;; - next-revision (file rev) OK ;; - check-headers () COULD BE SUPPORTED -;; - clear-headers () NOT NEEDED ;; - delete-file (file) OK ;; - rename-file (old new) OK ;; - find-file-hook () OK diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index b5be8d5..35f5354 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -85,7 +85,6 @@ ;; - previous-revision (file rev) OK ;; - next-revision (file rev) OK ;; - check-headers () ?? -;; - clear-headers () ?? ;; - delete-file (file) TEST IT ;; - rename-file (old new) OK ;; - find-file-hook () added for bug#10709 diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index c9e4d40..40a1027 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -528,7 +528,22 @@ Needs RCS 5.6.2 or later for -M." (vc-do-command "*vc*" 0 "rcs" (vc-master-name file) "-M" (concat "-u" rev)) ;; Do a real checkout after stealing the lock, so that we see ;; expanded headers. - (vc-do-command "*vc*" 0 "co" (vc-master-name file) "-f" (concat "-l" rev)))) + (vc-do-command "*vc*" 0 "co" (vc-master-name file) "-f" (concat "-l" rev)) + ;; Must clear any headers here because they wouldn't + ;; show that the file is locked now. + (let* ((filename (or file buffer-file-name)) + (visited (find-buffer-visiting filename))) + (if visited + (let ((context (vc-buffer-context))) + ;; save-excursion may be able to relocate point and mark + ;; properly. If it fails, vc-restore-buffer-context + ;; will give it a second try. + (save-excursion + (vc-rcs-clear-headers)) + (vc-restore-buffer-context context)) + (set-buffer (find-file-noselect filename)) + (vc-rcs-clear-headers) + (kill-buffer filename))))) (defun vc-rcs-modify-change-comment (files rev comment) "Modify the change comments change on FILES on a specified REV. If FILE is a @@ -943,7 +958,7 @@ Uses `rcs2log' which only works for RCS and CVS." \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t))) (defun vc-rcs-clear-headers () - "Implementation of vc-clear-headers for RCS." + "Clear RCS header value parts." (let ((case-fold-search nil)) (goto-char (point-min)) (while (re-search-forward diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index c93ff96..f3d0585 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -73,7 +73,6 @@ ;; - previous-revision (file rev) ?? ;; - next-revision (file rev) ?? ;; - check-headers () ?? -;; - clear-headers () ?? ;; - delete-file (file) ?? ;; * rename-file (old new) OK ;; - find-file-hook () NOT NEEDED diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 9e6b049..52deb13 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -514,15 +514,6 @@ ;; ;; Return non-nil if the current buffer contains any version headers. ;; -;; - clear-headers () -;; -;; In the current buffer, reset all version headers to their unexpanded -;; form. This function should be provided if the state-querying code -;; for this backend uses the version headers to determine the state of -;; a file. This function will then be called whenever VC changes the -;; version control state in such a way that the headers would give -;; wrong information. -;; ;; - delete-file (file) ;; ;; Delete FILE and mark it as deleted in the repository. If this @@ -1287,9 +1278,6 @@ For old-style locking-based version control systems, like RCS: "Claim lock retaining changes? "))) (progn (vc-call-backend backend 'steal-lock file) (clear-visited-file-modtime) - ;; Must clear any headers here because they wouldn't - ;; show that the file is locked now. - (vc-clear-headers file) (write-file buffer-file-name) (vc-mode-line file backend)) (if (not (yes-or-no-p @@ -2001,25 +1989,6 @@ the variable `vc-BACKEND-header'." (when (string-match (car f) buffer-file-name) (insert (format (cdr f) (car hdstrings))))))))))) -(defun vc-clear-headers (&optional file) - "Clear all version headers in the current buffer (or FILE). -The headers are reset to their non-expanded form." - (let* ((filename (or file buffer-file-name)) - (visited (find-buffer-visiting filename)) - (backend (vc-backend filename))) - (when (vc-find-backend-function backend 'clear-headers) - (if visited - (let ((context (vc-buffer-context))) - ;; save-excursion may be able to relocate point and mark - ;; properly. If it fails, vc-restore-buffer-context - ;; will give it a second try. - (save-excursion - (vc-call-backend backend 'clear-headers)) - (vc-restore-buffer-context context)) - (set-buffer (find-file-noselect filename)) - (vc-call-backend backend 'clear-headers) - (kill-buffer filename))))) - (defun vc-modify-change-comment (files rev oldcomment) "Edit the comment associated with the given files and revision." ;; Less of a kluge than it looks like; log-view mode only passes commit ea99f8c1ab8e97a54116e50157dd4bd6f1247b91 Author: Eric S. Raymond Date: Mon Dec 1 22:56:01 2014 -0500 Fix minor bug introduced in 'Terminate vc-disable-async-diff' diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 40e4211..9e6b049 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1714,7 +1714,7 @@ Return t if the buffer had changes, nil otherwise." ;; We regard this as "changed". ;; Diff it against /dev/null. (apply 'vc-do-command buffer - (async 'async 1) "diff" file + (if async 'async 1) "diff" file (append (vc-switches nil 'diff) '("/dev/null")))))) (setq files (nreverse filtered)))) (vc-call-backend (car vc-fileset) 'diff files async rev1 rev2 buffer) commit 7d2110560e17744d8a1969b1a3df6040f7e90440 Author: Eric S. Raymond Date: Mon Dec 1 20:00:40 2014 -0500 Update the git backend's header comment. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 93a129c..93c5ff8 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -50,6 +50,8 @@ ;; STATE-QUERYING FUNCTIONS ;; * registered (file) OK ;; * state (file) OK +;; * dir-status (dir update-function) OK +;; - dir-status-files (dir files ds uf) NOT NEEDED ;; * working-revision (file) OK ;; - latest-on-branch-p (file) NOT NEEDED ;; * checkout-model (files) OK @@ -65,13 +67,13 @@ ;; * checkout (file &optional rev) OK ;; * revert (file &optional contents-done) OK ;; - rollback (files) COULD BE SUPPORTED -;; - merge (file rev1 rev2) It would be possible to merge +;; - merge-file (file rev1 rev2) It would be possible to merge ;; changes into a single file, but ;; when committing they wouldn't ;; be identified as a merge ;; by git, so it's probably ;; not a good idea. -;; - merge-news (file) see `merge' +;; - merge-news (file) see `merge-file' ;; - steal-lock (file &optional revision) NOT NEEDED ;; HISTORY FUNCTIONS ;; * print-log (files buffer &optional shortlog start-revision limit) OK commit b7fd432d56e352e25e6db4eaf5b081ddc5a39367 Author: Eric S. Raymond Date: Mon Dec 1 18:54:28 2014 -0500 Remove could-register from the set of public VC backend methods, * vc/vc.el and all backends: API simplification; could-register is no longer a public method. (vc-cvs.el still has a private implementation.) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 76590e1..6c2b33e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,10 +1,14 @@ 2014-12-01 Eric S. Raymond - * vc/vc.el, and all backends: API cleanup; the backend diff method + * vc/vc.el and all backends: API simplification; could-register + is no longer a public method. (vc-cvs.el still has a private + implementation.) + + * vc/vc.el and all backends: API cleanup; the backend diff method takes an explicit async flag. This eliminates a particularly ugly global. - vc-bzr.el: Restore vc-bzr-state-heuristic as a private method. + * vc-bzr.el: Restore vc-bzr-state-heuristic as a private method. VC randomly/unpredictable fails without it; cause not yet established. 2014-12-01 Stefan Monnier diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 48476dc..de6ae21 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -596,18 +596,6 @@ in the branch repository (or whose status not be determined)." The criterion is that there is a `.bzr' directory in the same or a superior directory.") -(defun vc-bzr-could-register (file) - "Return non-nil if FILE could be registered under bzr." - (and (vc-bzr-responsible-p file) ; shortcut - (condition-case () - (with-temp-buffer - (vc-bzr-command "add" t 0 file "--dry-run") - ;; The command succeeds with no output if file is - ;; registered (in bzr 0.8). - (goto-char (point-min)) - (looking-at "added ")) - (error)))) - (defun vc-bzr-unregister (file) "Unregister FILE from bzr." (vc-bzr-command "remove" nil 0 file "--keep")) diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index 46aa027..4271cf7 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -145,11 +145,6 @@ It should return a status of either 0 (no differences found), or ;; Check for DAV support on the web server. t) -(defun vc-dav-could-register (url) - "Return non-nil if URL could be registered under this backend." - ;; Check for DAV support on the web server. - t) - ;;; Unimplemented functions ;; ;; vc-dav-latest-on-branch-p(URL) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 8fdea8c..93a129c 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -58,7 +58,6 @@ ;; * create-repo () OK ;; * register (files &optional rev comment) OK ;; - responsible-p (file) OK -;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD ;; - receive-file (file rev) NOT NEEDED ;; - unregister (file) OK ;; * checkin (files rev comment) OK diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 0f636c0..b5be8d5 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -55,7 +55,6 @@ ;; * register (files &optional rev comment) OK ;; * create-repo () OK ;; - responsible-p (file) OK -;; - could-register (file) OK ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED ;; - unregister (file) OK ;; * checkin (files rev comment) OK @@ -450,17 +449,6 @@ Optional arg REVISION is a revision to annotate from." (defalias 'vc-hg-responsible-p 'vc-hg-root) -;; Modeled after the similar function in vc-bzr.el -(defun vc-hg-could-register (file) - "Return non-nil if FILE could be registered under hg." - (and (vc-hg-responsible-p file) ; shortcut - (condition-case () - (with-temp-buffer - (vc-hg-command t nil file "add" "--dry-run")) - ;; The command succeeds with no output if file is - ;; registered. - (error)))) - (defun vc-hg-unregister (file) "Unregister FILE from hg." (vc-hg-command nil 0 file "forget")) diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index e03d855..85aaf3d 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -180,7 +180,6 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (vc-mtn-command nil 0 files "add")) (defun vc-mtn-responsible-p (file) (vc-mtn-root file)) -(defun vc-mtn-could-register (file) (vc-mtn-root file)) (declare-function log-edit-extract-headers "log-edit" (headers string)) diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 49c799c..c93ff96 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -43,7 +43,6 @@ ;; * register (files &optional rev comment) OK ;; * create-repo () OK ;; * responsible-p (file) OK -;; * could-register (file) OK ;; - receive-file (file rev) NOT NEEDED ;; - unregister (file) NOT NEEDED ;; * checkin (files comment) OK @@ -232,8 +231,6 @@ This function differs from vc-do-command in that it invokes `vc-src-program'." file (file-name-directory file))))) -(defalias 'vc-could-register 'vc-src-responsible-p) - (defun vc-src-checkin (files comment) "SRC-specific version of `vc-backend-checkin'. REV is ignored." diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 54b998d..55b8f11 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -284,10 +284,6 @@ to the SVN command." (defalias 'vc-svn-responsible-p 'vc-svn-root) -(defalias 'vc-svn-could-register 'vc-svn-root - "Return non-nil if FILE could be registered in SVN. -This is only possible if SVN is responsible for FILE's directory.") - (defun vc-svn-checkin (files comment &optional _extra-args-ignored) "SVN-specific version of `vc-backend-checkin'." (let ((status (apply diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 121e329..40e4211 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -227,11 +227,6 @@ ;; like change log generation. The default implementation always ;; returns nil. ;; -;; - could-register (file) -;; -;; Return non-nil if FILE could be registered under this backend. The -;; default implementation always returns t. -;; ;; - receive-file (file rev) ;; ;; Let this backend "receive" a file that is already registered under @@ -612,6 +607,7 @@ ;; call to it. A few older back ends retain versions for internal use in ;; their vc-state functions. ;; +;; could-register is no longer a public method. Only vc-cvs ever used it ;;; Todo: @@ -2824,11 +2820,6 @@ log entries should be gathered." The default is to return nil always." nil) -(defun vc-default-could-register (_backend _file) - "Return non-nil if BACKEND could be used to register FILE. -The default implementation returns t for all files." - t) - (defun vc-default-latest-on-branch-p (_backend _file) "Return non-nil if FILE is the latest on its branch. This default implementation always returns non-nil, which means that commit d788058c50783f6be19a578f5968d6eec129af0a Author: Eric S. Raymond Date: Mon Dec 1 18:03:38 2014 -0500 Document a trap for the unwary. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 022a7e2..76590e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,6 +4,9 @@ takes an explicit async flag. This eliminates a particularly ugly global. + vc-bzr.el: Restore vc-bzr-state-heuristic as a private method. + VC randomly/unpredictable fails without it; cause not yet established. + 2014-12-01 Stefan Monnier Merge some of the differences from the standalone CC-mode. commit ed6ce56e2326fb8b257e63e015598ad74b5fd35c Author: Eric S. Raymond Date: Mon Dec 1 17:56:41 2014 -0500 Terminate vc-disable-async-diff with extreme prejudice. * vc/vc.el, and all backends: API cleanup; the backend diff method takes an explicit async flag. This eliminates a particularly ugly global. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 106849b..022a7e2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-12-01 Eric S. Raymond + + * vc/vc.el, and all backends: API cleanup; the backend diff method + takes an explicit async flag. This eliminates a particularly ugly + global. + 2014-12-01 Stefan Monnier Merge some of the differences from the standalone CC-mode. diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index eb6ea7d..1bdad2a 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el @@ -447,7 +447,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (vc-arch-command nil 0 files "commit" "-s" summary "-L" comment "--" (vc-switches 'Arch 'checkin)))) -(defun vc-arch-diff (files &optional oldvers newvers buffer) +(defun vc-arch-diff (files &optional async oldvers newvers buffer) "Get a difference report using Arch between two versions of FILES." ;; FIXME: This implementation only works for singleton filesets. To make ;; it work for more cases, we have to either call `file-diffs' manually on @@ -464,7 +464,6 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (if newvers (error "Diffing specific revisions not implemented") (let* (process-file-side-effects - (async (not vc-disable-async-diff)) ;; Run the command from the root dir. (default-directory (vc-arch-root file)) (status diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 7f30378..48476dc 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -779,7 +779,7 @@ If LIMIT is non-nil, show no more than this many entries." (autoload 'vc-switches "vc") -(defun vc-bzr-diff (files &optional rev1 rev2 buffer) +(defun vc-bzr-diff (files &optional async rev1 rev2 buffer) "VC bzr backend for diff." (let* ((switches (vc-switches 'bzr 'diff)) (args @@ -795,7 +795,7 @@ If LIMIT is non-nil, show no more than this many entries." (or rev2 ""))))))) ;; `bzr diff' exits with code 1 if diff is non-empty. (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") - (if vc-disable-async-diff 1 'async) files + (if async 1 'async) files args))) diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index fc1e857..41c5326 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -569,11 +569,10 @@ Remaining arguments are ignored." (autoload 'vc-version-backup-file "vc") (declare-function vc-coding-system-for-diff "vc" (file)) -(defun vc-cvs-diff (files &optional oldvers newvers buffer) +(defun vc-cvs-diff (files &optional async oldvers newvers buffer) "Get a difference report using CVS between two revisions of FILE." (let* (process-file-side-effects - (async (and (not vc-disable-async-diff) - (vc-cvs-stay-local-p files))) + (async (and async (vc-cvs-stay-local-p files))) (invoke-cvs-diff-list nil) status) ;; Look through the file list and see if any files have backups diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index fe93e73..46aa027 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -117,7 +117,7 @@ only needs to update the status of URL within the backend. "Insert the revision log of URL into the *vc* buffer." ) -(defun vc-dav-diff (url &optional rev1 rev2) +(defun vc-dav-diff (url &optional async rev1 rev2) "Insert the diff for URL into the *vc-diff* buffer. If REV1 and REV2 are non-nil report differences from REV1 to REV2. If REV1 is nil, use the current workfile version as the older version. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 53db340..8fdea8c 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -984,11 +984,13 @@ or BRANCH^ (where \"^\" can be repeated)." (autoload 'vc-switches "vc") -(defun vc-git-diff (files &optional rev1 rev2 buffer) +(defun vc-git-diff (files &optional async rev1 rev2 buffer) "Get a difference report using Git between two revisions of FILES." (let (process-file-side-effects) (if vc-git-diff-switches - (apply #'vc-git-command (or buffer "*vc-diff*") 1 files + (apply #'vc-git-command (or buffer "*vc-diff*") + (if async 'async 1) + files (if (and rev1 rev2) "diff-tree" "diff-index") "--exit-code" (append (vc-switches 'git 'diff) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index bc704e7..0f636c0 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -316,7 +316,7 @@ If LIMIT is non-nil, show no more than this many entries." (autoload 'vc-switches "vc") -(defun vc-hg-diff (files &optional oldvers newvers buffer) +(defun vc-hg-diff (files &optional async oldvers newvers buffer) "Get a difference report using hg between two revisions of FILES." (let* ((firstfile (car files)) (working (and firstfile (vc-working-revision firstfile)))) @@ -324,7 +324,10 @@ If LIMIT is non-nil, show no more than this many entries." (setq oldvers nil)) (when (and (not oldvers) newvers) (setq oldvers working)) - (apply #'vc-hg-command (or buffer "*vc-diff*") nil files "diff" + (apply #'vc-hg-command + (or buffer "*vc-diff*") + (if async 'async nil) + files "diff" (append (vc-switches 'hg 'diff) (when oldvers diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index b32a1db..e03d855 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -238,9 +238,11 @@ If LIMIT is non-nil, show no more than this many entries." (autoload 'vc-switches "vc") -(defun vc-mtn-diff (files &optional rev1 rev2 buffer) +(defun vc-mtn-diff (files &optional async rev1 rev2 buffer) "Get a difference report using monotone between two revisions of FILES." - (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff" + (apply 'vc-mtn-command (or buffer "*vc-diff*") + (if async 'async 1) + files "diff" (append (vc-switches 'mtn 'diff) (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2))))) diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 940d967..c9e4d40 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -565,10 +565,10 @@ files beneath it." (vc-rcs-print-log-cleanup)) (when limit 'limit-unsupported)) -(defun vc-rcs-diff (files &optional oldvers newvers buffer) +(defun vc-rcs-diff (files &optional async oldvers newvers buffer) "Get a difference report using RCS between two sets of files." (apply #'vc-do-command (or buffer "*vc-diff*") - 1 ;; Always go synchronous, the repo is local + (if async 'async 1) "rcsdiff" (vc-expand-dirs files) (append (list "-q" (and oldvers (concat "-r" oldvers)) diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index cd4c054..8a9e0b1 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -342,7 +342,7 @@ Remaining arguments are ignored." (defvar w32-quote-process-args) ;; FIXME use sccsdiff if present? -(defun vc-sccs-diff (files &optional oldvers newvers buffer) +(defun vc-sccs-diff (files &optional _async oldvers newvers buffer) "Get a difference report using SCCS between two filesets." (setq files (vc-expand-dirs files)) (setq oldvers (vc-sccs-lookup-triple (car files) oldvers)) diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index b780161..49c799c 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -295,7 +295,7 @@ If LIMIT is non-nil, show no more than this many entries." (when limit (list "-l" (format "%s" limit))) vc-src-log-switches))))) -(defun vc-src-diff (files &optional oldvers newvers buffer) +(defun vc-src-diff (files &optional _async oldvers newvers buffer) "Get a difference report using src between two revisions of FILES." (let* ((firstfile (car files)) (working (and firstfile (vc-working-revision firstfile)))) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 03fb321..54b998d 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -573,8 +573,7 @@ If LIMIT is non-nil, show no more than this many entries." (vc-switches 'SVN 'diff) (list (concat "--diff-cmd=" diff-command) "-x" (mapconcat 'identity (vc-switches nil 'diff) " ")))) - (async (and (not vc-disable-async-diff) - (or oldvers newvers)))) ; Svn diffs those locally. + (async (or oldvers newvers))) ; Svn diffs those locally. (apply 'vc-svn-command buffer (if async 'async 0) files "diff" diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index d3315ca..121e329 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -382,17 +382,19 @@ ;; default implementation runs rcs2log, which handles RCS- and ;; CVS-style logs. ;; -;; * diff (files &optional rev1 rev2 buffer) +;; * diff (files &optional async rev1 rev2 buffer) ;; ;; Insert the diff for FILE into BUFFER, or the *vc-diff* buffer if -;; BUFFER is nil. If REV1 and REV2 are non-nil, report differences -;; from REV1 to REV2. If REV1 is nil, use the working revision (as -;; found in the repository) as the older revision; if REV2 is nil, -;; use the current working-copy contents as the newer revision. This +;; BUFFER is nil. If ASYNC is non-nil, run asynchronously.If REV1 +;; and REV2 are non-nil, report differences from REV1 to REV2. If +;; REV1 is nil, use the working revision (as found in the +;; repository) as the older revision; if REV2 is nil, use the +;; current working-copy contents as the newer revision. This ;; function should pass the value of (vc-switches BACKEND 'diff) to ;; the backend command. It should return a status of either 0 (no ;; differences found), or 1 (either non-empty diff or the diff is ;; run asynchronously). + ;; ;; - revision-completion-table (files) ;; @@ -569,10 +571,25 @@ ;;; Changes from the pre-25.1 API: ;; -;; - The 'editable' optional argument of vc-checkout is gone. The -;; upper level assumes that all files are checked out editable. This -;; moves closer to emulating modern non-locking behavior even on very -;; old VCSes. +;; - INCOMPATIBLE CHANGE: The 'editable' optional argument of +;; vc-checkout is gone. The upper level assumes that all files are +;; checked out editable. This moves closer to emulating modern +;; non-locking behavior even on very old VCSes. +;; +;; - INCOMPATIBLE CHANGE: The vc-register function and its backend +;; implementations no longer take a first optional revision +;; argument, since on no system since RCS has setting the initial +;; revision been even possible, let alone sane. +;; +;; INCOMPATIBLE CHANGE: In older versions of the API, vc-diff did +;; not take an async-mode flag as a first optional argument. (This +;; change eliminated a particularly ugly global.) +;; +;; - INCOMPATIBLE CHANGE: The backend operation for non-distributed +;; VCSes formerly called "merge" is now "merge-file" (to contrast +;; with merge-branch), and does its own prompting for revisions. +;; (This fixes a layer violation that produced bad behavior under +;; SVN.) ;; ;; - vc-state-heuristic is no longer a public method (the CVS backend ;; retains it as a private one). @@ -590,20 +607,11 @@ ;; variable are gone. These have't made sense on anything shipped ;; since RCS, and using them was a dumb stunt even on RCS. ;; -;; - The vc-register function and its backend implementations no longer -;; take a first optional revision argument, since on no system since -;; RCS has setting the initial revision been even possible, let alone -;; sane. -;; -;; - The backend operation for non-distributed VCSes formerly called -;; "merge" is now "merge-file" (to contrast with merge-branch), and -;; does its own prompting for revisions. (This fixes a layer violation -;; that produced bad behavior under SVN.) -;; ;; workfile-unchanged-p is no longer a public back-end method. It ;; was redundant with vc-state and usually implemented with a trivial ;; call to it. A few older back ends retain versions for internal use in ;; their vc-state functions. +;; ;;; Todo: @@ -865,13 +873,6 @@ is sensitive to blank lines." :group 'vc) -;; Variables users don't need to see - -(defvar vc-disable-async-diff nil - "VC sets this to t locally to disable some async diff operations. -Backends that offer asynchronous diffs should respect this variable -in their implementation of vc-BACKEND-diff.") - ;; File property caching (defun vc-clear-context () @@ -1717,11 +1718,10 @@ Return t if the buffer had changes, nil otherwise." ;; We regard this as "changed". ;; Diff it against /dev/null. (apply 'vc-do-command buffer - 1 "diff" file + (async 'async 1) "diff" file (append (vc-switches nil 'diff) '("/dev/null")))))) (setq files (nreverse filtered)))) - (let ((vc-disable-async-diff (not async))) - (vc-call-backend (car vc-fileset) 'diff files rev1 rev2 buffer)) + (vc-call-backend (car vc-fileset) 'diff files async rev1 rev2 buffer) (set-buffer buffer) (diff-mode) (set (make-local-variable 'diff-vc-backend) (car vc-fileset)) commit 4f54f7b3760218d53743e5f8e3f0d3065a03ee23 Author: Glenn Morris Date: Mon Dec 1 16:35:13 2014 -0500 Restore ChangeLog entry clobbered earlier today. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e0b0ca6..106849b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -59,6 +59,11 @@ * progmodes/cc-align.el (c-lineup-respect-col-0): New function. +2014-12-01 Lars Magne Ingebrigtsen + + * net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the + dom.el changes. + 2014-12-01 Stefan Monnier * vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the commit ab882ed218bf507a825f538213de442d93725014 Author: Glenn Morris Date: Mon Dec 1 16:32:04 2014 -0500 * lisp/vc/vc-svn.el: Remove stray comment char introduced earlier today. diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 00a0388..03fb321 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -9,7 +9,7 @@ ;; 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 +;; 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. commit 517505322a965a042d2d05385a25f7c13704e022 Author: Stefan Monnier Date: Mon Dec 1 15:06:49 2014 -0500 Merge some of the differences from the standalone CC-mode. The main change is to only use the `category' text-property only when available. For that many calls are changed to use c-get-char-property, c-next-single-property-change, c-sc-scan-lists, c-sc-parse-partial-sexp, c-unmark-<->-as-paren. * lisp/progmodes/cc-align.el (c-lineup-respect-col-0): New function. * lisp/progmodes/cc-cmds.el (c-forward-into-nomenclature) (c-backward-into-nomenclature): Use cc-subword if subword-mode is not available. (c-beginning-of-defun, c-end-of-defun, c-mark-function) (c-indent-line-or-region): Use c-region-is-active-p. * lisp/progmodes/cc-defs.el (c-version): Bump up to 5.33. (c-use-category): New const. (c-next-single-property-change): New macro. (c-region-is-active-p): Prefer region-active-p when available. (c-search-backward-char-property): Fix old min/max typo; probably a copy/paste error. (c-mark-<-as-paren, c-mark->-as-paren, c-unmark-<->-as-paren): Turn them into macros that obey c-use-category. (c-sc-scan-lists-no-category+1+1, c-sc-scan-lists-no-category+1-1) (c-sc-scan-lists-no-category-1+1, c-sc-scan-lists-no-category-1-1) (c-sc-scan-lists, c-sc-parse-partial-sexp) (c-looking-at-non-alphnumspace): New macros. (c-sc-parse-partial-sexp-no-category): New function. (c-emacs-features): Add `category-properties' element. * lisp/progmodes/cc-engine.el (c-invalidate-state-cache, c-parse-state): Handle the case where categories are not available. (c-record-parse-state-state, c-replay-parse-state-state): Handle marker values. (c-before-change-check-<>-operators): Look for the `syntax-table' property rather than for the corresponding `category'. (c-looking-at-decl-block): Remove unused var `c-disallow-comma-in-<>-arglists'. (c-forward-<>-arglist-recur): Remove unused var `orig-record-found-types'. * lisp/progmodes/cc-langs.el (c-modified-constant): New lang var. (c-known-type-key): Don't make a list just to throw it away. * lisp/progmodes/cc-bytecomp.el (cc-bytecomp-unbound-variables) (cc-bytecomp-original-functions, cc-bytecomp-original-properties) (cc-bytecomp-loaded-files): Re-set each time the file is loaded. (cc-bytecomp-obsolete-var, cc-bytecomp-ignore-obsolete) (cc-bytecomp-obsolete-fun): Delete unused functions. * lisp/progmodes/cc-mode.el (c-just-done-before-change): New var. (c-basic-common-init): Initialize it. (c-common-init): Only use mode-require-final-newline when available. (c-before-change): Check and set c-just-done-before-change. (c-after-change): Re-set c-just-done-before-change. (c-advise-fl-for-region): New macro. (lazy-lock-defer-rest-after-change, lazy-lock-defer-line-after-change) (font-lock-after-change-function, jit-lock-after-change): Advise if needed. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 762b248..e0b0ca6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,63 @@ -2014-12-01 Lars Magne Ingebrigtsen +2014-12-01 Stefan Monnier - * net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the - dom.el changes. + Merge some of the differences from the standalone CC-mode. + The main change is to only use the `category' text-property only when + available. For that many calls are changed to use c-get-char-property, + c-next-single-property-change, c-sc-scan-lists, + c-sc-parse-partial-sexp, c-unmark-<->-as-paren. + + * progmodes/cc-mode.el (c-just-done-before-change): New var. + (c-basic-common-init): Initialize it. + (c-common-init): Only use mode-require-final-newline when available. + (c-before-change): Check and set c-just-done-before-change. + (c-after-change): Re-set c-just-done-before-change. + (c-advise-fl-for-region): New macro. + (lazy-lock-defer-rest-after-change, lazy-lock-defer-line-after-change) + (font-lock-after-change-function, jit-lock-after-change): + Advise if needed. + + * progmodes/cc-langs.el (c-modified-constant): New lang var. + (c-known-type-key): Don't make a list just to throw it away. + + * progmodes/cc-engine.el (c-invalidate-state-cache, c-parse-state): + Handle the case where categories are not available. + (c-record-parse-state-state, c-replay-parse-state-state): + Handle marker values. + (c-before-change-check-<>-operators): Look for the `syntax-table' + property rather than for the corresponding `category'. + (c-looking-at-decl-block): Remove unused var + `c-disallow-comma-in-<>-arglists'. + (c-forward-<>-arglist-recur): Remove unused var + `orig-record-found-types'. + + * progmodes/cc-defs.el (c-version): Bump up to 5.33. + (c-use-category): New const. + (c-next-single-property-change): New macro. + (c-region-is-active-p): Prefer region-active-p when available. + (c-search-backward-char-property): Fix old min/max typo; probably + a copy/paste error. + (c-mark-<-as-paren, c-mark->-as-paren, c-unmark-<->-as-paren): + Turn them into macros that obey c-use-category. + (c-sc-scan-lists-no-category+1+1, c-sc-scan-lists-no-category+1-1) + (c-sc-scan-lists-no-category-1+1, c-sc-scan-lists-no-category-1-1) + (c-sc-scan-lists, c-sc-parse-partial-sexp) + (c-looking-at-non-alphnumspace): New macros. + (c-sc-parse-partial-sexp-no-category): New function. + (c-emacs-features): Add `category-properties' element. + + * progmodes/cc-cmds.el (c-forward-into-nomenclature) + (c-backward-into-nomenclature): Use cc-subword if subword-mode is + not available. + (c-beginning-of-defun, c-end-of-defun, c-mark-function) + (c-indent-line-or-region): Use c-region-is-active-p. + + * progmodes/cc-bytecomp.el (cc-bytecomp-unbound-variables) + (cc-bytecomp-original-functions, cc-bytecomp-original-properties) + (cc-bytecomp-loaded-files): Re-set each time the file is loaded. + (cc-bytecomp-obsolete-var, cc-bytecomp-ignore-obsolete) + (cc-bytecomp-obsolete-fun): Delete unused functions. + + * progmodes/cc-align.el (c-lineup-respect-col-0): New function. 2014-12-01 Stefan Monnier diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el index 05d796c..5800dc9 100644 --- a/lisp/progmodes/cc-align.el +++ b/lisp/progmodes/cc-align.el @@ -1229,6 +1229,18 @@ Works with: Any syntactic symbol." (back-to-indentation) (vector (current-column)))) +(defun c-lineup-respect-col-0 (langelem) + "If the current line starts at column 0, return [0]. Otherwise return nil. + +This can be used for comments (in conjunction with, say, +`c-lineup-comment'), to keep comments already at column 0 +anchored there, but reindent other comments." + (save-excursion + (back-to-indentation) + (if (eq (current-column) 0) + [0] + nil))) + (defun c-snug-do-while (syntax pos) "Dynamically calculate brace hanginess for do-while statements. @@ -1333,4 +1345,8 @@ For other semicolon contexts, no determination is made." (cc-provide 'cc-align) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-align.el ends here diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index d57d601..2fcd0fd 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -1146,4 +1146,8 @@ comment at the start of cc-engine.el for more info." (cc-provide 'cc-awk) ; Changed from 'awk-mode, ACM 2002/5/21 +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; awk-mode.el ends here diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el index 1936627..2db5a10 100644 --- a/lisp/progmodes/cc-bytecomp.el +++ b/lisp/progmodes/cc-bytecomp.el @@ -65,8 +65,7 @@ ;; elsewhere in the load path. ;; ;; To suppress byte compiler warnings, use the macros -;; `cc-bytecomp-defun', `cc-bytecomp-defvar', -;; `cc-bytecomp-obsolete-fun', and `cc-bytecomp-obsolete-var'. +;; `cc-bytecomp-defun' and `cc-bytecomp-defvar'. ;; ;; This file is not used at all after the package has been byte ;; compiled. It is however necessary when running uncompiled. @@ -78,6 +77,12 @@ (defvar cc-bytecomp-original-functions nil) (defvar cc-bytecomp-original-properties nil) (defvar cc-bytecomp-loaded-files nil) + +(setq cc-bytecomp-unbound-variables nil) +(setq cc-bytecomp-original-functions nil) +(setq cc-bytecomp-original-properties nil) +(setq cc-bytecomp-loaded-files nil) + (defvar cc-bytecomp-environment-set nil) (defmacro cc-bytecomp-debug-msg (&rest args) @@ -370,33 +375,6 @@ the file. Don't use outside `eval-when-compile'." "cc-bytecomp-put: Bound property %s for %s to %s" ,propname ,symbol ,value))) -(defmacro cc-bytecomp-obsolete-var (symbol) - "Suppress warnings that the given symbol is an obsolete variable. -Don't use within `eval-when-compile'." - `(eval-when-compile - (if (get ',symbol 'byte-obsolete-variable) - (cc-bytecomp-put ',symbol 'byte-obsolete-variable nil) - ;; This avoids a superfluous compiler warning - ;; about calling `get' for effect. - t))) - -(defun cc-bytecomp-ignore-obsolete (form) - ;; Wraps a call to `byte-compile-obsolete' that suppresses the warning. - (let ((byte-compile-warnings byte-compile-warnings)) - (byte-compile-disable-warning 'obsolete) - (byte-compile-obsolete form))) - -(defmacro cc-bytecomp-obsolete-fun (symbol) - "Suppress warnings that the given symbol is an obsolete function. -Don't use within `eval-when-compile'." - `(eval-when-compile - (if (eq (get ',symbol 'byte-compile) 'byte-compile-obsolete) - (cc-bytecomp-put ',symbol 'byte-compile - 'cc-bytecomp-ignore-obsolete) - ;; This avoids a superfluous compiler warning - ;; about calling `get' for effect. - t))) - (defmacro cc-bytecomp-boundp (symbol) "Return non-nil if the given symbol is bound as a variable outside the compilation. This is the same as using `boundp' but additionally @@ -423,4 +401,8 @@ exclude any functions that have been bound during compilation with (provide 'cc-bytecomp) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-bytecomp.el ends here diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 50cdd78..55b676b 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1308,16 +1308,28 @@ keyword on the line, the keyword is not inserted inside a literal, and (defun c-forward-into-nomenclature (&optional arg) "Compatibility alias for `c-forward-subword'." (interactive "p") - (require 'subword) - (subword-forward arg)) -(make-obsolete 'c-forward-into-nomenclature 'subword-forward "23.2") + (if (fboundp 'subword-mode) + (progn + (require 'subword) + (subword-forward arg)) + (require 'cc-subword) + (c-forward-subword arg))) +(make-obsolete 'c-forward-into-nomenclature + (if (fboundp 'subword-mode) 'subword-forward 'c-forward-subword) + "23.2") (defun c-backward-into-nomenclature (&optional arg) "Compatibility alias for `c-backward-subword'." (interactive "p") - (require 'subword) - (subword-backward arg)) -(make-obsolete 'c-backward-into-nomenclature 'subword-backward "23.2") + (if (fboundp 'subword-mode) + (progn + (require 'subword) + (subword-backward arg)) + (require 'cc-subword) + (c-backward-subword arg))) +(make-obsolete + 'c-backward-into-nomenclature + (if (fboundp 'subword-mode) 'subword-backward 'c-backward-subword) "23.2") (defun c-scope-operator () "Insert a double colon scope operator at point. @@ -1585,7 +1597,7 @@ defun." (or (not (eq this-command 'c-beginning-of-defun)) (eq last-command 'c-beginning-of-defun) - (and transient-mark-mode mark-active) + (c-region-is-active-p) (push-mark)) (c-save-buffer-state @@ -1709,7 +1721,7 @@ the open-parenthesis that starts a defun; see `beginning-of-defun'." (or (not (eq this-command 'c-end-of-defun)) (eq last-command 'c-end-of-defun) - (and transient-mark-mode mark-active) + (c-region-is-active-p) (push-mark)) (c-save-buffer-state @@ -1813,7 +1825,7 @@ with a brace block." (looking-at c-symbol-key)) (match-string-no-properties 0)) - ((looking-at "DEFUN\\_>") + ((looking-at "DEFUN\\s-*(") ;"DEFUN\\_>") think of XEmacs! ;; DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, ...) ==> Ffile_name_directory ;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK (down-list 1) @@ -2006,7 +2018,7 @@ function does not require the declaration to contain a brace block." (eq last-command 'c-mark-function))) (push-mark-p (and (eq this-command 'c-mark-function) (not extend-region-p) - (not (and transient-mark-mode mark-active))))) + (not (c-region-is-active-p))))) (if push-mark-p (push-mark (point))) (if extend-region-p (progn @@ -3343,7 +3355,7 @@ Otherwise, with a prefix argument, rigidly reindent the expression starting on the current line. Otherwise reindent just the current line." (interactive - (list current-prefix-arg (use-region-p))) + (list current-prefix-arg (c-region-is-active-p))) (if region (c-indent-region (region-beginning) (region-end)) (c-indent-command arg))) @@ -4732,4 +4744,8 @@ normally bound to C-o. See `c-context-line-break' for the details." (cc-provide 'cc-cmds) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-cmds.el ends here diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 1d8b8ab..46cb2f9 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -64,15 +64,14 @@ (not (fboundp 'push))) (cc-load "cc-fix"))) -; (eval-after-load "font-lock" ; 2006-07-09. font-lock is now preloaded -; ' -(if (and (featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS - ; to make the call to f-l-c-k throw an error. - (not (featurep 'cc-fix)) ; only load the file once. - (let (font-lock-keywords) - (font-lock-compile-keywords '("\\<\\>")) - font-lock-keywords)) ; did the previous call foul this up? - (load "cc-fix")) ;) +(when (featurep 'xemacs) ; There is now (2005/12) code in GNU Emacs CVS + ; to make the call to f-l-c-k throw an error. + (eval-after-load "font-lock" + '(if (and (not (featurep 'cc-fix)) ; only load the file once. + (let (font-lock-keywords) + (font-lock-compile-keywords '("\\<\\>")) + font-lock-keywords)) ; did the previous call foul this up? + (load "cc-fix")))) ;; The above takes care of the delayed loading, but this is necessary ;; to ensure correct byte compilation. @@ -94,7 +93,7 @@ ;;; Variables also used at compile time. -(defconst c-version "5.32.5" +(defconst c-version "5.33" "CC Mode version number.") (defconst c-version-sym (intern c-version)) @@ -336,16 +335,42 @@ to it is returned. This function does not modify the point or the mark." (t (error "Unknown buffer position requested: %s" position)))) (point)))) +(eval-and-compile + ;; Constant to decide at compilation time whether to use category + ;; properties. Currently (2010-03) they're available only on GNU Emacs. + (defconst c-use-category + (with-temp-buffer + (let ((parse-sexp-lookup-properties t) + (lookup-syntax-properties t)) + (set-syntax-table (make-syntax-table)) + (insert "<()>") + (put-text-property (point-min) (1+ (point-min)) + 'category 'c-<-as-paren-syntax) + (put-text-property (+ 3 (point-min)) (+ 4 (point-min)) + 'category 'c->-as-paren-syntax) + (goto-char (point-min)) + (forward-sexp) + (= (point) (+ 4 (point-min))))))) + +(defvar c-use-extents) + +(defmacro c-next-single-property-change (position prop &optional object limit) + ;; See the doc string for either of the defuns expanded to. + (if (and c-use-extents + (fboundp 'next-single-char-property-change)) + ;; XEmacs >= 2005-01-25 + `(next-single-char-property-change ,position ,prop ,object ,limit) + ;; Emacs and earlier XEmacs + `(next-single-property-change ,position ,prop ,object ,limit))) + (defmacro c-region-is-active-p () ;; Return t when the region is active. The determination of region ;; activeness is different in both Emacs and XEmacs. - ;; FIXME? Emacs has region-active-p since 23.1, so maybe this test - ;; should be updated. - (if (cc-bytecomp-boundp 'mark-active) - ;; Emacs. - 'mark-active - ;; XEmacs. - '(region-active-p))) + (if (cc-bytecomp-fboundp 'region-active-p) + ;; XEmacs. + '(region-active-p) + ;; Old Emacs. + 'mark-active)) (defmacro c-set-region-active (activate) ;; Activate the region if ACTIVE is non-nil, deactivate it @@ -1061,8 +1086,8 @@ nil; point is then left undefined." (while (and (< place ,(or limit '(point-max))) - (not (equal (get-text-property place ,property) ,value))) - (setq place (next-single-property-change + (not (equal (c-get-char-property place ,property) ,value))) + (setq place (c-next-single-property-change place ,property nil ,(or limit '(point-max))))) (when (< place ,(or limit '(point-max))) (goto-char place) @@ -1080,10 +1105,15 @@ point is then left undefined." (while (and (> place ,(or limit '(point-min))) - (not (equal (get-text-property (1- place) ,property) ,value))) - (setq place (previous-single-property-change + (not (equal (c-get-char-property (1- place) ,property) ,value))) + (setq place (,(if (and c-use-extents + (fboundp 'previous-single-char-property-change)) + ;; XEmacs > 2005-01-25. + 'previous-single-char-property-change + ;; Emacs and earlier XEmacs. + 'previous-single-property-change) place ,property nil ,(or limit '(point-min))))) - (when (> place ,(or limit '(point-max))) + (when (> place ,(or limit '(point-min))) (goto-char place) (search-backward-regexp ".") ; to set the match-data. (point)))) @@ -1100,9 +1130,9 @@ been put there by c-put-char-property. POINT remains unchanged." (and (< place to) (not (equal (get-text-property place property) value))) - (setq place (next-single-property-change place property nil to))) + (setq place (c-next-single-property-change place property nil to))) (< place to)) - (setq end-place (next-single-property-change place property nil to)) + (setq end-place (c-next-single-property-change place property nil to)) (remove-text-properties place end-place (cons property nil)) ;; Do we have to do anything with stickiness here? (setq place end-place)))) @@ -1119,7 +1149,7 @@ been put there by c-put-char-property. POINT remains unchanged." (if (equal (extent-property ext -property-) val) (delete-extent ext))) nil ,from ,to ,value nil -property-)) - ;; Gnu Emacs + ;; GNU Emacs `(c-clear-char-property-with-value-function ,from ,to ,property ,value))) ;; Macros to put overlays (Emacs) or extents (XEmacs) on buffer text. @@ -1203,36 +1233,43 @@ been put there by c-put-char-property. POINT remains unchanged." (if (< (point) start) (goto-char (point-max))))) -(defsubst c-mark-<-as-paren (pos) +(defmacro c-mark-<-as-paren (pos) ;; Mark the "<" character at POS as a template opener using the - ;; `syntax-table' property via the `category' property. + ;; `syntax-table' property either directly (XEmacs) or via a `category' + ;; property (GNU Emacs). ;; ;; This function does a hidden buffer change. Note that we use ;; indirection through the `category' text property. This allows us to ;; toggle the property in all template brackets simultaneously and ;; cheaply. We use this, for instance, in `c-parse-state'. - (c-put-char-property pos 'category 'c-<-as-paren-syntax)) + (if c-use-category + `(c-put-char-property ,pos 'category 'c-<-as-paren-syntax) + `(c-put-char-property ,pos 'syntax-table c-<-as-paren-syntax))) -(defsubst c-mark->-as-paren (pos) + +(defmacro c-mark->-as-paren (pos) ;; Mark the ">" character at POS as an sexp list closer using the - ;; syntax-table property. + ;; `syntax-table' property either directly (XEmacs) or via a `category' + ;; property (GNU Emacs). ;; ;; This function does a hidden buffer change. Note that we use ;; indirection through the `category' text property. This allows us to ;; toggle the property in all template brackets simultaneously and ;; cheaply. We use this, for instance, in `c-parse-state'. - (c-put-char-property pos 'category 'c->-as-paren-syntax)) - -(defsubst c-unmark-<->-as-paren (pos) - ;; Unmark the "<" or "<" character at POS as an sexp list opener using - ;; the syntax-table property indirectly through the `category' text - ;; property. + (if c-use-category + `(c-put-char-property ,pos 'category 'c->-as-paren-syntax) + `(c-put-char-property ,pos 'syntax-table c->-as-paren-syntax))) + +(defmacro c-unmark-<->-as-paren (pos) + ;; Unmark the "<" or "<" character at POS as an sexp list opener using the + ;; `syntax-table' property either directly or indirectly through a + ;; `category' text property. ;; - ;; This function does a hidden buffer change. Note that we use + ;; This function does a hidden buffer change. Note that we try to use ;; indirection through the `category' text property. This allows us to ;; toggle the property in all template brackets simultaneously and ;; cheaply. We use this, for instance, in `c-parse-state'. - (c-clear-char-property pos 'category)) + `(c-clear-char-property ,pos ,(if c-use-category ''category ''syntax-table))) (defsubst c-suppress-<->-as-parens () ;; Suppress the syntactic effect of all marked < and > as parens. Note @@ -1313,6 +1350,124 @@ been put there by c-put-char-property. POINT remains unchanged." (widen) (c-set-cpp-delimiters ,beg ,end))))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; The following macros are to be used only in `c-parse-state' and its +;; subroutines. Their main purpose is to simplify the handling of C++/Java +;; template delimiters and CPP macros. In GNU Emacs, this is done slickly by +;; the judicious use of 'category properties. These don't exist in XEmacs. +;; +;; Note: in the following macros, there is no special handling for parentheses +;; inside CPP constructs. That is because CPPs are always syntactically +;; balanced, thanks to `c-neutralize-CPP-line' in cc-mode.el. +(defmacro c-sc-scan-lists-no-category+1+1 (from) + ;; Do a (scan-lists FROM 1 1). Any finishing position which either (i) is + ;; determined by and angle bracket; or (ii) is inside a macro whose start + ;; isn't POINT-MACRO-START doesn't count as a finishing position. + `(let ((here (point)) + (pos (scan-lists ,from 1 1))) + (while (eq (char-before pos) ?>) + (setq pos (scan-lists pos 1 1))) + pos)) + +(defmacro c-sc-scan-lists-no-category+1-1 (from) + ;; Do a (scan-lists FROM 1 -1). Any finishing position which either (i) is + ;; determined by an angle bracket; or (ii) is inside a macro whose start + ;; isn't POINT-MACRO-START doesn't count as a finishing position. + `(let ((here (point)) + (pos (scan-lists ,from 1 -1))) + (while (eq (char-before pos) ?<) + (setq pos (scan-lists pos 1 1)) + (setq pos (scan-lists pos 1 -1))) + pos)) + +(defmacro c-sc-scan-lists-no-category-1+1 (from) + ;; Do a (scan-lists FROM -1 1). Any finishing position which either (i) is + ;; determined by and angle bracket; or (ii) is inside a macro whose start + ;; isn't POINT-MACRO-START doesn't count as a finishing position. + `(let ((here (point)) + (pos (scan-lists ,from -1 1))) + (while (eq (char-after pos) ?<) + (setq pos (scan-lists pos -1 1))) + pos)) + +(defmacro c-sc-scan-lists-no-category-1-1 (from) + ;; Do a (scan-lists FROM -1 -1). Any finishing position which either (i) is + ;; determined by and angle bracket; or (ii) is inside a macro whose start + ;; isn't POINT-MACRO-START doesn't count as a finishing position. + `(let ((here (point)) + (pos (scan-lists ,from -1 -1))) + (while (eq (char-after pos) ?>) + (setq pos (scan-lists pos -1 1)) + (setq pos (scan-lists pos -1 -1))) + pos)) + +(defmacro c-sc-scan-lists (from count depth) + (if c-use-category + `(scan-lists ,from ,count ,depth) + (cond + ((and (eq count 1) (eq depth 1)) + `(c-sc-scan-lists-no-category+1+1 ,from)) + ((and (eq count 1) (eq depth -1)) + `(c-sc-scan-lists-no-category+1-1 ,from)) + ((and (eq count -1) (eq depth 1)) + `(c-sc-scan-lists-no-category-1+1 ,from)) + ((and (eq count -1) (eq depth -1)) + `(c-sc-scan-lists-no-category-1-1 ,from)) + (t (error "Invalid parameter(s) to c-sc-scan-lists"))))) + + +(defun c-sc-parse-partial-sexp-no-category (from to targetdepth stopbefore + oldstate) + ;; Do a parse-partial-sexp using the supplied arguments, disregarding + ;; template/generic delimiters < > and disregarding macros other than the + ;; one at POINT-MACRO-START. + ;; + ;; NOTE that STOPBEFORE must be nil. TARGETDEPTH should be one less than + ;; the depth in OLDSTATE. This function is thus a SPECIAL PURPOSE variation + ;; on parse-partial-sexp, designed for calling from + ;; `c-remove-stale-state-cache'. + ;; + ;; Any finishing position which is determined by an angle bracket delimiter + ;; doesn't count as a finishing position. + ;; + ;; Note there is no special handling of CPP constructs here, since these are + ;; always syntactically balanced (thanks to `c-neutralize-CPP-line'). + (let ((state + (parse-partial-sexp from to targetdepth stopbefore oldstate))) + (while + (and (< (point) to) + ;; We must have hit targetdepth. + (or (eq (char-before) ?<) + (eq (char-before) ?>))) + (setcar state + (if (memq (char-before) '(?> ?\) ?\} ?\])) + (1+ (car state)) + (1- (car state)))) + (setq state + (parse-partial-sexp (point) to targetdepth stopbefore oldstate))) + state)) + +(defmacro c-sc-parse-partial-sexp (from to &optional targetdepth stopbefore + oldstate) + (if c-use-category + `(parse-partial-sexp ,from ,to ,targetdepth ,stopbefore ,oldstate) + `(c-sc-parse-partial-sexp-no-category ,from ,to ,targetdepth ,stopbefore + ,oldstate))) + + +(defvar c-emacs-features) + +(defmacro c-looking-at-non-alphnumspace () + "Are we looking at a character which isn't alphanumeric or space?" + (if (memq 'gen-comment-delim c-emacs-features) + `(looking-at +"\\([;#]\\|\\'\\|\\s(\\|\\s)\\|\\s\"\\|\\s\\\\|\\s$\\|\\s<\\|\\s>\\|\\s!\\)") + `(or (looking-at +"\\([;#]\\|\\'\\|\\s(\\|\\s)\\|\\s\"\\|\\s\\\\|\\s$\\|\\s<\\|\\s>\\)" + (let ((prop (c-get-char-property (point) 'syntax-table))) + (eq prop '(14))))))) ; '(14) is generic comment delimiter. + + (defsubst c-intersect-lists (list alist) ;; return the element of ALIST that matches the first element found ;; in LIST. Uses assq. @@ -1614,6 +1769,9 @@ non-nil, a caret is prepended to invert the set." (not (end-of-defun)))) (setq list (cons 'argumentative-bod-function list)))) + ;; Record whether the `category' text property works. + (if c-use-category (setq list (cons 'category-properties list))) + (let ((buf (generate-new-buffer " test")) parse-sexp-lookup-properties parse-sexp-ignore-comments @@ -1719,6 +1877,8 @@ might be present: in the buffer with the 'syntax-table property. It's always set - CC Mode no longer works in emacsen without this feature. +'category-properties Syntax routines can add a level of indirection to text + properties using the 'category property. 'gen-comment-delim Generic comment delimiters work (i.e. the syntax class `!'). 'gen-string-delim Generic string delimiters work @@ -2277,4 +2437,8 @@ fallback definition for all modes, to break the cycle).") (cc-provide 'cc-defs) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-defs.el ends here diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index a388b42..a24cb3d 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -534,7 +534,7 @@ comment at the start of cc-engine.el for more info." (while (progn (when (eq (get-text-property (point) 'c-type) value) (c-clear-char-property (point) 'c-type)) - (goto-char (next-single-property-change (point) 'c-type nil to)) + (goto-char (c-next-single-property-change (point) 'c-type nil to)) (< (point) to))))) @@ -1723,7 +1723,7 @@ comment at the start of cc-engine.el for more info." ;; the cases when the marked rung is complete. ;; (`next-single-property-change' is certain to move at least one ;; step forward.) - (setq rung-pos (1- (next-single-property-change + (setq rung-pos (1- (c-next-single-property-change rung-is-marked 'c-is-sws nil rung-end-pos))) ;; Got no marked rung here. Since the simple ws might have started ;; inside a line comment or cpp directive we must set `rung-pos' as @@ -1739,7 +1739,7 @@ comment at the start of cc-engine.el for more info." ;; The following search is the main reason that `c-in-sws' ;; and `c-is-sws' aren't combined to one property. - (goto-char (next-single-property-change + (goto-char (c-next-single-property-change (point) 'c-in-sws nil (point-max))) (unless (get-text-property (point) 'c-is-sws) ;; If the `c-in-sws' region extended past the last @@ -1861,7 +1861,7 @@ comment at the start of cc-engine.el for more info." ;; possible since we can't be in the ending ws of a line comment or ;; cpp directive now. (if (setq rung-is-marked next-rung-is-marked) - (setq rung-pos (1- (next-single-property-change + (setq rung-pos (1- (c-next-single-property-change rung-is-marked 'c-is-sws nil rung-end-pos))) (setq rung-pos next-rung-pos)) (setq safe-start t))) @@ -1939,7 +1939,7 @@ comment at the start of cc-engine.el for more info." (unless (get-text-property (point) 'c-is-sws) ;; If the `c-in-sws' region extended past the first ;; `c-is-sws' char we have to go forward a bit. - (goto-char (next-single-property-change + (goto-char (c-next-single-property-change (point) 'c-is-sws))) (c-debug-sws-msg @@ -2547,7 +2547,7 @@ comment at the start of cc-engine.el for more info." (setq pos here+) (c-safe (while - (setq ren+1 (scan-lists pos 1 1)) ; might signal + (setq ren+1 (c-sc-scan-lists pos 1 1)) ; might signal (setq lonely-rens (cons ren+1 lonely-rens) pos ren+1))))) @@ -2559,7 +2559,7 @@ comment at the start of cc-engine.el for more info." (c-safe (while (and lonely-rens ; actual values aren't used. - (setq pa (scan-lists pos -1 1))) + (setq pa (c-sc-scan-lists pos -1 1))) (setq pos pa) (setq lonely-rens (cdr lonely-rens))))) pos)) @@ -2715,8 +2715,8 @@ comment at the start of cc-engine.el for more info." (progn (c-safe (while - (and (setq ce (scan-lists bra -1 -1)) ; back past )/]/}; might signal - (setq bra (scan-lists ce -1 1)) ; back past (/[/{; might signal + (and (setq ce (c-sc-scan-lists bra -1 -1)) ; back past )/]/}; might signal + (setq bra (c-sc-scan-lists ce -1 1)) ; back past (/[/{; might signal (or (> bra here) ;(> ce here) (and (< ce here) @@ -2768,7 +2768,7 @@ comment at the start of cc-engine.el for more info." (not (c-beginning-of-macro)))) (setq c-state-cache (cons (cons (1- bra+1) - (scan-lists bra+1 1 1)) + (c-sc-scan-lists bra+1 1 1)) (if (consp (car c-state-cache)) (cdr c-state-cache) c-state-cache))) @@ -2818,9 +2818,9 @@ comment at the start of cc-engine.el for more info." ;; are no more b/b/p's to scan. (c-safe (while t - (setq pa+1 (scan-lists ren+1 1 -1) ; Into (/{/[; might signal + (setq pa+1 (c-sc-scan-lists ren+1 1 -1) ; Into (/{/[; might signal paren+1s (cons pa+1 paren+1s)) - (setq ren+1 (scan-lists pa+1 1 1)) ; Out of )/}/]; might signal + (setq ren+1 (c-sc-scan-lists pa+1 1 1)) ; Out of )/}/]; might signal (if (and (eq (char-before pa+1) ?{)) ; Check for a macro later. (setq bra+1 pa+1)) (setcar paren+1s ren+1))) @@ -2844,7 +2844,7 @@ comment at the start of cc-engine.el for more info." ;; finished - we just need to check for having found an ;; unmatched )/}/], which we ignore. Such a )/}/] can't be in a ;; macro, due the action of `c-neutralize-syntax-in-CPP'. - (c-safe (setq ren+1 (scan-lists ren+1 1 1)))))) ; acts as loop control. + (c-safe (setq ren+1 (c-sc-scan-lists ren+1 1 1)))))) ; acts as loop control. ;; Record the final, innermost, brace-pair if there is one. (c-state-push-any-brace-pair bra+1 macro-start-or-here) @@ -2947,7 +2947,7 @@ comment at the start of cc-engine.el for more info." ;; The next loop jumps forward out of a nested level of parens each ;; time round; the corresponding elements in `c-state-cache' are ;; removed. `pos' is just after the brace-pair or the open paren at - ;; (car c-state-cache). There can be no open parens/braces/brackets + ;; (car c-state-cache). There can be no open parens/braces/brackets ;; between `start-point'/`start-point-actual-macro-start' and HERE, ;; due to the interface spec to this function. (setq pos (if (and start-point-actual-macro-end @@ -2971,7 +2971,7 @@ comment at the start of cc-engine.el for more info." ;; Scan! (setq pps-state - (parse-partial-sexp + (c-sc-parse-partial-sexp (point) (if (< (point) pps-point) pps-point here) target-depth nil pps-state)) @@ -3002,9 +3002,10 @@ comment at the start of cc-engine.el for more info." ))) (if (< (point) pps-point) - (setq pps-state (parse-partial-sexp (point) pps-point - nil nil ; TARGETDEPTH, STOPBEFORE - pps-state))) + (setq pps-state (c-sc-parse-partial-sexp + (point) pps-point + nil nil ; TARGETDEPTH, STOPBEFORE + pps-state))) ;; If the last paren pair we moved out of was actually a brace pair, ;; insert it into `c-state-cache'. @@ -3125,12 +3126,15 @@ comment at the start of cc-engine.el for more info." (save-restriction (narrow-to-region here-bol (point-max)) (setq pos here-lit-start) - (c-safe (while (setq pa (scan-lists pos -1 1)) + (c-safe (while (setq pa (c-sc-scan-lists pos -1 1)) (setq pos pa)))) ; might signal nil)) ; for the cond - ((setq ren (c-safe-scan-lists pos -1 -1 too-far-back)) - ;; CASE 3: After a }/)/] before `here''s BOL. + ((save-restriction + (narrow-to-region too-far-back (point-max)) + (setq ren (c-safe (c-sc-scan-lists pos -1 -1)))) + + ;; CASE 3: After a }/)/] before `here''s BOL. (list (1+ ren) (and dropped-cons pos) nil)) ; Return value (t @@ -3352,15 +3356,19 @@ comment at the start of cc-engine.el for more info." ;; of all parens in preprocessor constructs, except for any such construct ;; containing point. We can then call `c-invalidate-state-cache-1' without ;; worrying further about macros and template delimiters. - (c-with-<->-as-parens-suppressed - (if (and c-state-old-cpp-beg - (< c-state-old-cpp-beg here)) - (c-with-all-but-one-cpps-commented-out - c-state-old-cpp-beg - (min c-state-old-cpp-end here) - (c-invalidate-state-cache-1 here)) - (c-with-cpps-commented-out - (c-invalidate-state-cache-1 here))))) + (if (eval-when-compile (memq 'category-properties c-emacs-features)) + ;; Emacs + (c-with-<->-as-parens-suppressed + (if (and c-state-old-cpp-beg + (< c-state-old-cpp-beg here)) + (c-with-all-but-one-cpps-commented-out + c-state-old-cpp-beg + (min c-state-old-cpp-end here) + (c-invalidate-state-cache-1 here)) + (c-with-cpps-commented-out + (c-invalidate-state-cache-1 here)))) + ;; XEmacs + (c-invalidate-state-cache-1 here))) (defmacro c-state-maybe-marker (place marker) ;; If PLACE is non-nil, return a marker marking it, otherwise nil. @@ -3388,13 +3396,17 @@ comment at the start of cc-engine.el for more info." ;; FIXME!!! Put in a `condition-case' here to protect the integrity of the ;; subsystem. (prog1 - (c-with-<->-as-parens-suppressed - (if (and here-cpp-beg (> here-cpp-end here-cpp-beg)) - (c-with-all-but-one-cpps-commented-out - here-cpp-beg here-cpp-end - (c-parse-state-1)) - (c-with-cpps-commented-out - (c-parse-state-1)))) + (if (eval-when-compile (memq 'category-properties c-emacs-features)) + ;; Emacs + (c-with-<->-as-parens-suppressed + (if (and here-cpp-beg (> here-cpp-end here-cpp-beg)) + (c-with-all-but-one-cpps-commented-out + here-cpp-beg here-cpp-end + (c-parse-state-1)) + (c-with-cpps-commented-out + (c-parse-state-1)))) + ;; XEmacs + (c-parse-state-1)) (setq c-state-old-cpp-beg (c-state-maybe-marker here-cpp-beg c-state-old-cpp-beg-marker) c-state-old-cpp-end @@ -3417,9 +3429,9 @@ comment at the start of cc-engine.el for more info." (lambda (arg) (let ((val (symbol-value arg))) (cons arg - (if (consp val) - (copy-tree val) - val)))) + (cond ((consp val) (copy-tree val)) + ((markerp val) (copy-marker val)) + (t val))))) '(c-state-cache c-state-cache-good-pos c-state-nonlit-pos-cache @@ -3439,7 +3451,11 @@ comment at the start of cc-engine.el for more info." (concat "(setq " (mapconcat (lambda (arg) - (format "%s %s%s" (car arg) (if (atom (cdr arg)) "" "'") (cdr arg))) + (format "%s %s%s" (car arg) + (if (atom (cdr arg)) "" "'") + (if (markerp (cdr arg)) + (format "(copy-marker %s)" (marker-position (cdr arg))) + (cdr arg)))) c-parse-state-state " ") ")"))) @@ -4783,7 +4799,7 @@ comment at the start of cc-engine.el for more info." (unless cfd-prop-match (save-excursion (while (progn - (goto-char (next-single-property-change + (goto-char (c-next-single-property-change (point) 'c-type nil cfd-limit)) (and (< (point) cfd-limit) (not (eq (c-get-char-property (1- (point)) 'c-type) @@ -4823,7 +4839,7 @@ comment at the start of cc-engine.el for more info." ;; Pseudo match inside a comment or string literal. Skip out ;; of comments and string literals. (while (progn - (goto-char (next-single-property-change + (goto-char (c-next-single-property-change (point) 'face nil cfd-limit)) (and (< (point) cfd-limit) (c-got-face-at (point) c-literal-faces)))) @@ -5012,7 +5028,7 @@ comment at the start of cc-engine.el for more info." (save-excursion (goto-char cfd-start-pos) (while (progn - (goto-char (next-single-property-change + (goto-char (c-next-single-property-change (point) 'face nil cfd-limit)) (and (< (point) cfd-limit) (c-got-face-at (point) c-literal-faces)))) @@ -5432,8 +5448,8 @@ comment at the start of cc-engine.el for more info." (c-go-list-forward)) (when (equal (c-get-char-property (1- (point)) 'syntax-table) c->-as-paren-syntax) ; should always be true. - (c-clear-char-property (1- (point)) 'category)) - (c-clear-char-property pos 'category)))) + (c-unmark-<->-as-paren (1- (point)))) + (c-unmark-<->-as-paren pos)))) (defun c-clear->-pair-props (&optional pos) ;; POS (default point) is at a > character. If it is marked with @@ -5449,8 +5465,8 @@ comment at the start of cc-engine.el for more info." (c-go-up-list-backward)) (when (equal (c-get-char-property (point) 'syntax-table) c-<-as-paren-syntax) ; should always be true. - (c-clear-char-property (point) 'category)) - (c-clear-char-property pos 'category)))) + (c-unmark-<->-as-paren (point))) + (c-unmark-<->-as-paren pos)))) (defun c-clear-<>-pair-props (&optional pos) ;; POS (default point) is at a < or > character. If it has an @@ -5539,9 +5555,10 @@ comment at the start of cc-engine.el for more info." (c-syntactic-skip-backward "^;{}" (c-determine-limit 512)) (setq new-beg (point)) - ;; Remove the syntax-table properties from each pertinent <...> pair. - ;; Firsly, the ones with the < before beg and > after beg. - (while (c-search-forward-char-property 'category 'c-<-as-paren-syntax beg) + ;; Remove the syntax-table/category properties from each pertinent <...> + ;; pair. Firsly, the ones with the < before beg and > after beg. + (while + (c-search-forward-char-property 'syntax-table c-<-as-paren-syntax beg) (if (c-clear-<-pair-props-if-match-after beg (1- (point))) (setq need-new-beg t))) @@ -5552,7 +5569,7 @@ comment at the start of cc-engine.el for more info." ;; Remove syntax-table properties from the remaining pertinent <...> ;; pairs, those with a > after end and < before end. - (while (c-search-backward-char-property 'category 'c->-as-paren-syntax end) + (while (c-search-backward-char-property 'syntax-table c->-as-paren-syntax end) (if (c-clear->-pair-props-if-match-before end) (setq need-new-end t))) @@ -5934,32 +5951,31 @@ comment at the start of cc-engine.el for more info." (while (and (progn (c-forward-syntactic-ws) - (let ((orig-record-found-types c-record-found-types)) - (when (or (and c-record-type-identifiers all-types) - (c-major-mode-is 'java-mode)) - ;; All encountered identifiers are types, so set the - ;; promote flag and parse the type. - (progn - (c-forward-syntactic-ws) - (if (looking-at "\\?") - (forward-char) - (when (looking-at c-identifier-start) - (let ((c-promote-possible-types t) - (c-record-found-types t)) - (c-forward-type)))) - - (c-forward-syntactic-ws) - - (when (or (looking-at "extends") - (looking-at "super")) - (forward-word) - (c-forward-syntactic-ws) + (when (or (and c-record-type-identifiers all-types) + (c-major-mode-is 'java-mode)) + ;; All encountered identifiers are types, so set the + ;; promote flag and parse the type. + (progn + (c-forward-syntactic-ws) + (if (looking-at "\\?") + (forward-char) + (when (looking-at c-identifier-start) (let ((c-promote-possible-types t) (c-record-found-types t)) - (c-forward-type) - (c-forward-syntactic-ws)))))) + (c-forward-type)))) + + (c-forward-syntactic-ws) + + (when (or (looking-at "extends") + (looking-at "super")) + (forward-word) + (c-forward-syntactic-ws) + (let ((c-promote-possible-types t) + (c-record-found-types t)) + (c-forward-type) + (c-forward-syntactic-ws))))) - (setq pos (point)) ; e.g. first token inside the '<' + (setq pos (point)) ; e.g. first token inside the '<' ;; Note: These regexps exploit the match order in \| so ;; that "<>" is matched by "<" rather than "[^>:-]>". @@ -6049,7 +6065,7 @@ comment at the start of cc-engine.el for more info." (or (and (eq (char-before) ?&) (not (eq (char-after) ?&))) (eq (char-before) ?,))) - ;; Just another argument. Record the position. The + ;; Just another argument. Record the position. The ;; type check stuff that made us stop at it is at ;; the top of the loop. (setq arg-start-pos (cons (point) arg-start-pos))) @@ -6472,13 +6488,14 @@ comment at the start of cc-engine.el for more info." (setq res nil))))) (when res - ;; Skip trailing type modifiers. If any are found we know it's + ;; Skip trailing type modifiers. If any are found we know it's ;; a type. (when c-opt-type-modifier-key (while (looking-at c-opt-type-modifier-key) ; e.g. "const", "volatile" (goto-char (match-end 1)) (c-forward-syntactic-ws) (setq res t))) + ;; Step over any type suffix operator. Do not let the existence ;; of these alter the classification of the found type, since ;; these operators typically are allowed in normal expressions @@ -6560,7 +6577,7 @@ comment at the start of cc-engine.el for more info." (progn (c-forward-syntactic-ws) t) (if (looking-at "(") (c-go-list-forward) - t))) + t))) (defmacro c-pull-open-brace (ps) ;; Pull the next open brace from PS (which has the form of paren-state), @@ -7147,7 +7164,7 @@ comment at the start of cc-engine.el for more info." ;; Now we've collected info about various characteristics of ;; the construct we're looking at. Below follows a decision - ;; tree based on that. It's ordered to check more certain + ;; tree based on that. It's ordered to check more certain ;; signs before less certain ones. (if got-identifier @@ -7233,7 +7250,7 @@ comment at the start of cc-engine.el for more info." at-decl-end (cond ((eq context 'decl) - ;; Inside an arglist that contains declarations. If K&R + ;; Inside an arglist that contains declarations. If K&R ;; style declarations and parenthesis style initializers ;; aren't allowed then the single identifier must be a ;; type, else we require that it's known or found @@ -7266,7 +7283,7 @@ comment at the start of cc-engine.el for more info." c-after-suffixed-type-maybe-decl-key)))))) ;; Got an empty paren pair and a preceding type that probably ;; really is the identifier. Shift the type backwards to make - ;; the last one the identifier. This is analogous to the + ;; the last one the identifier. This is analogous to the ;; "backtracking" done inside the `c-type-decl-suffix-key' loop ;; above. ;; @@ -7274,7 +7291,7 @@ comment at the start of cc-engine.el for more info." ;; "backtracking" code, do not shift backward if we're not ;; looking at either `c-after-suffixed-type-decl-key' or "[;,]". ;; Since there's no preceding type, the shift would mean that - ;; the declaration is typeless. But if the regexp doesn't match + ;; the declaration is typeless. But if the regexp doesn't match ;; then we will simply fall through in the tests below and not ;; recognize it at all, so it's better to try it as an abstract ;; declarator instead. @@ -7413,7 +7430,7 @@ comment at the start of cc-engine.el for more info." (not got-suffix)) ;; Got something like "foo * bar;". Since we're not inside an ;; arglist it would be a meaningless expression because the - ;; result isn't used. We therefore choose to recognize it as + ;; result isn't used. We therefore choose to recognize it as ;; a declaration. Do not allow a suffix since it could then ;; be a function call. (throw 'at-decl-or-cast t)) @@ -7424,7 +7441,7 @@ comment at the start of cc-engine.el for more info." (eq at-type 'found) (not (eq context 'arglist))) ;; Got something like "a (*b) (c);" or "a (b) = c;". It could - ;; be an odd expression or it could be a declaration. Treat + ;; be an odd expression or it could be a declaration. Treat ;; it as a declaration if "a" has been used as a type ;; somewhere else (if it's a known type we won't get here). (throw 'at-decl-or-cast t))) @@ -7435,7 +7452,7 @@ comment at the start of cc-engine.el for more info." (and (eq context 'decl) (not c-recognize-paren-inits) (or got-parens got-suffix)))) - ;; Got a type followed by an abstract declarator. If `got-prefix' + ;; Got a type followed by an abstract declarator. If `got-prefix' ;; is set it's something like "a *" without anything after it. If ;; `got-parens' or `got-suffix' is set it's "a()", "a[]", "a()[]", ;; or similar, which we accept only if the context rules out @@ -8105,7 +8122,7 @@ comment at the start of cc-engine.el for more info." (c-forward-token-2)) (eq (char-after) ?\)))))) - ;; ...Yes. We've identified the function's argument list. + ;; ...Yes. We've identified the function's argument list. (throw 'knr (progn (goto-char after-rparen) (c-forward-syntactic-ws) @@ -8432,10 +8449,7 @@ comment at the start of cc-engine.el for more info." (when (and c-recognize-<>-arglists (eq (char-before) ?>)) ;; Could be at the end of a template arglist. - (let ((c-parse-and-markup-<>-arglists t) - (c-disallow-comma-in-<>-arglists - (and containing-sexp - (not (eq (char-after containing-sexp) ?{))))) + (let ((c-parse-and-markup-<>-arglists t)) (while (and (c-backward-<>-arglist nil limit) (progn @@ -8698,7 +8712,7 @@ comment at the start of cc-engine.el for more info." (goto-char containing-sexp) (if (c-looking-at-inexpr-block next-containing next-containing) ;; We're in an in-expression block of some kind. Do not - ;; check nesting. We deliberately set the limit to the + ;; check nesting. We deliberately set the limit to the ;; containing sexp, so that c-looking-at-inexpr-block ;; doesn't check for an identifier before it. (setq containing-sexp nil) @@ -9460,15 +9474,15 @@ comment at the start of cc-engine.el for more info." ;;annotations. ((and (c-major-mode-is 'java-mode) (setq placeholder (point)) - (c-beginning-of-statement-1) - (progn - (while (and (c-forward-annotation) - (< (point) placeholder)) - (c-forward-syntactic-ws)) - t) - (prog1 - (>= (point) placeholder) - (goto-char placeholder))) + (c-beginning-of-statement-1) + (progn + (while (and (c-forward-annotation) + (< (point) placeholder)) + (c-forward-syntactic-ws)) + t) + (prog1 + (>= (point) placeholder) + (goto-char placeholder))) (c-beginning-of-statement-1 containing-sexp) (c-add-syntax 'annotation-var-cont (point))) @@ -9519,7 +9533,7 @@ comment at the start of cc-engine.el for more info." ((indent-point (point)) (case-fold-search nil) open-paren-in-column-0-is-defun-start - ;; A whole ugly bunch of various temporary variables. Have + ;; A whole ugly bunch of various temporary variables. Have ;; to declare them here since it's not possible to declare ;; a variable with only the scope of a cond test and the ;; following result clauses, and most of this function is a @@ -10431,7 +10445,7 @@ comment at the start of cc-engine.el for more info." paren-state)) ;; CASE 7B: Looking at the opening brace of an - ;; in-expression block or brace list. C.f. cases 4, 16A + ;; in-expression block or brace list. C.f. cases 4, 16A ;; and 17E. ((and (eq char-after-ip ?{) (progn @@ -10553,7 +10567,7 @@ comment at the start of cc-engine.el for more info." ))) ;; CASE 9: we are inside a brace-list - ((and (not (c-major-mode-is 'awk-mode)) ; Maybe this isn't needed (ACM, 2002/3/29) + ((and (not (c-major-mode-is 'awk-mode)) ; Maybe this isn't needed (ACM, 2002/3/29) (setq special-brace-list (or (and c-special-brace-lists ;;;; ALWAYS NIL FOR AWK!! (save-excursion @@ -10767,9 +10781,9 @@ comment at the start of cc-engine.el for more info." )) ;; CASE 19: line is an expression, not a statement, and is directly - ;; contained by a template delimiter. Most likely, we are in a + ;; contained by a template delimiter. Most likely, we are in a ;; template arglist within a statement. This case is based on CASE - ;; 7. At some point in the future, we may wish to create more + ;; 7. At some point in the future, we may wish to create more ;; syntactic symbols such as `template-intro', ;; `template-cont-nonempty', etc., and distinguish between them as we ;; do for `arglist-intro' etc. (2009-12-07). @@ -11105,7 +11119,7 @@ Cannot combine absolute offsets %S and %S in `add' method" ;; ;; This function might do hidden buffer changes. (let* ((symbol (c-langelem-sym langelem)) - (match (assq symbol c-offsets-alist)) + (match (assq symbol c-offsets-alist)) (offset (cdr-safe match))) (if match (setq offset (c-evaluate-offset offset langelem symbol)) @@ -11176,4 +11190,8 @@ Cannot combine absolute offsets %S and %S in `add' method" (cc-provide 'cc-engine) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-engine.el ends here diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 8035c18..448e764 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -266,7 +266,7 @@ ;; This function might do hidden buffer changes. (when (c-got-face-at (point) c-literal-faces) (while (progn - (goto-char (next-single-property-change + (goto-char (c-next-single-property-change (point) 'face nil limit)) (and (< (point) limit) (c-got-face-at (point) c-literal-faces)))) @@ -559,8 +559,7 @@ stuff. Used on level 1 and higher." (progn (c-mark-<-as-paren beg) (c-mark->-as-paren end)) - ;; (c-clear-char-property beg 'syntax-table) - (c-clear-char-property beg 'category))) + (c-unmark-<->-as-paren beg))) nil))))))) ;; #define. @@ -2702,4 +2701,8 @@ need for `pike-font-lock-extra-types'.") ;; 2006-07-10: awk-font-lock-keywords has been moved back to cc-awk.el. (cc-provide 'cc-fonts) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-fonts.el ends here diff --git a/lisp/progmodes/cc-guess.el b/lisp/progmodes/cc-guess.el index f46ae0f..4c07744 100644 --- a/lisp/progmodes/cc-guess.el +++ b/lisp/progmodes/cc-guess.el @@ -572,4 +572,9 @@ WITH-NAME is asked to the user." (cc-provide 'cc-guess) + +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-guess.el ends here diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 68b2d62..375725e 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -577,9 +577,18 @@ EOL terminated statements." (c c++ objc) t) (c-lang-defvar c-has-bitfields (c-lang-const c-has-bitfields)) +(c-lang-defconst c-modified-constant + "Regexp that matches a \"modified\" constant literal such as \"L'a'\", +a \"long character\". In particular, this recognizes forms of constant +which `c-backward-sexp' needs to be called twice to move backwards over." + t nil + (c c++ objc) "L'\\([^\\'\t\f\n\r]\\|\\\\.\\)'") +;; FIXME!!! Extend this to cover strings, if needed. 2008-04-11 +(c-lang-defvar c-modified-constant (c-lang-const c-modified-constant)) + (c-lang-defconst c-symbol-start "Regexp that matches the start of a symbol, i.e. any identifier or -keyword. It's unspecified how far it matches. Does not contain a \\| +keyword. It's unspecified how far it matches. Does not contain a \\| operator at the top level." t (concat "[" c-alpha "_]") java (concat "[" c-alpha "_@]") @@ -1144,7 +1153,8 @@ operators." c++ (append '("&" "<%" "%>" "<:" ":>" "%:" "%:%:") (c-lang-const c-other-op-syntax-tokens)) objc (append '("#" "##" ; Used by cpp. - "+" "-") (c-lang-const c-other-op-syntax-tokens)) + "+" "-") + (c-lang-const c-other-op-syntax-tokens)) idl (append '("#" "##") ; Used by cpp. (c-lang-const c-other-op-syntax-tokens)) pike (append '("..") @@ -2996,17 +3006,15 @@ is in effect or not." (when (boundp (c-mode-symbol "font-lock-extra-types")) (c-mode-var "font-lock-extra-types"))) (regexp-strings - (apply 'nconc - (mapcar (lambda (re) - (when (string-match "[][.*+?^$\\]" re) - (list re))) - extra-types))) + (delq nil (mapcar (lambda (re) + (when (string-match "[][.*+?^$\\]" re) + re)) + extra-types))) (plain-strings - (apply 'nconc - (mapcar (lambda (re) - (unless (string-match "[][.*+?^$\\]" re) - (list re))) - extra-types)))) + (delq nil (mapcar (lambda (re) + (unless (string-match "[][.*+?^$\\]" re) + re)) + extra-types)))) (concat "\\<\\(" (c-concat-separated (append (list (c-make-keywords-re nil @@ -3350,4 +3358,8 @@ evaluated and should not be quoted." (cc-provide 'cc-langs) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-langs.el ends here diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el index 735c2cb..ae26e9b 100644 --- a/lisp/progmodes/cc-menus.el +++ b/lisp/progmodes/cc-menus.el @@ -269,7 +269,7 @@ nested angle brackets constructs." "\\(" ; method name which gets captured ; into index "[" c-alpha "_]" - "[" c-alnum "_]*" + "[" c-alnum "_]*" "\\)" "[ \t\n\r]*" ;; An argument list that contains zero or more arguments. @@ -521,4 +521,8 @@ Example: (cc-provide 'cc-menus) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-menus.el ends here diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index cb138d5..4b8e41f 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -471,6 +471,14 @@ preferably use the `c-mode-menu' language constant directly." (defvar c-maybe-stale-found-type nil) (make-variable-buffer-local 'c-maybe-stale-found-type) +(defvar c-just-done-before-change nil) +(make-variable-buffer-local 'c-just-done-before-change) +;; This variable is set to t by `c-before-change' and to nil by +;; `c-after-change'. It is used to detect a spurious invocation of +;; `before-change-functions' directly following on from a correct one. This +;; happens in some Emacsen, for example when `basic-save-buffer' does (insert +;; ?\n) when `require-final-newline' is non-nil. + (defun c-basic-common-init (mode default-style) "Do the necessary initialization for the syntax handling routines and the line breaking/filling code. Intended to be used by other @@ -541,10 +549,11 @@ that requires a literal mode spec at compile time." ;; Use this in Emacs 21+ to avoid meddling with the rear-nonsticky ;; property on each character. (when (boundp 'text-property-default-nonsticky) + (make-local-variable 'text-property-default-nonsticky) (mapc (lambda (tprop) (unless (assq tprop text-property-default-nonsticky) - (set (make-local-variable 'text-property-default-nonsticky) - (cons `(,tprop . t) text-property-default-nonsticky)))) + (setq text-property-default-nonsticky + (cons `(,tprop . t) text-property-default-nonsticky)))) '(syntax-table category c-type))) ;; In Emacs 21 and later it's possible to turn off the ad-hoc @@ -604,10 +613,12 @@ that requires a literal mode spec at compile time." (make-local-hook 'before-change-functions) (make-local-hook 'after-change-functions)) (add-hook 'before-change-functions 'c-before-change nil t) + (setq c-just-done-before-change nil) (add-hook 'after-change-functions 'c-after-change nil t) - (set (make-local-variable 'font-lock-extend-after-change-region-function) - 'c-extend-after-change-region)) ; Currently (2009-05) used by all - ; languages with #define (C, C++,; ObjC), and by AWK. + (when (boundp 'font-lock-extend-after-change-region-function) + (set (make-local-variable 'font-lock-extend-after-change-region-function) + 'c-extend-after-change-region))) ; Currently (2009-05) used by all + ; languages with #define (C, C++,; ObjC), and by AWK. (defun c-setup-doc-comment-style () "Initialize the variables that depend on the value of `c-doc-comment-style'." @@ -668,9 +679,11 @@ compatible with old code; callers should always specify it." (or (c-cpp-define-name) (c-defun-name)))) (let ((rfn (assq mode c-require-final-newline))) (when rfn - (and (cdr rfn) - (set (make-local-variable 'require-final-newline) - mode-require-final-newline))))) + (if (boundp 'mode-require-final-newline) + (and (cdr rfn) + (set (make-local-variable 'require-final-newline) + mode-require-final-newline)) + (set (make-local-variable 'require-final-newline) (cdr rfn)))))) (defun c-count-cfss (lv-alist) ;; LV-ALIST is an alist like `file-local-variables-alist'. Count how many @@ -947,7 +960,11 @@ Note that the style variables are always made local to the buffer." c-new-END (min (cdr new-bounds) (c-determine-+ve-limit 500 endd))) ;; Clear all old relevant properties. (c-clear-char-property-with-value c-new-BEG c-new-END 'syntax-table '(1)) - (c-clear-char-property-with-value c-new-BEG c-new-END 'category 'c-cpp-delimiter) + + ;; CPP "comment" markers: + (if (eval-when-compile (memq 'category-properties c-emacs-features));Emacs. + (c-clear-char-property-with-value + c-new-BEG c-new-END 'category 'c-cpp-delimiter)) ;; FIXME!!! What about the "<" and ">" category properties? 2009-11-16 ;; Add needed properties to each CPP construct in the region. @@ -966,8 +983,10 @@ Note that the style variables are always made local to the buffer." (setq mbeg (point)) (if (> (c-syntactic-end-of-macro) mbeg) (progn - (c-neutralize-CPP-line mbeg (point)) - (c-set-cpp-delimiters mbeg (point))) + (c-neutralize-CPP-line mbeg (point)) ; "punctuation" properties + (if (eval-when-compile + (memq 'category-properties c-emacs-features)) ;Emacs. + (c-set-cpp-delimiters mbeg (point)))) ; "comment" markers (forward-line)) ; no infinite loop with, e.g., "#//" ))))) @@ -987,64 +1006,71 @@ Note that the style variables are always made local to the buffer." ;; it/them from the cache. Don't worry about being inside a string ;; or a comment - "wrongly" removing a symbol from `c-found-types' ;; isn't critical. - (setq c-maybe-stale-found-type nil) - (save-restriction - (save-match-data - (widen) - (save-excursion - ;; Are we inserting/deleting stuff in the middle of an identifier? - (c-unfind-enclosing-token beg) - (c-unfind-enclosing-token end) - ;; Are we coalescing two tokens together, e.g. "fo o" -> "foo"? - (when (< beg end) - (c-unfind-coalesced-tokens beg end)) - ;; Are we (potentially) disrupting the syntactic context which - ;; makes a type a type? E.g. by inserting stuff after "foo" in - ;; "foo bar;", or before "foo" in "typedef foo *bar;"? - ;; - ;; We search for appropriate c-type properties "near" the change. - ;; First, find an appropriate boundary for this property search. - (let (lim - type type-pos - marked-id term-pos - (end1 - (or (and (eq (get-text-property end 'face) 'font-lock-comment-face) - (previous-single-property-change end 'face)) - end))) - (when (>= end1 beg) ; Don't hassle about changes entirely in comments. - ;; Find a limit for the search for a `c-type' property - (while - (and (/= (skip-chars-backward "^;{}") 0) - (> (point) (point-min)) - (memq (c-get-char-property (1- (point)) 'face) - '(font-lock-comment-face font-lock-string-face)))) - (setq lim (max (point-min) (1- (point)))) - - ;; Look for the latest `c-type' property before end1 - (when (and (> end1 (point-min)) - (setq type-pos - (if (get-text-property (1- end1) 'c-type) - end1 - (previous-single-property-change end1 'c-type nil lim)))) - (setq type (get-text-property (max (1- type-pos) lim) 'c-type)) - - (when (memq type '(c-decl-id-start c-decl-type-start)) - ;; Get the identifier, if any, that the property is on. - (goto-char (1- type-pos)) - (setq marked-id - (when (looking-at "\\(\\sw\\|\\s_\\)") - (c-beginning-of-current-token) - (buffer-substring-no-properties (point) type-pos))) - - (goto-char end1) - (skip-chars-forward "^;{}") ; FIXME!!! loop for comment, maybe - (setq lim (point)) - (setq term-pos - (or (next-single-property-change end 'c-type nil lim) lim)) - (setq c-maybe-stale-found-type - (list type marked-id - type-pos term-pos - (buffer-substring-no-properties type-pos term-pos) + (unless c-just-done-before-change ; Guard against a spurious second + ; invocation of before-change-functions. + (setq c-just-done-before-change t) + (setq c-maybe-stale-found-type nil) + (save-restriction + (save-match-data + (widen) + (save-excursion + ;; Are we inserting/deleting stuff in the middle of an identifier? + (c-unfind-enclosing-token beg) + (c-unfind-enclosing-token end) + ;; Are we coalescing two tokens together, e.g. "fo o" -> "foo"? + (when (< beg end) + (c-unfind-coalesced-tokens beg end)) + ;; Are we (potentially) disrupting the syntactic context which + ;; makes a type a type? E.g. by inserting stuff after "foo" in + ;; "foo bar;", or before "foo" in "typedef foo *bar;"? + ;; + ;; We search for appropriate c-type properties "near" the change. + ;; First, find an appropriate boundary for this property search. + (let (lim + type type-pos + marked-id term-pos + (end1 + (or (and (eq (get-text-property end 'face) + 'font-lock-comment-face) + (previous-single-property-change end 'face)) + end))) + (when (>= end1 beg) ; Don't hassle about changes entirely in comments. + ;; Find a limit for the search for a `c-type' property + (while + (and (/= (skip-chars-backward "^;{}") 0) + (> (point) (point-min)) + (memq (c-get-char-property (1- (point)) 'face) + '(font-lock-comment-face font-lock-string-face)))) + (setq lim (max (point-min) (1- (point)))) + + ;; Look for the latest `c-type' property before end1 + (when (and (> end1 (point-min)) + (setq type-pos + (if (get-text-property (1- end1) 'c-type) + end1 + (previous-single-property-change end1 'c-type + nil lim)))) + (setq type (get-text-property (max (1- type-pos) lim) 'c-type)) + + (when (memq type '(c-decl-id-start c-decl-type-start)) + ;; Get the identifier, if any, that the property is on. + (goto-char (1- type-pos)) + (setq marked-id + (when (looking-at "\\(\\sw\\|\\s_\\)") + (c-beginning-of-current-token) + (buffer-substring-no-properties (point) type-pos))) + + (goto-char end1) + (skip-chars-forward "^;{}") ;FIXME!!! loop for comment, maybe + (setq lim (point)) + (setq term-pos + (or (c-next-single-property-change end 'c-type nil lim) + lim)) + (setq c-maybe-stale-found-type + (list type marked-id + type-pos term-pos + (buffer-substring-no-properties type-pos + term-pos) (buffer-substring-no-properties beg end))))))) (if c-get-state-before-change-functions @@ -1055,7 +1081,7 @@ Note that the style variables are always made local to the buffer." ))) ;; The following must be done here rather than in `c-after-change' because ;; newly inserted parens would foul up the invalidation algorithm. - (c-invalidate-state-cache beg)) + (c-invalidate-state-cache beg))) (defvar c-in-after-change-fontification nil) (make-variable-buffer-local 'c-in-after-change-fontification) @@ -1076,6 +1102,7 @@ Note that the style variables are always made local to the buffer." ;; This calls the language variable c-before-font-lock-functions, if non nil. ;; This typically sets `syntax-table' properties. + (setq c-just-done-before-change nil) (c-save-buffer-state (case-fold-search open-paren-in-column-0-is-defun-start) ;; When `combine-after-change-calls' is used we might get calls ;; with regions outside the current narrowing. This has been @@ -1096,11 +1123,12 @@ Note that the style variables are always made local to the buffer." ;; C-y is capable of spuriously converting category properties ;; c--as-paren-syntax and c-cpp-delimiter into hard syntax-table ;; properties. Remove these when it happens. - (c-clear-char-property-with-value beg end 'syntax-table - c-<-as-paren-syntax) - (c-clear-char-property-with-value beg end 'syntax-table - c->-as-paren-syntax) - (c-clear-char-property-with-value beg end 'syntax-table nil) + (when (eval-when-compile (memq 'category-properties c-emacs-features)) + (c-clear-char-property-with-value beg end 'syntax-table + c-<-as-paren-syntax) + (c-clear-char-property-with-value beg end 'syntax-table + c->-as-paren-syntax) + (c-clear-char-property-with-value beg end 'syntax-table nil)) (c-trim-found-types beg end old-len) ; maybe we don't need all of these. (c-invalidate-sws-region-after beg end) @@ -1238,6 +1266,7 @@ This function is called from `c-common-init', once per mode initialization." (make-local-hook 'font-lock-mode-hook)) (add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t)) +;; Emacs 22 and later. (defun c-extend-after-change-region (_beg _end _old-len) "Extend the region to be fontified, if necessary." ;; Note: the parameters are ignored here. This somewhat indirect @@ -1251,6 +1280,21 @@ This function is called from `c-common-init', once per mode initialization." ;; function. (cons c-new-BEG c-new-END)) +;; Emacs < 22 and XEmacs +(defmacro c-advise-fl-for-region (function) + `(defadvice ,function (before get-awk-region activate) + ;; Make sure that any string/regexp is completely font-locked. + (when c-buffer-is-cc-mode + (save-excursion + (ad-set-arg 1 c-new-END) ; end + (ad-set-arg 0 c-new-BEG))))) ; beg + +(unless (boundp 'font-lock-extend-after-change-region-function) + (c-advise-fl-for-region font-lock-after-change-function) + (c-advise-fl-for-region jit-lock-after-change) + (c-advise-fl-for-region lazy-lock-defer-rest-after-change) + (c-advise-fl-for-region lazy-lock-defer-line-after-change)) + ;; Connect up to `electric-indent-mode' (Emacs 24.4 and later). (defun c-electric-indent-mode-hook () ;; Emacs has en/disabled `electric-indent-mode'. Propagate this through to @@ -1779,4 +1823,8 @@ Key bindings: (cc-provide 'cc-mode) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-mode.el ends here diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index 337ef92..793a6ea 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -165,8 +165,8 @@ (c-offsets-alist . ((topmost-intro . 0) (substatement . +) (substatement-open . 0) - (case-label . +) - (access-label . -) + (case-label . +) + (access-label . -) (inclass . +) (inline-open . 0)))) ("linux" @@ -209,15 +209,15 @@ (c-offsets-alist . ((inline-open . 0) (topmost-intro-cont . +) (statement-block-intro . +) - (knr-argdecl-intro . 5) + (knr-argdecl-intro . 5) (substatement-open . +) (substatement-label . +) - (label . +) - (statement-case-open . +) - (statement-cont . +) - (arglist-intro . c-lineup-arglist-intro-after-paren) - (arglist-close . c-lineup-arglist) - (access-label . 0) + (label . +) + (statement-case-open . +) + (statement-cont . +) + (arglist-intro . c-lineup-arglist-intro-after-paren) + (arglist-close . c-lineup-arglist) + (access-label . 0) (inher-cont . c-lineup-java-inher) (func-decl-cont . c-lineup-java-throws)))) @@ -663,4 +663,8 @@ DEFAULT-STYLE has the same format as `c-default-style'." (cc-provide 'cc-styles) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-styles.el ends here diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index ac8dbfc..635e382 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -271,12 +271,13 @@ nil." :group 'c) ;;;###autoload(put 'c-basic-offset 'safe-local-variable 'integerp) + (defcustom c-tab-always-indent t "*Controls the operation of the TAB key. If t, hitting TAB always just indents the current line. If nil, hitting TAB indents the current line if point is at the left margin or in the line's indentation, otherwise it inserts a `real' tab character \(see -note\). If some other value (not nil or t), then tab is inserted only +note\). If some other value (not nil or t), then tab is inserted only within literals \(comments and strings), but the line is always reindented. @@ -540,7 +541,7 @@ variable in a mode hook." (const :format "IDL " idl-mode) (regexp :format "%v")) (cons :format "%v" (const :format "Pike " pike-mode) (regexp :format "%v")) - (cons :format "%v" + (cons :format "%v" (const :format "AWK " awk-mode) (regexp :format "%v"))) (cons :format " %v" (const :format "Other " other) (regexp :format "%v")))) @@ -1175,7 +1176,7 @@ can always override the use of `c-default-style' by making calls to (objc-method-args-cont . c-lineup-ObjC-method-args) ;; Anchor pos: At the method start (always at boi). (objc-method-call-cont . (c-lineup-ObjC-method-call-colons - c-lineup-ObjC-method-call +)) + c-lineup-ObjC-method-call +)) ;; Anchor pos: At the open bracket. (extern-lang-open . 0) (namespace-open . 0) @@ -1771,4 +1772,8 @@ It treats escaped EOLs as whitespace.") (cc-provide 'cc-vars) +;;; Local Variables: +;;; indent-tabs-mode: t +;;; tab-width: 8 +;;; End: ;;; cc-vars.el ends here commit 808699f13673a881949ab94d3c0e87f5ba9cd4cf Author: Eric S. Raymond Date: Mon Dec 1 14:51:03 2014 -0500 bzr-state randomly/unpredictably fails on non-bzr files. diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 34a7c7b..7f30378 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -178,6 +178,113 @@ in the repository root directory of FILE." (insert-file-contents-literally file) (sha1 (current-buffer)))) +(defun vc-bzr-state-heuristic (file) + "Like `vc-bzr-state' but hopefully without running Bzr." + ;; `bzr status' could be slow with large histories and pending merges, + ;; so this tries to avoid calling it if possible. bzr status is + ;; faster now, so this is not as important as it was. + ;; + ;; This function tries first to parse Bzr internal file + ;; `checkout/dirstate', but it may fail if Bzr internal file format + ;; has changed. As a safeguard, the `checkout/dirstate' file is + ;; only parsed if it contains the string `#bazaar dirstate flat + ;; format 3' in the first line. + ;; If the `checkout/dirstate' file cannot be parsed, fall back to + ;; running `vc-bzr-state'." + ;; + ;; The format of the dirstate file is explained in bzrlib/dirstate.py + ;; in the bzr distribution. Basically: + ;; header-line giving the version of the file format in use. + ;; a few lines of stuff + ;; entries, one per line, with null-separated fields. Each line: + ;; entry_key = dirname (may be empty), basename, file-id + ;; current = common ( = kind, fingerprint, size, executable ) + ;; + working ( = packed_stat ) + ;; parent = common ( as above ) + history ( = rev_id ) + ;; kinds = (r)elocated, (a)bsent, (d)irectory, (f)ile, (l)ink + (let* ((root (vc-bzr-root file)) + (dirstate (expand-file-name vc-bzr-admin-dirstate root))) + (when root ; Short cut. + (condition-case err + (with-temp-buffer + (insert-file-contents dirstate) + (goto-char (point-min)) + (if (not (looking-at "#bazaar dirstate flat format 3")) + (vc-bzr-state file) ; Some other unknown format? + (let* ((relfile (file-relative-name file root)) + (reldir (file-name-directory relfile))) + (cond + ((not + (re-search-forward + (concat "^\0" + (if reldir (regexp-quote + (directory-file-name reldir))) + "\0" + (regexp-quote (file-name-nondirectory relfile)) + "\0" + "[^\0]*\0" ;id? + "\\([^\0]*\\)\0" ;"a/f/d", a=removed? + "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)? + "\\([^\0]*\\)\0" ;size?p + ;; y/n. Whether or not the current copy + ;; was executable the last time bzr checked? + "[^\0]*\0" + "[^\0]*\0" ;? + ;; Parent information. Absent in a new repo. + "\\(?:\\([^\0]*\\)\0" ;"a/f/d" a=added? + "\\([^\0]*\\)\0" ;sha1 again? + "\\([^\0]*\\)\0" ;size again? + ;; y/n. Whether or not the repo thinks + ;; the file should be executable? + "\\([^\0]*\\)\0" + "[^\0]*\0\\)?" ;last revid? + ;; There are more fields when merges are pending. + ) + nil t)) + 'unregistered) + ;; Apparently the second sha1 is the one we want: when + ;; there's a conflict, the first sha1 is absent (and the + ;; first size seems to correspond to the file with + ;; conflict markers). + ((eq (char-after (match-beginning 1)) ?a) 'removed) + ;; If there is no parent, this must be a new repo. + ;; If file is in dirstate, can only be added (b#8025). + ((or (not (match-beginning 4)) + (eq (char-after (match-beginning 4)) ?a)) 'added) + ((or (and (eq (string-to-number (match-string 3)) + (nth 7 (file-attributes file))) + (equal (match-string 5) + (save-match-data (vc-bzr-sha1 file))) + ;; For a file, does the executable state match? + ;; (Bug#7544) + (or (not + (eq (char-after (match-beginning 1)) ?f)) + (let ((exe + (memq + ?x + (mapcar + 'identity + (nth 8 (file-attributes file)))))) + (if (eq (char-after (match-beginning 7)) + ?y) + exe + (not exe))))) + (and + ;; It looks like for lightweight + ;; checkouts \2 is empty and we need to + ;; look for size in \6. + (eq (match-beginning 2) (match-end 2)) + (eq (string-to-number (match-string 6)) + (nth 7 (file-attributes file))) + (equal (match-string 5) + (vc-bzr-sha1 file)))) + 'up-to-date) + (t 'edited))))) + ;; The dirstate file can't be read, or some other problem. + (error + (message "Falling back on \"slow\" status detection (%S)" err) + (vc-bzr-state file)))))) + ;; This is a cheap approximation that is autoloaded. If it finds a ;; possible match it loads this file and runs the real function. ;; It requires vc-bzr-admin-checkout-format-file to be autoloaded too. @@ -189,7 +296,7 @@ in the repository root directory of FILE." (defun vc-bzr-registered (file) "Return non-nil if FILE is registered with bzr." - (let ((state (vc-bzr-state file))) + (let ((state (vc-bzr-state-heuristic file))) (not (memq state '(nil unregistered ignored))))) (defconst vc-bzr-state-words commit 6d80f26a9ae8e43973dbc946a9c070192fd5c431 Author: Lars Magne Ingebrigtsen Date: Mon Dec 1 20:17:39 2014 +0100 shr-dom-print dom.el changes * net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the dom.el changes. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 481bd15..762b248 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-01 Lars Magne Ingebrigtsen + + * net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the + dom.el changes. + 2014-12-01 Stefan Monnier * vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the diff --git a/lisp/net/shr.el b/lisp/net/shr.el index f44ecc2..3ad8bd1 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1009,18 +1009,23 @@ ones, in case fg and bg are nil." "Convert DOM into a string containing the xml representation." (insert (format "<%s" (dom-tag dom))) (dolist (attr (dom-attributes dom)) - ;; Ignore attributes that start with a colon. + ;; Ignore attributes that start with a colon because they are + ;; private elements. (unless (= (aref (format "%s" (car attr)) 0) ?:) (insert (format " %s=\"%s\"" (car attr) (cdr attr))))) (insert ">") (let (url) (dolist (elem (dom-children dom)) - (when (or (not (eq (dom-tag elem) 'image)) - (not (setq url (dom-attr elem ':xlink:href))) - (not shr-blocked-images) - (not (string-match shr-blocked-images url))) + (cond + ((stringp elem) + (insert elem)) + ((or (not (eq (dom-tag elem) 'image)) + ;; Filter out blocked elements inside the SVG image. + (not (setq url (dom-attr elem ':xlink:href))) + (not shr-blocked-images) + (not (string-match shr-blocked-images url))) (insert " ") - (shr-dom-print elem)))) + (shr-dom-print elem))))) (insert (format "" (dom-tag dom)))) (defun shr-tag-svg (dom) commit 92c856e8adeb10237fe34d3055ee594109d381f7 Author: Glenn Morris Date: Mon Dec 1 13:48:43 2014 -0500 ChangeLog fix diff --git a/admin/ChangeLog b/admin/ChangeLog index 6adc3f5..00279a4 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -36,8 +36,9 @@ 2014-11-11 Eric S. Raymond - * make-tarball.txt, update-copyright, notes/bugtracker, notes/tags: - * 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-10 Eli Zaretskii commit 02d462b291ae4494d4935d4e21332b7d205a82ce Author: Glenn Morris Date: Mon Dec 1 13:40:06 2014 -0500 * admin/update_autogen (commit): Revert earlier change. This was based on a misunderstanding due to the mess that had been made in trunk of this file and its ChangeLog. diff --git a/admin/ChangeLog b/admin/ChangeLog index 0529a87..82974dc 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,7 +1,3 @@ -2014-12-01 Glenn Morris - - * update_autogen (commit): With git, call "add" before "commit". - 2014-11-19 Paul Eggert Lessen focus on ChangeLog files, as opposed to change log entries. diff --git a/admin/update_autogen b/admin/update_autogen index 84e0584..d9d34fa 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -228,10 +228,6 @@ commit () echo "Committing..." - [ "$vcs" = "git" ] && { - $vcs add "$@" || return $? - } - $vcs commit -m "Auto-commit of $type files." "$@" || return $? [ "$vcs" = "git" ] && { commit 857f7dff814722d7bc58609c2292a96aba78d6cb Author: Glenn Morris Date: Mon Dec 1 13:36:14 2014 -0500 Auto-commit of loaddefs files. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index f60d660..4157922 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3,7 +3,7 @@ ;;; Code: -;;;### (autoloads nil "5x5" "play/5x5.el" (21187 63826 213216 0)) +;;;### (autoloads nil "5x5" "play/5x5.el" (21607 54478 800121 42000)) ;;; 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" (21476 41895 -;;;;;; 55661 0)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; 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" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21607 54478 +;;;;;; 800121 42000)) ;;; 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" (21476 41895 -;;;;;; 55661 0)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21607 54478 +;;;;;; 800121 42000)) ;;; 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" (21541 15655 55679 -;;;;;; 0)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (21607 54478 800121 +;;;;;; 42000)) ;;; 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" (21278 229 -;;;;;; 682967 799000)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21607 54477 +;;;;;; 800124 118000)) ;;; 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" (21417 20521 870414 0)) +;;;### (autoloads nil "align" "align.el" (21607 54477 800124 118000)) ;;; 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" (21187 63826 213216 0)) +;;;### (autoloads nil "allout" "allout.el" (21607 54477 800124 118000)) ;;; 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" (21584 -;;;;;; 48809 507899 0)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21609 +;;;;;; 55608 852266 580000)) ;;; 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" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21607 54478 300138 +;;;;;; 641000)) ;;; 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" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "animate" "play/animate.el" (21607 54478 800121 +;;;;;; 42000)) ;;; 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" (21277 37159 898165 -;;;;;; 0)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21607 54477 800124 +;;;;;; 118000)) ;;; 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" (21208 -;;;;;; 39903 471297 312000)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; 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" (21584 48809 507899 -;;;;;; 0)) +;;;### (autoloads nil "appt" "calendar/appt.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1037,7 +1037,8 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21553 6820 877466 0)) +;;;### (autoloads nil "apropos" "apropos.el" (21607 54477 800124 +;;;;;; 118000)) ;;; 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" (21476 41895 55661 -;;;;;; 0)) +;;;### (autoloads nil "arc-mode" "arc-mode.el" (21621 7062 810116 +;;;;;; 332000)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1173,7 +1174,7 @@ archive. ;;;*** -;;;### (autoloads nil "array" "array.el" (21240 46395 727291 0)) +;;;### (autoloads nil "array" "array.el" (21607 54477 800124 118000)) ;;; 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" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "artist" "textmodes/artist.el" (21607 54478 +;;;;;; 800121 42000)) ;;; 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" (21419 62246 -;;;;;; 751914 0)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; 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" (21342 -;;;;;; 10917 902592 0)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21625 +;;;;;; 43838 483701 627000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1492,8 +1493,8 @@ let-binding.") ;;;*** -;;;### (autoloads nil "autoarg" "autoarg.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "autoarg" "autoarg.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1553,8 +1554,8 @@ This is similar to `autoarg-mode' but rebinds the keypad keys ;;;*** -;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1564,8 +1565,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1603,8 +1604,8 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21425 -;;;;;; 43779 760127 645000)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21628 +;;;;;; 43483 380149 771000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1655,8 +1656,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (21315 5521 187938 -;;;;;; 0)) +;;;### (autoloads nil "autorevert" "autorevert.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1744,7 +1745,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (21379 5287 607434 0)) +;;;### (autoloads nil "avoid" "avoid.el" (21607 54477 800124 118000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1782,8 +1783,8 @@ definition of \"random distance\".) ;;;*** -;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21563 42665 -;;;;;; 706656 0)) +;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/bat-mode.el (add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode)) @@ -1801,7 +1802,8 @@ Run script using `bat-run' and `bat-run-args'. ;;;*** -;;;### (autoloads nil "battery" "battery.el" (21346 7974 405729 0)) +;;;### (autoloads nil "battery" "battery.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1836,8 +1838,8 @@ seconds. ;;;*** -;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1873,8 +1875,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21414 44327 -;;;;;; 790846 0)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1966,7 +1968,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'. ;;;*** ;;;### (autoloads nil "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54478 800121 42000)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1976,8 +1978,8 @@ Major mode for editing BibTeX style files. ;;;*** -;;;### (autoloads nil "binhex" "mail/binhex.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "binhex" "mail/binhex.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -2001,8 +2003,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads nil "blackbox" "play/blackbox.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "blackbox" "play/blackbox.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2121,8 +2123,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21397 35239 170099 -;;;;;; 0)) +;;;### (autoloads nil "bookmark" "bookmark.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2315,8 +2317,8 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (21364 37926 -;;;;;; 837230 0)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2631,7 +2633,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (21452 59559 901066 0)) +;;;### (autoloads nil "bs" "bs.el" (21607 54477 800124 118000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2672,8 +2674,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21410 47268 609529 -;;;;;; 0)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2695,7 +2697,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54478 800121 42000)) ;;; 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))))) @@ -2715,8 +2717,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21586 -;;;;;; 4146 376146 0)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21607 +;;;;;; 54477 800124 118000)) ;;; 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) @@ -2836,8 +2838,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21554 -;;;;;; 27688 263871 0)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21617 +;;;;;; 49721 420132 227000)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2846,8 +2848,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21609 55608 +;;;;;; 852266 580000)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2858,8 +2860,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21554 -;;;;;; 27688 263871 0)) +;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2871,7 +2873,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (21584 48809 507899 0)) +;;;### (autoloads nil "calc" "calc/calc.el" (21607 54477 800124 118000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2957,8 +2959,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from calc/calc-undo.el (autoload 'calc-undo "calc-undo" "\ @@ -2968,8 +2970,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21417 20521 870414 -;;;;;; 0)) +;;;### (autoloads nil "calculator" "calculator.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2980,8 +2982,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21554 27688 -;;;;;; 263871 0)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3024,8 +3026,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "canlock" "gnus/canlock.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "canlock" "gnus/canlock.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -3042,8 +3044,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21586 -;;;;;; 49290 401031 0)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21623 +;;;;;; 2108 292281 129000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3053,8 +3055,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21551 51499 -;;;;;; 554352 0)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3152,8 +3154,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21551 51499 -;;;;;; 554352 0)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3310,8 +3312,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3362,8 +3364,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21551 51499 -;;;;;; 554352 0)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3371,8 +3373,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "ccl" "international/ccl.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3632,8 +3634,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21543 57381 -;;;;;; 284584 0)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3652,15 +3654,15 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cedet" "cedet/cedet.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "cedet" "cedet/cedet.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21576 54696 -;;;;;; 780899 0)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 3)) package--builtin-versions) @@ -3689,15 +3691,15 @@ Choose `cfengine2-mode' or `cfengine3-mode' by buffer contents. ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3714,8 +3716,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21607 +;;;;;; 54477 800124 118000)) ;;; 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) @@ -3915,8 +3917,8 @@ checking of documentation strings. ;;;*** -;;;### (autoloads nil "china-util" "language/china-util.el" (21197 -;;;;;; 43194 200483 0)) +;;;### (autoloads nil "china-util" "language/china-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -3953,8 +3955,8 @@ Encode the text in the current buffer to HZ. ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "chistory" "chistory.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -3993,8 +3995,8 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21318 -;;;;;; 28582 821557 0)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4077,8 +4079,8 @@ instead. ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21549 9768 -;;;;;; 351453 0)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21619 26501 +;;;;;; 970129 581000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) @@ -4108,8 +4110,8 @@ a future Emacs interpreter will be able to use it.") ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4129,8 +4131,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4150,7 +4152,7 @@ is run). ;;;*** -;;;### (autoloads nil "color" "color.el" (21187 63826 213216 0)) +;;;### (autoloads nil "color" "color.el" (21607 54477 800124 118000)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4169,7 +4171,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21339 34726 39547 0)) +;;;### (autoloads nil "comint" "comint.el" (21607 54477 800124 118000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4270,8 +4272,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4304,8 +4306,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21586 4146 -;;;;;; 376146 0)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4486,8 +4488,8 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** -;;;### (autoloads nil "completion" "completion.el" (21584 48809 507899 -;;;;;; 0)) +;;;### (autoloads nil "completion" "completion.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4509,8 +4511,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21383 -;;;;;; 2343 498187 0)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4665,8 +4667,8 @@ For details see `conf-mode'. Example: ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (21245 64312 799897 -;;;;;; 0)) +;;;### (autoloads nil "cookie1" "play/cookie1.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4694,8 +4696,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4733,8 +4735,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21438 -;;;;;; 26670 609361 0)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4932,8 +4934,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4951,8 +4953,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21263 7861 493097 -;;;;;; 0)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -4978,8 +4980,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21574 12970 -;;;;;; 82034 0)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -4995,8 +4997,8 @@ Major mode to edit \"Sassy CSS\" files. ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21319 49445 -;;;;;; 508378 0)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5041,8 +5043,8 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;*** -;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21503 425 -;;;;;; 992235 0)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -5053,8 +5055,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21567 9155 113406 -;;;;;; 0)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5366,8 +5368,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5400,8 +5402,8 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** -;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5411,8 +5413,8 @@ Mode used for cvs status output. ;;;*** -;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21383 2343 498187 -;;;;;; 0)) +;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) @@ -5456,8 +5458,8 @@ See `cwarn-mode' for more information on Cwarn mode. ;;;*** -;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21193 -;;;;;; 16180 875828 0)) +;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5485,8 +5487,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5532,8 +5534,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21197 43194 -;;;;;; 200483 0)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5543,7 +5545,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21430 32550 215986 0)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21607 54478 300138 641000)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5556,8 +5558,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5683,8 +5685,8 @@ There is some minimal font-lock support (see vars ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5727,8 +5729,8 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** -;;;### (autoloads nil "decipher" "play/decipher.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "decipher" "play/decipher.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5756,8 +5758,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "delim-col" "delim-col.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5782,7 +5784,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21414 44327 790846 0)) +;;;### (autoloads nil "delsel" "delsel.el" (21607 54477 800124 118000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5810,8 +5812,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5877,8 +5879,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21567 8911 359241 -;;;;;; 0)) +;;;### (autoloads nil "descr-text" "descr-text.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5912,8 +5914,7 @@ relevant to POS. ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21526 48295 289762 -;;;;;; 0)) +;;;### (autoloads nil "desktop" "desktop.el" (21616 28857 81577 239000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6118,8 +6119,8 @@ Revert to the last loaded desktop. ;;;*** -;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -6151,8 +6152,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21561 -;;;;;; 934 250078 0)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21625 +;;;;;; 43838 483701 627000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6194,7 +6195,7 @@ Major mode for editing the diary file. ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (21240 46395 727291 0)) +;;;### (autoloads nil "diff" "vc/diff.el" (21607 54478 800121 42000)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6242,8 +6243,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21546 33576 -;;;;;; 601815 0)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21628 45530 +;;;;;; 160140 360000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6275,7 +6276,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "dig" "net/dig.el" (21187 63826 213216 0)) +;;;### (autoloads nil "dig" "net/dig.el" (21607 54478 300138 641000)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6286,7 +6287,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21452 59559 901066 0)) +;;;### (autoloads nil "dired" "dired.el" (21607 54477 800124 118000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6406,8 +6407,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6437,8 +6438,8 @@ from `default-directory'. ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6452,8 +6453,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "disp-table" "disp-table.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6574,8 +6575,8 @@ in `.emacs'. ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6591,7 +6592,7 @@ Default is 2. ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (21240 46395 727291 0)) +;;;### (autoloads nil "dnd" "dnd.el" (21607 54477 800124 118000)) ;;; 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)) "\ @@ -6611,8 +6612,8 @@ if some action was made, or nil if the URL is ignored.") ;;;*** -;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6635,8 +6636,8 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads nil "doc-view" "doc-view.el" (21576 54696 780899 -;;;;;; 0)) +;;;### (autoloads nil "doc-view" "doc-view.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6682,8 +6683,8 @@ See the command `doc-view-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "doctor" "play/doctor.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6693,7 +6694,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (21187 63826 213216 0)) +;;;### (autoloads nil "double" "double.el" (21607 54477 800124 118000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6709,8 +6710,8 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21406 50214 284651 -;;;;;; 0)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) @@ -6721,8 +6722,8 @@ Switch to *dungeon* buffer and start game. ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21505 -;;;;;; 42150 427725 0)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6861,8 +6862,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7000,8 +7001,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7266,8 +7267,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7415,8 +7416,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7448,8 +7449,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "echistory" "echistory.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7460,8 +7461,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7471,7 +7472,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (21350 58112 380040 0)) +;;;### (autoloads nil "ede" "cedet/ede.el" (21607 54477 800124 118000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7497,8 +7498,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21452 59559 -;;;;;; 901066 0)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7562,7 +7563,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (21429 11690 49391 0)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (21607 54478 800121 42000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -7834,8 +7835,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7845,8 +7846,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21429 11690 -;;;;;; 49391 0)) +;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7858,8 +7859,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21458 11942 -;;;;;; 975332 0)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7878,8 +7879,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "edmacro" "edmacro.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -7928,8 +7929,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21417 20521 870414 -;;;;;; 0)) +;;;### (autoloads nil "edt" "emulation/edt.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -7946,7 +7947,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21429 11690 49391 0)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21607 54477 800124 118000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -7982,15 +7983,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21571 36773 -;;;;;; 524862 0)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21571 -;;;;;; 36773 524862 0)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8006,8 +8007,8 @@ It creates an autoload function for CNAME's constructor. ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (21327 43559 923043 -;;;;;; 0)) +;;;### (autoloads nil "elec-pair" "elec-pair.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from elec-pair.el (defvar electric-pair-text-pairs '((34 . 34)) "\ @@ -8042,8 +8043,8 @@ closing parenthesis. (Likewise for brackets, etc.). ;;;*** -;;;### (autoloads nil "elide-head" "elide-head.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "elide-head" "elide-head.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -8058,8 +8059,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21195 23530 -;;;;;; 495420 0)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8094,8 +8095,8 @@ optional prefix argument REINIT is non-nil. ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8129,8 +8130,8 @@ displayed. ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8157,20 +8158,22 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21302 89 140834 -;;;;;; 615000)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21608 34742 +;;;;;; 2253 811000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ Report a bug in GNU Emacs. Prompts for bug subject. Leaves you in a mail buffer. -\(fn TOPIC &optional RECENT-KEYS)" t nil) +\(fn TOPIC &optional UNUSED)" t nil) + +(set-advertised-calling-convention 'report-emacs-bug '(topic) '"24.5") ;;;*** -;;;### (autoloads nil "emerge" "vc/emerge.el" (21364 37926 837230 -;;;;;; 0)) +;;;### (autoloads nil "emerge" "vc/emerge.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -8230,8 +8233,8 @@ Emerge two RCS revisions of a file, with another revision as ancestor. ;;;*** -;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -8266,7 +8269,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21294 46247 414129 0)) +;;;### (autoloads nil "epa" "epa.el" (21624 22971 140149 848000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8454,8 +8457,8 @@ Insert selected KEYS after the point. ;;;*** -;;;### (autoloads nil "epa-dired" "epa-dired.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "epa-dired" "epa-dired.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8480,8 +8483,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (21205 7349 58947 -;;;;;; 0)) +;;;### (autoloads nil "epa-file" "epa-file.el" (21611 10937 700236 +;;;;;; 3000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8501,8 +8504,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-mail" "epa-mail.el" (21294 46247 414129 -;;;;;; 0)) +;;;### (autoloads nil "epa-mail" "epa-mail.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8579,7 +8582,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21578 10030 299837 0)) +;;;### (autoloads nil "epg" "epg.el" (21611 10937 700236 3000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8590,8 +8593,8 @@ Return a context object. ;;;*** -;;;### (autoloads nil "epg-config" "epg-config.el" (21543 57381 284584 -;;;;;; 0)) +;;;### (autoloads nil "epg-config" "epg-config.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8611,7 +8614,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21584 48809 507899 0)) +;;;### (autoloads nil "erc" "erc/erc.el" (21607 54478 300138 641000)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8659,36 +8662,36 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8718,14 +8721,14 @@ that subcommand. ;;;*** ;;;### (autoloads nil "erc-desktop-notifications" "erc/erc-desktop-notifications.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21617 49721 420132 227000)) ;;; Generated autoloads from erc/erc-desktop-notifications.el (autoload 'erc-notifications-mode "erc-desktop-notifications" "" t) ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8787,8 +8790,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8800,8 +8803,8 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'. ;;;*** -;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8822,8 +8825,8 @@ system. ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8833,22 +8836,22 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21308 46599 181916 -;;;;;; 0)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8877,8 +8880,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -8924,15 +8927,15 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -8943,8 +8946,8 @@ Show who's gone. ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21260 -;;;;;; 55795 711190 0)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -8961,8 +8964,8 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -8980,36 +8983,36 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21550 30640 287412 -;;;;;; 0)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9026,15 +9029,15 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9045,22 +9048,22 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21546 33576 -;;;;;; 601815 0)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21586 4146 -;;;;;; 376146 0)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9085,8 +9088,8 @@ keybindings will not do anything useful. ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9105,8 +9108,8 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9117,8 +9120,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21419 62246 751914 -;;;;;; 0)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9183,8 +9186,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** -;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9196,8 +9199,8 @@ Kill all test buffers that are still live. ;;;*** -;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21213 1461 -;;;;;; 513511 0)) +;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9207,8 +9210,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (21403 21396 190131 -;;;;;; 14000)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9243,8 +9246,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9552,8 +9555,8 @@ for \\[find-tag] (which see). ;;;*** -;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9721,7 +9724,7 @@ With ARG, insert that many delimiters. ;;;*** -;;;### (autoloads nil "eudc" "net/eudc.el" (21187 63826 213216 0)) +;;;### (autoloads nil "eudc" "net/eudc.el" (21607 54478 300138 641000)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9775,8 +9778,8 @@ This does nothing except loading eudc by autoload side-effect. ;;;*** -;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -9811,8 +9814,8 @@ Display a button for the JPEG DATA. ;;;*** -;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9828,8 +9831,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** -;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9839,8 +9842,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -9866,7 +9869,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21546 33576 601815 0)) +;;;### (autoloads nil "eww" "net/eww.el" (21628 44513 720130 219000)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -9882,15 +9885,26 @@ Render a file using EWW. \(fn FILE)" t nil) +(autoload 'eww-search-words "eww" "\ +Search the web for the text between the point and marker. +See the `eww-search-prefix' variable for the search engine used. + +\(fn &optional BEG END)" t nil) + (autoload 'eww-browse-url "eww" "\ \(fn URL &optional NEW-WINDOW)" nil nil) +(autoload 'eww-list-bookmarks "eww" "\ +Display the bookmarks. + +\(fn)" t nil) + ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -9931,7 +9945,7 @@ file modes. ;;;*** -;;;### (autoloads nil "expand" "expand.el" (21187 63826 213216 0)) +;;;### (autoloads nil "expand" "expand.el" (21607 54478 300138 641000)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -9980,8 +9994,8 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads nil "f90" "progmodes/f90.el" (21429 11690 49391 -;;;;;; 0)) +;;;### (autoloads nil "f90" "progmodes/f90.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10048,8 +10062,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (21241 18251 378509 -;;;;;; 0)) +;;;### (autoloads nil "face-remap" "face-remap.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10208,8 +10222,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;*** -;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21002 1963 769129 -;;;;;; 0)) +;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/feedmail.el (push (purecopy '(feedmail 11)) package--builtin-versions) @@ -10263,7 +10277,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21546 33576 601815 0)) +;;;### (autoloads nil "ffap" "ffap.el" (21607 54478 300138 641000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10326,8 +10340,8 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (21265 49588 918402 -;;;;;; 0)) +;;;### (autoloads nil "filecache" "filecache.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -10384,8 +10398,8 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads nil "filenotify" "filenotify.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "filenotify" "filenotify.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from filenotify.el (autoload 'file-notify-handle-event "filenotify" "\ @@ -10397,8 +10411,8 @@ Otherwise, signal a `file-notify-error'. ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "files-x" "files-x.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10463,8 +10477,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "filesets" "filesets.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10475,8 +10489,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (21539 60334 648861 -;;;;;; 0)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10496,8 +10510,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21264 57319 597552 -;;;;;; 0)) +;;;### (autoloads nil "find-dired" "find-dired.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10537,8 +10551,8 @@ use in place of \"-ls\" as the final argument. ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "find-file" "find-file.el" (21607 54478 300138 +;;;;;; 641000)) ;;; 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)))) "\ @@ -10628,8 +10642,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21419 -;;;;;; 62246 751914 0)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10787,8 +10801,8 @@ Define some key bindings for the find-function family of functions. ;;;*** -;;;### (autoloads nil "find-lisp" "find-lisp.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "find-lisp" "find-lisp.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10808,7 +10822,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21429 11690 49391 0)) +;;;### (autoloads nil "finder" "finder.el" (21607 54478 300138 641000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -10830,8 +10844,8 @@ Find packages matching a given keyword. ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -10852,8 +10866,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -10868,8 +10882,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21245 64312 -;;;;;; 799897 0)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -10899,8 +10913,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -10970,14 +10984,14 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "foldout" "foldout.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21240 46395 727291 0)) +;;;### (autoloads nil "follow" "follow.el" (21607 54478 300138 641000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11045,8 +11059,8 @@ selected if the original window is the first one in the frame. ;;;*** -;;;### (autoloads nil "footnote" "mail/footnote.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "footnote" "mail/footnote.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) @@ -11065,7 +11079,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (21187 63826 213216 0)) +;;;### (autoloads nil "forms" "forms.el" (21607 54478 300138 641000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11101,8 +11115,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11179,8 +11193,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "fortune" "play/fortune.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "fortune" "play/fortune.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11228,8 +11242,8 @@ and choose the directory as the fortune-file. ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (21549 9768 351453 -;;;;;; 0)) +;;;### (autoloads nil "frameset" "frameset.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from frameset.el (defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\ @@ -11415,15 +11429,15 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21350 58112 -;;;;;; 380040 0)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11500,8 +11514,8 @@ detailed description of this mode. ;;;*** -;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21202 31159 -;;;;;; 541460 0)) +;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11581,8 +11595,8 @@ regular expression that can be used as an element of ;;;*** -;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11596,8 +11610,8 @@ add virtual separators (like underscores) at places they belong to. ;;;*** -;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21326 22692 -;;;;;; 123234 0)) +;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11651,7 +11665,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (21582 7079 522747 0)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (21607 54478 300138 641000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11701,8 +11715,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21274 64565 -;;;;;; 737222 0)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11792,8 +11806,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21546 33576 -;;;;;; 601815 0)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21623 2108 292281 +;;;;;; 129000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11803,8 +11817,8 @@ Make the current buffer look like a nice article. ;;;*** -;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -11827,8 +11841,8 @@ deletion, or > if it is flagged for displaying. ;;;*** -;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21296 1575 -;;;;;; 438327 0)) +;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -11869,8 +11883,8 @@ supported. ;;;*** -;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21584 48809 -;;;;;; 507899 0)) +;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11905,8 +11919,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -11921,8 +11935,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -11932,8 +11946,8 @@ Convenience method to turn on gnus-dired-mode. ;;;*** -;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -11943,8 +11957,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21546 33576 -;;;;;; 601815 0)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus--random-face-with-type "gnus-fun" "\ @@ -12009,8 +12023,8 @@ Insert a random Face header from `gnus-face-directory'. ;;;*** -;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -12027,8 +12041,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21296 1575 -;;;;;; 438327 0)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12045,8 +12059,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21296 1575 -;;;;;; 438327 0)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12061,8 +12075,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12075,8 +12089,8 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;*** -;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -12099,8 +12113,8 @@ Minor mode for providing mailing-list commands. ;;;*** -;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21296 1575 -;;;;;; 438327 0)) +;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -12200,8 +12214,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21467 26920 -;;;;;; 243336 0)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12228,7 +12242,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads nil "gnus-notifications" "gnus/gnus-notifications.el" -;;;;;; (21296 1575 438327 0)) +;;;;;; (21607 54478 300138 641000)) ;;; Generated autoloads from gnus/gnus-notifications.el (autoload 'gnus-notifications "gnus-notifications" "\ @@ -12244,8 +12258,8 @@ This is typically a function to add in ;;;*** -;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21296 1575 -;;;;;; 438327 0)) +;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12268,8 +12282,8 @@ If picons are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12336,8 +12350,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21350 -;;;;;; 58112 380040 0)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12352,8 +12366,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12380,8 +12394,8 @@ See the documentation for these variables and functions for details. ;;;*** -;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21296 1575 -;;;;;; 438327 0)) +;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12391,8 +12405,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21566 18857 -;;;;;; 282099 0)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21620 25920 +;;;;;; 601566 783000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12402,8 +12416,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21584 48809 -;;;;;; 507899 0)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21623 2108 292281 +;;;;;; 129000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12414,8 +12428,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12430,8 +12444,8 @@ Install the sync hooks. ;;;*** -;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12441,8 +12455,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (21570 15914 957442 -;;;;;; 0)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (21620 46140 530123 +;;;;;; 341000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12458,8 +12472,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12485,8 +12499,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12527,8 +12541,8 @@ Like `goto-address-mode', but only for comments and strings. ;;;*** -;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21296 1575 438327 -;;;;;; 0)) +;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -12544,8 +12558,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (21542 36519 256429 -;;;;;; 0)) +;;;### (autoloads nil "grep" "progmodes/grep.el" (21612 31801 50825 +;;;;;; 711000)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12709,7 +12723,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'. ;;;*** -;;;### (autoloads nil "gs" "gs.el" (21240 46395 727291 0)) +;;;### (autoloads nil "gs" "gs.el" (21607 54478 300138 641000)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12722,8 +12736,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21549 9768 351453 -;;;;;; 0)) +;;;### (autoloads nil "gud" "progmodes/gud.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12818,8 +12832,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21588 45860 859392 -;;;;;; 0)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -12921,8 +12935,8 @@ binding mode. ;;;*** -;;;### (autoloads nil "handwrite" "play/handwrite.el" (21207 49087 -;;;;;; 974317 0)) +;;;### (autoloads nil "handwrite" "play/handwrite.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -12939,8 +12953,8 @@ Variables: `handwrite-linespace' (default 12) ;;;*** -;;;### (autoloads nil "hanoi" "play/hanoi.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "hanoi" "play/hanoi.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -12967,8 +12981,8 @@ to be updated. ;;;*** -;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21296 1575 438327 -;;;;;; 0)) +;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -13010,8 +13024,8 @@ Prefix arg sets default accept amount temporarily. ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21231 31415 579137 -;;;;;; 0)) +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -13138,8 +13152,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21419 62246 751914 -;;;;;; 0)) +;;;### (autoloads nil "help-fns" "help-fns.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13218,8 +13232,8 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file. ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "help-macro" "help-macro.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13233,8 +13247,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "help-mode" "help-mode.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13333,8 +13347,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13349,7 +13363,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21271 1974 113743 0)) +;;;### (autoloads nil "hexl" "hexl.el" (21607 54478 300138 641000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13443,7 +13457,8 @@ This discards the buffer's undo information. ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (21383 2343 498187 0)) +;;;### (autoloads nil "hi-lock" "hi-lock.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13610,8 +13625,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21546 33576 -;;;;;; 601815 0)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13658,8 +13673,8 @@ Several variables affect how the hiding is done: ;;;*** -;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21460 53672 -;;;;;; 48319 0)) +;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21607 54478 +;;;;;; 800121 42000)) ;;; 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))) "\ @@ -13721,8 +13736,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21271 1974 113743 -;;;;;; 0)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13853,8 +13868,8 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21402 53158 293492 -;;;;;; 0)) +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -13886,8 +13901,8 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "hl-line" "hl-line.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -13936,8 +13951,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (21554 27688 -;;;;;; 263871 0)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (21607 54477 +;;;;;; 800124 118000)) ;;; 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"))) "\ @@ -14047,8 +14062,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (21417 20521 -;;;;;; 870414 0)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14058,8 +14073,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21383 2343 -;;;;;; 498187 0)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14092,8 +14107,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'. ;;;*** -;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21537 18599 384335 -;;;;;; 0)) +;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14181,8 +14196,8 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21537 18854 710114 -;;;;;; 217000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14221,8 +14236,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21584 -;;;;;; 48809 507899 0)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21611 +;;;;;; 10937 700236 3000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14275,8 +14290,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21555 48550 492098 -;;;;;; 0)) +;;;### (autoloads nil "icomplete" "icomplete.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14315,8 +14330,8 @@ completions: ;;;*** -;;;### (autoloads nil "icon" "progmodes/icon.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "icon" "progmodes/icon.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14356,8 +14371,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21429 -;;;;;; 11690 49391 0)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14382,8 +14397,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21429 11690 -;;;;;; 49391 0)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14512,7 +14527,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21584 48809 507899 0)) +;;;### (autoloads nil "ido" "ido.el" (21612 31801 50825 711000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14774,7 +14789,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21542 36519 256429 0)) +;;;### (autoloads nil "ielm" "ielm.el" (21607 54478 300138 641000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -14786,7 +14801,7 @@ See `inferior-emacs-lisp-mode' for details. ;;;*** -;;;### (autoloads nil "iimage" "iimage.el" (21289 28325 826818 0)) +;;;### (autoloads nil "iimage" "iimage.el" (21607 54478 300138 641000)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -14802,7 +14817,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (21526 48295 289762 0)) +;;;### (autoloads nil "image" "image.el" (21607 54478 300138 641000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -14995,8 +15010,8 @@ If Emacs is compiled without ImageMagick support, this does nothing. ;;;*** -;;;### (autoloads nil "image-dired" "image-dired.el" (21194 37048 -;;;;;; 599945 0)) +;;;### (autoloads nil "image-dired" "image-dired.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) @@ -15133,8 +15148,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads nil "image-file" "image-file.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "image-file" "image-file.el" (21607 54478 300138 +;;;;;; 641000)) ;;; 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")) "\ @@ -15196,8 +15211,8 @@ An image file is one whose name has an extension in ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (21532 676 459903 -;;;;;; 0)) +;;;### (autoloads nil "image-mode" "image-mode.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15244,7 +15259,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21574 12970 82034 0)) +;;;### (autoloads nil "imenu" "imenu.el" (21607 54478 300138 641000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15382,8 +15397,8 @@ for more information. ;;;*** -;;;### (autoloads nil "ind-util" "language/ind-util.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "ind-util" "language/ind-util.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -15413,8 +15428,8 @@ Convert old Emacs Devanagari characters to UCS. ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21437 5802 -;;;;;; 125919 0)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15432,7 +15447,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21559 45607 560399 0)) +;;;### (autoloads nil "info" "info.el" (21607 54478 300138 641000)) ;;; 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))))) "\ @@ -15642,8 +15657,8 @@ Otherwise, visit the manual in a new Info buffer. ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (21238 4664 559807 -;;;;;; 0)) +;;;### (autoloads nil "info-look" "info-look.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15690,8 +15705,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "info-xref" "info-xref.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -15774,8 +15789,8 @@ the sources handy. ;;;*** -;;;### (autoloads nil "informat" "informat.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "informat" "informat.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15820,8 +15835,23 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inversion" "cedet/inversion.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "inline" "emacs-lisp/inline.el" (21628 43483 +;;;;;; 380149 771000)) +;;; Generated autoloads from emacs-lisp/inline.el + +(autoload 'define-inline "inline" "\ + + +\(fn NAME ARGS &rest BODY)" nil t) + +(function-put 'define-inline 'lisp-indent-function 'defun) + +(function-put 'define-inline 'doc-string-elt '3) + +;;;*** + +;;;### (autoloads nil "inversion" "cedet/inversion.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) @@ -15833,8 +15863,8 @@ Only checks one based on which kind of Emacs is being run. ;;;*** -;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -15854,8 +15884,8 @@ Toggle input method in interactive search. ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "isearchb" "isearchb.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -15869,8 +15899,8 @@ accessed via isearchb. ;;;*** -;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -15961,15 +15991,15 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (21240 46395 727291 0)) +;;;;;; (21607 54478 300138 641000)) ;;; 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" (21356 43818 -;;;;;; 957743 0)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16202,8 +16232,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" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "japan-util" "language/japan-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -16280,8 +16310,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16304,7 +16334,7 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21529 24490 97012 0)) +;;;### (autoloads nil "js" "progmodes/js.el" (21623 2108 292281 129000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16318,14 +16348,14 @@ Major mode for editing JavaScript. ;;;*** -;;;### (autoloads nil "json" "json.el" (21187 63826 213216 0)) +;;;### (autoloads nil "json" "json.el" (21607 54478 300138 641000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "keypad" "emulation/keypad.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "keypad" "emulation/keypad.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16380,8 +16410,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** -;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -16402,8 +16432,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "kkc" "international/kkc.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16425,7 +16455,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21244 11875 194797 0)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21607 54478 300138 641000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16537,8 +16567,8 @@ If kbd macro currently being defined end it before activating it. ;;;*** -;;;### (autoloads nil "korea-util" "language/korea-util.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "korea-util" "language/korea-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16552,8 +16582,8 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "landmark" "play/landmark.el" (21419 7843 195974 -;;;;;; 0)) +;;;### (autoloads nil "landmark" "play/landmark.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from play/landmark.el (push (purecopy '(landmark 1 0)) package--builtin-versions) @@ -16584,8 +16614,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "lao-util" "language/lao-util.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "lao-util" "language/lao-util.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16622,8 +16652,8 @@ Transcribe Romanized Lao string STR to Lao character string. ;;;*** -;;;### (autoloads nil "latexenc" "international/latexenc.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "latexenc" "international/latexenc.el" (21607 +;;;;;; 54478 300138 641000)) ;;; 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))) "\ @@ -16655,7 +16685,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54478 300138 641000)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16696,8 +16726,8 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** -;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16707,7 +16737,7 @@ A major mode to edit GNU ld script files ;;;*** -;;;### (autoloads nil "life" "play/life.el" (21240 46395 727291 0)) +;;;### (autoloads nil "life" "play/life.el" (21607 54478 800121 42000)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -16720,7 +16750,7 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads nil "linum" "linum.el" (21437 5802 125919 0)) +;;;### (autoloads nil "linum" "linum.el" (21607 54478 300138 641000)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -16757,8 +16787,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "loadhist" "loadhist.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16789,7 +16819,7 @@ something strange, such as redefining an Emacs function. ;;;*** -;;;### (autoloads nil "locate" "locate.el" (21187 63826 213216 0)) +;;;### (autoloads nil "locate" "locate.el" (21607 54478 300138 641000)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -16841,8 +16871,8 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21442 23723 6983 -;;;;;; 0)) +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16873,8 +16903,8 @@ done. Otherwise, it uses the current buffer. ;;;*** -;;;### (autoloads nil "log-view" "vc/log-view.el" (21195 57908 940910 -;;;;;; 0)) +;;;### (autoloads nil "log-view" "vc/log-view.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -16884,7 +16914,7 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (21240 46395 727291 0)) +;;;### (autoloads nil "lpr" "lpr.el" (21607 54478 300138 641000)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -16979,8 +17009,8 @@ for further customization of the printer command. ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21546 33576 601815 -;;;;;; 0)) +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -16991,8 +17021,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads nil "lunar" "calendar/lunar.el" (21554 27688 263871 -;;;;;; 0)) +;;;### (autoloads nil "lunar" "calendar/lunar.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -17004,8 +17034,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21567 8911 -;;;;;; 359241 0)) +;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17015,7 +17045,7 @@ A major mode to edit m4 macro files. ;;;*** -;;;### (autoloads nil "macros" "macros.el" (21240 46395 727291 0)) +;;;### (autoloads nil "macros" "macros.el" (21607 54478 300138 641000)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17104,8 +17134,8 @@ and then select the region of un-tablified names and use ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17135,8 +17165,8 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;*** -;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17165,8 +17195,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17240,8 +17270,8 @@ matches may be returned from the message body. ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17290,8 +17320,8 @@ double-quotes. ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17344,8 +17374,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any. ;;;*** -;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21215 8898 -;;;;;; 840126 623000)) +;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -17357,8 +17387,8 @@ The mail client is taken to be the handler of mailto URLs. ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17475,8 +17505,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "makesum" "makesum.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -17487,7 +17517,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads nil "man" "man.el" (21580 51751 606453 0)) +;;;### (autoloads nil "man" "man.el" (21607 54478 300138 641000)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17543,7 +17573,7 @@ Default bookmark handler for Man buffers. ;;;*** -;;;### (autoloads nil "master" "master.el" (21187 63826 213216 0)) +;;;### (autoloads nil "master" "master.el" (21607 54478 300138 641000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) @@ -17566,8 +17596,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads nil "mb-depth" "mb-depth.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "mb-depth" "mb-depth.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -17594,14 +17624,14 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "md4" "md4.el" (21187 63826 213216 0)) +;;;### (autoloads nil "md4" "md4.el" (21607 54478 300138 641000)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21584 48809 507899 -;;;;;; 0)) +;;;### (autoloads nil "message" "gnus/message.el" (21623 2108 292281 +;;;;;; 129000)) ;;; 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) @@ -17766,8 +17796,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) @@ -17783,8 +17813,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17827,8 +17857,8 @@ redisplayed as output is inserted. ;;;*** -;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21546 33576 601815 -;;;;;; 0)) +;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -17918,7 +17948,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21546 33576 601815 0)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21607 54478 300138 641000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -17935,8 +17965,8 @@ Display version information about MH-E and the MH mail handling system. ;;;*** -;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21286 52150 -;;;;;; 476720 0)) +;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18017,8 +18047,8 @@ perform the operation on all messages in that region. ;;;*** -;;;### (autoloads nil "midnight" "midnight.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "midnight" "midnight.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -18044,8 +18074,8 @@ to its second argument TM. ;;;*** -;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18074,7 +18104,7 @@ is modified to remove the default indication. ;;;*** -;;;### (autoloads nil "misc" "misc.el" (21240 46395 727291 0)) +;;;### (autoloads nil "misc" "misc.el" (21607 54478 300138 641000)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18102,8 +18132,8 @@ The return value is always nil. ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (21245 64312 799897 -;;;;;; 0)) +;;;### (autoloads nil "misearch" "misearch.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18138,6 +18168,10 @@ Isearch starts.") The buffer where the search is currently searching. The value is nil when the search still is in the initial buffer.") +(defvar multi-isearch-buffer-list nil) + +(defvar multi-isearch-file-list nil) + (autoload 'multi-isearch-setup "misearch" "\ Set up isearch to search multiple buffers. Intended to be added to `isearch-mode-hook'. @@ -18184,8 +18218,8 @@ whose file names match the specified wildcard. ;;;*** -;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) @@ -18196,8 +18230,8 @@ Major mode for the mixal asm language. ;;;*** -;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/mm-encode.el (autoload 'mm-default-file-encoding "mm-encode" "\ @@ -18207,8 +18241,8 @@ Return a default encoding for FILE. ;;;*** -;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21296 1575 -;;;;;; 438327 0)) +;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -18226,8 +18260,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -18240,8 +18274,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21296 1575 438327 -;;;;;; 0)) +;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18257,8 +18291,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21363 17065 850322 -;;;;;; 0)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18277,7 +18311,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** -;;;### (autoloads nil "mml" "gnus/mml.el" (21546 33576 601815 0)) +;;;### (autoloads nil "mml" "gnus/mml.el" (21607 54478 300138 641000)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18302,8 +18336,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21296 1575 438327 -;;;;;; 0)) +;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -18318,8 +18352,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21546 33576 601815 -;;;;;; 0)) +;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18359,16 +18393,16 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) ;;;*** -;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21282 19826 -;;;;;; 403614 0)) +;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18401,8 +18435,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "morse" "play/morse.el" (21616 28857 81577 +;;;;;; 239000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18427,8 +18461,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** -;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21202 31159 541460 -;;;;;; 0)) +;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18475,7 +18509,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21537 18599 384335 0)) +;;;### (autoloads nil "mpc" "mpc.el" (21607 54478 300138 641000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18485,7 +18519,7 @@ Main entry point for MPC. ;;;*** -;;;### (autoloads nil "mpuz" "play/mpuz.el" (21187 63826 213216 0)) +;;;### (autoloads nil "mpuz" "play/mpuz.el" (21607 54478 800121 42000)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18495,7 +18529,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21528 3626 241769 0)) +;;;### (autoloads nil "msb" "msb.el" (21607 54478 300138 641000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18520,8 +18554,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -18653,8 +18687,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (21412 -;;;;;; 2598 318409 0)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -18785,8 +18819,8 @@ per-character basis, this may not be accurate. ;;;*** -;;;### (autoloads nil "net-utils" "net/net-utils.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "net-utils" "net/net-utils.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -18880,8 +18914,8 @@ Open a network connection to HOST on PORT. ;;;*** -;;;### (autoloads nil "netrc" "net/netrc.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "netrc" "net/netrc.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -18893,8 +18927,8 @@ listed in the PORTS list. ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (21619 +;;;;;; 5051 260148 536000)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -18975,11 +19009,14 @@ values: :use-starttls-if-possible is a boolean that says to do opportunistic STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality. +:warn-unless-encrypted is a boolean which, if :return-list is +non-nil, is used warn the user if the connection isn't encrypted. + :nogreeting is a boolean that can be used to inhibit waiting for a greeting from the server. :nowait is a boolean that says the connection should be made - asynchronously, if possible. +asynchronously, if possible. \(fn NAME BUFFER HOST SERVICE &rest PARAMETERS)" nil nil) @@ -18987,8 +19024,8 @@ a greeting from the server. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21584 -;;;;;; 48809 507899 0)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21628 +;;;;;; 45530 160140 360000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19010,7 +19047,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (21549 9768 351453 0)) +;;;;;; (21607 54478 300138 641000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19020,8 +19057,8 @@ Start newsticker plainview. ;;;*** -;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21574 -;;;;;; 12970 82034 0)) +;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -19031,8 +19068,8 @@ Start reading news. You may want to bind this to a key. ;;;*** -;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21549 -;;;;;; 9768 351453 0)) +;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -19052,8 +19089,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21572 -;;;;;; 57638 740412 0)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21628 +;;;;;; 45530 160140 360000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19063,8 +19100,8 @@ Start newsticker treeview. ;;;*** -;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21204 37210 187838 -;;;;;; 0)) +;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19074,8 +19111,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -19089,8 +19126,8 @@ symbol in the alist. ;;;*** -;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21296 1575 438327 -;;;;;; 0)) +;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -19101,7 +19138,7 @@ This command does not work if you use short group names. ;;;*** -;;;### (autoloads nil "nnml" "gnus/nnml.el" (21187 63826 213216 0)) +;;;### (autoloads nil "nnml" "gnus/nnml.el" (21607 54478 300138 641000)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19111,7 +19148,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21240 46395 727291 0)) +;;;### (autoloads nil "novice" "novice.el" (21607 54478 300138 641000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19143,8 +19180,8 @@ future sessions. ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19158,14 +19195,14 @@ closing requests for requests that are used in matched pairs. ;;;*** -;;;### (autoloads nil "ntlm" "net/ntlm.el" (21553 6820 877466 0)) +;;;### (autoloads nil "ntlm" "net/ntlm.el" (21607 54478 300138 641000)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21293 25385 -;;;;;; 120083 0)) +;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19177,8 +19214,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21383 2343 -;;;;;; 498187 0)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21611 10937 +;;;;;; 700236 3000)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19238,8 +19275,8 @@ Many aspects this mode can be customized using ;;;*** -;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21293 25385 -;;;;;; 120083 0)) +;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -19251,8 +19288,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21437 5802 -;;;;;; 125919 0)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19289,8 +19326,8 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21584 48809 -;;;;;; 507899 0)) +;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/opascal.el (define-obsolete-function-alias 'delphi-mode 'opascal-mode "24.4") @@ -19325,7 +19362,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (21584 48809 507899 0)) +;;;### (autoloads nil "org" "org/org.el" (21607 54478 800121 42000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19546,8 +19583,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21563 42665 -;;;;;; 706656 0)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -19820,8 +19857,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (21551 51499 -;;;;;; 554352 0)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -19863,8 +19900,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (21335 37672 -;;;;;; 97862 0)) +;;;### (autoloads nil "org-colview" "org/org-colview.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from org/org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -19927,8 +19964,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21584 48809 -;;;;;; 507899 0)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -19938,8 +19975,8 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (21551 51499 554352 -;;;;;; 0)) +;;;### (autoloads nil "org-macs" "org/org-macs.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from org/org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -19949,8 +19986,8 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** -;;;### (autoloads nil "org-version" "org/org-version.el" (21563 42665 -;;;;;; 706656 0)) +;;;### (autoloads nil "org-version" "org/org-version.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from org/org-version.el (autoload 'org-release "org-version" "\ @@ -19967,8 +20004,8 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "outline" "outline.el" (21626 64704 823711 +;;;;;; 579000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20029,8 +20066,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21579 30887 -;;;;;; 81406 0)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20102,7 +20139,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads nil "paren" "paren.el" (21568 60581 999550 0)) +;;;### (autoloads nil "paren" "paren.el" (21607 54478 800121 42000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20128,8 +20165,8 @@ matching parenthesis is highlighted in `show-paren-style' after ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21541 -;;;;;; 15655 55679 0)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20142,8 +20179,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21429 11690 -;;;;;; 49391 0)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20192,8 +20229,8 @@ See also the user variables `pascal-type-keywords', `pascal-start-keywords' and ;;;*** -;;;### (autoloads nil "password-cache" "password-cache.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "password-cache" "password-cache.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20214,8 +20251,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21542 36519 -;;;;;; 256429 0)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20297,8 +20334,8 @@ Define a pcase UPattern macro. ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20308,8 +20345,8 @@ Completion rules for the `cvs' command. ;;;*** -;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20336,8 +20373,8 @@ Completion for the GNU tar utility. ;;;*** -;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20357,8 +20394,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20368,8 +20405,8 @@ Completion for the `rpm' command. ;;;*** -;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20424,8 +20461,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20449,8 +20486,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20507,7 +20544,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21280 13349 392544 0)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21607 54478 800121 42000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -20582,8 +20619,8 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21280 13349 -;;;;;; 392544 0)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21607 54478 +;;;;;; 800121 42000)) ;;; 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)) "\ @@ -20591,8 +20628,8 @@ Global menu used by PCL-CVS.") ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21535 -;;;;;; 63274 647253 0)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20653,8 +20690,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21419 62246 -;;;;;; 751914 0)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -20734,8 +20771,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "plstore" "gnus/plstore.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "plstore" "gnus/plstore.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -20750,8 +20787,8 @@ Major mode for editing PLSTORE files. ;;;*** -;;;### (autoloads nil "po" "textmodes/po.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "po" "textmodes/po.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -20762,7 +20799,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads nil "pong" "play/pong.el" (21187 63826 213216 0)) +;;;### (autoloads nil "pong" "play/pong.el" (21607 54478 800121 42000)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -20778,7 +20815,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21240 46395 727291 0)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21619 5051 260148 536000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -20789,8 +20826,8 @@ Use streaming commands. ;;;*** -;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21429 11690 49391 -;;;;;; 0)) +;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -20840,8 +20877,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (21546 33576 601815 -;;;;;; 0)) +;;;### (autoloads nil "printing" "printing.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21429,7 +21466,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (21187 63826 213216 0)) +;;;### (autoloads nil "proced" "proced.el" (21609 55608 852266 580000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21447,8 +21484,8 @@ Proced buffers. ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "profiler" "profiler.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21476,8 +21513,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21563 42665 -;;;;;; 706656 0)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21510,7 +21547,7 @@ With prefix argument ARG, restart the Prolog process if running before. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21187 63826 213216 0)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21607 54478 800121 42000)) ;;; 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")) "\ @@ -21521,8 +21558,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21586 4146 -;;;;;; 376146 0)) +;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) @@ -21568,8 +21605,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (21549 9768 351453 -;;;;;; 0)) +;;;### (autoloads nil "ps-print" "ps-print.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -21766,15 +21803,15 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21563 42665 -;;;;;; 706656 0)) +;;;### (autoloads nil "python" "progmodes/python.el" (21625 43838 +;;;;;; 980113 968000)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 4)) package--builtin-versions) @@ -21788,16 +21825,17 @@ Input and output via buffer named after `python-shell-buffer-name'. If there is a process already running in that buffer, just switch to it. -With argument, allows you to define CMD so you can edit the -command used to call the interpreter and define DEDICATED, so a -dedicated process for the current buffer is open. When numeric -prefix arg is other than 0 or 4 do not SHOW. +Argument CMD defaults to `python-shell-calculate-command' return +value. When called interactively with `prefix-arg', it allows +the user to edit such value and choose whether the interpreter +should be DEDICATED for the current buffer. When numeric prefix +arg is other than 0 or 4 do not SHOW. Runs the hook `inferior-python-mode-hook' after `comint-mode-hook' is run. (Type \\[describe-mode] in the process buffer for a list of commands.) -\(fn CMD &optional DEDICATED SHOW)" t nil) +\(fn &optional CMD DEDICATED SHOW)" t nil) (autoload 'python-mode "python" "\ Major mode for editing Python files. @@ -21808,7 +21846,7 @@ Major mode for editing Python files. ;;;*** -;;;### (autoloads nil "qp" "gnus/qp.el" (21187 63826 213216 0)) +;;;### (autoloads nil "qp" "gnus/qp.el" (21607 54478 300138 641000)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -21827,8 +21865,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (21215 43189 -;;;;;; 822371 0)) +;;;### (autoloads nil "quail" "international/quail.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22058,8 +22096,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22072,7 +22110,7 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'. ;;;*** ;;;### (autoloads nil "quail/uni-input" "leim/quail/uni-input.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54478 300138 641000)) ;;; Generated autoloads from leim/quail/uni-input.el (autoload 'ucs-input-activate "quail/uni-input" "\ @@ -22086,8 +22124,8 @@ While this input method is active, the variable ;;;*** -;;;### (autoloads nil "quickurl" "net/quickurl.el" (21222 16439 978802 -;;;;;; 0)) +;;;### (autoloads nil "quickurl" "net/quickurl.el" (21607 54478 300138 +;;;;;; 641000)) ;;; 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" "\ @@ -22158,7 +22196,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21585 9772 592973 408000)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22196,8 +22235,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22215,8 +22254,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "recentf" "recentf.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22242,7 +22281,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21546 33576 601815 0)) +;;;### (autoloads nil "rect" "rect.el" (21607 54478 800121 42000)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22382,8 +22421,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "refill" "textmodes/refill.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "refill" "textmodes/refill.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -22403,8 +22442,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21534 42729 -;;;;;; 1557 881000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'reftex-citation "reftex-cite" nil t) (autoload 'reftex-all-document-files "reftex-parse") @@ -22457,8 +22496,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21194 -;;;;;; 37048 599945 0)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21607 +;;;;;; 54478 800121 42000)) ;;; 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)))) @@ -22467,8 +22506,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21376 -;;;;;; 29092 815151 0)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22497,15 +22536,15 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (21584 48809 -;;;;;; 507899 0)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -22559,7 +22598,7 @@ to turn the *scratch* buffer into your notes buffer. ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (21239 25528 651427 0)) +;;;### (autoloads nil "repeat" "repeat.el" (21607 54478 800121 42000)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -22582,8 +22621,8 @@ recently executed command not bound to an input event\". ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -22614,8 +22653,8 @@ mail-sending package is used for editing and sending the message. ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "reposition" "reposition.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -22641,7 +22680,7 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads nil "reveal" "reveal.el" (21359 20005 772941 0)) +;;;### (autoloads nil "reveal" "reveal.el" (21607 54478 800121 42000)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -22676,8 +22715,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -22692,8 +22731,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -22737,8 +22776,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21546 33833 660830 -;;;;;; 846000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -22935,8 +22974,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23000,8 +23039,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21319 49445 -;;;;;; 508378 0)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23012,8 +23051,8 @@ Return a pattern. ;;;*** -;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21293 25385 -;;;;;; 120083 0)) +;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23025,8 +23064,8 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil. ;;;*** -;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21293 25385 -;;;;;; 120083 0)) +;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23056,8 +23095,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21293 25385 120083 -;;;;;; 0)) +;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23084,8 +23123,8 @@ must be equal. ;;;*** -;;;### (autoloads nil "robin" "international/robin.el" (20523 62082 -;;;;;; 997685 0)) +;;;### (autoloads nil "robin" "international/robin.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -23117,7 +23156,7 @@ Start using robin package NAME, which is a string. ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (21240 46395 727291 0)) +;;;### (autoloads nil "rot13" "rot13.el" (21607 54478 800121 42000)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23154,8 +23193,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21415 65191 692645 -;;;;;; 0)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23185,8 +23224,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21437 -;;;;;; 5802 125919 0)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23203,8 +23242,8 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21419 62246 751914 -;;;;;; 0)) +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23222,8 +23261,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -23534,15 +23573,15 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21326 22692 123234 -;;;;;; 0)) +;;;### (autoloads nil "savehist" "savehist.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -23574,8 +23613,8 @@ histories, which is probably undesirable. ;;;*** -;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21379 5287 -;;;;;; 607434 0)) +;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -23614,8 +23653,8 @@ that variable's value is a string. ;;;*** -;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -23628,8 +23667,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (21388 20265 495157 -;;;;;; 0)) +;;;### (autoloads nil "scroll-all" "scroll-all.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23654,8 +23693,8 @@ one window apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -23671,16 +23710,16 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (21256 34613 967717 -;;;;;; 0)) +;;;### (autoloads nil "secrets" "net/secrets.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) ;;;*** -;;;### (autoloads nil "semantic" "cedet/semantic.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "semantic" "cedet/semantic.el" (21609 55608 +;;;;;; 852266 580000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) @@ -23738,7 +23777,7 @@ Semantic mode. ;;;*** ;;;### (autoloads nil "semantic/bovine/grammar" "cedet/semantic/bovine/grammar.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54477 800124 118000)) ;;; Generated autoloads from cedet/semantic/bovine/grammar.el (autoload 'bovine-grammar-mode "semantic/bovine/grammar" "\ @@ -23749,7 +23788,7 @@ Major mode for editing Bovine grammars. ;;;*** ;;;### (autoloads nil "semantic/wisent/grammar" "cedet/semantic/wisent/grammar.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54477 800124 118000)) ;;; Generated autoloads from cedet/semantic/wisent/grammar.el (autoload 'wisent-grammar-mode "semantic/wisent/grammar" "\ @@ -23759,8 +23798,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24041,7 +24080,7 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "server" "server.el" (21437 5802 125919 0)) +;;;### (autoloads nil "server" "server.el" (21607 54478 800121 42000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24108,7 +24147,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21580 51751 606453 0)) +;;;### (autoloads nil "ses" "ses.el" (21607 54478 800121 42000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24152,8 +24191,8 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21481 -;;;;;; 59815 980216 0)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21623 +;;;;;; 2108 292281 129000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24218,8 +24257,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21510 -;;;;;; 60072 112989 0)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24283,8 +24322,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21271 54940 -;;;;;; 492268 31000)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24333,8 +24372,8 @@ function, `load-path-shadows-find'. ;;;*** -;;;### (autoloads nil "shadowfile" "shadowfile.el" (21222 16439 978802 -;;;;;; 0)) +;;;### (autoloads nil "shadowfile" "shadowfile.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -24372,7 +24411,7 @@ Set up file shadowing. ;;;*** -;;;### (autoloads nil "shell" "shell.el" (21374 22080 740835 768000)) +;;;### (autoloads nil "shell" "shell.el" (21607 54478 800121 42000)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24420,7 +24459,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21532 676 459903 0)) +;;;### (autoloads nil "shr" "net/shr.el" (21623 2108 292281 129000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24437,8 +24476,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24463,8 +24502,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -24479,8 +24518,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simula" "progmodes/simula.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "simula" "progmodes/simula.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -24528,8 +24567,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21420 38312 308000 -;;;;;; 0)) +;;;### (autoloads nil "skeleton" "skeleton.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -24647,8 +24686,8 @@ symmetrical ones, and the same character twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21409 26408 -;;;;;; 607647 0)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21628 45530 +;;;;;; 160140 360000)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -24675,8 +24714,8 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** -;;;### (autoloads nil "smiley" "gnus/smiley.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "smiley" "gnus/smiley.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -24693,8 +24732,8 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** -;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21322 25639 -;;;;;; 363230 0)) +;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21619 5051 260148 +;;;;;; 536000)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -24709,8 +24748,8 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads nil "snake" "play/snake.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "snake" "play/snake.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -24733,8 +24772,8 @@ Snake mode keybindings: ;;;*** -;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -24763,8 +24802,8 @@ then `snmpv2-mode-hook'. ;;;*** -;;;### (autoloads nil "solar" "calendar/solar.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "solar" "calendar/solar.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -24779,8 +24818,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "solitaire" "play/solitaire.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "solitaire" "play/solitaire.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -24855,7 +24894,7 @@ Pick your favorite shortcuts: ;;;*** -;;;### (autoloads nil "sort" "sort.el" (21240 46395 727291 0)) +;;;### (autoloads nil "sort" "sort.el" (21607 54478 800121 42000)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25030,7 +25069,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (21296 1575 438327 0)) +;;;### (autoloads nil "spam" "gnus/spam.el" (21607 54478 300138 641000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25044,8 +25083,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25087,8 +25126,8 @@ Spam reports will be queued with the method used when ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (21485 56871 932720 -;;;;;; 0)) +;;;### (autoloads nil "speedbar" "speedbar.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25112,8 +25151,8 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "spook" "play/spook.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25128,8 +25167,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21546 33576 601815 -;;;;;; 0)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 4)) package--builtin-versions) @@ -25595,15 +25634,15 @@ Run vsql as an inferior process. ;;;*** -;;;### (autoloads nil "srecode" "cedet/srecode.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "srecode" "cedet/srecode.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54477 800124 118000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -25615,8 +25654,8 @@ Major-mode for writing SRecode macros. ;;;*** -;;;### (autoloads nil "starttls" "gnus/starttls.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "starttls" "gnus/starttls.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -25639,7 +25678,8 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21271 1974 113743 0)) +;;;### (autoloads nil "strokes" "strokes.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -25752,8 +25792,8 @@ Read a complex stroke and insert its glyph into the current buffer. ;;;*** -;;;### (autoloads nil "studly" "play/studly.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "studly" "play/studly.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/studly.el (autoload 'studlify-region "studly" "\ @@ -25773,8 +25813,8 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (21546 33576 -;;;;;; 601815 0)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from progmodes/subword.el (define-obsolete-function-alias 'capitalized-words-mode 'subword-mode "25.1") @@ -25866,8 +25906,8 @@ See `superword-mode' for more information on Superword mode. ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -25899,8 +25939,8 @@ and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "t-mouse" "t-mouse.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -25928,7 +25968,7 @@ It relies on the `gpm' daemon being activated. ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (21240 46395 727291 0)) +;;;### (autoloads nil "tabify" "tabify.el" (21607 54478 800121 42000)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -25957,8 +25997,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (21194 37048 599945 -;;;;;; 0)) +;;;### (autoloads nil "table" "textmodes/table.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -26550,7 +26590,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads nil "talk" "talk.el" (21240 46395 727291 0)) +;;;### (autoloads nil "talk" "talk.el" (21607 54478 800121 42000)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -26565,8 +26605,8 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (21510 60072 112989 -;;;;;; 0)) +;;;### (autoloads nil "tar-mode" "tar-mode.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -26589,8 +26629,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -26638,8 +26678,8 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "telnet" "net/telnet.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from net/telnet.el (autoload 'telnet "telnet" "\ @@ -26664,7 +26704,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21558 24747 65197 0)) +;;;### (autoloads nil "term" "term.el" (21607 54478 800121 42000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -26706,8 +26746,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -26717,8 +26757,8 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads nil "tetris" "play/tetris.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "tetris" "play/tetris.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) @@ -26743,8 +26783,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21546 33576 -;;;;;; 601815 0)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21611 10938 +;;;;;; 204397 226000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27045,8 +27085,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27085,8 +27125,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21414 44327 -;;;;;; 790846 0)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27170,8 +27210,8 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads nil "thai-util" "language/thai-util.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "thai-util" "language/thai-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27198,8 +27238,8 @@ Compose Thai characters in the current buffer. ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "thingatpt" "thingatpt.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27263,7 +27303,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21240 46395 727291 0)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21607 54478 800121 42000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27297,8 +27337,8 @@ In dired, call the setroot program on the image at point. ;;;*** -;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -27371,14 +27411,14 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21568 60581 -;;;;;; 999550 0)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21611 10938 +;;;;;; 204397 226000)) ;;; Generated autoloads from textmodes/tildify.el -(push (purecopy '(tildify 4 5 4)) package--builtin-versions) +(push (purecopy '(tildify 4 5 7)) package--builtin-versions) (autoload 'tildify-region "tildify" "\ Add hard spaces in the region between BEG and END. -See variables `tildify-pattern-alist', `tildify-string-alist', and +See variables `tildify-pattern', `tildify-space-string', and `tildify-ignored-environments-alist' for information about configuration parameters. This function performs no refilling of the changed text. @@ -27389,7 +27429,7 @@ won't be prompted for confirmation of each substitution. (autoload 'tildify-buffer "tildify" "\ Add hard spaces in the current buffer. -See variables `tildify-pattern-alist', `tildify-string-alist', and +See variables `tildify-pattern', `tildify-space-string', and `tildify-ignored-environments-alist' for information about configuration parameters. This function performs no refilling of the changed text. @@ -27400,7 +27440,7 @@ won't be prompted for confirmation of each substitution. ;;;*** -;;;### (autoloads nil "time" "time.el" (21240 46395 727291 0)) +;;;### (autoloads nil "time" "time.el" (21607 54478 800121 42000)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -27462,8 +27502,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21584 -;;;;;; 48809 507899 0)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21611 +;;;;;; 10937 700236 3000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27566,8 +27606,8 @@ Convert the time interval in seconds to a short string. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (21607 54478 800121 +;;;;;; 42000)) ;;; 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) @@ -27607,8 +27647,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21584 -;;;;;; 48809 507899 0)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -27718,7 +27758,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (21187 63826 213216 0)) +;;;;;; (21607 54478 300138 641000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -27740,7 +27780,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (21240 46395 727291 0)) +;;;### (autoloads nil "tmm" "tmm.el" (21607 54478 800121 42000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27782,8 +27822,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21471 -;;;;;; 23976 844614 0)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21625 +;;;;;; 43838 483701 627000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -27850,8 +27890,8 @@ Mode for displaying and reprioritizing top priority Todo. ;;;*** -;;;### (autoloads nil "tool-bar" "tool-bar.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "tool-bar" "tool-bar.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -27921,8 +27961,8 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21607 54477 800124 +;;;;;; 118000)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -27935,8 +27975,8 @@ to a tcp server on another machine. ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -27981,8 +28021,8 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21525 27433 340807 -;;;;;; 0)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21625 43838 483701 +;;;;;; 627000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28068,7 +28108,7 @@ Invoke Tramp file name completion handler. Falls back to normal file name handler if no Tramp file name handler exists." (let ((directory-sep-char 47) (fn (assoc operation tramp-completion-file-name-handler-alist))) (if (and fn tramp-mode (or (eq tramp-syntax (quote sep)) (featurep (quote tramp)) (and (boundp (quote partial-completion-mode)) (symbol-value (quote partial-completion-mode))) (featurep (quote ido)) (featurep (quote icicles)))) (save-match-data (apply (cdr fn) args)) (tramp-completion-run-real-handler operation args)))) (defun tramp-autoload-file-name-handler (operation &rest args) "\ -Load Tramp file name handler, and perform OPERATION." (let ((default-directory temporary-file-directory)) (load "tramp" nil t)) (apply operation args)) +Load Tramp file name handler, and perform OPERATION." (let ((default-directory (or (symbol-value (quote temporary-file-directory)) "/"))) (load "tramp" nil t)) (apply operation args)) (defun tramp-register-autoload-file-name-handlers nil "\ Add Tramp file name handlers to `file-name-handler-alist' during autoload." (add-to-list (quote file-name-handler-alist) (cons tramp-file-name-regexp (quote tramp-autoload-file-name-handler))) (put (quote tramp-autoload-file-name-handler) (quote safe-magic) t) (add-to-list (quote file-name-handler-alist) (cons tramp-completion-file-name-regexp (quote tramp-completion-file-name-handler))) (put (quote tramp-completion-file-name-handler) (quote safe-magic) t)) @@ -28097,8 +28137,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21476 41895 -;;;;;; 55661 0)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28108,8 +28148,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21510 60072 112989 -;;;;;; 0)) +;;;### (autoloads nil "tutorial" "tutorial.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28133,8 +28173,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "tv-util" "language/tv-util.el" (20355 10021 -;;;;;; 546955 0)) +;;;### (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" "\ @@ -28144,8 +28184,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28192,8 +28232,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (21222 16439 978802 -;;;;;; 0)) +;;;### (autoloads nil "type-break" "type-break.el" (21609 55608 852266 +;;;;;; 580000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28325,7 +28365,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (21199 54969 178188 0)) +;;;### (autoloads nil "uce" "mail/uce.el" (21607 54478 300138 641000)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -28339,7 +28379,7 @@ You might need to set `uce-mail-reader' before using this. ;;;*** ;;;### (autoloads nil "ucs-normalize" "international/ucs-normalize.el" -;;;;;; (21194 37048 599945 0)) +;;;;;; (21607 54478 300138 641000)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -28404,8 +28444,8 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus. ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28425,8 +28465,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21240 46395 727291 -;;;;;; 0)) +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -28446,8 +28486,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use. ;;;*** -;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21607 54477 +;;;;;; 800124 118000)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -28459,7 +28499,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (21537 18599 384335 0)) +;;;### (autoloads nil "url" "url/url.el" (21607 54478 800121 42000)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -28506,8 +28546,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -28548,8 +28588,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** -;;;### (autoloads nil "url-cache" "url/url-cache.el" (21584 48809 -;;;;;; 507899 0)) +;;;### (autoloads nil "url-cache" "url/url-cache.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -28570,8 +28610,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-cid" "url/url-cid.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "url-cid" "url/url-cid.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -28581,8 +28621,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-dav" "url/url-dav.el" (21302 6606 390237 -;;;;;; 377000)) +;;;### (autoloads nil "url-dav" "url/url-dav.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -28616,8 +28656,8 @@ added to this list, so most requests can just pass in nil. ;;;*** -;;;### (autoloads nil "url-file" "url/url-file.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "url-file" "url/url-file.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -28627,8 +28667,8 @@ Handle file: and ftp: URLs. ;;;*** -;;;### (autoloads nil "url-gw" "url/url-gw.el" (21545 12711 344259 -;;;;;; 0)) +;;;### (autoloads nil "url-gw" "url/url-gw.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -28649,8 +28689,8 @@ overriding the value of `url-gateway-method'. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21546 -;;;;;; 33576 601815 0)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28704,8 +28744,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (21556 18779 796531 -;;;;;; 0)) +;;;### (autoloads nil "url-http" "url/url-http.el" (21619 5051 260148 +;;;;;; 536000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -28717,8 +28757,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-irc" "url/url-irc.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "url-irc" "url/url-irc.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -28728,8 +28768,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -28742,8 +28782,8 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** -;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -28758,8 +28798,8 @@ Handle the mailto: URL syntax. ;;;*** -;;;### (autoloads nil "url-misc" "url/url-misc.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "url-misc" "url/url-misc.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -28790,8 +28830,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-news" "url/url-news.el" (21301 65237 320114 -;;;;;; 350000)) +;;;### (autoloads nil "url-news" "url/url-news.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -28806,8 +28846,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-ns" "url/url-ns.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "url-ns" "url/url-ns.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -28847,8 +28887,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-parse" "url/url-parse.el" (21350 58112 -;;;;;; 380040 0)) +;;;### (autoloads nil "url-parse" "url/url-parse.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -28899,8 +28939,8 @@ parses to ;;;*** -;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -28910,8 +28950,8 @@ Setup variables that expose info about you and your system. ;;;*** -;;;### (autoloads nil "url-queue" "url/url-queue.el" (21193 16180 -;;;;;; 875828 0)) +;;;### (autoloads nil "url-queue" "url/url-queue.el" (21619 5051 +;;;;;; 260148 536000)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -28925,8 +28965,8 @@ The variable `url-queue-timeout' sets a timeout. ;;;*** -;;;### (autoloads nil "url-tramp" "url/url-tramp.el" (21546 33576 -;;;;;; 601815 0)) +;;;### (autoloads nil "url-tramp" "url/url-tramp.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from url/url-tramp.el (defvar url-tramp-protocols '("ftp" "ssh" "scp" "rsync" "telnet") "\ @@ -28944,8 +28984,8 @@ would have been passed to OPERATION. ;;;*** -;;;### (autoloads nil "url-util" "url/url-util.el" (21584 48809 507899 -;;;;;; 0)) +;;;### (autoloads nil "url-util" "url/url-util.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29113,8 +29153,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21260 57764 872288 -;;;;;; 374000)) +;;;### (autoloads nil "userlock" "userlock.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29142,8 +29182,8 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29168,7 +29208,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf7" "gnus/utf7.el" (21187 63826 213216 0)) +;;;### (autoloads nil "utf7" "gnus/utf7.el" (21607 54478 300138 641000)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29178,8 +29218,8 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;*** -;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21607 54478 +;;;;;; 300138 641000)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29203,7 +29243,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (21332 61483 90708 0)) +;;;### (autoloads nil "vc" "vc/vc.el" (21628 45530 160140 360000)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29254,8 +29294,7 @@ For old-style locking-based version control systems, like RCS: Register into a version control system. If VC-FILESET is given, register the files in that fileset. Otherwise register the current file. -With prefix argument SET-REVISION, allow user to specify initial revision -level. If COMMENT is present, use that as an initial comment. +If COMMENT is present, use that as an initial comment. The version control system to use is found by cycling through the list `vc-handled-backends'. The first backend in that list which declares @@ -29264,7 +29303,7 @@ directory are already registered under that backend) will be used to register the file. If no backend declares itself responsible, the first backend that could register the file is used. -\(fn &optional SET-REVISION VC-FILESET COMMENT)" t nil) +\(fn &optional VC-FILESET COMMENT)" t nil) (autoload 'vc-version-diff "vc" "\ Report diffs between revisions of the fileset in the repository history. @@ -29359,8 +29398,12 @@ checked out in that new branch. \(fn DIR NAME BRANCHP)" t nil) (autoload 'vc-retrieve-tag "vc" "\ -Descending recursively from DIR, retrieve the tag called NAME. -If NAME is empty, it refers to the latest revisions. +For each file in or below DIR, retrieve their tagged version NAME. +NAME can name a branch, in which case this command will switch to the +named branch in the directory DIR. +Interactively, prompt for DIR only for VCS that works at file level; +otherwise use the default directory of the current buffer. +If NAME is empty, it refers to the latest revisions of the current branch. If locking is used for the files in DIR, then there must not be any locked files at or below DIR (but if NAME is empty, locked files are allowed and simply skipped). @@ -29398,6 +29441,11 @@ When called interactively with a prefix argument, prompt for REMOTE-LOCATION. \(fn &optional REMOTE-LOCATION)" t nil) +(autoload 'vc-region-history "vc" "\ +Show the history of the region FROM..TO. + +\(fn FROM TO)" t nil) + (autoload 'vc-revert "vc" "\ Revert working copies of the selected fileset to their repository contents. This asks for confirmation if the buffer contents are not identical @@ -29490,8 +29538,8 @@ Return the branch part of a revision number REV. ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21584 48809 -;;;;;; 507899 0)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21607 54478 +;;;;;; 800121 42000)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29530,8 +29578,8 @@ should be applied to the background or to the foreground. ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21628 43483 380149 +;;;;;; 771000)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29541,8 +29589,8 @@ should be applied to the background or to the foreground. ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21584 48809 507899 -;;;;;; 0)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21628 43483 380149 +;;;;;; 771000)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -29558,8 +29606,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21584 48809 507899 -;;;;;; 0)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21628 43483 380149 +;;;;;; 771000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -29570,8 +29618,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21517 33344 974987 -;;;;;; 0)) +;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -29595,8 +29643,8 @@ These are the commands available for use in the file status buffer: ;;;*** -;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21575 -;;;;;; 33829 811769 0)) +;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -29619,8 +29667,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21513 36261 278490 -;;;;;; 0)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21628 45530 160140 +;;;;;; 360000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -29631,7 +29679,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21396 14374 24888 0)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21628 43483 380149 771000)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -29642,8 +29690,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21628 43483 380149 +;;;;;; 771000)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -29659,8 +29707,8 @@ Name of the monotone directory's format file.") ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21584 48809 507899 -;;;;;; 0)) +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21628 43483 380149 +;;;;;; 771000)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -29673,8 +29721,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21628 43483 380149 +;;;;;; 771000)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -29692,8 +29740,22 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21551 51499 554352 -;;;;;; 0)) +;;;### (autoloads nil "vc-src" "vc/vc-src.el" (21628 43483 380149 +;;;;;; 771000)) +;;; Generated autoloads from vc/vc-src.el + +(defvar vc-src-master-templates (purecopy '("%s.src/%s,v")) "\ +Where to look for SRC master files. +For a description of possible values, see `vc-check-master-templates'.") + +(custom-autoload 'vc-src-master-templates "vc-src" t) + +(defun vc-src-registered (f) (vc-default-registered 'src f)) + +;;;*** + +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21628 43483 380149 +;;;;;; 771000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29706,8 +29768,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21546 -;;;;;; 33576 601815 0)) +;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; 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)) @@ -29766,7 +29828,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21555 48550 492098 0)) +;;;;;; (21607 54478 800121 42000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -29905,8 +29967,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21305 -;;;;;; 16557 836987 0)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -30021,7 +30083,7 @@ Usage: and vice versa. Syntax-based indentation can be very slow in large files. Option - `vhdl-indent-syntax-based' allows to use faster but simpler indentation. + `vhdl-indent-syntax-based' allows you to use faster but simpler indentation. Option `vhdl-indent-comment-like-next-code-line' controls whether comment lines are indented like the preceding or like the following code @@ -30054,7 +30116,7 @@ Usage: CODE FILLING: - Code filling allows to condense code (e.g. sensitivity lists or port + Code filling allows you to condense code (e.g. sensitivity lists or port maps) by removing comments and newlines and re-wrapping so that all lines are maximally filled (block filling). `C-c C-f C-f' fills a list enclosed by parenthesis, `C-c C-f C-g' a group of lines separated by @@ -30314,7 +30376,7 @@ Usage: Words with special syntax can be highlighted by specifying their syntax and color in option `vhdl-special-syntax-alist' and by setting - option `vhdl-highlight-special-words' to non-nil. This allows to + option `vhdl-highlight-special-words' to non-nil. This allows you to establish some naming conventions (e.g. to distinguish different kinds of signals or other objects by using name suffices) and to support them visually. @@ -30460,8 +30522,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "viet-util" "language/viet-util.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "viet-util" "language/viet-util.el" (21607 +;;;;;; 54478 300138 641000)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -30505,7 +30567,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics. ;;;*** -;;;### (autoloads nil "view" "view.el" (21452 59559 901066 0)) +;;;### (autoloads nil "view" "view.el" (21607 54478 800121 42000)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -30761,8 +30823,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "viper" "emulation/viper.el" (21586 4146 376146 -;;;;;; 0)) +;;;### (autoloads nil "viper" "emulation/viper.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) @@ -30779,8 +30841,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21607 +;;;;;; 54477 800124 118000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -30870,7 +30932,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (21187 63826 213216 0)) +;;;### (autoloads nil "wdired" "wdired.el" (21607 54478 800121 42000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -30888,8 +30950,8 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads nil "webjump" "net/webjump.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "webjump" "net/webjump.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -30905,8 +30967,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21511 -;;;;;; 46035 786880 0)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21607 +;;;;;; 54478 800121 42000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -30936,8 +30998,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21570 15914 957442 -;;;;;; 0)) +;;;### (autoloads nil "whitespace" "whitespace.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31305,8 +31367,8 @@ cleaning up these problems. ;;;*** -;;;### (autoloads nil "wid-browse" "wid-browse.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "wid-browse" "wid-browse.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -31334,8 +31396,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21414 44327 790846 -;;;;;; 0)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31377,8 +31439,8 @@ Setup current buffer so editing string widgets works. ;;;*** -;;;### (autoloads nil "windmove" "windmove.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "windmove" "windmove.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -31430,7 +31492,7 @@ Default MODIFIER is 'shift. ;;;*** -;;;### (autoloads nil "winner" "winner.el" (21549 9768 351453 0)) +;;;### (autoloads nil "winner" "winner.el" (21607 54478 800121 42000)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -31453,7 +31515,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21393 38187 675040 0)) +;;;### (autoloads nil "woman" "woman.el" (21607 54478 800121 42000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31502,7 +31564,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (21187 63826 213216 0)) +;;;### (autoloads nil "xml" "xml.el" (21607 54478 800121 42000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -31558,8 +31620,8 @@ Both features can be combined by providing a cons cell ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21327 43559 923043 -;;;;;; 0)) +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21607 54478 300138 +;;;;;; 641000)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -31577,8 +31639,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21575 33829 811769 -;;;;;; 0)) +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21607 54478 800121 +;;;;;; 42000)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -31607,7 +31669,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** -;;;### (autoloads nil "yenc" "gnus/yenc.el" (21187 63826 213216 0)) +;;;### (autoloads nil "yenc" "gnus/yenc.el" (21607 54478 300138 641000)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -31622,7 +31684,7 @@ Extract file name from an yenc header. ;;;*** -;;;### (autoloads nil "zone" "play/zone.el" (21187 63826 213216 0)) +;;;### (autoloads nil "zone" "play/zone.el" (21607 54478 800121 42000)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -31654,21 +31716,21 @@ Zone out, completely. ;;;;;; "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" -;;;;;; "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/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" @@ -31702,8 +31764,8 @@ Zone out, completely. ;;;;;; "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/avl-tree.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-loaddefs.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" @@ -31777,37 +31839,38 @@ 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/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-loaddefs.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-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" @@ -31836,8 +31899,9 @@ Zone out, completely. ;;;;;; "url/url-vars.el" "vc/ediff-diff.el" "vc/ediff-init.el" "vc/ediff-merg.el" ;;;;;; "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-fns.el" -;;;;;; "w32-vars.el" "x-dnd.el") (21588 45918 816738 407000)) +;;;;;; "vc/vc-filewise.el" "vcursor.el" "vt-control.el" "vt100-led.el" +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21628 46363 926675 +;;;;;; 999000)) ;;;*** commit 4bc1cdd563d37192e6a2dbed03ca62a2e44a2dfd Author: Glenn Morris Date: Mon Dec 1 13:35:16 2014 -0500 ChangeLog fixes. diff --git a/admin/ChangeLog b/admin/ChangeLog index 091732b..6adc3f5 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -19,22 +19,26 @@ 2014-11-27 Oscar Fuentes - * admin/CPP-DEFINES: Mention MINGW_W64. + * CPP-DEFINES: Mention MINGW_W64. 2014-11-22 Glenn Morris * admin.el (set-version): No more need to update nt/*.rc. * authors.el (authors-renamed-files-alist): Add .rc.in files. +2014-11-16 Stefan Monnier + + * update_autogen: Merge from emacs-24 (restoring bzr conditionals). + 2014-11-13 Andreas Schwab * make-tarball.txt: Make annotated tag and push it out. 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, update-copyright, notes/bugtracker, notes/tags: + * repo.notes: Git transition. + * update_autogen: Remove some bzr conditionals. 2014-11-10 Eli Zaretskii commit e5c0350828d5cf558c93355da47ca6e738edd1ac Author: Glenn Morris Date: Mon Dec 1 13:29:03 2014 -0500 * admin/update_autogen: Fix bogosity introduced in 2014-11-16 merge. diff --git a/admin/ChangeLog b/admin/ChangeLog index 70961a7..091732b 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-12-01 Glenn Morris + + * update_autogen: Fix bogosity introduced in 2014-11-16 merge. + 2014-11-29 Paul Eggert Lessen focus on ChangeLog files, as opposed to change log entries. diff --git a/admin/update_autogen b/admin/update_autogen index 4c4f52e..af7ea83 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -305,9 +305,6 @@ EOF modified=$(status $basegen) || die - ## bzr status output is always relative to top-level, not PWD. - [ "$vcs" = "bzr" ] && cd $oldpwd - commit "generated" $modified || die "commit error" exit 0 @@ -379,11 +376,7 @@ echo "Checking status of loaddef files..." ## It probably would be fine to just check+commit lisp/, since ## making autoloads should not effect any other files. But better ## safe than sorry. -modified=$(status $genfiles ${ldefs_out#lisp/}) || die - - -## bzr status output is always relative to top-level, not PWD. -[ "$vcs" = "bzr" ] && cd ../ +modified=$(status $genfiles $ldefs_out) || die commit "loaddefs" $modified || die "commit error" commit b34578dd880e788a68bb7bbd12fd848ba461226a Author: Stefan Monnier Date: Mon Dec 1 13:15:28 2014 -0500 * lisp/vc: Fix use of find-conflicted-file in Git. * lisp/vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the current "project" rather than just the current directory. * lisp/vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory the file names make sense. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ec95af9..481bd15 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2014-12-01 Stefan Monnier + * vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the + current "project" rather than just the current directory. + * vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory + the file names make sense. + * vc/smerge-mode.el (smerge-swap): New command. * vc/diff-mode.el (diff-kill-applied-hunks): New command. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 805e488..53db340 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -777,7 +777,7 @@ This prompts for a branch to merge from." ;; See git-status(1). (when (member state '("AU" "UD" "UA" ;; "DD" "DU" "AA" "UU")) - (push file files))))))) + (push (expand-file-name file directory) files))))))) (defun vc-git-resolve-when-done () "Call \"git add\" if the conflict markers have been removed." diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index b6ba2d3..d3315ca 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2101,8 +2101,9 @@ changes from the current branch." (let* ((backend (or (if buffer-file-name (vc-backend buffer-file-name)) (vc-responsible-backend default-directory) (error "No VC backend"))) + (root (vc-root-dir)) (files (vc-call-backend backend - 'conflicted-files default-directory))) + 'conflicted-files (or root default-directory)))) ;; Don't try and visit the current file. (if (equal (car files) buffer-file-name) (pop files)) (if (null files) commit 8dac9c34d8a2575d44fc78824ec77a58b63701b6 Author: Stefan Monnier Date: Mon Dec 1 13:12:37 2014 -0500 * lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command. * lisp/vc/smerge-mode.el (smerge-swap): New command. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f233cd..ec95af9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,13 @@ +2014-12-01 Stefan Monnier + + * vc/smerge-mode.el (smerge-swap): New command. + + * vc/diff-mode.el (diff-kill-applied-hunks): New command. + 2014-12-01 Ulf Jasper - * net/newst-treeview.el (newsticker--treeview-item-show): Check - window liveliness before measuring its width. + * net/newst-treeview.el (newsticker--treeview-item-show): + Check window liveliness before measuring its width. * net/newst-backend.el (newsticker--get-news-by-url-callback): Pass correct status to `newsticker--sentinel-work'. @@ -25,13 +31,13 @@ * vc/vc.el, vc/vc-cvs.el, vc/vc-rcs.el, vc/vc-svn.el: The 'merge' backend method of RCS/CVS/SVN is now 'merge-file', to contrast with - 'merge-branch'. Prompting for merge revisions is pushed down to + 'merge-branch'. Prompting for merge revisions is pushed down to the back ends; this fixes a layering violation that caused bad behavior with SVN. * vc/vc.el, vc-hooks.el, and all backends: API simplification; vc-stay-local-p and repository-hostname are no longer public - methods. Only the CVS and SVN backends used these, and the SVN + methods. Only the CVS and SVN backends used these, and the SVN support was conditioned out because svn status -v is too slow. The CVS back end retains this machibery and the vc-stay-local configuration variable now only affects it. diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 9afb9f4..f3455ef 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1817,6 +1817,16 @@ With a prefix argument, try to REVERSE the hunk." (diff-hunk-status-msg line-offset (diff-xor reverse switched) t))) +(defun diff-kill-applied-hunks () + "Kill all hunks that have already been applied starting at point." + (interactive) + (while (not (eobp)) + (pcase-let ((`(,buf ,line-offset ,pos ,src ,_dst ,switched) + (diff-find-source-location nil nil))) + (if (and line-offset switched) + (diff-hunk-kill) + (diff-hunk-next))))) + (defalias 'diff-mouse-goto-source 'diff-goto-source) (defun diff-goto-source (&optional other-file event) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 7712815..0b7b702 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -1132,6 +1132,19 @@ repeating the command will highlight other two parts." (unless smerge-use-changed-face '((smerge . refine) (face . smerge-refined-added)))))) +(defun smerge-swap () + "Swap the \"Mine\" and the \"Other\" chunks. +Can be used before things like `smerge-keep-all' or `smerge-resolve' where the +ordering can have some subtle influence on the result, such as preferring the +spacing of the \"Other\" chunk." + (interactive) + (smerge-match-conflict) + (goto-char (match-beginning 3)) + (let ((txt3 (delete-and-extract-region (point) (match-end 3)))) + (insert (delete-and-extract-region (match-beginning 1) (match-end 1))) + (goto-char (match-beginning 1)) + (insert txt3))) + (defun smerge-diff (n1 n2) (smerge-match-conflict) (smerge-ensure-match n1) commit 581914e45fbc08b020aa0aeb6a2967f4e77ee484 Author: Ulf Jasper Date: Mon Dec 1 19:14:54 2014 +0100 newsticker: Prevent multiple "Could not download..." messages. Fixes bug#19166. * lisp/net/newst-backend.el (newsticker--get-news-by-url-callback): 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. * lisp/net/newst-treeview.el (newsticker--treeview-item-show): Check window liveliness before measuring its width. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 375dd08..9f233cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2014-12-01 Ulf Jasper + + * net/newst-treeview.el (newsticker--treeview-item-show): Check + window liveliness before measuring its width. + + * net/newst-backend.el (newsticker--get-news-by-url-callback): + 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. + 2014-12-01 Ivan Shmakov * net/eww.el (eww-render): Call `eww-after-render-hook' in the diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 31ebc7a..de5c23c 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -745,10 +745,14 @@ from." (insert result) ;; remove MIME header (goto-char (point-min)) - (search-forward "\n\n") + (search-forward "\n\n" nil t) (delete-region (point-min) (point)) ;; read the rss/atom contents - (newsticker--sentinel-work nil t feed-name "url-retrieve" (current-buffer)) + (newsticker--sentinel-work nil + (or (not status) + (not (eq (car status) :error))) + feed-name "url-retrieve" + (current-buffer)) (when status (let ((status-type (car status)) (status-details (cdr status))) @@ -831,7 +835,8 @@ Argument COMMAND is the command of the retrieval process. Argument BUFFER is the buffer of the retrieval process." (let ((time (current-time)) (name-symbol (intern feed-name)) - (something-was-added nil)) + (something-was-added nil) + (ct (current-time))) ;; catch known errors (zombie processes, rubbish-xml etc. ;; if an error occurs the news feed is not updated! (catch 'oops @@ -848,9 +853,10 @@ Argument BUFFER is the buffer of the retrieval process." (format-time-string "%A, %H:%M") feed-name event command) "" - (current-time) + ct 'new - 0 nil)) + 0 '((guid nil "newsticker--download-error")) + ct)) (message "%s: Error while retrieving news from %s" (format-time-string "%A, %H:%M") feed-name) diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 30015f4..0b15923 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -717,7 +717,9 @@ for the button." (remove-overlays) (when (and item feed-name-symbol) - (let ((wwidth (1- (window-width (newsticker--treeview-item-window))))) + (let ((wwidth (1- (if (window-live-p (newsticker--treeview-item-window)) + (window-width (newsticker--treeview-item-window)) + fill-column)))) (if newsticker-use-full-width (set (make-local-variable 'fill-column) wwidth)) (set (make-local-variable 'fill-column) (min fill-column commit b8775f0217b670f3a55ca014e3ecfc3fe9199fef Author: Stefan Monnier Date: Mon Dec 1 13:10:05 2014 -0500 * lisp/simple.el (newline): Place the hook buffer-locally, to make sure it's first. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ac36c05..12e5ef0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-12-01 Stefan Monnier + * simple.el (newline): Place the hook buffer-locally, + to make sure it's first. + * progmodes/prog-mode.el (prettify-symbols--compose-symbol): Fix handling of symbols with different syntax at beginning/end or with symbol rather than word syntax. diff --git a/lisp/simple.el b/lisp/simple.el index 65fcf6e..b8b1579 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -440,12 +440,12 @@ A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'." (self-insert-command (prefix-numeric-value arg))) (unwind-protect (progn - (add-hook 'post-self-insert-hook postproc) + (add-hook 'post-self-insert-hook postproc nil t) (self-insert-command (prefix-numeric-value arg))) ;; We first used let-binding to protect the hook, but that was naive ;; since add-hook affects the symbol-default value of the variable, ;; whereas the let-binding might only protect the buffer-local value. - (remove-hook 'post-self-insert-hook postproc))) + (remove-hook 'post-self-insert-hook postproc t))) (cl-assert (not (member postproc post-self-insert-hook))) (cl-assert (not (member postproc (default-value 'post-self-insert-hook)))))) nil) commit ec7e07b333873789774cea53b45248fd0bf00600 Author: Glenn Morris Date: Mon Dec 1 12:58:51 2014 -0500 * admin/update_autogen (commit): With git, call "add" before "commit". diff --git a/admin/ChangeLog b/admin/ChangeLog index 82974dc..0529a87 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-12-01 Glenn Morris + + * update_autogen (commit): With git, call "add" before "commit". + 2014-11-19 Paul Eggert Lessen focus on ChangeLog files, as opposed to change log entries. diff --git a/admin/update_autogen b/admin/update_autogen index d9d34fa..84e0584 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -228,6 +228,10 @@ commit () echo "Committing..." + [ "$vcs" = "git" ] && { + $vcs add "$@" || return $? + } + $vcs commit -m "Auto-commit of $type files." "$@" || return $? [ "$vcs" = "git" ] && { commit 52fab40c160699d9ca45436c30433360d69f015a Author: Ivan Shmakov Date: Mon Dec 1 18:55:54 2014 +0100 Call `eww-after-render-hook' in the correct buffer Fixes: debbugs:19225 * net/eww.el (eww-render): Call `eww-after-render-hook' in the correct buffer. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85f6b3b..375dd08 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-01 Ivan Shmakov + + * net/eww.el (eww-render): Call `eww-after-render-hook' in the + correct buffer (bug#19225). + 2014-12-01 Lars Magne Ingebrigtsen * net/nsm.el (network-security-level): Change the default to `medium'. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 70427c1..73abd26 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -309,14 +309,14 @@ See the `eww-search-prefix' variable for the search engine used." ((equal (car content-type) "application/pdf") (eww-display-pdf)) ((string-match-p "\\`image/" (car content-type)) - (eww-display-image buffer) - (eww-update-header-line-format)) + (eww-display-image buffer)) (t - (eww-display-raw buffer encode) - (eww-update-header-line-format))) - (plist-put eww-data :url url) - (setq eww-history-position 0) - (run-hooks 'eww-after-render-hook)) + (eww-display-raw buffer encode))) + (with-current-buffer buffer + (plist-put eww-data :url url) + (eww-update-header-line-format) + (setq eww-history-position 0) + (run-hooks 'eww-after-render-hook))) (kill-buffer data-buffer)))) (defun eww-parse-headers () @@ -404,10 +404,7 @@ See the `eww-search-prefix' variable for the search engine used." (while (and (not (eobp)) (get-text-property (point) 'eww-form)) (forward-line 1))))) - (plist-put eww-data :url url) - (setq eww-history-position 0) - (eww-size-text-inputs) - (eww-update-header-line-format)))) + (eww-size-text-inputs)))) (defun eww-handle-link (dom) (let* ((rel (dom-attr dom 'rel)) commit 11b65bc080884362f65bf639fddcdb58ad023fbf Author: Paul Eggert Date: Mon Dec 1 09:16:04 2014 -0800 * .gitignore: Avoid "**", as it requires Git 1.8.2 or later. diff --git a/.gitignore b/.gitignore index b3a9a9c..d40f09a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,11 @@ # along with GNU Emacs. If not, see . +# Currently we assume only Git 1.7.1 (April 2010) or later, so this +# file does not rely on "**" in patterns. The "**" feature was added +# in Git 1.8.2 (March 2013). + + # Built by 'autogen.sh'. /aclocal.m4 /configure @@ -72,10 +77,10 @@ src/buildobj.h src/globals.h # Lisp-level sources built by 'make'. +*cus-load.el +*loaddefs.el leim/changed.misc leim/changed.tit -lisp/**/*cus-load.el -lisp/**/*loaddefs.el lisp/cedet/semantic/bovine/c-by.el lisp/cedet/semantic/bovine/make-by.el lisp/cedet/semantic/bovine/scm-by.el diff --git a/ChangeLog b/ChangeLog index 0cf1fe6..c70503c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2014-12-01 Paul Eggert * .gitignore: Remove redundant pattern (subsumed by _*). + Avoid "**", as it requires Git 1.8.2 or later. 2014-11-21 Paul Eggert commit d83f0618d4e0f2772e307550e309c6f7cc5623d3 Author: Paul Eggert Date: Mon Dec 1 09:13:35 2014 -0800 * .gitignore: Remove redundant pattern (subsumed by _*). diff --git a/.gitignore b/.gitignore index 989bbb0..b3a9a9c 100644 --- a/.gitignore +++ b/.gitignore @@ -117,8 +117,6 @@ deps/ # Logs and temporaries. *.log *.tmp -# Created by MS-DOS builds -src/_gdbinit # Time stamps. stamp_BLD diff --git a/ChangeLog b/ChangeLog index dba1ff3..0cf1fe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-12-01 Paul Eggert + + * .gitignore: Remove redundant pattern (subsumed by _*). + 2014-11-21 Paul Eggert Add more of the old .bzrignore to .gitignore. commit 40ce283460ee15747f71ed0eb72d75846391a98a Author: Eric S. Raymond Date: Mon Dec 1 12:05:32 2014 -0500 Test checkin to attempt to tickle a bug reported on the dev list. diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index dd1841d..fe93e73 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -77,7 +77,7 @@ See `vc-checkout-model' for a list of possible values." "Return the current workfile version of URL." "Unknown") -(defun vc-dav-register (url &optional comment) +(defun vc-dav-register (url &optional _comment) "Register URL in the DAV backend." ;; Do we need to do anything here? FIXME? ) commit f8b82217c74f635deb02a825528e574745c51b0e Author: Lars Magne Ingebrigtsen Date: Mon Dec 1 17:46:28 2014 +0100 * net/nsm.el (network-security-level): Change the default to `medium'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8a2f507..85f6b3b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2014-12-01 Lars Magne Ingebrigtsen + * net/nsm.el (network-security-level): Change the default to `medium'. + * net/eww.el (eww): Leave point in a place that doesn't cause scrolling when displaying "Loading...". diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 2b540f3..067de55 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -34,7 +34,7 @@ :version "25.1" :group 'comm) -(defcustom network-security-level 'low +(defcustom network-security-level 'medium "How secure the network should be. If a potential problem with the security of the network connection is found, the user is asked to give input into how the commit 8bb7019c27dccddbbfeb7969679fcc92a65f198d Author: Eric S. Raymond Date: Mon Dec 1 11:44:34 2014 -0500 ChangeLog typo fix. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e75cc89..8a2f507 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -15,7 +15,7 @@ vc-stay-local-p and repository-hostname are no longer public methods. Only the CVS and SVN backends used these, and the SVN support was conditioned out because svn status -v is too slow. - The CVS back end retaiin this machibery and the vc-stay-local + The CVS back end retains this machibery and the vc-stay-local configuration variable now only affects it. 2014-12-01 Stefan Monnier commit d17bae9039021b600ceaec93f2f0e888b12e523d Author: Eric S. Raymond Date: Mon Dec 1 11:41:45 2014 -0500 Refactor VC merging to fix a layer violation. * vc/vc.el, vc/vc-cvs.el, vc/vc-rcs.el, vc/vc-svn.el: The 'merge' backend method of RCS/CVS/SVN is now 'merge-file', to contrast with 'merge-branch'. Prompting for merge revisions is pushed down to the back ends; this fixes a layering violation that caused bad behavior with SVN. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b736b2d..e75cc89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,6 +5,12 @@ 2014-12-01 Eric S. Raymond + * vc/vc.el, vc/vc-cvs.el, vc/vc-rcs.el, vc/vc-svn.el: The 'merge' + backend method of RCS/CVS/SVN is now 'merge-file', to contrast with + 'merge-branch'. Prompting for merge revisions is pushed down to + the back ends; this fixes a layering violation that caused bad + behavior with SVN. + * vc/vc.el, vc-hooks.el, and all backends: API simplification; vc-stay-local-p and repository-hostname are no longer public methods. Only the CVS and SVN backends used these, and the SVN diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index a09909a..fc1e857 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -440,6 +440,35 @@ REV is the revision to check out." ;; Make the file read-only by switching off all w-bits (set-file-modes file (logand (file-modes file) 3950))))) +(defun vc-cvs-merge-file (file) + "Accept a file merge request, prompting for revisions." + (let* ((first-revision + (vc-read-revision + (concat "Merge " file + " from branch or revision " + "(default news on current branch): ") + (list file) + 'CVS)) + second-revision + status) + (cond + ((string= first-revision "") + (setq status (vc-cvs-merge-news file))) + (t + (if (not (vc-branch-p first-revision)) + (setq second-revision + (vc-read-revision + "Second revision: " + (list file) 'CVS nil + (concat (vc-branch-part first-revision) "."))) + ;; We want to merge an entire branch. Set revisions + ;; accordingly, so that vc-cvs-merge understands us. + (setq second-revision first-revision) + ;; first-revision must be the starting point of the branch + (setq first-revision (vc-branch-part first-revision))) + (setq status (vc-cvs-merge file first-revision second-revision)))) + status)) + (defun vc-cvs-merge (file first-revision &optional second-revision) "Merge changes into current working copy of FILE. The changes are between FIRST-REVISION and SECOND-REVISION." diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 96ae583..940d967 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -486,6 +486,31 @@ revert all registered files beneath it." (concat (if (eq (vc-state file) 'edited) "-u" "-r") (vc-working-revision file))))) +(defun vc-rcs-merge-file (file) + "Accept a file merge request, prompting for revisions." + (let* ((first-revision + (vc-read-revision + (concat "Merge " file " from branch or revision: ") + (list file) + 'RCS)) + second-revision) + (cond + ((string= first-revision "") + (error "A starting RCS revision is required")) + (t + (if (not (vc-branch-p first-revision)) + (setq second-revision + (vc-read-revision + "Second RCS revision: " + (list file) 'RCS nil + (concat (vc-branch-part first-revision) "."))) + ;; We want to merge an entire branch. Set revisions + ;; accordingly, so that vc-rcs-merge understands us. + (setq second-revision first-revision) + ;; first-revision must be the starting point of the branch + (setq first-revision (vc-branch-part first-revision))))) + (vc-rcs-merge file first-revision second-revision))) + (defun vc-rcs-merge (file first-version &optional second-version) "Merge changes into current working copy of FILE. The changes are between FIRST-VERSION and SECOND-VERSION." diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index c3efcc5..00a0388 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -379,6 +379,29 @@ FILE is a file wildcard, relative to the root directory of DIRECTORY." (unless contents-done (vc-svn-command nil 0 file "revert"))) +(defun vc-svn-merge-file (file) + "Accept a file merge request, prompting for revisions." + (let* ((first-revision + (vc-read-revision + (concat "Merge " file + " from SVN revision " + "(default news on current branch): ") + (list file) + 'SVN)) + second-revision + status) + (cond + ((string= first-revision "") + (setq status (vc-svn-merge-news file))) + (t + (setq second-revision + (vc-read-revision + "Second SVN revision: " + (list file) 'SVN nil + first-revision)) + (setq status (vc-svn-merge file first-revision second-revision)))) + status)) + (defun vc-svn-merge (file first-version &optional second-version) "Merge changes into current working copy of FILE. The changes are between FIRST-VERSION and SECOND-VERSION." diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index a30581e..b6ba2d3 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -289,10 +289,11 @@ ;; 'cancel-version' and took a single file arg, not a list of ;; files.) ;; -;; - merge (file rev1 rev2) +;; - merge-file (file rev1 rev2) ;; -;; Merge the changes between REV1 and REV2 into the current working file -;; (for non-distributed VCS). +;; Merge the changes between REV1 and REV2 into the current working +;; file (for non-distributed VCS). It is expected that with an +;; empty first revision this will behave like the merge-news method. ;; ;; - merge-branch () ;; @@ -594,6 +595,11 @@ ;; RCS has setting the initial revision been even possible, let alone ;; sane. ;; +;; - The backend operation for non-distributed VCSes formerly called +;; "merge" is now "merge-file" (to contrast with merge-branch), and +;; does its own prompting for revisions. (This fixes a layer violation +;; that produced bad behavior under SVN.) +;; ;; workfile-unchanged-p is no longer a public back-end method. It ;; was redundant with vc-state and usually implemented with a trivial ;; call to it. A few older back ends retain versions for internal use in @@ -2060,42 +2066,17 @@ changes from the current branch." (vc-buffer-sync) (dolist (file files) (let* ((state (vc-state file)) - first-revision second-revision status) + status) (cond ((stringp state) ;; Locking VCses only (error "File %s is locked by %s" file state)) ((not (vc-editable-p file)) (vc-checkout file t))) - (setq first-revision - (vc-read-revision - (concat "Merge " file - " from branch or revision " - "(default news on current branch): ") - (list file) - backend)) - (cond - ((string= first-revision "") - (setq status (vc-call-backend backend 'merge-news file))) - (t - (if (not (vc-branch-p first-revision)) - (setq second-revision - (vc-read-revision - "Second revision: " - (list file) backend nil - ;; FIXME: This is CVS/RCS/SCCS specific. - (concat (vc-branch-part first-revision) "."))) - ;; We want to merge an entire branch. Set revisions - ;; accordingly, so that vc-BACKEND-merge understands us. - (setq second-revision first-revision) - ;; first-revision must be the starting point of the branch - (setq first-revision (vc-branch-part first-revision))) - (setq status (vc-call-backend backend 'merge file - first-revision second-revision)))) + (setq status (vc-call-backend backend 'merge-file file)) (vc-maybe-resolve-conflicts file status "WORKFILE" "MERGE SOURCE")))) (t (error "Sorry, merging is not implemented for %s" backend))))) - (defun vc-maybe-resolve-conflicts (file status &optional _name-A _name-B) (vc-resynch-buffer file t (not (buffer-modified-p))) (if (zerop status) (message "Merge successful") commit dce46a7484d9898cc161a8333ec71db3480b110b Author: Lars Magne Ingebrigtsen Date: Mon Dec 1 17:11:50 2014 +0100 * .gitignore: Ignore loaddefs directly under lisp, and in sub-sub-directories diff --git a/.gitignore b/.gitignore index 8e8a032..71ded39 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,10 @@ src/globals.h leim/changed.misc leim/changed.tit lisp/**/*cus-load.el +lisp/cus-load.el lisp/**/*loaddefs.el +lisp/**/**/*loaddefs.el +lisp/*loaddefs.el lisp/cedet/semantic/bovine/c-by.el lisp/cedet/semantic/bovine/make-by.el lisp/cedet/semantic/bovine/scm-by.el diff --git a/ChangeLog b/ChangeLog index a3c342c..cd7698c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-12-01 Lars Magne Ingebrigtsen + + * .gitignore: Ignore loaddefs directly under lisp, and in + sub-sub-directories. + 2014-11-29 Paul Eggert Add more of the old .bzrignore to .gitignore. commit 31410dcb09783b69f0e679ab90b7347dea028357 Author: Lars Magne Ingebrigtsen Date: Mon Dec 1 17:09:01 2014 +0100 Minor eww point placement fixup * net/eww.el (eww): Leave point in a place that doesn't cause scrolling when displaying "Loading...". diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ec62db..b736b2d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-01 Lars Magne Ingebrigtsen + + * net/eww.el (eww): Leave point in a place that doesn't cause + scrolling when displaying "Loading...". + 2014-12-01 Eric S. Raymond * vc/vc.el, vc-hooks.el, and all backends: API simplification; diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 2059b5e..70427c1 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -258,7 +258,8 @@ word(s) will be searched for via `eww-search-prefix'." (plist-put eww-data :url url) (eww-update-header-line-format) (let ((inhibit-read-only t)) - (insert (format "Loading %s..." url)))) + (insert (format "Loading %s..." url)) + (goto-char (point-min)))) (url-retrieve url 'eww-render (list url nil (current-buffer)))) commit cb8ed25555d4eb610d55dc66c11b122031bcb759 Author: Eric S. Raymond Date: Mon Dec 1 10:59:05 2014 -0500 Small but crucial change for new VC registration API. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index ffb6e5d..a30581e 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1147,7 +1147,7 @@ For old-style locking-based version control systems, like RCS: ((eq state 'ignored) (error "Fileset files are ignored by the version-control system")) ((or (null state) (eq state 'unregistered)) - (vc-register nil vc-fileset)) + (vc-register vc-fileset)) ;; Files are up-to-date, or need a merge and user specified a revision ((or (eq state 'up-to-date) (and verbose (eq state 'needs-update))) (cond commit 4893831f692993f625db0ad6b16200a379fc0138 Author: Eric S. Raymond Date: Mon Dec 1 10:57:09 2014 -0500 Update some documentation changes and todo items. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 0aceb55..805e488 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -57,7 +57,6 @@ ;; STATE-CHANGING FUNCTIONS ;; * create-repo () OK ;; * register (files &optional rev comment) OK -;; - init-revision (file) NOT NEEDED ;; - responsible-p (file) OK ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD ;; - receive-file (file rev) NOT NEEDED @@ -92,7 +91,6 @@ ;; - retrieve-tag (dir name update) OK ;; MISCELLANEOUS ;; - make-version-backups-p (file) NOT NEEDED -;; - repository-hostname (dirname) NOT NEEDED ;; - previous-revision (file rev) OK ;; - next-revision (file rev) OK ;; - check-headers () COULD BE SUPPORTED diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 9bb79a7..bc704e7 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -54,7 +54,6 @@ ;; STATE-CHANGING FUNCTIONS ;; * register (files &optional rev comment) OK ;; * create-repo () OK -;; - init-revision () NOT NEEDED ;; - responsible-p (file) OK ;; - could-register (file) OK ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED @@ -84,7 +83,6 @@ ;; - retrieve-tag (dir name update) OK FIXME UPDATE BUFFERS ;; MISCELLANEOUS ;; - make-version-backups-p (file) ?? -;; - repository-hostname (dirname) ?? ;; - previous-revision (file rev) OK ;; - next-revision (file rev) OK ;; - check-headers () ?? diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 0462223..b780161 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -71,7 +71,6 @@ ;; - retrieve-tag (dir name update) ?? ;; MISCELLANEOUS ;; - make-version-backups-p (file) ?? -;; - repository-hostname (dirname) NOT NEEDED ;; - previous-revision (file rev) ?? ;; - next-revision (file rev) ?? ;; - check-headers () ?? diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 6d45f7f..ffb6e5d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -601,13 +601,11 @@ ;;; Todo: -;; - Get rid of the "master file" terminology. - ;; - Add key-binding for vc-delete-file. ;;;; New Primitives: ;; -;; - deal with push/pull operations. +;; - deal with push operations. ;; ;;;; Primitives that need changing: ;; @@ -620,10 +618,16 @@ ;; ;;;; Improved branch and tag handling: ;; +;; - Make sure the *vc-dir* buffer is updated after merge-branch operations. +;; ;; - add a generic mechanism for remembering the current branch names, ;; display the branch name in the mode-line. Replace ;; vc-cvs-sticky-tag with that. ;; +;; - Add a primitives for switching to a branch (creating it if required. +;; +;; - Add the ability to list tags and branches. +;; ;;;; Internal cleanups: ;; ;; - vc-expand-dirs should take a backend parameter and only look for @@ -636,8 +640,34 @@ ;; (or nil if it worked synchronously). Hopefully we can define the old ;; 4 operations in term of this one. ;; +;;;; Unify two different versions of the amend capability +;; +;; - Some back ends (SCCS/RCS/SVN/SRC), have an amend capability that can +;; be invoked from log-view. +;; +;; - The git backend supports amending, but in a different +;; way (press `C-c C-e' in log-edit buffer, when making a new commit). +;; +;; - Second, `log-view-modify-change-comment' doesn't seem to support +;; modern backends at all because `log-view-extract-comment' +;; unconditionally calls `log-view-current-file'. This should be easy to +;; fix. +;; +;; - Third, doing message editing in log-view might be a natural way to go +;; about it, but editing any but the last commit (and even it, if it's +;; been pushed) is a dangerous operation in Git, which we shouldn't make +;; too easy for users to perform. +;; +;; There should be a check that the given comment is not reachable +;; from any of the "remote" refs? +;; ;;;; Other ;; +;; - asynchronous checkin and commit, so you can keep working in other +;; buffers while the repo operation happens. +;; +;; - Direct support for stash/shelve. +;; ;; - when a file is in `conflict' state, turn on smerge-mode. ;; ;; - figure out what to do with conflicts that are not caused by the @@ -1154,7 +1184,7 @@ For old-style locking-based version control systems, like RCS: ;; state of each individual file in the fileset, it seems ;; simplest to just check if the file exists. Bug#9781. (when (and (file-exists-p file) (not (file-writable-p file))) - ;; Make the file+buffer read-write. + ;; Make the file-buffer read-write. (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) (error "Aborted")) ;; Maybe we somehow lost permissions on the directory. commit 185320a5fe050da1058181503952b55e581d674b Author: Eric S. Raymond Date: Mon Dec 1 10:47:27 2014 -0500 Finish vc-stay-local containment. * vc/vc.el, vc-hooks.el, and all backends: API simplification; vc-stay-local-p and repository-hostname are no longer public methods. Only the CVS and SVN backends used these, and the SVN support was conditioned out because svn status -v is too slow. The CVS back end retaiin this machibery and the vc-stay-local configuration variable now only affects it. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 41b3ddb..0ec62db 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2014-12-01 Eric S. Raymond + + * vc/vc.el, vc-hooks.el, and all backends: API simplification; + vc-stay-local-p and repository-hostname are no longer public + methods. Only the CVS and SVN backends used these, and the SVN + support was conditioned out because svn status -v is too slow. + The CVS back end retaiin this machibery and the vc-stay-local + configuration variable now only affects it. + 2014-12-01 Stefan Monnier * emacs-lisp/inline.el: New file. diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 28da328..a09909a 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -110,7 +110,7 @@ This is only meaningful if you don't use the implicit checkout model :version "21.1" :group 'vc-cvs) -(defcustom vc-cvs-stay-local 'only-file +(defcustom vc-stay-local 'only-file "Non-nil means use local operations when possible for remote repositories. This avoids slow queries over the network and instead uses heuristics and past information to determine the current status of a file. @@ -222,7 +222,7 @@ See also variable `vc-cvs-sticky-date-format-string'." (defun vc-cvs-state (file) "CVS-specific version of `vc-state'." - (if (vc-stay-local-p file 'CVS) + (if (vc-cvs-stay-local-p file) (let ((state (vc-file-getprop file 'vc-state))) ;; If we should stay local, use the heuristic but only if ;; we don't have a more precise state already available. @@ -527,7 +527,7 @@ Remaining arguments are ignored." ;; It's just the catenation of the individual logs. (vc-cvs-command buffer - (if (vc-stay-local-p files 'CVS) 'async 0) + (if (vc-cvs-stay-local-p files) 'async 0) files "log") (with-current-buffer buffer (vc-run-delayed (vc-rcs-print-log-cleanup))) @@ -544,7 +544,7 @@ Remaining arguments are ignored." "Get a difference report using CVS between two revisions of FILE." (let* (process-file-side-effects (async (and (not vc-disable-async-diff) - (vc-stay-local-p files 'CVS))) + (vc-cvs-stay-local-p files))) (invoke-cvs-diff-list nil) status) ;; Look through the file list and see if any files have backups @@ -596,7 +596,7 @@ Remaining arguments are ignored." "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-stay-local-p file 'CVS) + (if (vc-cvs-stay-local-p file) 'async 0) file "annotate" (if revision (concat "-r" revision))) @@ -733,7 +733,7 @@ If UPDATE is non-nil, then update (resynch) any affected buffers." (defun vc-cvs-make-version-backups-p (file) "Return non-nil if version backups should be made for FILE." - (vc-stay-local-p file 'CVS)) + (vc-cvs-stay-local-p file)) (defun vc-cvs-check-headers () "Check if the current file has any headers in it." @@ -757,8 +757,34 @@ and that it passes `vc-cvs-global-switches' to it before FLAGS." (append vc-cvs-global-switches flags)))) -(defun vc-cvs-stay-local-p (file) ;Back-compatibility. - (vc-stay-local-p file 'CVS)) +(defun vc-cvs-stay-local-p (file) + "Return non-nil if VC should stay local when handling FILE. +If FILE is a list of files, return non-nil if any of them +individually should stay local." + (if (listp file) + (delq nil (mapcar (lambda (arg) (vc-cvs-stay-local-p arg)) file)) + (let* ((sym (vc-make-backend-sym 'CVS 'stay-local)) + (stay-local (if (boundp sym) (symbol-value sym) vc-stay-local))) + (if (symbolp stay-local) stay-local + (let ((dirname (if (file-directory-p file) + (directory-file-name file) + (file-name-directory file)))) + (eq 'yes + (or (vc-file-getprop dirname 'vc-cvs-stay-local-p) + (vc-file-setprop + dirname 'vc-cvs-stay-local-p + (let ((hostname (vc-cvs-repository-hostname dirname))) + (if (not hostname) + 'no + (let ((default t)) + (if (eq (car-safe stay-local) 'except) + (setq default nil stay-local (cdr stay-local))) + (when (consp stay-local) + (setq stay-local + (mapconcat 'identity stay-local "\\|"))) + (if (if (string-match stay-local hostname) + default (not default)) + 'yes 'no)))))))))))) (defun vc-cvs-repository-hostname (dirname) "Hostname of the CVS server associated to workarea DIRNAME." @@ -1018,7 +1044,7 @@ state." (defun vc-cvs-dir-status (dir update-function) "Create a list of conses (file . state) for DIR." ;; FIXME check all files in DIR instead? - (let ((local (vc-stay-local-p dir 'CVS))) + (let ((local (vc-cvs-stay-local-p dir))) (if (and local (not (eq local 'only-file))) (vc-cvs-dir-status-heuristic dir update-function) (vc-cvs-command (current-buffer) 'async dir "-f" "status") diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 55bae67..6d45f7f 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -581,6 +581,10 @@ ;; CVS leaves no alternative (which was not gated by this variable). The ;; only affected back ends were SCCS and RCS. ;; +;; - vc-stay-local-p and repository-hostname are no longer part +;; of the public API. The vc-stay-local configuration variable +;; remains but only affects the CVS back end. +;; ;; - The init-revision function and the default-initial-revision ;; variable are gone. These have't made sense on anything shipped ;; since RCS, and using them was a dumb stunt even on RCS. commit 2a81c5d94d4f01b8d23ffb52871e5ab1e863e09e Author: Eric S. Raymond Date: Mon Dec 1 10:11:42 2014 -0500 Confine vc-stay-local to CVS, because it was unusable in SVN. diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 39c18d4..c4acef9 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -170,64 +170,6 @@ control systems." :type 'boolean :group 'vc) -(defcustom vc-stay-local 'only-file - "Non-nil means use local operations when possible for remote repositories. -This avoids slow queries over the network and instead uses heuristics -and past information to determine the current status of a file. - -If value is the symbol `only-file', `vc-dir' will connect to the -server, but heuristics will be used to determine the status for -all other VC operations. - -The value can also be a regular expression or list of regular -expressions to match against the host name of a repository; then VC -only stays local for hosts that match it. Alternatively, the value -can be a list of regular expressions where the first element is the -symbol `except'; then VC always stays local except for hosts matched -by these regular expressions." - :type '(choice - (const :tag "Always stay local" t) - (const :tag "Only for file operations" only-file) - (const :tag "Don't stay local" nil) - (list :format "\nExamine hostname and %v" :tag "Examine hostname ..." - (set :format "%v" :inline t (const :format "%t" :tag "don't" except)) - (regexp :format " stay local,\n%t: %v" :tag "if it matches") - (repeat :format "%v%i\n" :inline t (regexp :tag "or")))) - :version "23.1" - :group 'vc) - -(defun vc-stay-local-p (file &optional backend) - "Return non-nil if VC should stay local when handling FILE. -This uses the `repository-hostname' backend operation. -If FILE is a list of files, return non-nil if any of them -individually should stay local." - (if (listp file) - (delq nil (mapcar (lambda (arg) (vc-stay-local-p arg backend)) file)) - (setq backend (or backend (vc-backend file))) - (let* ((sym (vc-make-backend-sym backend 'stay-local)) - (stay-local (if (boundp sym) (symbol-value sym) vc-stay-local))) - (if (symbolp stay-local) stay-local - (let ((dirname (if (file-directory-p file) - (directory-file-name file) - (file-name-directory file)))) - (eq 'yes - (or (vc-file-getprop dirname 'vc-stay-local-p) - (vc-file-setprop - dirname 'vc-stay-local-p - (let ((hostname (vc-call-backend - backend 'repository-hostname dirname))) - (if (not hostname) - 'no - (let ((default t)) - (if (eq (car-safe stay-local) 'except) - (setq default nil stay-local (cdr stay-local))) - (when (consp stay-local) - (setq stay-local - (mapconcat 'identity stay-local "\\|"))) - (if (if (string-match stay-local hostname) - default (not default)) - 'yes 'no)))))))))))) - ;;; This is handled specially now. ;; Tell Emacs about this new kind of minor mode ;; (add-to-list 'minor-mode-alist '(vc-mode vc-mode)) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 4381c8a..c3efcc5 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -511,7 +511,6 @@ If LIMIT is non-nil, show no more than this many entries." 'vc-svn-command buffer 'async - ;; (if (and (= (length files) 1) (vc-stay-local-p file 'SVN)) 'async 0) (list file) "log" (append @@ -552,7 +551,6 @@ If LIMIT is non-nil, show no more than this many entries." (list (concat "--diff-cmd=" diff-command) "-x" (mapconcat 'identity (vc-switches nil 'diff) " ")))) (async (and (not vc-disable-async-diff) - (vc-stay-local-p files 'SVN) (or oldvers newvers)))) ; Svn diffs those locally. (apply 'vc-svn-command buffer (if async 'async 0) @@ -595,7 +593,7 @@ NAME is assumed to be a URL." ;; Subversion makes backups for us, so don't bother. ;; (defun vc-svn-make-version-backups-p (file) ;; "Return non-nil if version backups should be made for FILE." -;; (vc-stay-local-p file 'SVN)) +;; nil) (defun vc-svn-check-headers () "Check if the current file has any headers in it." @@ -618,17 +616,6 @@ and that it passes `vc-svn-global-switches' to it before FLAGS." (cons vc-svn-global-switches flags) (append vc-svn-global-switches flags)))) -(defun vc-svn-repository-hostname (dirname) - (with-temp-buffer - (let (process-file-side-effects) - (vc-svn-command t t dirname "info" "--xml")) - (goto-char (point-min)) - (when (re-search-forward "\\(.*\\)" nil t) - ;; This is not a hostname but a URL. This may actually be considered - ;; as a feature since it allows vc-svn-stay-local to specify different - ;; behavior for different modules on the same server. - (match-string 1)))) - (defun vc-svn-resolve-when-done () "Call \"svn resolved\" if the conflict markers have been removed." (save-excursion diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 54fb9cd..55bae67 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -481,14 +481,6 @@ ;; ;; Return the root of the VC controlled hierarchy for file. ;; -;; - repository-hostname (dirname) -;; -;; Return the hostname that the backend will have to contact -;; in order to operate on a file in DIRNAME. If the return value -;; is nil, it means that the repository is local. -;; This function is used in `vc-stay-local-p' which backends can use -;; for their convenience. -;; ;; - ignore (file &optional directory) ;; ;; Ignore FILE under the VCS of DIRECTORY (default is `default-directory'). @@ -630,9 +622,6 @@ ;; ;;;; Internal cleanups: ;; -;; - backends that care about vc-stay-local should try to take it into -;; account for vc-dir. Is this likely to be useful??? YES! -;; ;; - vc-expand-dirs should take a backend parameter and only look for ;; files managed by that backend. ;; commit c1083725258be6b4e7ae760a06368280fdf05302 Author: Eric S. Raymond Date: Mon Dec 1 10:03:17 2014 -0500 Remove stay-local support in svn back end, because... ...status -v is so slow that it's unusable. diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 0479519..4381c8a 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -156,7 +156,6 @@ If you want to force an empty list of arguments, use t." (defun vc-svn-state (file &optional localp) "SVN-specific version of `vc-state'." (let (process-file-side-effects) - (setq localp (or localp (vc-stay-local-p file 'SVN))) (with-temp-buffer (cd (file-name-directory file)) (vc-svn-command t 0 file "status" (if localp "-v" "-u")) @@ -199,21 +198,13 @@ If you want to force an empty list of arguments, use t." ;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher. (declare-function vc-exec-after "vc-dispatcher" (code)) -(defun vc-svn-dir-status (dir callback) +(defun vc-svn-dir-status (_dir callback) "Run 'svn status' for DIR and update BUFFER via CALLBACK. CALLBACK is called as (CALLBACK RESULT BUFFER), where RESULT is a list of conses (FILE . STATE) for directory DIR." ;; FIXME should this rather be all the files in dir? - ;; FIXME: the vc-stay-local-p logic below is disabled, it ends up - ;; calling synchronously (vc-svn-registered DIR) => calling svn status -v DIR - ;; which is VERY SLOW for big trees and it makes emacs - ;; completely unresponsive during that time. - (let* ((local (and nil (vc-stay-local-p dir 'SVN))) - (remote (or t (not local) (eq local 'only-file)))) - (vc-svn-command (current-buffer) 'async nil "status" - (if remote "-u")) - (vc-run-delayed - (vc-svn-after-dir-status callback remote)))) + (vc-svn-command (current-buffer) 'async nil "status" "-u") + (vc-run-delayed (vc-svn-after-dir-status callback))) (defun vc-svn-dir-status-files (_dir files _default-state callback) (apply 'vc-svn-command (current-buffer) 'async nil "status" files) commit f0e8c1eac226641ea8acab9e0f47ce3541803f0d Author: Stefan Monnier Date: Mon Dec 1 09:45:15 2014 -0500 New macro `define-inline'. * lisp/emacs-lisp/inline.el: New file. diff --git a/etc/NEWS b/etc/NEWS index 9c34bb2..6c636cf 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -373,6 +373,8 @@ Emacs-21. * Lisp Changes in Emacs 25.1 +** define-inline provides a new way to define inlinable functions. + ** New function macroexpand-1 to perform a single step of macroexpansion. ** Some "x-*" were obsoleted: diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6691f5..41b3ddb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,13 @@ +2014-12-01 Stefan Monnier + + * emacs-lisp/inline.el: New file. + 2014-12-01 Eric S. Raymond * vc/vc.el, vc-hooks.el, and all backends: API simplification; vc-state-heuristic is no longer a public method, having been - removed where it is redundant, unnecessary, or known buggy. This - eliminated all backends except CVS. Eliminates bug#7850. + removed where it is redundant, unnecessary, or known buggy. + This eliminated all backends except CVS. Eliminates bug#7850. * vc/vc-cvs.el, vc/vc-hooks.el, vc/vc-rcs.el, vc/vc-sccs.el: Eliminate vc-mistrust-permissions. It was only relevant to the @@ -41,8 +45,8 @@ 2014-11-29 Fabián Ezequiel Gallina - * progmodes/python.el (python-shell-completion-setup-code): Use - __builtin__ module (or builtins in Python 3) and catch all errors + * progmodes/python.el (python-shell-completion-setup-code): + Use __builtin__ module (or builtins in Python 3) and catch all errors when importing readline and rlcompleter. 2014-11-29 Stephen Berman @@ -94,8 +98,8 @@ 2014-11-29 Eli Zaretskii - * vc/vc-git.el (vc-git-command, vc-git--call): Bind - coding-system-for-read and coding-system-for-write to + * vc/vc-git.el (vc-git-command, vc-git--call): + Bind coding-system-for-read and coding-system-for-write to vc-git-commits-coding-system. (vc-git-previous-revision): Use "~1" instead of "^", since the latter is a special character for MS-Windows system shells. diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 38956df..01f5970 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -120,7 +120,8 @@ expression, in which case we want to handle forms differently." ;; Look for an interactive spec. (interactive (pcase body ((or `((interactive . ,_) . ,_) - `(,_ (interactive . ,_) . ,_)) t)))) + `(,_ (interactive . ,_) . ,_)) + t)))) ;; Add the usage form at the end where describe-function-1 ;; can recover it. (when (listp args) (setq doc (help-add-fundoc-usage doc args))) @@ -140,11 +141,9 @@ expression, in which case we want to handle forms differently." ;; For complex cases, try again on the macro-expansion. ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode define-globalized-minor-mode defun defmacro - ;; FIXME: we'd want `defmacro*' here as well, so as - ;; to handle its `declare', but when autoload is run - ;; CL is not loaded so macroexpand doesn't know how - ;; to expand it! - easy-mmode-define-minor-mode define-minor-mode)) + easy-mmode-define-minor-mode define-minor-mode + define-inline cl-defun cl-defmacro)) + (macrop car) (setq expand (let ((load-file-name file)) (macroexpand form))) (memq (car expand) '(progn prog1 defalias))) (make-autoload expand file 'expansion)) ;Recurse on the expansion. diff --git a/lisp/emacs-lisp/inline.el b/lisp/emacs-lisp/inline.el new file mode 100644 index 0000000..3f11781 --- /dev/null +++ b/lisp/emacs-lisp/inline.el @@ -0,0 +1,251 @@ +;;; inline.el --- Define functions by their inliner -*- lexical-binding:t; -*- + +;; Copyright (C) 2014 Stefan Monnier + +;; Author: Stefan Monnier + +;; 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: + +;; This package provides the macro `define-inline' which lets you define +;; functions by defining their (exhaustive) compiler macro. +;; +;; The idea is that instead of doing like defsubst and cl-defsubst (i.e. from +;; the function's definition, guess the best way to inline the function), +;; we go the other way around: the programmer provides the code that does the +;; inlining (as a compiler-macro) and from that we derive the definition of the +;; function itself. The idea originated in an attempt to clean up `cl-typep', +;; whose function definition amounted to (eval (cl--make-type-test EXP TYPE)). +;; +;; The simplest use is for plain and simple inlinable functions. Rather than: +;; +;; (defmacro myaccessor (obj) +;; (macroexp-let2 macroexp-copyable-p obj obj +;; `(if (foop ,obj) (aref (cdr ,obj) 3) (aref ,obj 2)))) +;; Or +;; (defsubst myaccessor (obj) +;; (if (foop obj) (aref (cdr obj) 3) (aref obj 2))) +;; Or +;; (cl-defsubst myaccessor (obj) +;; (if (foop obj) (aref (cdr obj) 3) (aref obj 2))) +;; +;; You'd do +;; +;; (define-inline myaccessor (obj) +;; (inline-letevals (obj) +;; (inline-quote (if (foop ,obj) (aref (cdr ,obj) 3) (aref ,obj 2))))) +;; +;; Other than verbosity, you get the best of all 3 above without their +;; respective downsides: +;; - defmacro: can't be passed to `mapcar' since it's not a function. +;; - defsubst: not as efficient, and doesn't work as a `gv' place. +;; - cl-defsubst: only works by accident, since it has latent bugs in its +;; handling of variables and scopes which could bite you at any time. +;; (e.g. try (cl-defsubst my-test1 (x) (let ((y 5)) (+ x y))) +;; and then M-: (macroexpand-all '(my-test1 y)) RET) +;; There is still one downside shared with the defmacro and cl-defsubst +;; approach: when the function is inlined, the scoping rules (dynamic or +;; lexical) will be inherited from the the call site. + +;; Of course, since define-inline defines a compiler macro, you can also do +;; call-site optimizations, just like you can with `defmacro', but not with +;; defsubst nor cl-defsubst. + +;;; Code: + +(require 'macroexp) + +(defmacro inline-quote (exp) + "Similar to backquote, but quotes code and only accepts , and not ,@." + (declare (debug t)) + (error "inline-quote can only be used within define-inline")) + +(defmacro inline-const-p (exp) + "Return non-nil if the value of EXP is already known." + (declare (debug t)) + (error "inline-const-p can only be used within define-inline")) + +(defmacro inline-const-val (exp) + "Return the value of EXP." + (declare (debug t)) + (error "inline-const-val can only be used within define-inline")) + +(defmacro inline-error (format &rest args) + "Signal an error." + (declare (debug t)) + (error "inline-error can only be used within define-inline")) + +(defmacro inline--leteval (_var-exp &rest _body) + (declare (indent 1) (debug (sexp &rest body))) + (error "inline-letevals can only be used within define-inline")) +(defmacro inline--letlisteval (_list &rest _body) + (declare (indent 1) (debug (sexp &rest body))) + (error "inline-letevals can only be used within define-inline")) + +(defmacro inline-letevals (vars &rest body) + "Make sure the expressions in VARS are evaluated. +VARS should be a list of elements of the form (VAR EXP) or just VAR, in case +EXP is equal to VAR. The result is to evaluate EXP and bind the result to VAR. + +The tail of VARS can be either nil or a symbol VAR which should hold a list +of arguments,in which case each argument is evaluated and the resulting +new list is re-bound to VAR. + +After VARS is handled, BODY is evaluated in the new environment." + (declare (indent 1) (debug (sexp &rest body))) + (cond + ((consp vars) + `(inline--leteval ,(pop vars) (inline-letevals ,vars ,@body))) + (vars + `(inline--letlisteval ,vars ,@body)) + (t (macroexp-progn body)))) + + +;;;###autoload +(defmacro define-inline (name args &rest body) + ;; FIXME: How can this work with CL arglists? + (declare (indent defun) (debug defun) (doc-string 3)) + (let ((doc (if (stringp (car-safe body)) (list (pop body)))) + (declares (if (eq (car-safe (car-safe body)) 'declare) (pop body))) + (cm-name (intern (format "%s--inliner" name))) + (bodyexp (macroexp-progn body))) + ;; If the function is autoloaded then when we load the .el file, the + ;; `compiler-macro' property is already set (from loaddefs.el) and might + ;; hence be called during the macroexpand-all calls below (if the function + ;; is recursive). + ;; So we disable any pre-loaded compiler-macro setting to avoid this. + (function-put name 'compiler-macro nil) + `(progn + (defun ,name ,args + ,@doc + (declare (compiler-macro ,cm-name) ,@(cdr declares)) + ,(macroexpand-all bodyexp + `((inline-quote . inline--dont-quote) + ;; (inline-\` . inline--dont-quote) + (inline--leteval . inline--dont-leteval) + (inline--letlisteval . inline--dont-letlisteval) + (inline-const-p . inline--alwaysconst-p) + (inline-const-val . inline--alwaysconst-val) + (inline-error . inline--error) + ,@macroexpand-all-environment))) + :autoload-end + (eval-and-compile + (defun ,cm-name ,(cons 'inline--form args) + (ignore inline--form) ;In case it's not used! + (catch 'inline--just-use + ,(macroexpand-all + bodyexp + `((inline-quote . inline--do-quote) + ;; (inline-\` . inline--do-quote) + (inline--leteval . inline--do-leteval) + (inline--letlisteval + . inline--do-letlisteval) + (inline-const-p . inline--testconst-p) + (inline-const-val . inline--getconst-val) + (inline-error . inline--warning) + ,@macroexpand-all-environment)))))))) + +(defun inline--do-quote (exp) + (pcase exp + (`(,'\, ,e) e) ;Eval `e' now *and* later. + (`'(,'\, ,e) `(list 'quote ,e)) ;Only eval `e' now, not later. + (`#'(,'\, ,e) `(list 'function ,e)) ;Only eval `e' now, not later. + ((pred consp) + (let ((args ())) + (while (and (consp exp) (not (eq '\, (car exp)))) + (push (inline--do-quote (pop exp)) args)) + (setq args (nreverse args)) + (if exp + `(backquote-list* ,@args ,(inline--do-quote exp)) + `(list ,@args)))) + (_ (macroexp-quote exp)))) + +(defun inline--dont-quote (exp) + (pcase exp + (`(,'\, ,e) e) + (`'(,'\, ,e) e) + (`#'(,'\, ,e) e) + ((pred consp) + (let ((args ())) + (while (and (consp exp) (not (eq '\, (car exp)))) + (push (inline--dont-quote (pop exp)) args)) + (setq args (nreverse args)) + (if exp + `(apply ,@args ,(inline--dont-quote exp)) + args))) + (_ exp))) + +(defun inline--do-leteval (var-exp &rest body) + `(macroexp-let2 ,(if (symbolp var-exp) #'macroexp-copyable-p #'ignore) + ,(or (car-safe var-exp) var-exp) + ,(or (car (cdr-safe var-exp)) var-exp) + ,@body)) + +(defun inline--dont-leteval (var-exp &rest body) + (if (symbolp var-exp) + (macroexp-progn body) + `(let (,var-exp) ,@body))) + +(defun inline--do-letlisteval (listvar &rest body) + ;; Here's a sample situation: + ;; (define-inline foo (arg &rest keys) + ;; (inline-letevals (arg . keys) + ;; )) + ;; I.e. in we need `keys' to contain a list of + ;; macroexp-copyable-p expressions. + (let ((bsym (make-symbol "bindings"))) + `(let* ((,bsym ()) + (,listvar (mapcar (lambda (e) + (if (macroexp-copyable-p e) e + (let ((v (make-symbol "v"))) + (push (list v e) ,bsym) + v))) + ,listvar))) + (macroexp-let* (nreverse ,bsym) + ,(macroexp-progn body))))) + +(defun inline--dont-letlisteval (_listvar &rest body) + (macroexp-progn body)) + +(defun inline--testconst-p (exp) + `(macroexp-const-p ,exp)) + +(defun inline--alwaysconst-p (_exp) + t) + +(defun inline--getconst-val (exp) + (macroexp-let2 macroexp-copyable-p exp exp + `(cond + ((not (macroexp-const-p ,exp)) + (throw 'inline--just-use inline--form)) + ((consp ,exp) (cadr ,exp)) + (t ,exp)))) + +(defun inline--alwaysconst-val (exp) + exp) + +(defun inline--error (&rest args) + `(error ,@args)) + +(defun inline--warning (&rest _args) + `(throw 'inline--just-use + ;; FIXME: This would inf-loop by calling us right back when + ;; macroexpand-all recurses to expand inline--form. + ;; (macroexp--warn-and-return (format ,@args) + ;; inline--form) + inline--form)) + +(provide 'inline) +;;; inline.el ends here commit 578d91ac509a9856cf854bea75b6328cf40d1d03 Author: Eric S. Raymond Date: Mon Dec 1 09:41:54 2014 -0500 Remove vc-state-heuristic from the set of public methods. * vc/vc.el, vc-hooks.el, and all backends: API simplification; vc-state-heuristic is no longer a public method, having been removed where it is redundant, unnecessary, or known buggy. This eliminated all backends except CVS. Eliminates bug#7850. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6f5bb46..d6691f5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2014-12-01 Eric S. Raymond + * vc/vc.el, vc-hooks.el, and all backends: API simplification; + vc-state-heuristic is no longer a public method, having been + removed where it is redundant, unnecessary, or known buggy. This + eliminated all backends except CVS. Eliminates bug#7850. + * vc/vc-cvs.el, vc/vc-hooks.el, vc/vc-rcs.el, vc/vc-sccs.el: Eliminate vc-mistrust-permissions. It was only relevant to the RCS and SCCS back ends and defaulted to t. Code now always diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 19a8299..34a7c7b 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -178,113 +178,6 @@ in the repository root directory of FILE." (insert-file-contents-literally file) (sha1 (current-buffer)))) -(defun vc-bzr-state-heuristic (file) - "Like `vc-bzr-state' but hopefully without running Bzr." - ;; `bzr status' could be slow with large histories and pending merges, - ;; so this tries to avoid calling it if possible. bzr status is - ;; faster now, so this is not as important as it was. - ;; - ;; This function tries first to parse Bzr internal file - ;; `checkout/dirstate', but it may fail if Bzr internal file format - ;; has changed. As a safeguard, the `checkout/dirstate' file is - ;; only parsed if it contains the string `#bazaar dirstate flat - ;; format 3' in the first line. - ;; If the `checkout/dirstate' file cannot be parsed, fall back to - ;; running `vc-bzr-state'." - ;; - ;; The format of the dirstate file is explained in bzrlib/dirstate.py - ;; in the bzr distribution. Basically: - ;; header-line giving the version of the file format in use. - ;; a few lines of stuff - ;; entries, one per line, with null-separated fields. Each line: - ;; entry_key = dirname (may be empty), basename, file-id - ;; current = common ( = kind, fingerprint, size, executable ) - ;; + working ( = packed_stat ) - ;; parent = common ( as above ) + history ( = rev_id ) - ;; kinds = (r)elocated, (a)bsent, (d)irectory, (f)ile, (l)ink - (let* ((root (vc-bzr-root file)) - (dirstate (expand-file-name vc-bzr-admin-dirstate root))) - (when root ; Short cut. - (condition-case err - (with-temp-buffer - (insert-file-contents dirstate) - (goto-char (point-min)) - (if (not (looking-at "#bazaar dirstate flat format 3")) - (vc-bzr-state file) ; Some other unknown format? - (let* ((relfile (file-relative-name file root)) - (reldir (file-name-directory relfile))) - (cond - ((not - (re-search-forward - (concat "^\0" - (if reldir (regexp-quote - (directory-file-name reldir))) - "\0" - (regexp-quote (file-name-nondirectory relfile)) - "\0" - "[^\0]*\0" ;id? - "\\([^\0]*\\)\0" ;"a/f/d", a=removed? - "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)? - "\\([^\0]*\\)\0" ;size?p - ;; y/n. Whether or not the current copy - ;; was executable the last time bzr checked? - "[^\0]*\0" - "[^\0]*\0" ;? - ;; Parent information. Absent in a new repo. - "\\(?:\\([^\0]*\\)\0" ;"a/f/d" a=added? - "\\([^\0]*\\)\0" ;sha1 again? - "\\([^\0]*\\)\0" ;size again? - ;; y/n. Whether or not the repo thinks - ;; the file should be executable? - "\\([^\0]*\\)\0" - "[^\0]*\0\\)?" ;last revid? - ;; There are more fields when merges are pending. - ) - nil t)) - 'unregistered) - ;; Apparently the second sha1 is the one we want: when - ;; there's a conflict, the first sha1 is absent (and the - ;; first size seems to correspond to the file with - ;; conflict markers). - ((eq (char-after (match-beginning 1)) ?a) 'removed) - ;; If there is no parent, this must be a new repo. - ;; If file is in dirstate, can only be added (b#8025). - ((or (not (match-beginning 4)) - (eq (char-after (match-beginning 4)) ?a)) 'added) - ((or (and (eq (string-to-number (match-string 3)) - (nth 7 (file-attributes file))) - (equal (match-string 5) - (save-match-data (vc-bzr-sha1 file))) - ;; For a file, does the executable state match? - ;; (Bug#7544) - (or (not - (eq (char-after (match-beginning 1)) ?f)) - (let ((exe - (memq - ?x - (mapcar - 'identity - (nth 8 (file-attributes file)))))) - (if (eq (char-after (match-beginning 7)) - ?y) - exe - (not exe))))) - (and - ;; It looks like for lightweight - ;; checkouts \2 is empty and we need to - ;; look for size in \6. - (eq (match-beginning 2) (match-end 2)) - (eq (string-to-number (match-string 6)) - (nth 7 (file-attributes file))) - (equal (match-string 5) - (vc-bzr-sha1 file)))) - 'up-to-date) - (t 'edited))))) - ;; The dirstate file can't be read, or some other problem. - (error - (message "Falling back on \"slow\" status detection (%S)" err) - (vc-bzr-state file)))))) - ;; This is a cheap approximation that is autoloaded. If it finds a ;; possible match it loads this file and runs the real function. ;; It requires vc-bzr-admin-checkout-format-file to be autoloaded too. @@ -296,7 +189,7 @@ in the repository root directory of FILE." (defun vc-bzr-registered (file) "Return non-nil if FILE is registered with bzr." - (let ((state (vc-bzr-state-heuristic file))) + (let ((state (vc-bzr-state file))) (not (memq state '(nil unregistered ignored))))) (defconst vc-bzr-state-words @@ -494,8 +387,6 @@ in the branch repository (or whose status not be determined)." (message "There are unresolved conflicts in this file"))) (defun vc-bzr-working-revision (file) - ;; Together with the code in vc-state-heuristic, this makes it possible - ;; to get the initial VC state of a Bzr file even if Bzr is not installed. (let* ((rootdir (vc-bzr-root file)) (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file rootdir)) diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index e6ab771..dd1841d 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -133,10 +133,6 @@ It should return a status of either 0 (no differences found), or ;;; Optional functions -;; Should be faster than vc-dav-state - but how? -(defun vc-dav-state-heuristic (url) - "Estimate the version control state of URL at visiting time." - (vc-dav-state url)) ;; This should use url-dav-get-properties with a depth of `1' to get ;; all the properties. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f2cb997..0aceb55 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -50,7 +50,6 @@ ;; STATE-QUERYING FUNCTIONS ;; * registered (file) OK ;; * state (file) OK -;; - state-heuristic (file) NOT NEEDED ;; * working-revision (file) OK ;; - latest-on-branch-p (file) NOT NEEDED ;; * checkout-model (files) OK diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 52d5ceb..9bb79a7 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -43,7 +43,6 @@ ;; STATE-QUERYING FUNCTIONS ;; * registered (file) OK ;; * state (file) OK -;; - state-heuristic (file) NOT NEEDED ;; - dir-status (dir update-function) OK ;; - dir-status-files (dir files ds uf) OK ;; - dir-extra-headers (dir) OK diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 46a6b31..39c18d4 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -548,18 +548,12 @@ status of this file. Otherwise, the value returned is one of: "Quickly recompute the `state' of FILE." (vc-file-setprop file 'vc-state - (vc-call-backend backend 'state-heuristic file))) + (vc-call-backend backend 'state file))) (defsubst vc-up-to-date-p (file) "Convenience function that checks whether `vc-state' of FILE is `up-to-date'." (eq (vc-state file) 'up-to-date)) -(defun vc-default-state-heuristic (backend file) - "Default implementation of vc-BACKEND-state-heuristic. -It simply calls the real state computation function `vc-BACKEND-state' -and does not employ any heuristic at all." - (vc-call-backend backend 'state file)) - (defun vc-working-revision (file &optional backend) "Return the repository version from which FILE was checked out. If FILE is not registered, this function always returns nil." diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 931dc5a..0462223 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -31,7 +31,6 @@ ;; STATE-QUERYING FUNCTIONS ;; * registered (file) OK ;; * state (file) OK -;; - state-heuristic (file) NOT NEEDED ;; * dir-status (dir update-function) OK ;; - dir-status-files (dir files ds uf) ?? ;; - dir-extra-headers (dir) NOT NEEDED diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index fa584fa..0479519 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -9,7 +9,7 @@ ;; 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 +;; 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. @@ -162,25 +162,6 @@ If you want to force an empty list of arguments, use t." (vc-svn-command t 0 file "status" (if localp "-v" "-u")) (vc-svn-parse-status file)))) -;; NB this does not handle svn properties, which can be changed -;; without changing the file timestamp. -;; Note that unlike vc-cvs-state-heuristic, this is not called from -;; vc-svn-state. AFAICS, it is only called from vc-state-refresh via -;; vc-after-save (bug#7850). Therefore the fact that it ignores -;; properties is irrelevant. If you want to make vc-svn-state call -;; this, it should be extended to handle svn properties. -(defun vc-svn-state-heuristic (file) - "SVN-specific state heuristic." - ;; If the file has not changed since checkout, consider it `up-to-date'. - ;; Otherwise consider it `edited'. Copied from vc-cvs-state-heuristic. - (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) - (lastmod (nth 5 (file-attributes file)))) - (cond - ((equal checkout-time lastmod) 'up-to-date) - ((string= (vc-working-revision file) "0") 'added) - ((null checkout-time) 'unregistered) - (t 'edited)))) - ;; FIXME it would be better not to have the "remote" argument, ;; but to distinguish the two output formats based on content. (defun vc-svn-after-dir-status (callback &optional remote) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 0d0639b..54fb9cd 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -128,16 +128,7 @@ ;; Return the current version control state of FILE. For a list of ;; possible values, see `vc-state'. This function should do a full and ;; reliable state computation; it is usually called immediately after -;; C-x v v. If you want to use a faster heuristic when visiting a -;; file, put that into `state-heuristic' below. Note that under most -;; VCSes this won't be called at all, dir-status is used instead. -;; -;; - state-heuristic (file) -;; -;; If provided, this function is used to estimate the version control -;; state of FILE at visiting time. It should be considerably faster -;; than the implementation of `state'. For a list of possible values, -;; see the doc string of `vc-state'. +;; C-x v v. ;; ;; - dir-status (dir update-function) ;; @@ -590,6 +581,9 @@ ;; moves closer to emulating modern non-locking behavior even on very ;; old VCSes. ;; +;; - vc-state-heuristic is no longer a public method (the CVS backend +;; retains it as a private one). +;; ;; - the vc-mistrust-permissions configuration variable is gone; the ;; code no longer relies on permissions except in one corner case where ;; CVS leaves no alternative (which was not gated by this variable). The commit 33b4235db671a6c5644a9ce73a8901f073cb0ecc Author: Eric S. Raymond Date: Mon Dec 1 09:08:26 2014 -0500 The vc-mistrust-permissions configuration variable is gone. * vc/vc-cvs.el, vc/vc-hooks.el, vc/vc-rcs.el, vc/vc-sccs.el: Eliminate vc-mistrust-permissions. It was only relevant to the RCS and SCCS back ends and defaulted to t. Code now always mistrusts permissions - by actual measurement the effect on performance is negligible. As a side effect bug#11490 is now irrelevant. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66b671a..6f5bb46 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2014-12-01 Eric S. Raymond + * vc/vc-cvs.el, vc/vc-hooks.el, vc/vc-rcs.el, vc/vc-sccs.el: + Eliminate vc-mistrust-permissions. It was only relevant to the + RCS and SCCS back ends and defaulted to t. Code now always + mistrusts permissions - by actual measurement the effect on + performance is negligible. As a side effect bug#11490 is now + irrelevant. + * vc/vc.el, vc-hooks.el, and all backends: API simplification; vc-workfile-unchanged-p is no longer a public method (but the RCS and SCCS back ends retain it as a private method used in state diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index c938899..28da328 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -48,9 +48,9 @@ ;; If the file is not writable (despite CVSREAD being ;; undefined), this is probably because the file is being ;; "watched" by other developers. - ;; (If vc-mistrust-permissions was t, we actually shouldn't - ;; trust this, but there is no other way to learn this from - ;; CVS at the moment (version 1.9).) + ;; (We actually shouldn't trust this, but there is + ;; no other way to learn this from CVS at the + ;; moment (version 1.9).) (string-match "r-..-..-." (nth 8 attrib))) 'announce 'implicit)))))) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 7224aee..46a6b31 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -170,22 +170,6 @@ control systems." :type 'boolean :group 'vc) -;; If you fix bug#11490, probably you can set this back to nil. -(defcustom vc-mistrust-permissions t - "If non-nil, don't assume permissions/ownership track version-control status. -If nil, do rely on the permissions. -See also variable `vc-consult-headers'." - :version "24.3" ; nil->t, bug#11490 - :type 'boolean - :group 'vc) - -(defun vc-mistrust-permissions (file) - "Internal access function to variable `vc-mistrust-permissions' for FILE." - (or (eq vc-mistrust-permissions 't) - (and vc-mistrust-permissions - (funcall vc-mistrust-permissions - (vc-backend-subdirectory-name file))))) - (defcustom vc-stay-local 'only-file "Non-nil means use local operations when possible for remote repositories. This avoids slow queries over the network and instead uses heuristics diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 3028d7e..96ae583 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -155,51 +155,6 @@ For a description of possible values, see `vc-check-master-templates'." 'unlocked-changes 'edited)))))) -(defun vc-rcs-state-heuristic (file) - "State heuristic for RCS." - (let (vc-rcs-headers-result) - (if (and vc-consult-headers - (setq vc-rcs-headers-result - (vc-rcs-consult-headers file)) - (eq vc-rcs-headers-result 'rev-and-lock)) - (let ((state (vc-file-getprop file 'vc-state))) - ;; If the headers say that the file is not locked, the - ;; permissions can tell us whether locking is used for - ;; the file or not. - (if (and (eq state 'up-to-date) - (not (vc-mistrust-permissions file)) - (file-exists-p file)) - (cond - ((string-match ".rw..-..-." (nth 8 (file-attributes file))) - (vc-file-setprop file 'vc-checkout-model 'implicit) - (setq state - (if (vc-rcs-workfile-is-newer file) - 'edited - 'up-to-date))) - ((string-match ".r-..-..-." (nth 8 (file-attributes file))) - (vc-file-setprop file 'vc-checkout-model 'locking)))) - state) - (if (not (vc-mistrust-permissions file)) - (let* ((attributes (file-attributes file 'string)) - (owner-name (nth 2 attributes)) - (permissions (nth 8 attributes))) - (cond ((and permissions (string-match ".r-..-..-." permissions)) - (vc-file-setprop file 'vc-checkout-model 'locking) - 'up-to-date) - ((and permissions (string-match ".rw..-..-." permissions)) - (if (eq (vc-rcs-checkout-model file) 'locking) - (if (file-ownership-preserved-p file) - 'edited - owner-name) - (if (vc-rcs-workfile-is-newer file) - 'edited - 'up-to-date))) - (t - ;; Strange permissions. Fall through to - ;; expensive state computation. - (vc-rcs-state file)))) - (vc-rcs-state file))))) - (autoload 'vc-expand-dirs "vc") (defun vc-rcs-dir-status (dir update-function) @@ -1098,7 +1053,7 @@ Returns: nil if no headers were found 'rev-and-lock if revision and lock info was found" (cond ((not (get-file-buffer file)) nil) - ((let (status version locking-user) + ((let (status version) (with-current-buffer (get-file-buffer file) (save-excursion (goto-char (point-min)) @@ -1124,11 +1079,11 @@ Returns: nil if no headers were found (cond ;; unlocked revision ((looking-at "\\$") - (setq locking-user 'none) + ;;(setq locking-user 'none) (setq status 'rev-and-lock)) ;; revision is locked by some user ((looking-at "\\([^ ]+\\) \\$") - (setq locking-user (match-string-no-properties 1)) + ;;(setq locking-user (match-string-no-properties 1)) (setq status 'rev-and-lock)) ;; everything else: false (nil))) @@ -1146,39 +1101,19 @@ Returns: nil if no headers were found (goto-char (point-min)) (if (re-search-forward (concat "\\$" "Locker:") nil t) (cond ((looking-at " \\([^ ]+\\) \\$") - (setq locking-user (match-string-no-properties 1)) + ;;(setq locking-user (match-string-no-properties 1)) (setq status 'rev-and-lock)) ((looking-at " *\\$") - (setq locking-user 'none) + ;;(setq locking-user 'none) (setq status 'rev-and-lock)) (t - (setq locking-user 'none) + ;;(setq locking-user 'none) (setq status 'rev-and-lock))) (setq status 'rev))) ;; else: nothing found ;; ------------------- (t nil)))) (if status (vc-file-setprop file 'vc-working-revision version)) - (and (eq status 'rev-and-lock) - (vc-file-setprop file 'vc-state - (cond - ((eq locking-user 'none) 'up-to-date) - ((string= locking-user (vc-user-login-name file)) - 'edited) - (t locking-user))) - ;; If the file has headers, we don't want to query the - ;; master file, because that would eliminate all the - ;; performance gain the headers brought us. We therefore - ;; use a heuristic now to find out whether locking is used - ;; for this file. If we trust the file permissions, and the - ;; file is not locked, then if the file is read-only we - ;; assume that locking is used for the file, otherwise - ;; locking is not used. - (not (vc-mistrust-permissions file)) - (vc-up-to-date-p file) - (if (string-match ".r-..-..-." (nth 8 (file-attributes file))) - (vc-file-setprop file 'vc-checkout-model 'locking) - (vc-file-setprop file 'vc-checkout-model 'implicit))) status)))) (defun vc-release-greater-or-equal (r1 r2) diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 8c9595a..cd4c054 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -132,29 +132,6 @@ For a description of possible values, see `vc-check-master-templates'." locking-user))) 'up-to-date)))) -(defun vc-sccs-state-heuristic (file) - "SCCS-specific state heuristic." - (if (not (vc-mistrust-permissions file)) - ;; This implementation assumes that any file which is under version - ;; control and has -rw-r--r-- is locked by its owner. This is true - ;; for both RCS and SCCS, which keep unlocked files at -r--r--r--. - ;; We have to be careful not to exclude files with execute bits on; - ;; scripts can be under version control too. Also, we must ignore the - ;; group-read and other-read bits, since paranoid users turn them off. - (let* ((attributes (file-attributes file 'string)) - (owner-name (nth 2 attributes)) - (permissions (nth 8 attributes))) - (if (string-match ".r-..-..-." permissions) - 'up-to-date - (if (string-match ".rw..-..-." permissions) - (if (file-ownership-preserved-p file) - 'edited - owner-name) - ;; Strange permissions. - ;; Fall through to real state computation. - (vc-sccs-state file)))) - (vc-sccs-state file))) - (autoload 'vc-expand-dirs "vc") (defun vc-sccs-dir-status (dir update-function) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 1ae3346..0d0639b 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -590,6 +590,11 @@ ;; moves closer to emulating modern non-locking behavior even on very ;; old VCSes. ;; +;; - the vc-mistrust-permissions configuration variable is gone; the +;; code no longer relies on permissions except in one corner case where +;; CVS leaves no alternative (which was not gated by this variable). The +;; only affected back ends were SCCS and RCS. +;; ;; - The init-revision function and the default-initial-revision ;; variable are gone. These have't made sense on anything shipped ;; since RCS, and using them was a dumb stunt even on RCS. commit f82f3f1f177c1a9cc2c2236f51acd1be1809ae1f Author: Eric S. Raymond Date: Mon Dec 1 08:24:27 2014 -0500 API simplification: remove vc-workfile-unchanged-p from pubic methods. * vc/vc.el, vc-hooks.el, and all backends: API simplification; vc-workfile-unchanged-p is no longer a public method (but the RCS and SCCS back ends retain it as a private method used in state computation). This method was redundant with vc-state and usually implemented as a trivial call to same. Fixes the failure mode described in bug#694. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f775afe..66b671a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2014-12-01 Eric S. Raymond + * vc/vc.el, vc-hooks.el, and all backends: API simplification; + vc-workfile-unchanged-p is no longer a public method (but the RCS + and SCCS back ends retain it as a private method used in state + computation). This method was redundant with vc-state and usually + implemented as a trivial call to same. Fixes the failure mode + described in bug#694. + * vc/vc.el and all backends: API simplification; init-revision is gone, and vc-registered functions no longer take an initial-revision argument. diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index 6d2e472..eb6ea7d 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el @@ -261,10 +261,6 @@ Only the value `maybe' can be trusted :-(." ;; Strip the terminating newline. (buffer-substring (point-min) (1- (point-max))))))))) -(defun vc-arch-workfile-unchanged-p (_file) - "Stub: arch workfiles are always considered to be in a changed state," - nil) - (defun vc-arch-state (file) ;; There's no checkout operation and merging is not done from VC ;; so the only operation that's state dependent that VC supports is commit diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index afe8770..19a8299 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -493,9 +493,6 @@ in the branch repository (or whose status not be determined)." (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t) (message "There are unresolved conflicts in this file"))) -(defun vc-bzr-workfile-unchanged-p (file) - (eq 'unchanged (car (vc-bzr-status file)))) - (defun vc-bzr-working-revision (file) ;; Together with the code in vc-state-heuristic, this makes it possible ;; to get the initial VC state of a Bzr file even if Bzr is not installed. diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index ff4d5e5..e6ab771 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -144,11 +144,6 @@ It should return a status of either 0 (no differences found), or "find the version control state of all files in DIR in a fast way." ) -(defun vc-dav-workfile-unchanged-p (url) - "Return non-nil if URL is unchanged from its current workfile version." - ;; Probably impossible with webdav - ) - (defun vc-dav-responsible-p (url) "Return non-nil if DAV considers itself `responsible' for URL." ;; Check for DAV support on the web server. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index ae1b356..f2cb997 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -54,7 +54,6 @@ ;; * working-revision (file) OK ;; - latest-on-branch-p (file) NOT NEEDED ;; * checkout-model (files) OK -;; - workfile-unchanged-p (file) OK ;; - mode-line-string (file) OK ;; STATE-CHANGING FUNCTIONS ;; * create-repo () OK @@ -248,9 +247,6 @@ matching the resulting Git log output, and KEYWORDS is a list of str) (vc-git--rev-parse "HEAD")))) -(defun vc-git-workfile-unchanged-p (file) - (eq 'up-to-date (vc-git-state file))) - (defun vc-git-mode-line-string (file) "Return a string for `vc-mode-line' to put in the mode line for FILE." (let* ((rev (vc-working-revision file)) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 337107f..52d5ceb 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -51,7 +51,6 @@ ;; * working-revision (file) OK ;; - latest-on-branch-p (file) ?? ;; * checkout-model (files) OK -;; - workfile-unchanged-p (file) OK ;; - mode-line-string (file) NOT NEEDED ;; STATE-CHANGING FUNCTIONS ;; * register (files &optional rev comment) OK @@ -531,10 +530,6 @@ REV is the revision to check out into WORKFILE." ;; Modeled after the similar function in vc-bzr.el -(defun vc-hg-workfile-unchanged-p (file) - (eq 'up-to-date (vc-hg-state file))) - -;; Modeled after the similar function in vc-bzr.el (defun vc-hg-revert (file &optional contents-done) (unless contents-done (with-temp-buffer (vc-hg-command t 0 file "revert")))) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 3a2ad40..7224aee 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -576,39 +576,6 @@ It simply calls the real state computation function `vc-BACKEND-state' and does not employ any heuristic at all." (vc-call-backend backend 'state file)) -(defun vc-workfile-unchanged-p (file) - "Return non-nil if FILE has not changed since the last checkout." - (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) - (lastmod (nth 5 (file-attributes file)))) - ;; This is a shortcut for determining when the workfile is - ;; unchanged. It can fail under some circumstances; see the - ;; discussion in bug#694. - (if (and checkout-time - ;; Tramp and Ange-FTP return this when they don't know the time. - (not (equal lastmod '(0 0)))) - (equal checkout-time lastmod) - (let ((unchanged (vc-call workfile-unchanged-p file))) - (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) - unchanged)))) - -(defun vc-default-workfile-unchanged-p (backend file) - "Check if FILE is unchanged by diffing against the repository version. -Return non-nil if FILE is unchanged." - (zerop (condition-case err - ;; If the implementation supports it, let the output - ;; go to *vc*, not *vc-diff*, since this is an internal call. - (vc-call-backend backend 'diff (list file) nil nil "*vc*") - (wrong-number-of-arguments - ;; If this error came from the above call to vc-BACKEND-diff, - ;; try again without the optional buffer argument (for - ;; backward compatibility). Otherwise, resignal. - (if (or (not (eq (cadr err) - (indirect-function - (vc-find-backend-function backend 'diff)))) - (not (eq (cl-caddr err) 4))) - (signal (car err) (cdr err)) - (vc-call-backend backend 'diff (list file))))))) - (defun vc-working-revision (file &optional backend) "Return the repository version from which FILE was checked out. If FILE is not registered, this function always returns nil." diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index f12ca0f..b32a1db 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -154,9 +154,6 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)") (match-string 1)))) -(defun vc-mtn-workfile-unchanged-p (file) - (not (eq (vc-mtn-state file) 'edited))) - ;; Mode-line rewrite code copied from vc-arch.el. (defcustom vc-mtn-mode-line-rewrite diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 572a83e..3028d7e 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -149,7 +149,7 @@ For a description of possible values, see `vc-check-master-templates'." 'vc-working-revision)))) (if (not (eq state 'up-to-date)) state - (if (vc-workfile-unchanged-p file) + (if (vc-rcs-workfile-unchanged-p file) 'up-to-date (if (eq (vc-rcs-checkout-model (list file)) 'locking) 'unlocked-changes @@ -248,7 +248,7 @@ When VERSION is given, perform check for that version." (vc-rcs-find-most-recent-rev (vc-branch-part version)))))) (defun vc-rcs-workfile-unchanged-p (file) - "RCS-specific implementation of `vc-workfile-unchanged-p'." + "Has FILE remained unchanged since last checkout?" ;; Try to use rcsdiff --brief. If rcsdiff does not understand that, ;; do a double take and remember the fact for the future (let* ((version (concat "-r" (vc-working-revision file))) diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 46e191a..8c9595a 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -124,7 +124,7 @@ For a description of possible values, see `vc-check-master-templates'." (working-revision (vc-working-revision file)) (locking-user (cdr (assoc working-revision locks)))) (if (not locking-user) - (if (vc-workfile-unchanged-p file) + (if (vc-sccs-workfile-unchanged-p file) 'up-to-date 'unlocked-changes) (if (string= locking-user (vc-user-login-name file)) @@ -197,7 +197,7 @@ Optional string REV is a revision." (write-region nil nil outfile nil 'silent))) (defun vc-sccs-workfile-unchanged-p (file) - "SCCS-specific implementation of `vc-workfile-unchanged-p'." + "Has FILE remained unchanged since last checkout?" (let ((tempfile (make-temp-file "vc-sccs"))) (unwind-protect (progn diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 186f73f..931dc5a 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -39,7 +39,6 @@ ;; * working-revision (file) OK ;; - latest-on-branch-p (file) ?? ;; * checkout-model (files) OK -;; * workfile-unchanged-p (file) OK ;; - mode-line-string (file) NOT NEEDED ;; STATE-CHANGING FUNCTIONS ;; * register (files &optional rev comment) OK @@ -213,9 +212,6 @@ This function differs from vc-do-command in that it invokes `vc-src-program'." (vc-src-command standard-output file "list" "-f{1}" "@"))) "0")) -(defun vc-src-workfile-unchanged-p (file) - (eq 'up-to-date (vc-src-state file))) - ;;; ;;; State-changing functions ;;; diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 62e68e2..1ae3346 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -200,17 +200,6 @@ ;; Indicate whether FILES need to be "checked out" before they can be ;; edited. See `vc-checkout-model' for a list of possible values. ;; -;; - workfile-unchanged-p (file) -;; -;; Return non-nil if FILE is unchanged from the working revision. -;; This function should do a brief comparison of FILE's contents -;; with those of the repository copy of the working revision. If -;; the backend does not have such a brief-comparison feature, the -;; default implementation of this function can be used, which -;; delegates to a full vc-BACKEND-diff. (Note that vc-BACKEND-diff -;; must not run asynchronously in this case, see variable -;; `vc-disable-async-diff'.) -;; ;; - mode-line-string (file) ;; ;; If provided, this function should return the VC-specific mode @@ -609,6 +598,11 @@ ;; take a first optional revision argument, since on no system since ;; RCS has setting the initial revision been even possible, let alone ;; sane. +;; +;; workfile-unchanged-p is no longer a public back-end method. It +;; was redundant with vc-state and usually implemented with a trivial +;; call to it. A few older back ends retain versions for internal use in +;; their vc-state functions. ;;; Todo: @@ -1186,7 +1180,7 @@ For old-style locking-based version control systems, like RCS: ;; For files with locking, if the file does not contain ;; any changes, just let go of the lock, i.e. revert. (when (and (not (eq model 'implicit)) - (vc-workfile-unchanged-p file) + (eq state 'up-to-date) ;; If buffer is modified, that means the user just ;; said no to saving it; in that case, don't revert, ;; because the user might intend to save after commit 2532d74a5fb5168955aa900f597bf7efc14efb12 Author: Eric S. Raymond Date: Mon Dec 1 07:39:15 2014 -0500 Renove duplicate code. diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el index da8abc5..75ac256 100644 --- a/lisp/vc/vc-filewise.el +++ b/lisp/vc/vc-filewise.el @@ -81,38 +81,4 @@ If the file is not registered, or the master name is not known, return nil." (vc-file-setprop file 'vc-name result) nil)))) ; Not registered -(defun vc-check-master-templates (file templates) - "Return non-nil if there is a master corresponding to FILE. - -TEMPLATES is a list of strings or functions. If an element is a -string, it must be a control string as required by `format', with two -string placeholders, such as \"%sRCS/%s,v\". The directory part of -FILE is substituted for the first placeholder, the basename of FILE -for the second. If a file with the resulting name exists, it is taken -as the master of FILE, and returned. - -If an element of TEMPLATES is a function, it is called with the -directory part and the basename of FILE as arguments. It should -return non-nil if it finds a master; that value is then returned by -this function." - (let ((dirname (or (file-name-directory file) "")) - (basename (file-name-nondirectory file))) - (catch 'found - (mapcar - (lambda (s) - (let ((trial (vc-possible-master s dirname basename))) - (when (and trial (file-exists-p trial) - ;; Make sure the file we found with name - ;; TRIAL is not the source file itself. - ;; That can happen with RCS-style names if - ;; the file name is truncated (e.g. to 14 - ;; chars). See if either directory or - ;; attributes differ. - (or (not (string= dirname - (file-name-directory trial))) - (not (equal (file-attributes file) - (file-attributes trial))))) - (throw 'found trial)))) - templates)))) - (provide 'vc-filewise) commit f9f250920b3e76470a496db194cbbdcf62865430 Author: Glenn Morris Date: Mon Dec 1 07:23:04 2014 -0500 Auto-commit of loaddefs files. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 9c5bb29..23e9b94 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3,7 +3,7 @@ ;;; Code: -;;;### (autoloads nil "5x5" "play/5x5.el" (21291 53104 0 0)) +;;;### (autoloads nil "5x5" "play/5x5.el" (21607 56025 301574 889000)) ;;; 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" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21607 56059 +;;;;;; 303525 127000)) ;;; 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" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (21607 56025 +;;;;;; 301574 889000)) ;;; 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" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -108,7 +108,8 @@ Completion is available. ;;;*** -;;;### (autoloads nil "add-log" "vc/add-log.el" (21291 53104 0 0)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -237,8 +238,8 @@ old-style time formats for entries are supported. ;;;*** -;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21607 56023 +;;;;;; 800854 237000)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -373,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) ;;;*** -;;;### (autoloads nil "align" "align.el" (21417 24123 550487 0)) +;;;### (autoloads nil "align" "align.el" (21607 56023 800854 237000)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -476,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** -;;;### (autoloads nil "allout" "allout.el" (21291 53104 0 0)) +;;;### (autoloads nil "allout" "allout.el" (21607 56023 800854 237000)) ;;; Generated autoloads from allout.el (push (purecopy '(allout 2 3)) package--builtin-versions) @@ -836,8 +837,8 @@ for details on preparing Emacs for automatic allout activation. ;;;*** -;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21346 -;;;;;; 62196 0 0)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from allout-widgets.el (push (purecopy '(allout-widgets 1 0)) package--builtin-versions) @@ -895,8 +896,8 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** -;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -917,8 +918,8 @@ directory, so that Emacs will know its current contents. ;;;*** -;;;### (autoloads nil "animate" "play/animate.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "animate" "play/animate.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -950,8 +951,8 @@ the buffer *Birthday-Present-for-Name*. ;;;*** -;;;### (autoloads nil "ansi-color" "ansi-color.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from ansi-color.el (push (purecopy '(ansi-color 3 4 2)) package--builtin-versions) @@ -977,8 +978,8 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** -;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from progmodes/antlr-mode.el (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions) @@ -1014,7 +1015,8 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;*** -;;;### (autoloads nil "appt" "calendar/appt.el" (21291 53104 0 0)) +;;;### (autoloads nil "appt" "calendar/appt.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1035,7 +1037,8 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21291 53104 0 0)) +;;;### (autoloads nil "apropos" "apropos.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1150,7 +1153,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads nil "arc-mode" "arc-mode.el" (21291 53104 0 0)) +;;;### (autoloads nil "arc-mode" "arc-mode.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1170,7 +1174,7 @@ archive. ;;;*** -;;;### (autoloads nil "array" "array.el" (21291 53104 0 0)) +;;;### (autoloads nil "array" "array.el" (21607 56023 800854 237000)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1241,8 +1245,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads nil "artist" "textmodes/artist.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "artist" "textmodes/artist.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from textmodes/artist.el (push (purecopy '(artist 1 2 6)) package--builtin-versions) @@ -1448,8 +1452,8 @@ Keymap summary ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21419 27241 -;;;;;; 500420 0)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1476,8 +1480,8 @@ Special commands: ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21623 +;;;;;; 5708 80843 798000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1489,7 +1493,8 @@ let-binding.") ;;;*** -;;;### (autoloads nil "autoarg" "autoarg.el" (21291 53104 0 0)) +;;;### (autoloads nil "autoarg" "autoarg.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1549,8 +1554,8 @@ This is similar to `autoarg-mode' but rebinds the keypad keys ;;;*** -;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1560,8 +1565,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1599,8 +1604,8 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1649,8 +1654,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (21310 8261 0 -;;;;;; 0)) +;;;### (autoloads nil "autorevert" "autorevert.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1738,7 +1743,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (21372 35662 356409 0)) +;;;### (autoloads nil "avoid" "avoid.el" (21607 56023 800854 237000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1776,8 +1781,8 @@ definition of \"random distance\".) ;;;*** -;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21559 49204 -;;;;;; 612992 0)) +;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/bat-mode.el (add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode)) @@ -1795,7 +1800,8 @@ Run script using `bat-run' and `bat-run-args'. ;;;*** -;;;### (autoloads nil "battery" "battery.el" (21341 23900 0 0)) +;;;### (autoloads nil "battery" "battery.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1830,8 +1836,8 @@ seconds. ;;;*** -;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (21607 +;;;;;; 56023 800854 237000)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1867,8 +1873,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1960,7 +1966,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'. ;;;*** ;;;### (autoloads nil "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56025 801549 101000)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1970,7 +1976,8 @@ Major mode for editing BibTeX style files. ;;;*** -;;;### (autoloads nil "binhex" "mail/binhex.el" (21291 53104 0 0)) +;;;### (autoloads nil "binhex" "mail/binhex.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -1994,8 +2001,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads nil "blackbox" "play/blackbox.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "blackbox" "play/blackbox.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2114,8 +2121,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21396 17985 27631 -;;;;;; 0)) +;;;### (autoloads nil "bookmark" "bookmark.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2307,8 +2314,8 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (21361 65337 -;;;;;; 555586 0)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2623,7 +2630,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (21452 63160 995987 0)) +;;;### (autoloads nil "bs" "bs.el" (21607 56058 801550 360000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2664,8 +2671,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2687,7 +2694,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56025 301574 889000)) ;;; 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))))) @@ -2707,8 +2714,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21578 -;;;;;; 13627 353178 0)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21607 +;;;;;; 56058 801550 360000)) ;;; 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) @@ -2828,8 +2835,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2838,8 +2845,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21607 56023 +;;;;;; 800854 237000)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2850,8 +2857,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2865,7 +2872,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (21421 21182 542043 0)) +;;;### (autoloads nil "calc" "calc/calc.el" (21607 56058 801550 360000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2949,8 +2956,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (21607 56023 +;;;;;; 800854 237000)) ;;; Generated autoloads from calc/calc-undo.el (autoload 'calc-undo "calc-undo" "\ @@ -2960,8 +2967,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "calculator" "calculator.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2972,8 +2979,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21517 36917 -;;;;;; 994200 0)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3016,8 +3023,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "canlock" "gnus/canlock.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "canlock" "gnus/canlock.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -3034,8 +3041,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "cap-words" "progmodes/cap-words.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from progmodes/cap-words.el (autoload 'capitalized-words-mode "cap-words" "\ @@ -3074,8 +3081,8 @@ Obsoletes `c-forward-into-nomenclature'. ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3085,8 +3092,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21307 46976 -;;;;;; 0 0)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3184,8 +3191,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3342,8 +3349,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3394,8 +3401,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3403,8 +3410,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "ccl" "international/ccl.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3664,8 +3671,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3684,14 +3691,15 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cedet" "cedet/cedet.el" (21291 53104 0 0)) +;;;### (autoloads nil "cedet" "cedet/cedet.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 3)) package--builtin-versions) @@ -3721,15 +3729,15 @@ on the buffer contents ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56024 300834 853000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3746,8 +3754,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21607 +;;;;;; 56024 300834 853000)) ;;; 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) @@ -3947,8 +3955,8 @@ checking of documentation strings. ;;;*** -;;;### (autoloads nil "china-util" "language/china-util.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "china-util" "language/china-util.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -3985,7 +3993,8 @@ Encode the text in the current buffer to HZ. ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (21291 53104 0 0)) +;;;### (autoloads nil "chistory" "chistory.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -4024,8 +4033,8 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4103,8 +4112,8 @@ For example, the function `case' has an indent property ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) @@ -4134,8 +4143,8 @@ a future Emacs interpreter will be able to use it.") ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4155,7 +4164,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21291 53104 0 0)) +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4175,7 +4185,7 @@ is run). ;;;*** -;;;### (autoloads nil "color" "color.el" (21291 53104 0 0)) +;;;### (autoloads nil "color" "color.el" (21607 56023 800854 237000)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4194,7 +4204,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21341 23900 0 0)) +;;;### (autoloads nil "comint" "comint.el" (21607 56058 801550 360000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4293,8 +4303,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4327,8 +4337,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21586 7735 -;;;;;; 250801 0)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4509,8 +4519,8 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** -;;;### (autoloads nil "completion" "completion.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "completion" "completion.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4532,8 +4542,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4688,8 +4698,8 @@ For details see `conf-mode'. Example: ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "cookie1" "play/cookie1.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4717,8 +4727,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4756,8 +4766,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4955,7 +4965,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21291 53104 0 0)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4973,7 +4984,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21291 53104 0 0)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -4999,8 +5011,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5010,8 +5022,8 @@ Major mode to edit Cascading Style Sheets. ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21588 49464 -;;;;;; 654417 0)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5056,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" (21499 26326 -;;;;;; 740865 488000)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -5068,8 +5080,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21567 8919 365077 -;;;;;; 0)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5381,7 +5393,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21291 53104 0 0)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5414,8 +5427,8 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** -;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5425,8 +5438,8 @@ Mode used for cvs status output. ;;;*** -;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) @@ -5470,8 +5483,8 @@ See `cwarn-mode' for more information on Cwarn mode. ;;;*** -;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5499,7 +5512,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (21291 53104 0 0)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5545,8 +5559,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21607 56023 +;;;;;; 800854 237000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5556,7 +5570,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (21406 53815 191813 0)) +;;;### (autoloads nil "dbus" "net/dbus.el" (21607 56059 303525 127000)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5569,8 +5583,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5696,8 +5710,8 @@ There is some minimal font-lock support (see vars ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5740,8 +5754,8 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** -;;;### (autoloads nil "decipher" "play/decipher.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "decipher" "play/decipher.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5769,7 +5783,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (21291 53104 0 0)) +;;;### (autoloads nil "delim-col" "delim-col.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5794,7 +5809,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21586 50103 617693 0)) +;;;### (autoloads nil "delsel" "delsel.el" (21607 56023 800854 237000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5822,8 +5837,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5889,8 +5904,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "descr-text" "descr-text.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5924,7 +5939,8 @@ relevant to POS. ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21520 13117 11728 0)) +;;;### (autoloads nil "desktop" "desktop.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6129,8 +6145,8 @@ Revert to the last loaded desktop. ;;;*** -;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -6162,8 +6178,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21519 -;;;;;; 16950 560827 246000)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21617 +;;;;;; 53323 210147 705000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6205,7 +6221,7 @@ Major mode for editing the diary file. ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (21291 53104 0 0)) +;;;### (autoloads nil "diff" "vc/diff.el" (21607 56025 801549 101000)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6253,8 +6269,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21574 16579 -;;;;;; 173517 0)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6286,7 +6302,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "dig" "net/dig.el" (21291 53104 0 0)) +;;;### (autoloads nil "dig" "net/dig.el" (21607 56024 801559 72000)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6297,7 +6313,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21574 16579 173517 0)) +;;;### (autoloads nil "dired" "dired.el" (21607 56058 801550 360000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6417,7 +6433,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (21291 53104 0 0)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6447,8 +6464,8 @@ from `default-directory'. ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6462,8 +6479,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "disp-table" "disp-table.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6584,8 +6601,8 @@ in `.emacs'. ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6601,7 +6618,7 @@ Default is 2. ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (21291 53104 0 0)) +;;;### (autoloads nil "dnd" "dnd.el" (21607 56023 800854 237000)) ;;; 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)) "\ @@ -6621,8 +6638,8 @@ if some action was made, or nil if the URL is ignored.") ;;;*** -;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6645,8 +6662,8 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads nil "doc-view" "doc-view.el" (21578 13627 353178 -;;;;;; 0)) +;;;### (autoloads nil "doc-view" "doc-view.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6692,7 +6709,8 @@ See the command `doc-view-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (21291 53104 0 0)) +;;;### (autoloads nil "doctor" "play/doctor.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6702,7 +6720,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (21291 53104 0 0)) +;;;### (autoloads nil "double" "double.el" (21607 56023 800854 237000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6718,7 +6736,8 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21291 53104 0 0)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) @@ -6729,8 +6748,8 @@ Switch to *dungeon* buffer and start game. ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6869,8 +6888,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7008,8 +7027,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7274,8 +7293,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7423,8 +7442,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7456,7 +7475,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (21291 53104 0 0)) +;;;### (autoloads nil "echistory" "echistory.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7467,8 +7487,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7478,7 +7498,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (21346 62196 0 0)) +;;;### (autoloads nil "ede" "cedet/ede.el" (21607 56058 801550 360000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7504,8 +7524,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21433 12343 -;;;;;; 302925 0)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7569,7 +7589,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (21423 62909 33477 0)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (21607 56025 801549 101000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -7841,8 +7861,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7852,8 +7872,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21423 62909 -;;;;;; 33477 0)) +;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7865,8 +7885,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21349 10841 -;;;;;; 0 0)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7885,7 +7905,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (21291 53104 0 0)) +;;;### (autoloads nil "edmacro" "edmacro.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -7934,7 +7955,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21291 53104 0 0)) +;;;### (autoloads nil "edt" "emulation/edt.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -7951,7 +7973,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21423 62909 33477 0)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21607 56023 800854 237000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -7987,15 +8009,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21364 41525 -;;;;;; 730218 0)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8011,8 +8033,8 @@ It creates an autoload function for CNAME's constructor. ;;;*** -;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -8055,7 +8077,8 @@ Emacs Lisp mode) that support ElDoc.") ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (21341 23900 0 0)) +;;;### (autoloads nil "elec-pair" "elec-pair.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from elec-pair.el (defvar electric-pair-text-pairs '((34 . 34)) "\ @@ -8090,8 +8113,8 @@ closing parenthesis. (Likewise for brackets, etc.). ;;;*** -;;;### (autoloads nil "elide-head" "elide-head.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "elide-head" "elide-head.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -8106,8 +8129,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8142,7 +8165,8 @@ optional prefix argument REINIT is non-nil. ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21291 53104 0 0)) +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8176,8 +8200,8 @@ displayed. ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8204,20 +8228,22 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21295 7741 0 -;;;;;; 0)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ Report a bug in GNU Emacs. Prompts for bug subject. Leaves you in a mail buffer. -\(fn TOPIC &optional RECENT-KEYS)" t nil) +\(fn TOPIC &optional UNUSED)" t nil) + +(set-advertised-calling-convention 'report-emacs-bug '(topic) '"24.5") ;;;*** -;;;### (autoloads nil "emerge" "vc/emerge.el" (21363 20664 637808 -;;;;;; 0)) +;;;### (autoloads nil "emerge" "vc/emerge.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -8277,8 +8303,8 @@ Emerge two RCS revisions of a file, with another revision as ancestor. ;;;*** -;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "enriched" "textmodes/enriched.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -8313,7 +8339,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21291 53104 0 0)) +;;;### (autoloads nil "epa" "epa.el" (21607 56059 303525 127000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8491,7 +8517,8 @@ Insert selected KEYS after the point. ;;;*** -;;;### (autoloads nil "epa-dired" "epa-dired.el" (21291 53104 0 0)) +;;;### (autoloads nil "epa-dired" "epa-dired.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8516,7 +8543,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (21291 53104 0 0)) +;;;### (autoloads nil "epa-file" "epa-file.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8536,7 +8564,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-mail" "epa-mail.el" (21291 53104 0 0)) +;;;### (autoloads nil "epa-mail" "epa-mail.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8613,7 +8642,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21291 53104 0 0)) +;;;### (autoloads nil "epg" "epg.el" (21607 56059 303525 127000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8624,8 +8653,8 @@ Return a context object. ;;;*** -;;;### (autoloads nil "epg-config" "epg-config.el" (21574 16579 173517 -;;;;;; 0)) +;;;### (autoloads nil "epg-config" "epg-config.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8645,9 +8674,8 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21291 53104 0 0)) +;;;### (autoloads nil "erc" "erc/erc.el" (21607 56024 300834 853000)) ;;; 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. @@ -8694,35 +8722,36 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21291 53104 0 0)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8752,14 +8781,14 @@ that subcommand. ;;;*** ;;;### (autoloads nil "erc-desktop-notifications" "erc/erc-desktop-notifications.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56024 300834 853000)) ;;; Generated autoloads from erc/erc-desktop-notifications.el (autoload 'erc-notifications-mode "erc-desktop-notifications" "" t) ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8821,8 +8850,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8834,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" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -8856,8 +8885,8 @@ system. ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -8867,21 +8896,22 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21307 46976 0 -;;;;;; 0)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21291 53104 0 0)) +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8910,8 +8940,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -8957,15 +8987,15 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -8976,8 +9006,8 @@ Show who's gone. ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -8994,8 +9024,8 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9013,36 +9043,36 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9059,15 +9089,15 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9078,22 +9108,22 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21574 16579 -;;;;;; 173517 0)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9118,8 +9148,8 @@ keybindings will not do anything useful. ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9138,8 +9168,8 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9150,7 +9180,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21291 53104 0 0)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9215,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" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9228,8 +9259,8 @@ Kill all test buffers that are still live. ;;;*** -;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9239,8 +9270,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9275,8 +9306,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9584,8 +9615,8 @@ for \\[find-tag] (which see). ;;;*** -;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9753,7 +9784,7 @@ With ARG, insert that many delimiters. ;;;*** -;;;### (autoloads nil "eudc" "net/eudc.el" (21291 53104 0 0)) +;;;### (autoloads nil "eudc" "net/eudc.el" (21607 56024 801559 72000)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9807,8 +9838,8 @@ This does nothing except loading eudc by autoload side-effect. ;;;*** -;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -9843,8 +9874,8 @@ Display a button for the JPEG DATA. ;;;*** -;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9860,8 +9891,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** -;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9871,8 +9902,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -9898,7 +9929,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21420 48935 113702 389000)) +;;;### (autoloads nil "eww" "net/eww.el" (21607 56059 303525 127000)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -9921,8 +9952,8 @@ Render a file using EWW. ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -9963,7 +9994,7 @@ file modes. ;;;*** -;;;### (autoloads nil "expand" "expand.el" (21291 53104 0 0)) +;;;### (autoloads nil "expand" "expand.el" (21607 56024 300834 853000)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -10012,8 +10043,8 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads nil "f90" "progmodes/f90.el" (21423 62909 33477 -;;;;;; 0)) +;;;### (autoloads nil "f90" "progmodes/f90.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10080,8 +10111,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "face-remap" "face-remap.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10240,8 +10271,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;*** -;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/feedmail.el (push (purecopy '(feedmail 11)) package--builtin-versions) @@ -10295,7 +10326,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21291 53104 0 0)) +;;;### (autoloads nil "ffap" "ffap.el" (21607 56059 303525 127000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10358,7 +10389,8 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (21291 53104 0 0)) +;;;### (autoloads nil "filecache" "filecache.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -10415,8 +10447,8 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads nil "filenotify" "filenotify.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "filenotify" "filenotify.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from filenotify.el (autoload 'file-notify-handle-event "filenotify" "\ @@ -10428,7 +10460,8 @@ Otherwise, signal a `file-notify-error'. ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21291 53104 0 0)) +;;;### (autoloads nil "files-x" "files-x.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10493,7 +10526,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21291 53104 0 0)) +;;;### (autoloads nil "filesets" "filesets.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10504,7 +10538,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (21291 53104 0 0)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10524,8 +10559,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "find-dired" "find-dired.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10565,7 +10600,8 @@ use in place of \"-ls\" as the final argument. ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (21291 53104 0 0)) +;;;### (autoloads nil "find-file" "find-file.el" (21607 56024 300834 +;;;;;; 853000)) ;;; 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)))) "\ @@ -10655,8 +10691,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10814,7 +10850,8 @@ Define some key bindings for the find-function family of functions. ;;;*** -;;;### (autoloads nil "find-lisp" "find-lisp.el" (21291 53104 0 0)) +;;;### (autoloads nil "find-lisp" "find-lisp.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10834,7 +10871,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21423 62909 33477 0)) +;;;### (autoloads nil "finder" "finder.el" (21607 56024 300834 853000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -10856,7 +10893,8 @@ Find packages matching a given keyword. ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21291 53104 0 0)) +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -10877,8 +10915,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -10893,8 +10931,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -10924,8 +10962,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -10995,13 +11033,14 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (21291 53104 0 0)) +;;;### (autoloads nil "foldout" "foldout.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21291 53104 0 0)) +;;;### (autoloads nil "follow" "follow.el" (21607 56024 300834 853000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11069,8 +11108,8 @@ selected if the original window is the first one in the frame. ;;;*** -;;;### (autoloads nil "footnote" "mail/footnote.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "footnote" "mail/footnote.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) @@ -11089,7 +11128,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (21291 53104 0 0)) +;;;### (autoloads nil "forms" "forms.el" (21607 56024 300834 853000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11125,8 +11164,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11203,8 +11242,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "fortune" "play/fortune.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "fortune" "play/fortune.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11252,7 +11291,8 @@ and choose the directory as the fortune-file. ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (21300 58261 0 0)) +;;;### (autoloads nil "frameset" "frameset.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from frameset.el (defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\ @@ -11432,15 +11472,15 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21346 62196 -;;;;;; 0 0)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11517,8 +11557,8 @@ detailed description of this mode. ;;;*** -;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11598,8 +11638,8 @@ regular expression that can be used as an element of ;;;*** -;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11613,8 +11653,8 @@ add virtual separators (like underscores) at places they belong to. ;;;*** -;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11668,7 +11708,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (21583 31547 162318 0)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (21607 56059 303525 127000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11718,8 +11758,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11809,8 +11849,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11820,8 +11860,8 @@ Make the current buffer look like a nice article. ;;;*** -;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -11844,8 +11884,8 @@ deletion, or > if it is flagged for displaying. ;;;*** -;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -11886,8 +11926,8 @@ supported. ;;;*** -;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11922,8 +11962,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -11938,8 +11978,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -11949,8 +11989,8 @@ Convenience method to turn on gnus-dired-mode. ;;;*** -;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -11960,8 +12000,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21352 50356 -;;;;;; 891885 0)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus-random-x-face "gnus-fun" "\ @@ -12005,8 +12045,8 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to ;;;*** -;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -12023,8 +12063,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12041,8 +12081,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12057,8 +12097,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12071,8 +12111,8 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;*** -;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -12095,8 +12135,8 @@ Minor mode for providing mailing-list commands. ;;;*** -;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -12196,8 +12236,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12224,7 +12264,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads nil "gnus-notifications" "gnus/gnus-notifications.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56059 303525 127000)) ;;; Generated autoloads from gnus/gnus-notifications.el (autoload 'gnus-notifications "gnus-notifications" "\ @@ -12240,8 +12280,8 @@ This is typically a function to add in ;;;*** -;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12264,8 +12304,8 @@ If picons are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12332,8 +12372,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21346 -;;;;;; 62196 0 0)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12348,8 +12388,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12376,8 +12416,8 @@ See the documentation for these variables and functions for details. ;;;*** -;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12387,8 +12427,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12398,8 +12438,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12410,8 +12450,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12426,8 +12466,8 @@ Install the sync hooks. ;;;*** -;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12437,7 +12477,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (21291 53104 0 0)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12453,7 +12494,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21291 53104 0 0)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12479,8 +12521,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12521,8 +12563,8 @@ Like `goto-address-mode', but only for comments and strings. ;;;*** -;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -12538,7 +12580,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (21291 53104 0 0)) +;;;### (autoloads nil "grep" "progmodes/grep.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12702,7 +12745,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'. ;;;*** -;;;### (autoloads nil "gs" "gs.el" (21291 53104 0 0)) +;;;### (autoloads nil "gs" "gs.el" (21607 56024 801559 72000)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12715,8 +12758,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21510 63678 326735 -;;;;;; 0)) +;;;### (autoloads nil "gud" "progmodes/gud.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12804,8 +12847,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21387 3002 678518 -;;;;;; 0)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -12907,8 +12950,8 @@ binding mode. ;;;*** -;;;### (autoloads nil "handwrite" "play/handwrite.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "handwrite" "play/handwrite.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -12925,7 +12968,8 @@ Variables: `handwrite-linespace' (default 12) ;;;*** -;;;### (autoloads nil "hanoi" "play/hanoi.el" (21291 53104 0 0)) +;;;### (autoloads nil "hanoi" "play/hanoi.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -12952,8 +12996,8 @@ to be updated. ;;;*** -;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "hashcash" "mail/hashcash.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -12995,8 +13039,8 @@ Prefix arg sets default accept amount temporarily. ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -13123,8 +13167,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21418 44988 932893 -;;;;;; 0)) +;;;### (autoloads nil "help-fns" "help-fns.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13203,8 +13247,8 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file. ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "help-macro" "help-macro.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13218,7 +13262,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21291 53104 0 0)) +;;;### (autoloads nil "help-mode" "help-mode.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13317,8 +13362,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13333,7 +13378,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21291 53104 0 0)) +;;;### (autoloads nil "hexl" "hexl.el" (21607 56024 801559 72000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13427,7 +13472,8 @@ This discards the buffer's undo information. ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (21291 53104 0 0)) +;;;### (autoloads nil "hi-lock" "hi-lock.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13594,8 +13640,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21452 63160 -;;;;;; 995987 0)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13638,8 +13684,8 @@ Several variables affect how the hiding is done: ;;;*** -;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21607 56059 +;;;;;; 303525 127000)) ;;; 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))) "\ @@ -13701,7 +13747,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21291 53104 0 0)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13832,8 +13879,8 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21375 36695 783701 -;;;;;; 621000)) +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -13865,7 +13912,8 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (21291 53104 0 0)) +;;;### (autoloads nil "hl-line" "hl-line.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -13914,8 +13962,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -14063,8 +14111,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (21416 3260 -;;;;;; 930862 0)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14074,8 +14122,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21341 23900 -;;;;;; 0 0)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14108,7 +14156,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'. ;;;*** -;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21291 53104 0 0)) +;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14196,7 +14245,8 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21291 53104 0 0)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14235,8 +14285,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14289,7 +14339,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21291 53104 0 0)) +;;;### (autoloads nil "icomplete" "icomplete.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14324,7 +14375,8 @@ completions: ;;;*** -;;;### (autoloads nil "icon" "progmodes/icon.el" (21291 53104 0 0)) +;;;### (autoloads nil "icon" "progmodes/icon.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14364,8 +14416,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21423 -;;;;;; 62909 33477 0)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14390,8 +14442,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21423 62909 -;;;;;; 33477 0)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14520,7 +14572,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21291 53104 0 0)) +;;;### (autoloads nil "ido" "ido.el" (21607 56059 303525 127000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14782,7 +14834,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21291 53104 0 0)) +;;;### (autoloads nil "ielm" "ielm.el" (21607 56059 303525 127000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -14794,7 +14846,7 @@ See `inferior-emacs-lisp-mode' for details. ;;;*** -;;;### (autoloads nil "iimage" "iimage.el" (21291 53104 0 0)) +;;;### (autoloads nil "iimage" "iimage.el" (21607 56024 801559 72000)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -14810,7 +14862,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (21526 51891 165318 0)) +;;;### (autoloads nil "image" "image.el" (21607 56024 801559 72000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15003,8 +15055,8 @@ If Emacs is compiled without ImageMagick support, this does nothing. ;;;*** -;;;### (autoloads nil "image-dired" "image-dired.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "image-dired" "image-dired.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) @@ -15141,8 +15193,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads nil "image-file" "image-file.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "image-file" "image-file.el" (21607 56024 801559 +;;;;;; 72000)) ;;; 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")) "\ @@ -15204,8 +15256,8 @@ An image file is one whose name has an extension in ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "image-mode" "image-mode.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15252,7 +15304,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21553 10423 381604 0)) +;;;### (autoloads nil "imenu" "imenu.el" (21607 56059 303525 127000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15390,8 +15442,8 @@ for more information. ;;;*** -;;;### (autoloads nil "ind-util" "language/ind-util.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ind-util" "language/ind-util.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -15421,8 +15473,8 @@ Convert old Emacs Devanagari characters to UCS. ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15440,7 +15492,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21478 823 211178 0)) +;;;### (autoloads nil "info" "info.el" (21607 56059 303525 127000)) ;;; 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))))) "\ @@ -15650,7 +15702,8 @@ Otherwise, visit the manual in a new Info buffer. ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (21291 53104 0 0)) +;;;### (autoloads nil "info-look" "info-look.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15697,7 +15750,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (21291 53104 0 0)) +;;;### (autoloads nil "info-xref" "info-xref.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -15780,7 +15834,8 @@ the sources handy. ;;;*** -;;;### (autoloads nil "informat" "informat.el" (21291 53104 0 0)) +;;;### (autoloads nil "informat" "informat.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15825,8 +15880,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inversion" "cedet/inversion.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "inversion" "cedet/inversion.el" (21607 56023 +;;;;;; 800854 237000)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) @@ -15838,8 +15893,8 @@ Only checks one based on which kind of Emacs is being run. ;;;*** -;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -15859,7 +15914,8 @@ Toggle input method in interactive search. ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (21291 53104 0 0)) +;;;### (autoloads nil "isearchb" "isearchb.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -15873,8 +15929,8 @@ accessed via isearchb. ;;;*** -;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -15965,15 +16021,15 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56024 801559 72000)) ;;; 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" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16206,8 +16262,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" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "japan-util" "language/japan-util.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -16284,7 +16340,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (21291 53104 0 0)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16307,7 +16364,8 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21387 3002 678518 0)) +;;;### (autoloads nil "js" "progmodes/js.el" (21609 59210 634406 +;;;;;; 998000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16319,14 +16377,14 @@ Major mode for editing JavaScript. ;;;*** -;;;### (autoloads nil "json" "json.el" (21291 53104 0 0)) +;;;### (autoloads nil "json" "json.el" (21607 56024 801559 72000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "keypad" "emulation/keypad.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "keypad" "emulation/keypad.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16381,8 +16439,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** -;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -16403,8 +16461,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "kkc" "international/kkc.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16426,7 +16484,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21291 53104 0 0)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21607 56024 801559 72000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16538,8 +16596,8 @@ If kbd macro currently being defined end it before activating it. ;;;*** -;;;### (autoloads nil "korea-util" "language/korea-util.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "korea-util" "language/korea-util.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16553,8 +16611,8 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "landmark" "play/landmark.el" (21414 47927 -;;;;;; 641973 0)) +;;;### (autoloads nil "landmark" "play/landmark.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16584,8 +16642,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "lao-util" "language/lao-util.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "lao-util" "language/lao-util.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16622,8 +16680,8 @@ Transcribe Romanized Lao string STR to Lao character string. ;;;*** -;;;### (autoloads nil "latexenc" "international/latexenc.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "latexenc" "international/latexenc.el" (21607 +;;;;;; 56024 801559 72000)) ;;; 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))) "\ @@ -16655,7 +16713,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56024 801559 72000)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16696,8 +16754,8 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** -;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16707,7 +16765,7 @@ A major mode to edit GNU ld script files ;;;*** -;;;### (autoloads nil "life" "play/life.el" (21291 53104 0 0)) +;;;### (autoloads nil "life" "play/life.el" (21607 56025 301574 889000)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -16720,7 +16778,7 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads nil "linum" "linum.el" (21291 53104 0 0)) +;;;### (autoloads nil "linum" "linum.el" (21607 56059 303525 127000)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -16757,7 +16815,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21291 53104 0 0)) +;;;### (autoloads nil "loadhist" "loadhist.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16788,7 +16847,7 @@ something strange, such as redefining an Emacs function. ;;;*** -;;;### (autoloads nil "locate" "locate.el" (21291 53104 0 0)) +;;;### (autoloads nil "locate" "locate.el" (21607 56024 801559 72000)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -16840,8 +16899,8 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21438 54848 741535 -;;;;;; 566000)) +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16872,8 +16931,8 @@ done. Otherwise, it uses the current buffer. ;;;*** -;;;### (autoloads nil "log-view" "vc/log-view.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "log-view" "vc/log-view.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -16883,7 +16942,7 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (21291 53104 0 0)) +;;;### (autoloads nil "lpr" "lpr.el" (21607 56024 801559 72000)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -16978,7 +17037,8 @@ for further customization of the printer command. ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21291 53104 0 0)) +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -16989,8 +17049,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads nil "lunar" "calendar/lunar.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "lunar" "calendar/lunar.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -17004,8 +17064,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17015,7 +17075,7 @@ A major mode to edit m4 macro files. ;;;*** -;;;### (autoloads nil "macros" "macros.el" (21291 53104 0 0)) +;;;### (autoloads nil "macros" "macros.el" (21607 56024 801559 72000)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17104,8 +17164,8 @@ and then select the region of un-tablified names and use ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17135,8 +17195,8 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;*** -;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17165,8 +17225,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17240,8 +17300,8 @@ matches may be returned from the message body. ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17290,8 +17350,8 @@ double-quotes. ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17344,8 +17404,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any. ;;;*** -;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -17357,8 +17417,8 @@ The mail client is taken to be the handler of mailto URLs. ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17475,7 +17535,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (21291 53104 0 0)) +;;;### (autoloads nil "makesum" "makesum.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -17486,7 +17547,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads nil "man" "man.el" (21587 28603 874778 0)) +;;;### (autoloads nil "man" "man.el" (21607 56059 303525 127000)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17540,7 +17601,7 @@ Default bookmark handler for Man buffers. ;;;*** -;;;### (autoloads nil "master" "master.el" (21291 53104 0 0)) +;;;### (autoloads nil "master" "master.el" (21607 56024 801559 72000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) @@ -17563,7 +17624,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads nil "mb-depth" "mb-depth.el" (21291 53104 0 0)) +;;;### (autoloads nil "mb-depth" "mb-depth.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -17590,14 +17652,14 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "md4" "md4.el" (21291 53104 0 0)) +;;;### (autoloads nil "md4" "md4.el" (21607 56024 801559 72000)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "message" "gnus/message.el" (21607 56059 303525 +;;;;;; 127000)) ;;; 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) @@ -17762,8 +17824,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) @@ -17779,8 +17841,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17823,8 +17885,8 @@ redisplayed as output is inserted. ;;;*** -;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21546 37177 316318 -;;;;;; 0)) +;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -17914,7 +17976,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21546 37177 316318 0)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21607 56059 303525 127000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -17931,8 +17993,8 @@ Display version information about MH-E and the MH mail handling system. ;;;*** -;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18013,7 +18075,8 @@ perform the operation on all messages in that region. ;;;*** -;;;### (autoloads nil "midnight" "midnight.el" (21291 53104 0 0)) +;;;### (autoloads nil "midnight" "midnight.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from midnight.el (autoload 'clean-buffer-list "midnight" "\ @@ -18039,8 +18102,8 @@ to its second argument TM. ;;;*** -;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18069,7 +18132,7 @@ is modified to remove the default indication. ;;;*** -;;;### (autoloads nil "misc" "misc.el" (21291 53104 0 0)) +;;;### (autoloads nil "misc" "misc.el" (21607 56024 801559 72000)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18097,7 +18160,8 @@ The return value is always nil. ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (21291 53104 0 0)) +;;;### (autoloads nil "misearch" "misearch.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18178,8 +18242,8 @@ whose file names match the specified wildcard. ;;;*** -;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) @@ -18190,8 +18254,8 @@ Major mode for the mixal asm language. ;;;*** -;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/mm-encode.el (autoload 'mm-default-file-encoding "mm-encode" "\ @@ -18201,8 +18265,8 @@ Return a default encoding for FILE. ;;;*** -;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -18220,8 +18284,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -18234,7 +18298,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21291 53104 0 0)) +;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18250,7 +18315,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21291 53104 0 0)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18269,7 +18335,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** -;;;### (autoloads nil "mml" "gnus/mml.el" (21547 58040 560240 0)) +;;;### (autoloads nil "mml" "gnus/mml.el" (21607 56059 303525 127000)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18294,8 +18360,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -18310,8 +18376,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18351,16 +18417,16 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21607 56023 +;;;;;; 800854 237000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) ;;;*** -;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "modula2" "progmodes/modula2.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18393,7 +18459,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (21291 53104 0 0)) +;;;### (autoloads nil "morse" "play/morse.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18418,8 +18485,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** -;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18466,7 +18533,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21346 62196 0 0)) +;;;### (autoloads nil "mpc" "mpc.el" (21607 56059 303525 127000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18476,7 +18543,7 @@ Main entry point for MPC. ;;;*** -;;;### (autoloads nil "mpuz" "play/mpuz.el" (21291 53104 0 0)) +;;;### (autoloads nil "mpuz" "play/mpuz.el" (21607 56025 301574 889000)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18486,7 +18553,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21291 53104 0 0)) +;;;### (autoloads nil "msb" "msb.el" (21607 56059 303525 127000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18511,8 +18578,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -18644,8 +18711,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -18776,8 +18843,8 @@ per-character basis, this may not be accurate. ;;;*** -;;;### (autoloads nil "net-utils" "net/net-utils.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "net-utils" "net/net-utils.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -18871,7 +18938,8 @@ Open a network connection to HOST on PORT. ;;;*** -;;;### (autoloads nil "netrc" "net/netrc.el" (21291 53104 0 0)) +;;;### (autoloads nil "netrc" "net/netrc.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -18883,8 +18951,8 @@ listed in the PORTS list. ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -18977,8 +19045,8 @@ a greeting from the server. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19000,7 +19068,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56059 303525 127000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19010,8 +19078,8 @@ Start newsticker plainview. ;;;*** -;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -19021,8 +19089,8 @@ Start reading news. You may want to bind this to a key. ;;;*** -;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -19042,8 +19110,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19053,15 +19121,15 @@ Start newsticker treeview. ;;;*** -;;;### (autoloads nil "newsticker" "net/newsticker.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "newsticker" "net/newsticker.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from net/newsticker.el (push (purecopy '(newsticker 1 99)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19071,7 +19139,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21291 53104 0 0)) +;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -19085,8 +19154,8 @@ symbol in the alist. ;;;*** -;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -19097,7 +19166,7 @@ This command does not work if you use short group names. ;;;*** -;;;### (autoloads nil "nnml" "gnus/nnml.el" (21291 53104 0 0)) +;;;### (autoloads nil "nnml" "gnus/nnml.el" (21607 56024 801559 72000)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19107,7 +19176,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21291 53104 0 0)) +;;;### (autoloads nil "novice" "novice.el" (21607 56025 301574 889000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19139,8 +19208,8 @@ future sessions. ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (21607 +;;;;;; 56025 801549 101000)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19154,14 +19223,14 @@ closing requests for requests that are used in matched pairs. ;;;*** -;;;### (autoloads nil "ntlm" "net/ntlm.el" (21291 53104 0 0)) +;;;### (autoloads nil "ntlm" "net/ntlm.el" (21607 56059 303525 127000)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21291 57968 -;;;;;; 0 0)) +;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19173,8 +19242,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21373 1839 -;;;;;; 721535 649000)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19234,8 +19303,8 @@ Many aspects this mode can be customized using ;;;*** -;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21291 57968 -;;;;;; 0 0)) +;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -19247,8 +19316,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21430 36152 -;;;;;; 122368 0)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19285,8 +19354,8 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "opascal" "progmodes/opascal.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/opascal.el (define-obsolete-function-alias 'delphi-mode 'opascal-mode "24.4") @@ -19321,7 +19390,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (21562 25401 415 0)) +;;;### (autoloads nil "org" "org/org.el" (21607 56059 303525 127000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19542,8 +19611,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21563 46263 -;;;;;; 313725 0)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -19816,8 +19885,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (21550 34234 -;;;;;; 544440 0)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -19859,8 +19928,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (21341 23900 -;;;;;; 0 0)) +;;;### (autoloads nil "org-colview" "org/org-colview.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from org/org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -19923,8 +19992,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21550 34234 -;;;;;; 544440 0)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -19934,8 +20003,8 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (21550 34234 544440 -;;;;;; 0)) +;;;### (autoloads nil "org-macs" "org/org-macs.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from org/org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -19945,8 +20014,8 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** -;;;### (autoloads nil "org-version" "org/org-version.el" (21563 46263 -;;;;;; 313725 0)) +;;;### (autoloads nil "org-version" "org/org-version.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from org/org-version.el (autoload 'org-release "org-version" "\ @@ -19963,7 +20032,7 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21291 53104 0 0)) +;;;### (autoloads nil "outline" "outline.el" (21623 5708 80843 798000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20024,8 +20093,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21548 36924 -;;;;;; 712996 563000)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20097,7 +20166,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads nil "paren" "paren.el" (21291 53104 0 0)) +;;;### (autoloads nil "paren" "paren.el" (21607 56059 303525 127000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20123,8 +20192,8 @@ matching parenthesis is highlighted in `show-paren-style' after ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20137,8 +20206,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21423 62909 -;;;;;; 33477 0)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20187,8 +20256,8 @@ See also the user variables `pascal-type-keywords', `pascal-start-keywords' and ;;;*** -;;;### (autoloads nil "password-cache" "password-cache.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "password-cache" "password-cache.el" (21607 +;;;;;; 56025 301574 889000)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20209,8 +20278,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20271,7 +20340,8 @@ of the form (UPAT EXP). ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21291 53104 0 0)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20281,7 +20351,8 @@ Completion rules for the `cvs' command. ;;;*** -;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21291 53104 0 0)) +;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20308,8 +20379,8 @@ Completion for the GNU tar utility. ;;;*** -;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20329,7 +20400,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21291 53104 0 0)) +;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20339,8 +20411,8 @@ Completion for the `rpm' command. ;;;*** -;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20395,7 +20467,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21291 53104 0 0)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20419,7 +20492,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (21291 53104 0 0)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20476,7 +20550,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21291 53104 0 0)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21607 56025 801549 101000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -20551,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" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21607 56025 +;;;;;; 801549 101000)) ;;; 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)) "\ @@ -20560,8 +20634,8 @@ Global menu used by PCL-CVS.") ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21341 -;;;;;; 23900 0 0)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20622,8 +20696,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (21419 27241 -;;;;;; 500420 0)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -20703,8 +20777,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "plstore" "gnus/plstore.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "plstore" "gnus/plstore.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -20719,7 +20793,8 @@ Major mode for editing PLSTORE files. ;;;*** -;;;### (autoloads nil "po" "textmodes/po.el" (21291 53104 0 0)) +;;;### (autoloads nil "po" "textmodes/po.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -20730,7 +20805,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads nil "pong" "play/pong.el" (21291 53104 0 0)) +;;;### (autoloads nil "pong" "play/pong.el" (21607 56025 301574 889000)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -20746,7 +20821,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21291 53104 0 0)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21607 56024 801559 72000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -20757,8 +20832,8 @@ Use streaming commands. ;;;*** -;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21427 59969 217865 -;;;;;; 0)) +;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21607 56058 801550 +;;;;;; 360000)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -20808,8 +20883,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (21359 23622 725850 -;;;;;; 0)) +;;;### (autoloads nil "printing" "printing.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21397,7 +21472,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (21291 53104 0 0)) +;;;### (autoloads nil "proced" "proced.el" (21607 56025 301574 889000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21415,7 +21490,8 @@ Proced buffers. ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (21291 53104 0 0)) +;;;### (autoloads nil "profiler" "profiler.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21443,8 +21519,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21559 49204 -;;;;;; 612992 0)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21477,7 +21553,7 @@ With prefix argument ARG, restart the Prolog process if running before. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21291 53104 0 0)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21607 56025 801549 101000)) ;;; 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")) "\ @@ -21488,8 +21564,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) @@ -21536,8 +21612,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (21359 23622 725850 -;;;;;; 0)) +;;;### (autoloads nil "ps-print" "ps-print.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -21734,14 +21810,15 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (21291 53104 0 0)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21574 16579 -;;;;;; 173517 0)) +;;;### (autoloads nil "python" "progmodes/python.el" (21627 2757 +;;;;;; 110119 58000)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 4)) package--builtin-versions) @@ -21775,7 +21852,7 @@ Major mode for editing Python files. ;;;*** -;;;### (autoloads nil "qp" "gnus/qp.el" (21291 53104 0 0)) +;;;### (autoloads nil "qp" "gnus/qp.el" (21607 56024 801559 72000)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -21794,8 +21871,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "quail" "international/quail.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22025,8 +22102,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22039,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" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56024 801559 72000)) ;;; Generated autoloads from leim/quail/uni-input.el (autoload 'ucs-input-activate "quail/uni-input" "\ @@ -22053,8 +22130,8 @@ While this input method is active, the variable ;;;*** -;;;### (autoloads nil "quickurl" "net/quickurl.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "quickurl" "net/quickurl.el" (21607 56025 301574 +;;;;;; 889000)) ;;; 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" "\ @@ -22125,7 +22202,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21291 53104 0 0)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22163,8 +22241,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22182,7 +22260,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (21291 53104 0 0)) +;;;### (autoloads nil "recentf" "recentf.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22208,7 +22287,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21291 53104 0 0)) +;;;### (autoloads nil "rect" "rect.el" (21607 56059 303525 127000)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22348,8 +22427,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "refill" "textmodes/refill.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "refill" "textmodes/refill.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -22369,8 +22448,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -22419,8 +22498,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "reftex-cite" "textmodes/reftex-cite.el" (21607 +;;;;;; 56059 804396 982000)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload 'reftex-citation "reftex-cite" "\ @@ -22450,7 +22529,7 @@ While entering the regexp, completion on knows citation keys is possible. ;;;*** ;;;### (autoloads nil "reftex-global" "textmodes/reftex-global.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56059 804396 982000)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload 'reftex-isearch-minor-mode "reftex-global" "\ @@ -22467,7 +22546,7 @@ With no argument, this command toggles ;;;*** ;;;### (autoloads nil "reftex-index" "textmodes/reftex-index.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56059 804396 982000)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload 'reftex-index-phrases-mode "reftex-index" "\ @@ -22500,7 +22579,7 @@ Here are all local bindings. ;;;*** ;;;### (autoloads nil "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (21346 62196 0 0)) +;;;;;; (21623 5708 80843 798000)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload 'reftex-all-document-files "reftex-parse" "\ @@ -22512,8 +22591,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21607 +;;;;;; 56025 801549 101000)) ;;; 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)))) @@ -22522,8 +22601,8 @@ of master file. ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22552,15 +22631,15 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -22614,7 +22693,7 @@ to turn the *scratch* buffer into your notes buffer. ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (21291 53104 0 0)) +;;;### (autoloads nil "repeat" "repeat.el" (21607 56025 801549 101000)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -22637,8 +22716,8 @@ recently executed command not bound to an input event\". ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -22669,8 +22748,8 @@ mail-sending package is used for editing and sending the message. ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "reposition" "reposition.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -22696,7 +22775,7 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads nil "reveal" "reveal.el" (21291 53104 0 0)) +;;;### (autoloads nil "reveal" "reveal.el" (21607 56059 303525 127000)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -22731,8 +22810,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -22747,7 +22826,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (21291 53104 0 0)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -22791,7 +22871,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21349 10841 0 0)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -22988,8 +23069,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23053,8 +23134,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21319 19378 -;;;;;; 0 0)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23065,8 +23146,8 @@ Return a pattern. ;;;*** -;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21291 57968 -;;;;;; 0 0)) +;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23078,8 +23159,8 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil. ;;;*** -;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21291 57968 -;;;;;; 0 0)) +;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23109,8 +23190,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21291 57968 0 -;;;;;; 0)) +;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23137,8 +23218,8 @@ must be equal. ;;;*** -;;;### (autoloads nil "robin" "international/robin.el" (20627 28607 -;;;;;; 0 0)) +;;;### (autoloads nil "robin" "international/robin.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -23170,7 +23251,7 @@ Start using robin package NAME, which is a string. ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (21291 53104 0 0)) +;;;### (autoloads nil "rot13" "rot13.el" (21607 56025 801549 101000)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23207,7 +23288,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21343 47921 0 0)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23237,8 +23319,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21433 -;;;;;; 12343 302925 0)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21607 +;;;;;; 56025 801549 101000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23255,8 +23337,8 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21419 27241 500420 -;;;;;; 0)) +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23274,7 +23356,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21291 53104 0 0)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -23585,14 +23668,15 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21291 53104 0 0)) +;;;### (autoloads nil "savehist" "savehist.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -23624,8 +23708,8 @@ histories, which is probably undesirable. ;;;*** -;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21372 35662 -;;;;;; 356409 0)) +;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -23664,8 +23748,8 @@ that variable's value is a string. ;;;*** -;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -23678,8 +23762,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "scroll-all" "scroll-all.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23704,8 +23788,8 @@ one window apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -23721,15 +23805,16 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (21291 53104 0 0)) +;;;### (autoloads nil "secrets" "net/secrets.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) ;;;*** -;;;### (autoloads nil "semantic" "cedet/semantic.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "semantic" "cedet/semantic.el" (21607 56058 +;;;;;; 801550 360000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) @@ -23787,7 +23872,7 @@ Semantic mode. ;;;*** ;;;### (autoloads nil "semantic/bovine/grammar" "cedet/semantic/bovine/grammar.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56058 801550 360000)) ;;; Generated autoloads from cedet/semantic/bovine/grammar.el (autoload 'bovine-grammar-mode "semantic/bovine/grammar" "\ @@ -23798,7 +23883,7 @@ Major mode for editing Bovine grammars. ;;;*** ;;;### (autoloads nil "semantic/wisent/grammar" "cedet/semantic/wisent/grammar.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56023 800854 237000)) ;;; Generated autoloads from cedet/semantic/wisent/grammar.el (autoload 'wisent-grammar-mode "semantic/wisent/grammar" "\ @@ -23808,8 +23893,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24090,7 +24175,7 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "server" "server.el" (21291 53104 0 0)) +;;;### (autoloads nil "server" "server.el" (21607 56059 303525 127000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24157,7 +24242,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21291 53104 0 0)) +;;;### (autoloads nil "ses" "ses.el" (21607 56059 303525 127000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24201,8 +24286,8 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21607 +;;;;;; 56059 804396 982000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24267,8 +24352,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21437 -;;;;;; 9401 747944 0)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24332,8 +24417,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24382,8 +24467,8 @@ function, `load-path-shadows-find'. ;;;*** -;;;### (autoloads nil "shadowfile" "shadowfile.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "shadowfile" "shadowfile.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -24421,7 +24506,7 @@ Set up file shadowing. ;;;*** -;;;### (autoloads nil "shell" "shell.el" (21313 65162 0 0)) +;;;### (autoloads nil "shell" "shell.el" (21607 56059 303525 127000)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24469,7 +24554,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21501 48695 777628 0)) +;;;### (autoloads nil "shr" "net/shr.el" (21607 56059 303525 127000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24486,7 +24571,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (21291 53104 0 0)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24511,8 +24597,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -24527,8 +24613,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simula" "progmodes/simula.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "simula" "progmodes/simula.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -24576,8 +24662,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21574 16579 173517 -;;;;;; 0)) +;;;### (autoloads nil "skeleton" "skeleton.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -24695,8 +24781,8 @@ symmetrical ones, and the same character twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21574 16579 -;;;;;; 173517 0)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -24723,7 +24809,8 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** -;;;### (autoloads nil "smiley" "gnus/smiley.el" (21291 53104 0 0)) +;;;### (autoloads nil "smiley" "gnus/smiley.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -24740,8 +24827,8 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** -;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -24756,7 +24843,8 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads nil "snake" "play/snake.el" (21291 53104 0 0)) +;;;### (autoloads nil "snake" "play/snake.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -24779,8 +24867,8 @@ Snake mode keybindings: ;;;*** -;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -24809,8 +24897,8 @@ then `snmpv2-mode-hook'. ;;;*** -;;;### (autoloads nil "solar" "calendar/solar.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "solar" "calendar/solar.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -24825,8 +24913,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "solitaire" "play/solitaire.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "solitaire" "play/solitaire.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -24901,7 +24989,7 @@ Pick your favorite shortcuts: ;;;*** -;;;### (autoloads nil "sort" "sort.el" (21291 53104 0 0)) +;;;### (autoloads nil "sort" "sort.el" (21607 56025 801549 101000)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25076,7 +25164,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (21291 53104 0 0)) +;;;### (autoloads nil "spam" "gnus/spam.el" (21607 56059 303525 127000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25090,8 +25178,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25133,8 +25221,8 @@ Spam reports will be queued with the method used when ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (21483 18756 674635 -;;;;;; 0)) +;;;### (autoloads nil "speedbar" "speedbar.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25158,7 +25246,8 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (21291 53104 0 0)) +;;;### (autoloads nil "spook" "play/spook.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25173,7 +25262,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21291 53104 0 0)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21607 56059 303525 +;;;;;; 127000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 4)) package--builtin-versions) @@ -25634,15 +25724,15 @@ buffer. ;;;*** -;;;### (autoloads nil "srecode" "cedet/srecode.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "srecode" "cedet/srecode.el" (21607 56023 800854 +;;;;;; 237000)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56023 800854 237000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -25654,8 +25744,8 @@ Major-mode for writing SRecode macros. ;;;*** -;;;### (autoloads nil "starttls" "gnus/starttls.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "starttls" "gnus/starttls.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -25678,7 +25768,8 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21291 53104 0 0)) +;;;### (autoloads nil "strokes" "strokes.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -25791,7 +25882,8 @@ Read a complex stroke and insert its glyph into the current buffer. ;;;*** -;;;### (autoloads nil "studly" "play/studly.el" (21291 53104 0 0)) +;;;### (autoloads nil "studly" "play/studly.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/studly.el (autoload 'studlify-region "studly" "\ @@ -25811,8 +25903,8 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (21607 56059 +;;;;;; 303525 127000)) ;;; Generated autoloads from progmodes/subword.el (autoload 'subword-mode "subword" "\ @@ -25906,8 +25998,8 @@ See `superword-mode' for more information on Superword mode. ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -25939,7 +26031,8 @@ and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (21291 53104 0 0)) +;;;### (autoloads nil "t-mouse" "t-mouse.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -25967,7 +26060,7 @@ It relies on the `gpm' daemon being activated. ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (21291 53104 0 0)) +;;;### (autoloads nil "tabify" "tabify.el" (21607 56025 801549 101000)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -25996,8 +26089,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "table" "textmodes/table.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -26589,7 +26682,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads nil "talk" "talk.el" (21291 53104 0 0)) +;;;### (autoloads nil "talk" "talk.el" (21607 56025 801549 101000)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -26604,8 +26697,8 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (21503 32807 150781 -;;;;;; 797000)) +;;;### (autoloads nil "tar-mode" "tar-mode.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -26628,7 +26721,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21291 53104 0 0)) +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -26676,7 +26770,8 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (21291 53104 0 0)) +;;;### (autoloads nil "telnet" "net/telnet.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from net/telnet.el (autoload 'telnet "telnet" "\ @@ -26701,7 +26796,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21554 31287 788939 0)) +;;;### (autoloads nil "term" "term.el" (21607 56059 303525 127000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -26743,8 +26838,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -26754,7 +26849,8 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads nil "tetris" "play/tetris.el" (21291 53104 0 0)) +;;;### (autoloads nil "tetris" "play/tetris.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) @@ -26779,8 +26875,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21462 12596 -;;;;;; 577539 0)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27081,8 +27177,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27121,8 +27217,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21412 6211 -;;;;;; 413773 0)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27206,8 +27302,8 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads nil "thai-util" "language/thai-util.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "thai-util" "language/thai-util.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27234,7 +27330,8 @@ Compose Thai characters in the current buffer. ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (21291 53104 0 0)) +;;;### (autoloads nil "thingatpt" "thingatpt.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27298,7 +27395,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21291 53104 0 0)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21607 56025 801549 101000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27332,8 +27429,8 @@ In dired, call the setroot program on the image at point. ;;;*** -;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -27406,8 +27503,8 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from textmodes/tildify.el (push (purecopy '(tildify 4 5)) package--builtin-versions) @@ -27431,7 +27528,7 @@ This function performs no refilling of the changed text. ;;;*** -;;;### (autoloads nil "time" "time.el" (21291 53104 0 0)) +;;;### (autoloads nil "time" "time.el" (21607 56025 801549 101000)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -27493,8 +27590,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27605,8 +27702,8 @@ This function does not work for SECONDS greater than `most-positive-fixnum'. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (21607 56025 801549 +;;;;;; 101000)) ;;; 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) @@ -27646,8 +27743,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21607 +;;;;;; 56058 801550 360000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -27757,7 +27854,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56024 801559 72000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -27779,7 +27876,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (21291 53104 0 0)) +;;;### (autoloads nil "tmm" "tmm.el" (21607 56025 801549 101000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27821,8 +27918,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21468 -;;;;;; 51404 66554 0)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21623 +;;;;;; 5708 80843 798000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -27889,7 +27986,8 @@ Mode for displaying and reprioritizing top priority Todo. ;;;*** -;;;### (autoloads nil "tool-bar" "tool-bar.el" (21291 53104 0 0)) +;;;### (autoloads nil "tool-bar" "tool-bar.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -27959,7 +28057,8 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21291 53104 0 0)) +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -27972,8 +28071,8 @@ to a tcp server on another machine. ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -28018,8 +28117,8 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21389 44725 461529 -;;;;;; 0)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21617 53323 210147 +;;;;;; 705000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28105,7 +28204,7 @@ Invoke Tramp file name completion handler. Falls back to normal file name handler if no Tramp file name handler exists." (let ((directory-sep-char 47) (fn (assoc operation tramp-completion-file-name-handler-alist))) (if (and fn tramp-mode (or (eq tramp-syntax (quote sep)) (featurep (quote tramp)) (and (boundp (quote partial-completion-mode)) (symbol-value (quote partial-completion-mode))) (featurep (quote ido)) (featurep (quote icicles)))) (save-match-data (apply (cdr fn) args)) (tramp-completion-run-real-handler operation args)))) (defun tramp-autoload-file-name-handler (operation &rest args) "\ -Load Tramp file name handler, and perform OPERATION." (let ((default-directory temporary-file-directory)) (load "tramp" nil t)) (apply operation args)) +Load Tramp file name handler, and perform OPERATION." (let ((default-directory (or (symbol-value (quote temporary-file-directory)) "/"))) (load "tramp" nil t)) (apply operation args)) (defun tramp-register-autoload-file-name-handlers nil "\ Add Tramp file name handlers to `file-name-handler-alist' during autoload." (add-to-list (quote file-name-handler-alist) (cons tramp-file-name-regexp (quote tramp-autoload-file-name-handler))) (put (quote tramp-autoload-file-name-handler) (quote safe-magic) t) (add-to-list (quote file-name-handler-alist) (cons tramp-completion-file-name-regexp (quote tramp-completion-file-name-handler))) (put (quote tramp-completion-file-name-handler) (quote safe-magic) t)) @@ -28134,8 +28233,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21607 56025 +;;;;;; 301574 889000)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28145,8 +28244,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21509 42819 588289 -;;;;;; 0)) +;;;### (autoloads nil "tutorial" "tutorial.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28170,8 +28269,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "tv-util" "language/tv-util.el" (20352 35897 -;;;;;; 0 0)) +;;;### (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" "\ @@ -28181,8 +28280,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21607 +;;;;;; 56025 801549 101000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28229,8 +28328,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "type-break" "type-break.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28362,7 +28461,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (21291 53104 0 0)) +;;;### (autoloads nil "uce" "mail/uce.el" (21607 56024 801559 72000)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -28376,7 +28475,7 @@ You might need to set `uce-mail-reader' before using this. ;;;*** ;;;### (autoloads nil "ucs-normalize" "international/ucs-normalize.el" -;;;;;; (21291 53104 0 0)) +;;;;;; (21607 56024 801559 72000)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -28441,8 +28540,8 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus. ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (21607 +;;;;;; 56025 801549 101000)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28462,8 +28561,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (21607 56024 801559 +;;;;;; 72000)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -28483,8 +28582,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use. ;;;*** -;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (21607 56024 +;;;;;; 300834 853000)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -28496,7 +28595,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (21532 4280 979161 0)) +;;;### (autoloads nil "url" "url/url.el" (21607 56059 804396 982000)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -28543,8 +28642,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -28585,8 +28684,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** -;;;### (autoloads nil "url-cache" "url/url-cache.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "url-cache" "url/url-cache.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -28607,7 +28706,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-cid" "url/url-cid.el" (21291 53104 0 0)) +;;;### (autoloads nil "url-cid" "url/url-cid.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -28617,7 +28717,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-dav" "url/url-dav.el" (21291 53104 0 0)) +;;;### (autoloads nil "url-dav" "url/url-dav.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -28651,8 +28752,8 @@ added to this list, so most requests can just pass in nil. ;;;*** -;;;### (autoloads nil "url-file" "url/url-file.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "url-file" "url/url-file.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -28662,7 +28763,8 @@ Handle file: and ftp: URLs. ;;;*** -;;;### (autoloads nil "url-gw" "url/url-gw.el" (21291 53104 0 0)) +;;;### (autoloads nil "url-gw" "url/url-gw.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -28680,8 +28782,8 @@ Might do a non-blocking connection; use `process-status' to check. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21420 -;;;;;; 315 511456 0)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21607 +;;;;;; 56059 804396 982000)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28735,8 +28837,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (21574 16579 173517 -;;;;;; 0)) +;;;### (autoloads nil "url-http" "url/url-http.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -28748,7 +28850,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-irc" "url/url-irc.el" (21291 53104 0 0)) +;;;### (autoloads nil "url-irc" "url/url-irc.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -28758,8 +28861,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -28772,8 +28875,8 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** -;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -28788,8 +28891,8 @@ Handle the mailto: URL syntax. ;;;*** -;;;### (autoloads nil "url-misc" "url/url-misc.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "url-misc" "url/url-misc.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -28820,8 +28923,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-news" "url/url-news.el" (21574 16579 173517 -;;;;;; 0)) +;;;### (autoloads nil "url-news" "url/url-news.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -28836,7 +28939,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-ns" "url/url-ns.el" (21291 53104 0 0)) +;;;### (autoloads nil "url-ns" "url/url-ns.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -28876,8 +28980,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-parse" "url/url-parse.el" (21346 62196 -;;;;;; 0 0)) +;;;### (autoloads nil "url-parse" "url/url-parse.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -28928,8 +29032,8 @@ parses to ;;;*** -;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -28939,8 +29043,8 @@ Setup variables that expose info about you and your system. ;;;*** -;;;### (autoloads nil "url-queue" "url/url-queue.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "url-queue" "url/url-queue.el" (21607 56025 +;;;;;; 801549 101000)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -28954,8 +29058,8 @@ The variable `url-queue-timeout' sets a timeout. ;;;*** -;;;### (autoloads nil "url-util" "url/url-util.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "url-util" "url/url-util.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29123,7 +29227,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21291 53104 0 0)) +;;;### (autoloads nil "userlock" "userlock.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29151,8 +29256,8 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29177,7 +29282,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf7" "gnus/utf7.el" (21291 53104 0 0)) +;;;### (autoloads nil "utf7" "gnus/utf7.el" (21607 56024 801559 72000)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29187,8 +29292,8 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;*** -;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "uudecode" "mail/uudecode.el" (21607 56024 +;;;;;; 801559 72000)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29212,7 +29317,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (21291 53104 0 0)) +;;;### (autoloads nil "vc" "vc/vc.el" (21613 56261 180128 217000)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29362,8 +29467,12 @@ checked out in that new branch. \(fn DIR NAME BRANCHP)" t nil) (autoload 'vc-retrieve-tag "vc" "\ -Descending recursively from DIR, retrieve the tag called NAME. -If NAME is empty, it refers to the latest revisions. +For each file in or below DIR, retrieve their tagged version NAME. +NAME can name a branch, in which case this command will switch to the +named branch in the directory DIR. +Interactively, prompt for DIR only for VCS that works at file level; +otherwise use the default directory of the current buffer. +If NAME is empty, it refers to the latest revisions of the current branch. If locking is used for the files in DIR, then there must not be any locked files at or below DIR (but if NAME is empty, locked files are allowed and simply skipped). @@ -29493,8 +29602,8 @@ Return the branch part of a revision number REV. ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21291 53104 -;;;;;; 0 0)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21607 56059 +;;;;;; 804396 982000)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29531,7 +29640,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21291 53104 0 0)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29541,7 +29651,8 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21291 53104 0 0)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21619 8648 550151 +;;;;;; 780000)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -29557,7 +29668,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21291 53104 0 0)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -29568,8 +29680,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21514 60739 675589 -;;;;;; 0)) +;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -29593,8 +29705,8 @@ These are the commands available for use in the file status buffer: ;;;*** -;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21444 -;;;;;; 12002 871574 911000)) +;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (21607 +;;;;;; 56059 804396 982000)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -29617,8 +29729,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21425 18234 73199 -;;;;;; 0)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21615 11593 522981 +;;;;;; 49000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -29629,7 +29741,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21574 16579 173517 0)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21619 8648 550151 780000)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -29640,7 +29752,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21291 53104 0 0)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -29656,8 +29769,8 @@ Name of the monotone directory's format file.") ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21372 35662 356409 -;;;;;; 0)) +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -29670,7 +29783,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21291 53104 0 0)) +;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -29688,8 +29802,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21551 55091 744410 -;;;;;; 0)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29702,8 +29816,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21607 +;;;;;; 56059 303525 127000)) ;;; 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)) @@ -29762,7 +29876,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21346 62196 0 0)) +;;;;;; (21607 56059 303525 127000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -29901,8 +30015,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21587 -;;;;;; 28603 874778 0)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -30456,8 +30570,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "viet-util" "language/viet-util.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "viet-util" "language/viet-util.el" (21607 +;;;;;; 56024 801559 72000)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -30501,7 +30615,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics. ;;;*** -;;;### (autoloads nil "view" "view.el" (21452 63160 995987 0)) +;;;### (autoloads nil "view" "view.el" (21607 56025 801549 101000)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -30757,8 +30871,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "viper" "emulation/viper.el" (21574 16579 173517 -;;;;;; 0)) +;;;### (autoloads nil "viper" "emulation/viper.el" (21607 56024 300834 +;;;;;; 853000)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) @@ -30775,8 +30889,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21607 +;;;;;; 56024 300834 853000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -30866,7 +30980,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (21291 53104 0 0)) +;;;### (autoloads nil "wdired" "wdired.el" (21607 56025 801549 101000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -30884,7 +30998,8 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads nil "webjump" "net/webjump.el" (21291 53104 0 0)) +;;;### (autoloads nil "webjump" "net/webjump.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -30900,8 +31015,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21291 -;;;;;; 53104 0 0)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21607 +;;;;;; 56059 303525 127000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -30931,8 +31046,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "whitespace" "whitespace.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31331,8 +31446,8 @@ cleaning up these problems. ;;;*** -;;;### (autoloads nil "wid-browse" "wid-browse.el" (21291 53104 0 -;;;;;; 0)) +;;;### (autoloads nil "wid-browse" "wid-browse.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -31360,7 +31475,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21291 53104 0 0)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31402,7 +31518,8 @@ Setup current buffer so editing string widgets works. ;;;*** -;;;### (autoloads nil "windmove" "windmove.el" (21291 53104 0 0)) +;;;### (autoloads nil "windmove" "windmove.el" (21607 56025 801549 +;;;;;; 101000)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -31454,7 +31571,7 @@ Default MODIFIER is 'shift. ;;;*** -;;;### (autoloads nil "winner" "winner.el" (21291 53104 0 0)) +;;;### (autoloads nil "winner" "winner.el" (21607 56059 804396 982000)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -31477,7 +31594,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21291 53104 0 0)) +;;;### (autoloads nil "woman" "woman.el" (21607 56059 804396 982000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31526,7 +31643,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (21291 53104 0 0)) +;;;### (autoloads nil "xml" "xml.el" (21607 56025 801549 101000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -31582,7 +31699,8 @@ Both features can be combined by providing a cons cell ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21341 23900 0 0)) +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21607 56025 301574 +;;;;;; 889000)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -31600,8 +31718,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21410 50877 492638 -;;;;;; 0)) +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (21607 56059 804396 +;;;;;; 982000)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -31630,7 +31748,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** -;;;### (autoloads nil "yenc" "gnus/yenc.el" (21291 53104 0 0)) +;;;### (autoloads nil "yenc" "gnus/yenc.el" (21607 56024 801559 72000)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -31645,7 +31763,7 @@ Extract file name from an yenc header. ;;;*** -;;;### (autoloads nil "zone" "play/zone.el" (21291 53104 0 0)) +;;;### (autoloads nil "zone" "play/zone.el" (21607 56025 301574 889000)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -31691,16 +31809,14 @@ Zone out, completely. ;;;;;; "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" @@ -31718,19 +31834,17 @@ 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/loaddefs.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" +;;;;;; "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" ;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" @@ -31776,15 +31890,8 @@ Zone out, completely. ;;;;;; "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-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" @@ -31872,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") (21588 49521 125399 -;;;;;; 605000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21628 23968 97140 +;;;;;; 527000)) ;;;*** commit 9e9e3432fa4e31731f4c058caf8f30b7a4552c1b Author: Eric S. Raymond Date: Mon Dec 1 07:08:40 2014 -0500 Argument removal inadvertently omitted from my previous commit. diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 30d66e4..fa584fa 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -300,7 +300,7 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." (autoload 'vc-switches "vc") -(defun vc-svn-register (files &optional _rev _comment) +(defun vc-svn-register (files &optional _comment) "Register FILES into the SVN version-control system. The COMMENT argument is ignored This does an add but not a commit. Passes either `vc-svn-register-switches' or `vc-register-switches' commit 2f4f92007956983e6f5cb5136a57ddaa0cd9428e Author: Eric S. Raymond Date: Mon Dec 1 06:23:10 2014 -0500 VC API simplification: remove ability to set initial revision. This hasn't made any sense since RCS, and was a dumb stunt then. * vc/vc.el and all backends: API simplification; init-revision is gone, and vc-registered functions no longer take an initial-revision argument. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f9b613..f775afe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-12-01 Eric S. Raymond + + * vc/vc.el and all backends: API simplification; init-revision is + gone, and vc-registered functions no longer take an + initial-revision argument. + 2014-11-29 Glenn Morris * vc/vc-src.el (vc-src, vc-src-diff-switches) diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index 53b8e35..6d2e472 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el @@ -231,8 +231,7 @@ Only the value `maybe' can be trusted :-(." "Return the administrative directory of FILE." (expand-file-name "{arch}" (vc-arch-root file))) -(defun vc-arch-register (files &optional rev _comment) - (if rev (error "Explicit initial revision not supported for Arch")) +(defun vc-arch-register (files &optional _comment) (dolist (file files) (let ((tagmet (vc-arch-tagging-method file))) (if (and (memq tagmet '(tagline implicit)) comment-start) @@ -496,8 +495,6 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see "A wrapper around `vc-do-command' for use in vc-arch.el." (apply 'vc-do-command (or buffer "*vc*") okstatus vc-arch-program file flags)) -(defun vc-arch-init-revision () nil) - ;;; Completion of versions and revisions. (defun vc-arch--version-completion-table (root string) diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 7a1539b..afe8770 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -580,10 +580,6 @@ in the branch repository (or whose status not be determined)." "Create a new Bzr repository." (vc-bzr-command "init" nil 0 nil)) -(defun vc-bzr-init-revision (&optional _file) - "Always return nil, as Bzr cannot register explicit versions." - nil) - (defun vc-bzr-previous-revision (_file rev) (if (string-match "\\`[0-9]+\\'" rev) (number-to-string (1- (string-to-number rev))) @@ -594,11 +590,8 @@ in the branch repository (or whose status not be determined)." (number-to-string (1+ (string-to-number rev))) (error "Don't know how to compute the next revision of %s" rev))) -(defun vc-bzr-register (files &optional rev _comment) - "Register FILES under bzr. -Signal an error unless REV is nil. -COMMENT is ignored." - (if rev (error "Can't register explicit revision with bzr")) +(defun vc-bzr-register (files &optional _comment) + "Register FILES under bzr. COMMENT is ignored." (vc-bzr-command "add" nil 0 files)) ;; Could run `bzr status' in the directory and see if it succeeds, but diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 4bce79c..c938899 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -282,7 +282,7 @@ committed and support display of sticky tags." (autoload 'vc-switches "vc") -(defun vc-cvs-register (files &optional _rev comment) +(defun vc-cvs-register (files &optional comment) "Register FILES into the CVS version-control system. COMMENT can be used to provide an initial description of FILES. Passes either `vc-cvs-register-switches' or `vc-register-switches' diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index df7801f..ff4d5e5 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -77,7 +77,7 @@ See `vc-checkout-model' for a list of possible values." "Return the current workfile version of URL." "Unknown") -(defun vc-dav-register (url &optional rev comment) +(defun vc-dav-register (url &optional comment) "Register URL in the DAV backend." ;; Do we need to do anything here? FIXME? ) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 3a94313..ae1b356 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -605,7 +605,7 @@ The car of the list is the current branch." "Create a new Git repository." (vc-git-command nil 0 nil "init")) -(defun vc-git-register (files &optional _rev _comment) +(defun vc-git-register (files &optional _comment) "Register FILES into the git version-control system." (let (flist dlist) (dolist (crt files) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index d8cda91..337107f 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -441,10 +441,8 @@ Optional arg REVISION is a revision to annotate from." "Rename file from OLD to NEW using `hg mv'." (vc-hg-command nil 0 new "mv" old)) -(defun vc-hg-register (files &optional _rev _comment) - "Register FILES under hg. -REV is ignored. -COMMENT is ignored." +(defun vc-hg-register (files &optional _comment) + "Register FILES under hg. COMMENT is ignored." (vc-hg-command nil 0 files "add")) (defun vc-hg-create-repo () diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 145fdeb..f12ca0f 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -179,7 +179,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (_ ?:)) branch))) -(defun vc-mtn-register (files &optional _rev _comment) +(defun vc-mtn-register (files &optional _comment) (vc-mtn-command nil 0 files "add")) (defun vc-mtn-responsible-p (file) (vc-mtn-root file)) diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 341a1d4..572a83e 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -276,18 +276,15 @@ When VERSION is given, perform check for that version." (autoload 'vc-switches "vc") -(defun vc-rcs-register (files &optional rev comment) +(defun vc-rcs-register (files &optional comment) "Register FILES into the RCS version-control system. -REV is the optional revision number for the files. COMMENT can be used -to provide an initial description for each FILES. +COMMENT can be used to provide an initial description for each FILES. Passes either `vc-rcs-register-switches' or `vc-register-switches' to the RCS command. Automatically retrieve a read-only version of the file with keywords expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." (let (subdir name) - ;; When REV is specified, we need to force using "-t-". - (when rev (unless comment (setq comment ""))) (dolist (file files) (and (not (file-exists-p (setq subdir (expand-file-name "RCS" @@ -299,7 +296,6 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." (apply #'vc-do-command "*vc*" 0 "ci" file ;; if available, use the secure registering option (and (vc-rcs-release-p "5.6.4") "-i") - (concat (if vc-keep-workfiles "-u" "-r") rev) (and comment (concat "-t-" comment)) (vc-switches 'RCS 'register)) ;; parse output to find master file name and workfile version @@ -336,7 +332,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." (defun vc-rcs-receive-file (file rev) "Implementation of receive-file for RCS." (let ((checkout-model (vc-rcs-checkout-model (list file)))) - (vc-rcs-register file rev "") + (vc-rcs-register file "") (when (eq checkout-model 'implicit) (vc-rcs-set-non-strict-locking file)) (vc-rcs-set-default-branch file (concat rev ".1")))) diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 26aa49c..46e191a 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -222,10 +222,9 @@ Optional string REV is a revision." (autoload 'vc-switches "vc") -(defun vc-sccs-register (files &optional rev comment) +(defun vc-sccs-register (files &optional comment) "Register FILES into the SCCS version-control system. -REV is the optional revision number for the file. COMMENT can be used -to provide an initial description of FILES. +COMMENT can be used to provide an initial description of FILES. Passes either `vc-sccs-register-switches' or `vc-register-switches' to the SCCS command. @@ -239,7 +238,6 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." (or project-file (format (car vc-sccs-master-templates) dirname basename)))) (apply 'vc-sccs-do-command nil 0 "admin" vc-master-name - (and rev (not (string= rev "")) (concat "-r" rev)) "-fb" (concat "-i" (file-relative-name file)) (and comment (concat "-y" comment)) diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 6113368..186f73f 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -44,7 +44,6 @@ ;; STATE-CHANGING FUNCTIONS ;; * register (files &optional rev comment) OK ;; * create-repo () OK -;; - init-revision () NOT NEEDED ;; * responsible-p (file) OK ;; * could-register (file) OK ;; - receive-file (file rev) NOT NEEDED @@ -228,10 +227,8 @@ This function differs from vc-do-command in that it invokes `vc-src-program'." (autoload 'vc-switches "vc") -(defun vc-src-register (files &optional _rev _comment) - "Register FILES under src. -REV is ignored. -COMMENT is ignored." +(defun vc-src-register (files &optional _comment) + "Register FILES under src. COMMENT is ignored." (vc-src-command nil files "add")) (defun vc-src-responsible-p (file) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index bee1644..62e68e2 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -228,21 +228,16 @@ ;; it so VC mode can add files to it. For file-oriented systems, this ;; need do no more than create a subdirectory with the right name. ;; -;; * register (files &optional rev comment) +;; * register (files &optional comment) ;; -;; Register FILES in this backend. Optionally, an initial revision REV -;; and an initial description of the file, COMMENT, may be specified, -;; but it is not guaranteed that the backend will do anything with this. -;; The implementation should pass the value of vc-register-switches -;; to the backend command. (Note: in older versions of VC, this -;; command took a single file argument and not a list.) -;; The REV argument is a historical leftover and is never used. -;; -;; - init-revision (file) -;; -;; The initial revision to use when registering FILE if one is not -;; specified by the user. If not provided, the variable -;; vc-default-init-revision is used instead. +;; Register FILES in this backend. Optionally, an initial +;; description of the file, COMMENT, may be specified, but it is not +;; guaranteed that the backend will do anything with this. The +;; implementation should pass the value of vc-register-switches to +;; the backend command. (Note: in older versions of VC, this +;; command had an optional revision first argument that was +;; not used; in still older ones it took a single file argument and +;; not a list.) ;; ;; - responsible-p (file) ;; @@ -599,6 +594,22 @@ ;; the project that contains DIR. ;; FIXME: what should it do with non-text conflicts? +;;; Changes from the pre-25.1 API: +;; +;; - The 'editable' optional argument of vc-checkout is gone. The +;; upper level assumes that all files are checked out editable. This +;; moves closer to emulating modern non-locking behavior even on very +;; old VCSes. +;; +;; - The init-revision function and the default-initial-revision +;; variable are gone. These have't made sense on anything shipped +;; since RCS, and using them was a dumb stunt even on RCS. +;; +;; - The vc-register function and its backend implementations no longer +;; take a first optional revision argument, since on no system since +;; RCS has setting the initial revision been even possible, let alone +;; sane. + ;;; Todo: ;; - Get rid of the "master file" terminology. @@ -715,14 +726,6 @@ (make-obsolete-variable 'vc-initial-comment "it has no effect." "23.2") -(defcustom vc-default-init-revision "1.1" - "A string used as the default revision number when a new file is registered. -This can be overridden by giving a prefix argument to \\[vc-register]. This -can also be overridden by a particular VC backend." - :type 'string - :group 'vc - :version "20.3") - (defcustom vc-checkin-switches nil "A string or list of strings specifying extra switches for checkin. These are passed to the checkin program by \\[vc-checkin]." @@ -1294,12 +1297,11 @@ For old-style locking-based version control systems, like RCS: (declare-function vc-dir-move-to-goal-column "vc-dir" ()) ;;;###autoload -(defun vc-register (&optional set-revision vc-fileset comment) +(defun vc-register (&optional vc-fileset comment) "Register into a version control system. If VC-FILESET is given, register the files in that fileset. Otherwise register the current file. -With prefix argument SET-REVISION, allow user to specify initial revision -level. If COMMENT is present, use that as an initial comment. +If COMMENT is present, use that as an initial comment. The version control system to use is found by cycling through the list `vc-handled-backends'. The first backend in that list which declares @@ -1331,11 +1333,7 @@ first backend that could register the file is used." (vc-buffer-sync))))) (message "Registering %s... " files) (mapc 'vc-file-clearprops files) - (vc-call-backend backend 'register files - (if set-revision - (read-string (format "Initial revision level for %s: " files)) - (vc-call-backend backend 'init-revision)) - comment) + (vc-call-backend backend 'register files comment) (mapc (lambda (file) (vc-file-setprop file 'vc-backend backend) @@ -2839,8 +2837,6 @@ This default implementation always returns non-nil, which means that editing non-current revisions is not supported by default." t) -(defun vc-default-init-revision (_backend) vc-default-init-revision) - (defun vc-default-find-revision (backend file rev buffer) "Provide the new `find-revision' op based on the old `checkout' op. This is only for compatibility with old backends. They should be updated commit 7536c8645e9f82b74bd4da5d91c325ab92beb541 Author: Glenn Morris Date: Mon Dec 1 00:28:08 2014 -0800 * lisp/gnus/gnus-cloud.el (gnus-cloud): Add :version tag. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0175431..c526b53 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2014-12-01 Glenn Morris + + * gnus-cloud.el (gnus-cloud): Add :version tag. + 2014-11-29 John Mastro (tiny change) * auth-source.el (auth-source-macos-keychain-search-items): Return diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el index ec85a16..ec016ee 100644 --- a/lisp/gnus/gnus-cloud.el +++ b/lisp/gnus/gnus-cloud.el @@ -30,6 +30,7 @@ (defgroup gnus-cloud nil "Syncing Gnus data via IMAP." + :version "25.1" :group 'gnus) (defcustom gnus-cloud-synced-files @@ -39,6 +40,7 @@ (:directory "~/News" :match ".*.SCORE\\'")) "List of file regexps that should be kept up-to-date via the cloud." :group 'gnus-cloud + ;; FIXME this type does not match the default. Nor does the documentation. :type '(repeat regexp)) (defvar gnus-cloud-group-name "*Emacs Cloud*") commit e97b6e6f11ceb85f4f3cbe1ecbbc46aa0a8de48a Author: Stefan Monnier Date: Sun Nov 30 23:07:19 2014 -0500 * lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol): Refine. Fix handling of symbols with different syntax at beginning/end or with symbol rather than word syntax. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 726d9b0..ac36c05 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-12-01 Stefan Monnier + + * progmodes/prog-mode.el (prettify-symbols--compose-symbol): + Fix handling of symbols with different syntax at beginning/end or with + symbol rather than word syntax. + 2014-11-30 Eli Zaretskii * simple.el (line-move): If noninteractive, call line-move-1, not diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index 4074669..e0e5746 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -66,11 +66,13 @@ Regexp match data 0 points to the chars." ;; Check that the chars should really be composed into a symbol. (let* ((start (match-beginning 0)) (end (match-end 0)) - (syntaxes (if (eq (char-syntax (char-after start)) ?w) + (syntaxes-beg (if (memq (char-syntax (char-after start)) '(?w ?_)) + '(?w ?_) '(?. ?\\))) + (syntaxes-end (if (memq (char-syntax (char-before end)) '(?w ?_)) '(?w ?_) '(?. ?\\))) match) - (if (or (memq (char-syntax (or (char-before start) ?\s)) syntaxes) - (memq (char-syntax (or (char-after end) ?\s)) syntaxes) + (if (or (memq (char-syntax (or (char-before start) ?\s)) syntaxes-beg) + (memq (char-syntax (or (char-after end) ?\s)) syntaxes-end) ;; syntax-ppss could modify the match data (bug#14595) (progn (setq match (match-string 0)) (nth 8 (syntax-ppss)))) ;; No composition for you. Let's actually remove any composition commit 59c4d5f95337d6393edb5ffe6b9ef74e4f89058f Author: Eli Zaretskii Date: Sun Nov 30 18:06:19 2014 +0200 Fix bug #19211 with move-end-of-line in non-interactive session. lisp/simple.el (line-move): If noninteractive, call line-move-1, not forward-line, since the former is compatible with line-move-visual both in terms of the column to which it moves and the return value. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9a45f08..726d9b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-11-30 Eli Zaretskii + + * simple.el (line-move): If noninteractive, call line-move-1, not + forward-line, since the former is compatible with line-move-visual + both in terms of the column to which it moves and the return + value. (Bug#19211) + 2014-11-27 Stephen Berman Stefan Monnier diff --git a/lisp/simple.el b/lisp/simple.el index 0c0e815..65fcf6e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5191,7 +5191,7 @@ TRY-VSCROLL controls whether to vscroll tall lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this function will not vscroll." (if noninteractive - (forward-line arg) + (line-move-1 arg noerror to-end) (unless (and auto-window-vscroll try-vscroll ;; Only vscroll for single line moves (= (abs arg) 1) commit 3517da701ea5d16c296745d6678988b06bee615d Author: Paul Eggert Date: Sat Nov 29 23:30:22 2014 -0800 Port better to AddressSanitizer. These changes suffice for temacs on x86-64 with GCC 4.9.2 and -fsanitize=address. * alloc.c (valid_pointer_p) [ADDRESS_SANITIZER]: Return -1 or 0, as the pipe trick doesn't work. * alloc.c (relocatable_string_data_p, mark_object, sweep_symbols): * data.c (Ffset): * print.c (print_object): When a pointer-check primitive returns -1, do not assume this means the pointer is valid or that the underlying system has failed. It could just be that addresses are being sanitized so Emacs can't test for pointer validity. * lisp.h (defined_GC_CHECK_STRING_BYTES): New constant. (USE_STACK_STRING) [GC_CHECK_STRING_BYTES]: Now false, since the string validity checker doesn't work on stack-based strings. diff --git a/src/ChangeLog b/src/ChangeLog index 668c3e8..c977eb4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,21 @@ +2014-11-30 Paul Eggert + + Port better to AddressSanitizer. + These changes suffice for temacs on x86-64 with GCC 4.9.2 and + -fsanitize=address. + * alloc.c (valid_pointer_p) [ADDRESS_SANITIZER]: + Return -1 or 0, as the pipe trick doesn't work. + * alloc.c (relocatable_string_data_p, mark_object, sweep_symbols): + * data.c (Ffset): + * print.c (print_object): + When a pointer-check primitive returns -1, do not assume this + means the pointer is valid or that the underlying system has failed. + It could just be that addresses are being sanitized so Emacs can't + test for pointer validity. + * lisp.h (defined_GC_CHECK_STRING_BYTES): New constant. + (USE_STACK_STRING) [GC_CHECK_STRING_BYTES]: Now false, since the + string validity checker doesn't work on stack-based strings. + 2014-11-29 Paul Eggert Improve clarity of USE_LSB_TAG definition. diff --git a/src/alloc.c b/src/alloc.c index faad0b5..1019c2a 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -4934,6 +4934,10 @@ valid_pointer_p (void *p) #ifdef WINDOWSNT return w32_valid_pointer_p (p, 16); #else + + if (ADDRESS_SANITIZER) + return p ? -1 : 0; + int fd[2]; /* Obviously, we cannot just access it (we would SEGV trying), so we @@ -4949,7 +4953,7 @@ valid_pointer_p (void *p) return valid; } - return -1; + return -1; #endif } @@ -5048,8 +5052,8 @@ relocatable_string_data_p (const char *str) struct sdata *sdata = (struct sdata *) (str - offsetof (struct sdata, data)); - if (valid_pointer_p (sdata) - && valid_pointer_p (sdata->string) + if (0 < valid_pointer_p (sdata) + && 0 < valid_pointer_p (sdata->string) && maybe_lisp_pointer (sdata->string)) return (valid_lisp_object_p (make_lisp_ptr (sdata->string, Lisp_String)) @@ -6364,7 +6368,7 @@ mark_object (Lisp_Object arg) CHECK_ALLOCATED_AND_LIVE (live_symbol_p); ptr->gcmarkbit = 1; /* Attempt to catch bogus objects. */ - eassert (valid_lisp_object_p (ptr->function) >= 1); + eassert (valid_lisp_object_p (ptr->function)); mark_object (ptr->function); mark_object (ptr->plist); switch (ptr->redirect) @@ -6749,7 +6753,7 @@ sweep_symbols (void) ++num_used; sym->s.gcmarkbit = 0; /* Attempt to catch bogus objects. */ - eassert (valid_lisp_object_p (sym->s.function) >= 1); + eassert (valid_lisp_object_p (sym->s.function)); } } diff --git a/src/data.c b/src/data.c index 9977a3a..b48dbbe 100644 --- a/src/data.c +++ b/src/data.c @@ -729,7 +729,7 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0, /* Convert to eassert or remove after GC bug is found. In the meantime, check unconditionally, at a slight perf hit. */ - if (valid_lisp_object_p (definition) < 1) + if (! valid_lisp_object_p (definition)) emacs_abort (); set_symbol_function (symbol, definition); diff --git a/src/lisp.h b/src/lisp.h index 42bb337..a56c4a7 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4604,6 +4604,12 @@ lisp_word_count (ptrdiff_t nbytes) # define USE_STACK_LISP_OBJECTS false #endif +#ifdef GC_CHECK_STRING_BYTES +enum { defined_GC_CHECK_STRING_BYTES = true }; +#else +enum { defined_GC_CHECK_STRING_BYTES = false }; +#endif + /* Struct inside unions that are typically no larger and aligned enough. */ union Aligned_Cons @@ -4628,6 +4634,7 @@ enum USE_STACK_CONS = (USE_STACK_LISP_OBJECTS && alignof (union Aligned_Cons) % GCALIGNMENT == 0), USE_STACK_STRING = (USE_STACK_CONS + && !defined_GC_CHECK_STRING_BYTES && alignof (union Aligned_String) % GCALIGNMENT == 0) }; diff --git a/src/print.c b/src/print.c index 49331ef..7723b98 100644 --- a/src/print.c +++ b/src/print.c @@ -2098,14 +2098,16 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) for (i = 0; i < limit; i++) { Lisp_Object maybe = area[i]; + int valid = valid_lisp_object_p (maybe); - if (valid_lisp_object_p (maybe) > 0) + if (0 < valid) { PRINTCHAR (' '); print_object (maybe, printcharfun, escapeflag); } else - strout (" ", -1, -1, printcharfun); + strout (valid ? " " : " ", + -1, -1, printcharfun); } if (i == limit && i < amount) strout (" ...", 4, 4, printcharfun); commit 70723e5107fd92c31e5b395d58be0b20b13c322d Author: Glenn Morris Date: Sat Nov 29 16:51:13 2014 -0800 ChangeLog fix. diff --git a/ChangeLog b/ChangeLog index 498ae90..a3c342c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,11 +127,6 @@ * .gitignore: Ignore generated file lib/stdalign.h. -2014-11-16 Paul Eggert - - Backport fix for minor Bazaar leftovers. - * .dir-locals.el: Remove reference to bzr commit --fixes debbugs. - 2014-11-16 Eli Zaretskii * .gitignore: Add more ignorables. @@ -163,6 +158,10 @@ * Makefile.in (install-arch-indep): Compress publicsuffix.txt file. +2014-11-13 Paul Eggert + + * .dir-locals.el: Remove reference to bzr commit --fixes debbugs. + 2014-11-13 Lars Magne Ingebrigtsen * .gitignore: Copy over sufficient ignorable files from the old commit 6228c5d4d950c669bfe6867b0b23a6af12a1d8d1 Author: Glenn Morris Date: Sat Nov 29 13:50:13 2014 -0800 ChangeLog fix: standardize some bug refs. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9b9da84..9f9b613 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -460,9 +460,8 @@ 2014-11-19 Rüdiger Sonderfeld - Fix bug#19099. * vc/vc-git.el (vc-git-diff): Use "difftool -x diff" with - `diff-switches' if `vc-git-diff-switches' is nil. + `diff-switches' if `vc-git-diff-switches' is nil. (Bug#19099) 2014-11-19 Artur Malabarba @@ -549,9 +548,8 @@ 2014-11-18 Paul Pogonyshev Rüdiger Sonderfeld - Fix bug#13871 (an alternative version of the patch). - * progmodes/cc-langs.el: Support some of the new keywords in - C++11. + * progmodes/cc-langs.el: Support some of the new keywords in C++11. + An alternative version of the patch from bug#13871. (c-operators): Add "alignof". (c-primitive-type-kwds): Add "char16_t", "char32_t". (c-type-modifier-kwds): Add "constexpr", "noexcept". @@ -603,9 +601,8 @@ 2014-11-17 Ulf Jasper - Fix bug#5433. * calendar/icalendar.el (icalendar-export-alarms): - New customizable variable. + New customizable variable. (Bug#5433) (icalendar-export-region): Export alarms as specified in `icalendar-export-alarms'. (icalendar--create-ical-alarm, icalendar--do-create-ical-alarm): @@ -3236,8 +3233,7 @@ (c-typeless-decl-kwds): Append "auto" onto the C++ value. (c-not-decl-init-keywords): Also exclude c-typeof-kwds from value. - Make ">>" act as double template ender in C++ Mode. - Fix bug#11386. + Make ">>" act as double template ender in C++ Mode. (Bug#11386) * progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split off from c->-op-cont-re. (c->-op-cont-tokens): Change to use the above. commit 9457d88b4363c51dcf0a8add466bfcd603822bae Author: Glenn Morris Date: Sat Nov 29 13:44:31 2014 -0800 Add missing ChangeLog entry. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aa2181d..9b9da84 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -464,6 +464,11 @@ * vc/vc-git.el (vc-git-diff): Use "difftool -x diff" with `diff-switches' if `vc-git-diff-switches' is nil. +2014-11-19 Artur Malabarba + + * lisp/ido.el (ido-bury-buffer-at-head): New command. + (ido-buffer-completion-map): Bind it to C-S-b. + 2014-11-18 Juri Linkov * simple.el (next-line-or-history-element): Wrap next-line commit 9402d80f259b1f3aee9a5ce5d70ea1ea390a2234 Author: Glenn Morris Date: Sat Nov 29 13:38:29 2014 -0800 * lisp/vc/vc-filewise.el: Comment fixes. diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el index 4a05c98..da8abc5 100644 --- a/lisp/vc/vc-filewise.el +++ b/lisp/vc/vc-filewise.el @@ -24,8 +24,8 @@ ;;; Commentary: ;; Common functions for file-oriented back ends - SCCS, RCS, SRC, CVS -;; -;; The main purpose of this file is so none od this code jas to like +;; +;; The main purpose of this file is so none of this code has to live ;; in the always-resident vc-hooks. A secondary purpose is to remove ;; code specific to this class of back ends from vc.el. commit 741f5e15dd6fff6a57f97549a56480103ede7179 Author: Glenn Morris Date: Sat Nov 29 13:34:29 2014 -0800 * lisp/vc/vc-src.el: Fix copy-pasted :version tags. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e92a05f..aa2181d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-29 Glenn Morris + + * vc/vc-src.el (vc-src, vc-src-diff-switches) + (vc-src-master-templates): Fix :version tags. + 2014-11-29 Paul Rankin (tiny change) * outline.el (outline-move-subtree-down): Refactor and improve code. diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 884e050..6113368 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -23,7 +23,7 @@ ;;; Commentary: -;; See vc.el. SRC requires an underlying RCS version of 4.0 or greater. +;; See vc.el. SRC requires an underlying RCS version of 4.0 or greater. ;; FUNCTION NAME STATUS ;; BACKEND PROPERTIES @@ -96,7 +96,7 @@ (defgroup vc-src nil "VC SRC backend." - :version "24.1" + :version "25.1" :group 'vc) (defcustom vc-src-release nil @@ -119,7 +119,6 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "21.1" :group 'vc-src) ;; This needs to be autoloaded because vc-src-registered uses it (via @@ -135,7 +134,6 @@ For a description of possible values, see `vc-check-master-templates'." (repeat :tag "User-specified" (choice string function))) - :version "21.1" :group 'vc-src) commit 1252594e56ba47b63d5605deefb9c541229e1c98 Author: Glenn Morris Date: Sat Nov 29 13:31:57 2014 -0800 ChangeLog fix diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f1ef3f2..e92a05f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -410,17 +410,17 @@ * vc/vc-src.el, vc/vc.el: Added support for SRC. Needs more testing and a real log-view mode. - * vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el, vc/vc-git.el, - vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el, vc/vc-sccs.el, - vc/vc-svn.el, vc/vc.el: Remove editable argument from the backend + * vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el, vc/vc-git.el: + * vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el, vc/vc-sccs.el: + * vc/vc-svn.el, vc/vc.el: Remove editable argument from the backend checkout methods; where it matters (which is only in SCCS and RCS) files are always checked out editable. This may actually have been dynamically true already - it looks like the vc-next-action code evolved past visiting the other case. Tested with RCS. - * vc/vc-arch.el, vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el, - vc/vc-git.el, vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el, - vc/vc-sccs.el, vc/vc-svn.el, vc/vc.el: Remove never-used rev + * vc/vc-arch.el, vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el: + * vc/vc-git.el, vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el: + * vc/vc-sccs.el, vc/vc-svn.el, vc/vc.el: Remove never-used rev argument from the backend checkin methods. Only the RCS, SCCS, and CVS back ends tried to do anything with it, and that code was never exercised. Chiseling away the cruft of decades... commit babb0ca80be9a46eee70f23377f360e927797ae2 Author: Glenn Morris Date: Sat Nov 29 13:28:25 2014 -0800 ChangeLog fix (do not merge to master) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8c48019..9a45f08 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -142,7 +142,7 @@ * vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940) -2014-10-28 Peder O. Klingenberg (tiny change) +2014-11-15 Peder O. Klingenberg * mail/emacsbug.el (report-emacs-bug): Make a better guess at envelope-from when reporting through sendmail (bug#19054). commit aa1459ae2a2d578455a3da911732fceaeeb5d23e Author: Glenn Morris Date: Sat Nov 29 13:25:50 2014 -0800 Fix up merged ChangeLog entries (dates, duplication, etc) diff --git a/ChangeLog b/ChangeLog index 4ab7aac..498ae90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,7 +73,7 @@ * .gitignore: Add entries for emacsvers files. -2014-11-17 Paul Eggert +2014-11-27 Paul Eggert Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode. * .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes diff --git a/admin/ChangeLog b/admin/ChangeLog index d894f76..70961a7 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -13,7 +13,7 @@ * gitmerge.el: New file. * notes/git-workflow: Add documentation for using it. -2014-11-17 Oscar Fuentes +2014-11-27 Oscar Fuentes * admin/CPP-DEFINES: Mention MINGW_W64. @@ -22,12 +22,6 @@ * admin.el (set-version): No more need to update nt/*.rc. * authors.el (authors-renamed-files-alist): Add .rc.in files. -2014-11-16 Glenn Morris - - * update_autogen: Auto-detect VCS in use. - (vcs): New variable. - (status, commit, main): Handle git. - 2014-11-13 Andreas Schwab * make-tarball.txt: Make annotated tag and push it out. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 956f14b..bc81e17 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -10,7 +10,7 @@ * maintaining.texi (Switching Branches): Mention "C-x v r". Correct commands for switching branches in various VCSs. -2014-11-16 Tassilo Horn +2014-11-27 Tassilo Horn * misc.texi (DocView Slicing): Describe how to slice with the mouse. Fix command mentioned by slice by BoundingBox paragraph. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fbd7e2f..f1ef3f2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -9,12 +9,6 @@ forward to find the end of the subtree and the insertion point (bug#19102). -2014-11-29 Leonard Randall - - * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search - for comment lines non-greedy and stopping at newlines to fix stack - overflows with large files. [Backport] - 2014-11-29 Fabián Ezequiel Gallina * progmodes/python.el (python-shell-completion-setup-code): Use @@ -171,19 +165,19 @@ * dom.el (dom-pp): New function. -2014-11-17 Eli Zaretskii +2014-11-27 Eli Zaretskii * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry): Don't assume --long is the default for "bzr log", always specify it explicitly, in case the user defined an alias for 'log' that uses some other format. -2014-11-16 Fabián Ezequiel Gallina +2014-11-27 Fabián Ezequiel Gallina * progmodes/python.el (python-eldoc--get-doc-at-point): Strip shell output before returning. (bug#18794) -2014-11-16 Dmitry Gutov +2014-11-27 Dmitry Gutov Fix indentation before `!=' and after `+='. Originally reported in https://github.com/mooz/js2-mode/issues/174. @@ -191,7 +185,7 @@ (in)equality operator a separate case. (js--continued-expression-p): Escape the second `+' in the regexp. -2014-11-16 Stefan Monnier +2014-11-27 Stefan Monnier * window.el (handle-select-window): Deactivate shift-region (bug#19003). diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index e2b2668..0175431 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -28,10 +28,6 @@ * message.el (message-valid-fqdn-regexp): Add non-internaional new TLDs. -2014-11-16 Adam Sjøgren - - * mml2015.el (mml2015-display-key-image): New variable. - 2014-11-14 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-summary-exit-no-update): Don't query about diff --git a/nt/ChangeLog b/nt/ChangeLog index 6f90562..28f5fd4 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,12 +1,7 @@ -2014-11-17 Oscar Fuentes +2014-11-27 Oscar Fuentes * inc/ms-w32.h: Define MINGW_W64. - - * nt/addpm.c: Use it. - - * nt/addsection.c: Use it. - - * nt/preprep.c: Use it. + * nt/addpm.c, nt/addsection.c, nt/preprep.c: Use it. 2014-11-24 Glenn Morris diff --git a/src/ChangeLog b/src/ChangeLog index 53834ed..668c3e8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -25,24 +25,12 @@ for paxctl and setfattr. Fixes temacs startup failure with grsecurity/PaX enabled Linux kernel (bug#19067). -2014-11-29 Ulf Jasper - - * nsterm.m (ns_send_appdefined): Check for application defined - event on Cocoa (Bug#18993). Backport from trunk. - 2014-11-27 Oscar Fuentes - * src/w32.c: Use MINGW_W64 instead of _W64. - - * src/w32heap.c: Likewise. - -2014-11-17 Oscar Fuentes - - * src/w32.c: Use MINGW_W64 instead of _W64. - - * src/w32term.c: Likewise. + * src/w32.c, src/w32heap.c, src/w32term.c: + Use MINGW_W64 instead of _W64. -2014-11-16 Stefan Monnier +2014-11-27 Stefan Monnier * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). commit bb19b229f9c1c32ed8829f14f670bfd9d7ebe2a2 Author: Rasmus Date: Sat Nov 29 13:37:13 2014 +0100 Python.el: Update commentary on RET-behavior Commentary reflect that `electric-indent-mode' in enabled by default. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 48d80b9..521f0b5 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -209,11 +209,13 @@ ;; `python-imenu-format-parent-item-jump-label-function' variables for ;; changing the way labels are formatted in the tree version. -;; If you used python-mode.el you probably will miss auto-indentation -;; when inserting newlines. To achieve the same behavior you have -;; two options: +;; If you used python-mode.el you may miss auto-indentation when +;; inserting newlines. To achieve the same behavior you have two +;; options: -;; 1) Use GNU/Emacs' standard binding for `newline-and-indent': C-j. +;; 1) Enable the minor-mode `electric-indent-mode' (enabled by +;; default) and use RET. If this mode is disabled use +;; `newline-and-indent', bound to C-j. ;; 2) Add the following hook in your .emacs: commit 287740d6ed8135702d34133dbf01c4387bc145dc Author: Paul Rankin Date: Sat Nov 29 14:56:59 2014 +0100 * outline.el (outline-move-subtree-down): Refactor and improve code. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2a450a7..fbd7e2f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-29 Paul Rankin (tiny change) + + * outline.el (outline-move-subtree-down): Refactor and improve code. + 2014-11-29 Stephen Berman Stefan Monnier diff --git a/lisp/outline.el b/lisp/outline.el index 61ee7ff..bb56341 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -645,25 +645,25 @@ the match data is set appropriately." (defun outline-move-subtree-down (&optional arg) "Move the current subtree down past ARG headlines of the same level." (interactive "p") - (let ((movfunc (if (> arg 0) 'outline-get-next-sibling - 'outline-get-last-sibling)) - (ins-point (make-marker)) - (cnt (abs arg)) - ;; Make sure we can move forward to find the end of the - ;; subtree and the insertion point. - (maybe-forward-char (lambda () - (if (eq (char-after) ?\n) (forward-char 1) - (if (and (eobp) (not (bolp))) (insert "\n"))))) - beg end folded) - ;; Select the tree. - (outline-back-to-heading) - (setq beg (point)) - (save-match-data - (save-excursion (outline-end-of-heading) - (setq folded (outline-invisible-p))) - (outline-end-of-subtree)) - (funcall maybe-forward-char) - (setq end (point)) + (outline-back-to-heading) + (let* ((movfunc (if (> arg 0) 'outline-get-next-sibling + 'outline-get-last-sibling)) + ;; Find the end of the subtree to be moved as well as the point to + ;; move it to, adding a newline if necessary, to ensure these points + ;; are at bol on the line below the subtree. + (end-point-func (lambda () + (outline-end-of-subtree) + (if (eq (char-after) ?\n) (forward-char 1) + (if (and (eobp) (not (bolp))) (insert "\n"))) + (point))) + (beg (point)) + (folded (save-match-data + (outline-end-of-heading) + (outline-invisible-p))) + (end (save-match-data + (funcall end-point-func))) + (ins-point (make-marker)) + (cnt (abs arg))) ;; Find insertion point, with error handling. (goto-char beg) (while (> cnt 0) @@ -673,8 +673,7 @@ the match data is set appropriately." (setq cnt (1- cnt))) (if (> arg 0) ;; Moving forward - still need to move over subtree. - (progn (outline-end-of-subtree) - (funcall maybe-forward-char))) + (funcall end-point-func)) (move-marker ins-point (point)) (insert (delete-and-extract-region beg end)) (goto-char ins-point) commit dbff8fd118824163f4d2780fa8566cf92e1d8e86 Author: Paul Eggert Date: Fri Nov 28 23:54:57 2014 -0800 Spelling fix. diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 88c6333..d2f9068 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -157,7 +157,7 @@ Auto-commit" (delete-char 1) (insert (if skip "M" " ")) (setq buffer-read-only t)))))) - + (defun gitmerge-highlight-skip-regexp () "Highlight strings that match `gitmerge-skip-regexp'." (save-excursion @@ -361,7 +361,7 @@ Throw an user-error if we cannot resolve automatically." (goto-char (point-min)) (while (not (eobp)) (push (buffer-substring (point) (line-end-position)) files) - (forward-line)) + (forward-line)) (dolist (file files) (if (gitmerge-resolve file) ;; File still has conflicts @@ -393,7 +393,7 @@ Throw an user-error if we cannot resolve automatically." (call-process "git" nil t nil "diff" "--name-only") (zerop (buffer-size)))) - + (defun gitmerge-maybe-resume () "Check if we have to resume a merge. If so, add no longer conflicted files and commit." @@ -420,7 +420,7 @@ If so, add no longer conflicted files and commit." (unless (zerop (call-process "git" nil t nil "commit" "--no-edit")) (error "Git error during merge - fix it manually")))) - ;; Sucesfully resumed. + ;; Successfully resumed. t)))) (defun gitmerge-get-all-branches () commit 366c1ceb038b42ed8590486e1a3c3cebba87e9da Author: Paul Eggert Date: Fri Nov 28 23:38:41 2014 -0800 Improve clarity of USE_LSB_TAG definition. Problem reported by Lee Duhem. Suggestion by Andreas Schwab in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02222.html * lisp.h (USE_LSB_TAG): Define in terms of the (simpler) VAL_MAX / 2 rather than in terms of the (more complicated) EMACS_INT_MAX >> GCTYPEBITS, and adjust commentary to match. diff --git a/src/ChangeLog b/src/ChangeLog index ed111bf..53834ed 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2014-11-29 Paul Eggert + + Improve clarity of USE_LSB_TAG definition. + Problem reported by Lee Duhem. Suggestion by Andreas Schwab in: + http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02222.html + * lisp.h (USE_LSB_TAG): Define in terms of the (simpler) + VAL_MAX / 2 rather than in terms of the (more complicated) + EMACS_INT_MAX >> GCTYPEBITS, and adjust commentary to match. + 2014-11-29 Eli Zaretskii * xdisp.c (handle_single_display_spec): When ignoring a fringe diff --git a/src/lisp.h b/src/lisp.h index bdff019..42bb337 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -257,16 +257,17 @@ enum Lisp_Bits /* The maximum value that can be stored in a EMACS_INT, assuming all bits other than the type bits contribute to a nonnegative signed value. - This can be used in #if, e.g., '#if VAL_MAX < UINTPTR_MAX' below. */ + This can be used in #if, e.g., '#if USB_TAG' below expands to an + expression involving VAL_MAX. */ #define VAL_MAX (EMACS_INT_MAX >> (GCTYPEBITS - 1)) /* Whether the least-significant bits of an EMACS_INT contain the tag. - On hosts where pointers-as-ints do not exceed VAL_MAX, USE_LSB_TAG is: + On hosts where pointers-as-ints do not exceed VAL_MAX / 2, USE_LSB_TAG is: a. unnecessary, because the top bits of an EMACS_INT are unused, and b. slower, because it typically requires extra masking. So, USE_LSB_TAG is true only on hosts where it might be useful. */ DEFINE_GDB_SYMBOL_BEGIN (bool, USE_LSB_TAG) -#define USE_LSB_TAG (EMACS_INT_MAX >> GCTYPEBITS < INTPTR_MAX) +#define USE_LSB_TAG (VAL_MAX / 2 < INTPTR_MAX) DEFINE_GDB_SYMBOL_END (USE_LSB_TAG) #if !USE_LSB_TAG && !defined WIDE_EMACS_INT commit 0cce3623b169732a51f055a86fc926313b11a5ee Merge: 9875d23 6b765b8 Author: Paul Eggert Date: Fri Nov 28 22:55:31 2014 -0800 Merge branch 'emacs-24'. commit 9875d23d86c0668b1e697b67a394560d66c7826d Author: Glenn Morris Date: Fri Nov 28 19:00:15 2014 -0800 * configure.ac: Simplify gnutls tests. Ref: http://debbugs.gnu.org/19168#21 diff --git a/ChangeLog b/ChangeLog index 6f8a0fa..9eae9e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-29 Glenn Morris + + * configure.ac: Simplify gnutls tests. + 2014-11-28 Stefan Monnier * .gitignore: Add entries for emacsvers files. diff --git a/configure.ac b/configure.ac index 70592d9..010abc8 100644 --- a/configure.ac +++ b/configure.ac @@ -2599,19 +2599,13 @@ fi AC_SUBST(LIBSELINUX_LIBS) HAVE_GNUTLS=no -HAVE_GNUTLS3=no if test "${with_gnutls}" = "yes" ; then - EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.0], - [HAVE_GNUTLS3=yes], [HAVE_GNUTLS3=no]) - if test "${HAVE_GNUTLS3}" = "yes"; then - AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.]) - HAVE_GNUTLS="yes" - else - EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], - [HAVE_GNUTLS=yes], [HAVE_GNUTLS=no]) - fi + EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], + [HAVE_GNUTLS=yes], [HAVE_GNUTLS=no]) if test "${HAVE_GNUTLS}" = "yes"; then AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.]) + EMACS_CHECK_MODULES([LIBGNUTLS3], [gnutls >= 3.0.0], + [AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])], []) fi # Windows loads GnuTLS dynamically commit 91191bd4b516b34176f395cdffff21ab71248536 Author: Stefan Monnier Date: Fri Nov 28 18:18:57 2014 -0500 * .gitignore: Add entries for emacsvers files. diff --git a/.gitignore b/.gitignore index 4200d8a..b5eda43 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,8 @@ leim/changed.misc leim/changed.tit nt/emacs.rc nt/emacsclient.rc + +# Auto-generated from the corresponding *.in file. +doc/emacs/emacsver.texi +doc/man/emacs.1 +etc/refcards/emacsver.tex diff --git a/ChangeLog b/ChangeLog index 0fc6be9..6f8a0fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-28 Stefan Monnier + + * .gitignore: Add entries for emacsvers files. + 2014-11-17 Paul Eggert Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode. commit ac4532a2326535ef3c0d761d25e23acf55b107b3 Author: Stefan Monnier Date: Fri Nov 28 18:14:38 2014 -0500 * lisp/simple.el (execute-extended-command--shorter): Fix the "M-p" case. Fixes: debbugs:19152 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 45ba279..782481f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,14 @@ +2014-11-28 Stefan Monnier + + * simple.el (execute-extended-command--shorter): Fix the "M-p" case + (bug#19152). + 2014-11-28 Martin Rudalics Fix two issues around help-window-select. (Bug#11039) (Bug#19012) * help.el (help-window-old-frame): New variable. - (help-window-select): Default to nil (Bug#11039). Rewrite - doc-string. + (help-window-select): Default to nil (Bug#11039). + Rewrite doc-string. (help-window-setup): When the help window appears on another frame and `help-window-select' is non-nil, give that frame input focus too (Bug#19012). @@ -18,20 +23,20 @@ 2014-11-28 Daiki Ueno * epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region) - (epa-sign-region, epa-encrypt-region): Use - `epg-context-set-{passphrase,progress}-callback', instead of + (epa-sign-region, epa-encrypt-region): + Use `epg-context-set-{passphrase,progress}-callback', instead of `setf'. This partially reverts commit 9e48a95c (bug#19150). Reported by José A. Romero L. 2014-11-27 Lars Magne Ingebrigtsen - * net/eww.el (eww-restore-history): Bind - `inhibit-modification-hooks' instead of `after-change-functions'. + * net/eww.el (eww-restore-history): + Bind `inhibit-modification-hooks' instead of `after-change-functions'. 2014-11-27 Ulf Jasper - * net/newst-backend.el (newsticker--parse-atom-1.0): Handle - embedded (x)html in summary node. + * net/newst-backend.el (newsticker--parse-atom-1.0): + Handle embedded (x)html in summary node. 2014-11-27 Sam Steingold @@ -40,8 +45,8 @@ 2014-11-27 Ulf Jasper - * net/newst-treeview.el (newsticker-groups-filename): Change - default value to nil. Point out that variable is obsolete in doc + * net/newst-treeview.el (newsticker-groups-filename): + Change default value to nil. Point out that variable is obsolete in doc string. (newsticker--treeview-load): Change wording of the questions the user is asked when `newsticker-groups-filename' is found to be @@ -70,8 +75,8 @@ 2014-11-16 Fabián Ezequiel Gallina - * progmodes/python.el (python-eldoc--get-doc-at-point): Strip - shell output before returning. (bug#18794) + * progmodes/python.el (python-eldoc--get-doc-at-point): + Strip shell output before returning. (bug#18794) 2014-11-16 Dmitry Gutov @@ -109,8 +114,8 @@ 2014-11-26 Ulf Jasper - * net/newst-backend.el (newsticker--parse-generic-items): Take - care of UIDs when adding elements to cache. + * net/newst-backend.el (newsticker--parse-generic-items): + Take care of UIDs when adding elements to cache. 2014-11-26 Alan Mackenzie @@ -249,8 +254,8 @@ 2014-11-22 Ulf Jasper - * net/newst-backend.el (newsticker--sentinel-work): Tell - `libxml-parse-xml-region' to discard comments. Fixes bug#18787. + * net/newst-backend.el (newsticker--sentinel-work): + Tell `libxml-parse-xml-region' to discard comments. Fixes bug#18787. 2014-11-22 Michael Albinus diff --git a/lisp/simple.el b/lisp/simple.el index 2a47165..16db05a 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1612,7 +1612,7 @@ If the value is non-nil and not a number, we wait 2 seconds." (defun execute-extended-command--shorter (name typed) (let ((candidates '()) - (max (length (or typed name))) + (max (length typed)) (len 1) binding) (while (and (not binding) commit 7b79b1abad4b697e4f08c5011d346bdb9b219059 Author: Martin Rudalics Date: Fri Nov 28 18:12:32 2014 +0100 Fix two issues around help-window-select. (Bug#11039) (Bug#19012) * help.el (help-window-old-frame): New variable. (help-window-select): Default to nil (Bug#11039). Rewrite doc-string. (help-window-setup): When the help window appears on another frame and `help-window-select' is non-nil, give that frame input focus too (Bug#19012). (with-help-window): Store selected frame in help-window-old-frame. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3037012..45ba279 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2014-11-28 Martin Rudalics + + Fix two issues around help-window-select. (Bug#11039) (Bug#19012) + * help.el (help-window-old-frame): New variable. + (help-window-select): Default to nil (Bug#11039). Rewrite + doc-string. + (help-window-setup): When the help window appears on another + frame and `help-window-select' is non-nil, give that frame input + focus too (Bug#19012). + (with-help-window): Store selected frame in + help-window-old-frame. + 2014-11-28 Ulf Jasper * net/newst-treeview.el (newsticker--treeview-load): Take care of diff --git a/lisp/help.el b/lisp/help.el index eaee6d1..44716a5 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -46,6 +46,9 @@ (defvar help-window-point-marker (make-marker) "Marker to override default `window-point' in help windows.") +(defvar help-window-old-frame nil + "Frame selected at the time `with-help-window' is invoked.") + (defvar help-map (let ((map (make-sparse-keymap))) (define-key map (char-to-string help-char) 'help-for-help) @@ -1155,17 +1158,27 @@ provided `fit-frame-to-buffer' is non-nil." (fit-window-to-buffer window height nil width)))) ;;; Help windows. -(defcustom help-window-select 'other - "Non-nil means select help window for viewing. +(defcustom help-window-select nil + "Non-nil means select help window for viewing. Choices are: + never (nil) Select help window only if there is no other window on its frame. - other Select help window unless the selected window is the - only other window on the help window's frame. + + other Select help window if and only if it appears on the + previously selected frame, that frame contains at + least two other windows and the help window is + either new or showed a different buffer before. + always (t) Always select the help window. +If this option is non-nil and the help window appears on another +frame, then give that frame input focus too. Note also that if +the help window appears on another frame, it may get selected and +its frame get input focus even if this option is nil. + This option has effect if and only if the help window was created -by `with-help-window'" +by `with-help-window'." :type '(choice (const :tag "never (nil)" nil) (const :tag "other" other) (const :tag "always (t)" t)) @@ -1212,7 +1225,9 @@ Return VALUE." (let* ((help-buffer (when (window-live-p window) (window-buffer window))) (help-setup (when (window-live-p window) - (car (window-parameter window 'quit-restore))))) + (car (window-parameter window 'quit-restore)))) + (frame (window-frame window))) + (when help-buffer ;; Handle `help-window-point-marker'. (when (eq (marker-buffer help-window-point-marker) help-buffer) @@ -1220,13 +1235,27 @@ Return VALUE." ;; Reset `help-window-point-marker'. (set-marker help-window-point-marker nil)) + ;; If the help window appears on another frame, select it if + ;; `help-window-select' is non-nil and give that frame input focus + ;; too. See also Bug#19012. + (when (and help-window-select + (frame-live-p help-window-old-frame) + (not (eq frame help-window-old-frame))) + (select-window window) + (select-frame-set-input-focus frame)) + (cond ((or (eq window (selected-window)) - (and (or (eq help-window-select t) - (eq help-setup 'frame) + ;; If the help window is on the selected frame, select + ;; it if `help-window-select' is t or `help-window-select' + ;; is 'other, the frame contains at least three windows, and + ;; the help window did show another buffer before. See also + ;; Bug#11039. + (and (eq frame (selected-frame)) + (or (eq help-window-select t) (and (eq help-window-select 'other) - (eq (window-frame window) (selected-frame)) - (> (length (window-list nil 'no-mini)) 2))) + (> (length (window-list nil 'no-mini)) 2) + (not (eq help-setup 'same)))) (select-window window))) ;; The help window is or gets selected ... (help-window-display-message @@ -1235,12 +1264,13 @@ Return VALUE." ;; ... and is new, ... "Type \"q\" to delete help window") ((eq help-setup 'frame) + ;; ... on a new frame, ... "Type \"q\" to quit the help frame") ((eq help-setup 'other) ;; ... or displayed some other buffer before. "Type \"q\" to restore previous buffer")) window t)) - ((and (eq (window-frame window) (selected-frame)) + ((and (eq (window-frame window) help-window-old-frame) (= (length (window-list nil 'no-mini)) 2)) ;; There are two windows on the help window's frame and the ;; other one is the selected one. @@ -1297,6 +1327,7 @@ the help window if the current value of the user option (cons 'help-mode-setup temp-buffer-window-setup-hook)) (temp-buffer-window-show-hook (cons 'help-mode-finish temp-buffer-window-show-hook))) + (setq help-window-old-frame (selected-frame)) (with-temp-buffer-window ,buffer-name nil 'help-window-setup (progn ,@body))))) commit d36439ca667bbdc7b89b5aa6e82d52a3cd2ded46 Author: Ulf Jasper Date: Fri Nov 28 16:27:34 2014 +0100 newsticker: Take care of nil value for `newsticker-groups-filename'. * lisp/net/newst-treeview.el (newsticker--treeview-load): Take care of nil value for `newsticker-groups-filename'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 772e0a7..3037012 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-28 Ulf Jasper + + * net/newst-treeview.el (newsticker--treeview-load): Take care of + nil value for `newsticker-groups-filename'. + 2014-11-28 Daiki Ueno * epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region) diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 9466192..30015f4 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -1275,7 +1275,8 @@ Note: does not update the layout." (concat newsticker-dir "/groups"))) (buf (and (file-exists-p filename) (find-file-noselect filename)))) - (and (file-exists-p newsticker-groups-filename) + (and newsticker-groups-filename + (file-exists-p newsticker-groups-filename) (y-or-n-p (format (concat "Delete the file \"%s\",\nto which the obsolete " "variable `newsticker-groups-filename' points ? ") commit f33ec1f5293c701ce489a8e3982b5b984400b578 Author: Daiki Ueno Date: Fri Nov 28 15:59:23 2014 +0900 epg: Use epg-context-set-*-callback for extra treatment of args * epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region) (epa-sign-region, epa-encrypt-region): Use `epg-context-set-{passphrase,progress}-callback', instead of `setf'. This partially reverts commit 9e48a95c (bug#19150). Reported by José A. Romero L. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ff0dc8..772e0a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-11-28 Daiki Ueno + + * epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region) + (epa-sign-region, epa-encrypt-region): Use + `epg-context-set-{passphrase,progress}-callback', instead of + `setf'. This partially reverts commit 9e48a95c (bug#19150). + Reported by José A. Romero L. + 2014-11-27 Lars Magne Ingebrigtsen * net/eww.el (eww-restore-history): Bind diff --git a/lisp/epa.el b/lisp/epa.el index 8b95261..07a9545 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -776,13 +776,13 @@ If no one is selected, default secret key is used. " (setf (epg-context-armor context) epa-armor) (setf (epg-context-textmode context) epa-textmode) (setf (epg-context-signers context) signers) - (setf (epg-context-passphrase-callback context) - #'epa-passphrase-callback-function) - (setf (epg-context-progress-callback context) - (cons - #'epa-progress-callback-function - (format "Signing %s..." - (file-name-nondirectory file)))) + (epg-context-set-passphrase-callback context + #'epa-passphrase-callback-function) + (epg-context-set-progress-callback context + (cons + #'epa-progress-callback-function + (format "Signing %s..." + (file-name-nondirectory file)))) (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (message "Signing %s..." (file-name-nondirectory file)) (condition-case error @@ -807,13 +807,13 @@ If no one is selected, symmetric encryption will be performed. "))) (context (epg-make-context epa-protocol))) (setf (epg-context-armor context) epa-armor) (setf (epg-context-textmode context) epa-textmode) - (setf (epg-context-passphrase-callback context) - #'epa-passphrase-callback-function) - (setf (epg-context-progress-callback context) - (cons - #'epa-progress-callback-function - (format "Encrypting %s..." - (file-name-nondirectory file)))) + (epg-context-set-passphrase-callback context + #'epa-passphrase-callback-function) + (epg-context-set-progress-callback context + (cons + #'epa-progress-callback-function + (format "Encrypting %s..." + (file-name-nondirectory file)))) (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (message "Encrypting %s..." (file-name-nondirectory file)) (condition-case error @@ -851,12 +851,12 @@ For example: (save-excursion (let ((context (epg-make-context epa-protocol)) plain) - (setf (epg-context-passphrase-callback context) - #'epa-passphrase-callback-function) - (setf (epg-context-progress-callback context) - (cons - #'epa-progress-callback-function - "Decrypting...")) + (epg-context-set-passphrase-callback context + #'epa-passphrase-callback-function) + (epg-context-set-progress-callback context + (cons + #'epa-progress-callback-function + "Decrypting...")) (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (message "Decrypting...") (condition-case error @@ -1058,12 +1058,12 @@ If no one is selected, default secret key is used. " ;;(setf (epg-context-textmode context) epa-textmode) (setf (epg-context-textmode context) t) (setf (epg-context-signers context) signers) - (setf (epg-context-passphrase-callback context) - #'epa-passphrase-callback-function) - (setf (epg-context-progress-callback context) - (cons - #'epa-progress-callback-function - "Signing...")) + (epg-context-set-passphrase-callback context + #'epa-passphrase-callback-function) + (epg-context-set-progress-callback context + (cons + #'epa-progress-callback-function + "Signing...")) (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (message "Signing...") (condition-case error @@ -1147,12 +1147,12 @@ If no one is selected, symmetric encryption will be performed. ") (setf (epg-context-textmode context) t) (if sign (setf (epg-context-signers context) signers)) - (setf (epg-context-passphrase-callback context) - #'epa-passphrase-callback-function) - (setf (epg-context-progress-callback context) - (cons - #'epa-progress-callback-function - "Encrypting...")) + (epg-context-set-passphrase-callback context + #'epa-passphrase-callback-function) + (epg-context-set-progress-callback context + (cons + #'epa-progress-callback-function + "Encrypting...")) (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (message "Encrypting...") (condition-case error @@ -1316,12 +1316,12 @@ If no one is selected, default public key is exported. "))) ;; (error "No keys selected")) ;; (list keys current-prefix-arg))) ;; (let ((context (epg-make-context epa-protocol))) -;; (setf (epg-context-passphrase-callback context) -;; #'epa-passphrase-callback-function) -;; (setf (epg-context-progress-callback context) -;; (cons -;; #'epa-progress-callback-function -;; "Signing keys...")) +;; (epg-context-set-passphrase-callback context +;; #'epa-passphrase-callback-function) +;; (epg-context-set-progress-callback context +;; (cons +;; #'epa-progress-callback-function +;; "Signing keys...")) ;; (setf (epg-context-pinentry-mode context) epa-pinentry-mode) ;; (message "Signing keys...") ;; (epg-sign-keys context keys local) commit 692322388c9f5bdebf2e8c4f7434c1d4769a04cc Author: David Engster Date: Thu Nov 27 23:17:40 2014 +0100 admin: Add documentation for gitmerge.el * gitmerge.el: New file. * notes/git-workflow: Add documentation for using it. diff --git a/admin/ChangeLog b/admin/ChangeLog index c30e4be..84aea47 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,6 +1,7 @@ 2014-11-27 David Engster * gitmerge.el: New file. + * notes/git-workflow: Add documentation for using it. 2014-11-17 Oscar Fuentes diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index 71ebd2a..d1d105a 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow @@ -68,11 +68,57 @@ and add "Backport:" to the commit string. Then git push -Merging emacs-24 to trunk -========================= - -This has yet to be written. - +Merging emacs-24 to trunk/master +================================ + +It is recommended to use the file gitmerge.el in the admin directory +for merging 'emacs-24' into 'master'. It will take care of many +things which would otherwise have to be done manually, like ignoring +commits that should not land in master, fixing up ChangeLogs and +automatically dealing with certain types of conflicts. If you really +want to, you can do the merge manually, but then you're on your own. +If you still choose to do that, make absolutely sure that you *always* +use the 'merge' command to transport commits from 'emacs-24' to +'master'. *Never* use 'cherry-pick'! If you don't know why, then you +shouldn't manually do the merge in the first place; just use +gitmerge.el instead. + +How to use gitmerge.el: + +Enter the Emacs repository, checkout 'master' and make sure it's +up-to-date by doing a pull. Then start Emacs with + + emacs -l admin/gitmerge.el -f gitmerge + +You'll be asked for the branch to merge, which will default to +'origin/emacs-24', which you should accept. Merging a local tracking +branch is discouraged, since it might not be up-to-date, or worse, +contain commits from you which are not yet pushed upstream. + +You will now see the list of commits from 'emacs-24' which are not yet +merged to 'master'. You might also see commits that are already +marked for "skipping", which means that they will be merged with a +different merge strategy ('ours'), which will effectively ignore the +commit's diff while still being seen as merged, so it won't turn up +again in future merges. Recognizing these kinds of commits is done +with a simple regexp searching the log for strings like 'backport' or +'merge', so you'll probably see false positives as well as false +negatives. Carefully go through the commits, investigate them by +hitting 'l', 'd' and 'f', and mark or unmark them for skipping with +'s'. When you're done, hit 'm' to start the merge. + +You'll likely get conflicts during the process which cannot be dealt +with automatically. In that case, the merge will stop and show you +the list of conflicted files. Resolve those conflicts as usual using +smerge and restart gitmerge (remember to enter the repository when +doing that). You don't have to 'add' the resolved files and 'commit' +the resulting merge, but if you really want to, feel free to do that. +Note you can also resume gitmerge in a new Emacs session, since the +current state will be saved to disk. + +When everything's done, look hard at the resulting merge. Skipping +commits requires separate merges, so don't be surprised to see more +than one merge commit. If you're happy, push. Warnings about X11 forwarding ============================= commit d931478266f7ec1216c927caf926f8be8cec4094 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 21:26:49 2014 +0100 Fix typo in last checkin * eww.el (eww-restore-history): Bind `inhibit-modification-hooks' instead of `after-change-functions'. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index e74935b..2059b5e 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -374,7 +374,7 @@ See the `eww-search-prefix' variable for the search engine used." (plist-put eww-data :source source) (plist-put eww-data :dom document) (let ((inhibit-read-only t) - (inhibit-modification-hooks nil) + (inhibit-modification-hooks t) (shr-target-id (url-target (url-generic-parse-url url))) (shr-external-rendering-functions '((title . eww-tag-title) @@ -712,7 +712,7 @@ the like." (defun eww-restore-history (elem) (let ((inhibit-read-only t) - (inhibit-modification-hooks nil) + (inhibit-modification-hooks t) (text (plist-get elem :text))) (setq eww-data elem) (if (null text) @@ -958,10 +958,10 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (when-let (pos (and (< (1+ end) (point-max)) (> (1- end) (point-min)) (cond - ((get-text-property (1- end) 'eww-form) - (1- end)) ((get-text-property (1+ end) 'eww-form) - (1+ end))))) + (1+ end)) + ((get-text-property (1- end) 'eww-form) + (1- end))))) (let* ((form (get-text-property pos 'eww-form)) (properties (text-properties-at pos)) (inhibit-read-only t) @@ -1200,11 +1200,10 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (when (or (get-text-property start 'eww-form) (setq start (next-single-property-change start 'eww-form))) (let ((props (get-text-property start 'eww-form))) - (plist-put props :start (set-marker (make-marker) start)) + (plist-put props :start start) (setq start (next-single-property-change start 'eww-form nil (point-max))) - (plist-put props - :end (set-marker (make-marker) start))))))) + (plist-put props :end start)))))) (defun eww-input-value (input) (let ((type (plist-get input :type)) commit a5fde629ffff283132122f57996e1296816c3640 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 20:28:34 2014 +0100 * net/eww.el (eww-restore-history): Bind `inhibit-modification-hooks' instead of `after-change-functions'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3f63669..7ff0dc8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-27 Lars Magne Ingebrigtsen + + * net/eww.el (eww-restore-history): Bind + `inhibit-modification-hooks' instead of `after-change-functions'. + 2014-11-27 Ulf Jasper * net/newst-backend.el (newsticker--parse-atom-1.0): Handle diff --git a/lisp/net/eww.el b/lisp/net/eww.el index f65403b..e74935b 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -374,7 +374,7 @@ See the `eww-search-prefix' variable for the search engine used." (plist-put eww-data :source source) (plist-put eww-data :dom document) (let ((inhibit-read-only t) - (after-change-functions nil) + (inhibit-modification-hooks nil) (shr-target-id (url-target (url-generic-parse-url url))) (shr-external-rendering-functions '((title . eww-tag-title) @@ -712,7 +712,7 @@ the like." (defun eww-restore-history (elem) (let ((inhibit-read-only t) - (after-change-functions nil) + (inhibit-modification-hooks nil) (text (plist-get elem :text))) (setq eww-data elem) (if (null text) commit 370258f7616887a7a0edddda8a09299897f2df70 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 20:26:24 2014 +0100 (eww-process-text-input): Try to keep track of the size more reliably. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a29cad1..3f63669 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -27,6 +27,7 @@ the history. (eww-process-text-input): Fix deletion at the start of the field, too. (eww-mode): Revert mistanken removal of `buffer-disable-undo'. + (eww-process-text-input): Try to keep track of the size more reliably. * dom.el (dom-pp): New function. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 3883767..f65403b 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -405,6 +405,7 @@ See the `eww-search-prefix' variable for the search engine used." (forward-line 1))))) (plist-put eww-data :url url) (setq eww-history-position 0) + (eww-size-text-inputs) (eww-update-header-line-format)))) (defun eww-handle-link (dom) @@ -953,7 +954,7 @@ appears in a or tag." "List of input types which represent a text input. See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") -(defun eww-process-text-input (beg end length) +(defun eww-process-text-input (beg end replace-length) (when-let (pos (and (< (1+ end) (point-max)) (> (1- end) (point-min)) (cond @@ -964,24 +965,23 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (let* ((form (get-text-property pos 'eww-form)) (properties (text-properties-at pos)) (inhibit-read-only t) + (length (- end beg replace-length)) (type (plist-get form :type))) (when (and form (member type eww-text-input-types)) (cond - ((zerop length) + ((> length 0) ;; Delete some space at the end. (save-excursion (goto-char (if (equal type "textarea") (1- (line-end-position)) (eww-end-of-field))) - (let ((new (- end beg))) - (while (and (> new 0) - (eql (following-char) ? )) - (delete-region (point) (1+ (point))) - (setq new (1- new)))) - (set-text-properties beg end properties))) - ((> length 0) + (while (and (> length 0) + (eql (following-char) ? )) + (delete-region (1- (point)) (point)) + (cl-decf length)))) + ((< length 0) ;; Add padding. (save-excursion (goto-char (1- end)) @@ -990,8 +990,11 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (1- (line-end-position)) (1+ (eww-end-of-field)))) (let ((start (point))) - (insert (make-string length ? )) - (set-text-properties start (point) properties))))) + (insert (make-string (abs length) ? )) + (set-text-properties start (point) properties)) + (goto-char (1- end))))) + (set-text-properties (plist-get form :start) (plist-get form :end) + properties) (let ((value (buffer-substring-no-properties (eww-beginning-of-field) (eww-end-of-field)))) @@ -1190,6 +1193,19 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (setq start (next-single-property-change start 'eww-form)))) (nreverse inputs))) +(defun eww-size-text-inputs () + (let ((start (point-min))) + (while (and start + (< start (point-max))) + (when (or (get-text-property start 'eww-form) + (setq start (next-single-property-change start 'eww-form))) + (let ((props (get-text-property start 'eww-form))) + (plist-put props :start (set-marker (make-marker) start)) + (setq start (next-single-property-change + start 'eww-form nil (point-max))) + (plist-put props + :end (set-marker (make-marker) start))))))) + (defun eww-input-value (input) (let ((type (plist-get input :type)) (value (plist-get input :value))) commit cceb7a8921e34d4b4942456b59d342a7566fda59 Author: Ulf Jasper Date: Thu Nov 27 19:32:08 2014 +0100 newsticker: Handle embedded (x)html in atom feeds. * lisp/net/newst-backend.el (newsticker--parse-atom-1.0): Handle embedded (x)html in summary node. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d412404..a29cad1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-27 Ulf Jasper + + * net/newst-backend.el (newsticker--parse-atom-1.0): Handle + embedded (x)html in summary node. + 2014-11-27 Sam Steingold * menu-bar.el (menu-bar-open): When everything else fails, diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 41f8b84..31ebc7a 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -1216,13 +1216,17 @@ URL `http://www.atompub.org/2005/08/17/draft-ietf-atompub-format-11.html'" (car (xml-get-children node 'title))))) ;; desc-fn (lambda (node) - ;; unxml the content node. Atom allows for - ;; integrating (x)html into the atom structure - ;; but we need the raw html string. + ;; unxml the content or the summary node. Atom + ;; allows for integrating (x)html into the atom + ;; structure but we need the raw html string. ;; e.g. http://www.heise.de/open/news/news-atom.xml - (or (newsticker--unxml + ;; http://feeds.feedburner.com/ru_nix_blogs + (or (newsticker--unxml (car (xml-node-children - (car (xml-get-children node 'content))))) + (car (xml-get-children node 'content))))) + (newsticker--unxml + (car (xml-node-children + (car (xml-get-children node 'summary))))) (car (xml-node-children (car (xml-get-children node 'summary)))))) ;; link-fn commit 07efa3f0ba196c1eea130032c765d5d1a62fa627 Author: Sam Steingold Date: Thu Nov 27 13:17:42 2014 -0500 Use `mouse-menu-bar-map' when no other menus are available. * lisp/menu-bar.el (menu-bar-open): When everything else fails, use (mouse-menu-bar-map). diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3665d19..d412404 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-27 Sam Steingold + + * menu-bar.el (menu-bar-open): When everything else fails, + use (mouse-menu-bar-map). + 2014-11-27 Ulf Jasper * net/newst-treeview.el (newsticker-groups-filename): Change diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 5ae5da9..12fb192 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -2303,7 +2303,8 @@ If FRAME is nil or not given, use the selected frame." global-map (vector 'menu-bar menu)) (lookup-key-ignore-too-long (current-local-map) (vector 'menu-bar menu)) - (cdar (minor-mode-key-binding (vector 'menu-bar menu)))) + (cdar (minor-mode-key-binding (vector 'menu-bar menu))) + (mouse-menu-bar-map)) (posn-at-x-y x 0 nil t) nil t))) (t (with-selected-frame (or frame (selected-frame)) (tmm-menubar)))))) commit 574988509898f8022145b047df780c9c807af4b3 Author: Ulf Jasper Date: Thu Nov 27 18:37:47 2014 +0100 newsticker: Change wording of confirmation prompt regarding obsolete variable `newsticker-groups-filename'. Fixes: debbugs:19165 * lisp/net/newst-treeview.el (newsticker-groups-filename): Change default value to nil. Point out that variable is obsolete in doc string. (newsticker--treeview-load): Change wording of the questions the user is asked when `newsticker-groups-filename' is found to be used and we offer to read and remove the groups file. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d875b0..3665d19 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2014-11-27 Ulf Jasper + + * net/newst-treeview.el (newsticker-groups-filename): Change + default value to nil. Point out that variable is obsolete in doc + string. + (newsticker--treeview-load): Change wording of the questions the + user is asked when `newsticker-groups-filename' is found to be + used and we offer to read and remove the groups file. (bug#19165) + 2014-11-27 Lars Magne Ingebrigtsen * net/eww.el (eww): Record the new URL immediately, so that if the diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 6d0720d..9466192 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -132,8 +132,9 @@ Example: (\"Topmost group\" \"feed1\" (\"subgroup1\" \"feed 2\") \"feed3\")") (defcustom newsticker-groups-filename - "~/.newsticker-groups" - "Name of the newsticker groups settings file." + nil + "Name of the newsticker groups settings file. This variable is obsolete." + :version "25.1" ; changed default value to nil :type 'string :group 'newsticker-treeview) (make-obsolete-variable 'newsticker-groups-filename 'newsticker-dir "23.1") @@ -1259,16 +1260,26 @@ Note: does not update the layout." "Load treeview settings." (let* ((coding-system-for-read 'utf-8) (filename - (or (and (file-exists-p newsticker-groups-filename) + (or (and newsticker-groups-filename + (not (string= + (expand-file-name newsticker-groups-filename) + (expand-file-name (concat newsticker-dir "/groups")))) + (file-exists-p newsticker-groups-filename) (y-or-n-p - (format "Old newsticker groups (%s) file exists. Read it? " - newsticker-groups-filename)) + (format + (concat "Obsolete variable `newsticker-groups-filename' " + "points to existing file \"%s\".\n" + "Read it? ") + newsticker-groups-filename)) newsticker-groups-filename) (concat newsticker-dir "/groups"))) (buf (and (file-exists-p filename) (find-file-noselect filename)))) (and (file-exists-p newsticker-groups-filename) - (y-or-n-p (format "Delete old newsticker groups file? ")) + (y-or-n-p (format + (concat "Delete the file \"%s\",\nto which the obsolete " + "variable `newsticker-groups-filename' points ? ") + newsticker-groups-filename)) (delete-file newsticker-groups-filename)) (when buf (set-buffer buf) commit f42adad94bd8cf4f7a86bdced796bb88ec7e5bb2 Author: David Engster Date: Thu Nov 27 18:22:00 2014 +0100 admin: Add gitmerge.el * gitmerge.el: New file. diff --git a/admin/ChangeLog b/admin/ChangeLog index 6d13404..c30e4be 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-11-27 David Engster + + * gitmerge.el: New file. + 2014-11-17 Oscar Fuentes * admin/CPP-DEFINES: Mention MINGW_W64. diff --git a/admin/gitmerge.el b/admin/gitmerge.el new file mode 100644 index 0000000..88c6333 --- /dev/null +++ b/admin/gitmerge.el @@ -0,0 +1,528 @@ +;;; gitmerge.el --- help merge one Emacs branch into another + +;; Copyright (C) 2010-2014 Free Software Foundation, Inc. + +;; Authors: David Engster +;; Stefan Monnier + +;; Keywords: maint + +;; 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: + +;; Rewrite of bzrmerge.el, but using git. +;; +;; In a nutshell: For merging foo into master, do +;; +;; - 'git checkout master' in Emacs repository +;; - Start Emacs, cd to Emacs repository +;; - M-x gitmerge +;; - Choose branch 'foo' or 'origin/foo', depending on whether you +;; like to merge from a local tracking branch or from the remote +;; (does not make a difference if the local tracking branch is +;; up-to-date). +;; - Mark commits you'd like to skip, meaning to only merge their +;; metadata (merge strategy 'ours'). +;; - Hit 'm' to start merging. Skipped commits will be merged separately. +;; - If conflicts cannot be resolved automatically, you'll have to do +;; it manually. In that case, resolve the conflicts and restart +;; gitmerge, which will automatically resume. It will add resolved +;; files, commit the pending merge and continue merging the rest. +;; - Inspect master branch, and if everything looks OK, push. + +;;; Code: + +(require 'vc-git) +(require 'smerge-mode) + +(defvar gitmerge-skip-regexp + "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\ +Auto-commit" + "Regexp matching logs of revisions that might be skipped. +`gitmerge-missing' will ask you if it should skip any matches.") + +(defvar gitmerge-status-file (expand-file-name "gitmerge-status" + user-emacs-directory) + "File where missing commits will be saved between sessions.") + +(defvar gitmerge-ignore-branches-regexp + "origin/\\(\\(HEAD\\|master\\)$\\|\\(old-branches\\|other-branches\\)/\\)" + "Regexp matching branches we want to ignore.") + +(defface gitmerge-skip-face + '((t (:strike-through t))) + "Face for skipped commits.") + +(defconst gitmerge-default-branch "origin/emacs-24" + "Default for branch that should be merged.") + +(defconst gitmerge-buffer "*gitmerge*" + "Working buffer for gitmerge.") + +(defconst gitmerge-output-buffer "*gitmerge output*" + "Buffer for displaying git output.") + +(defconst gitmerge-warning-buffer "*gitmerge warnings*" + "Buffer where gitmerge will display any warnings.") + +(defvar gitmerge-log-regexp + "^\\([A-Z ]\\)\\s-*\\([0-9a-f]+\\) \\(.+?\\): \\(.*\\)$") + +(defvar gitmerge-mode-map + (let ((map (make-keymap))) + (define-key map [(l)] 'gitmerge-show-log) + (define-key map [(d)] 'gitmerge-show-diff) + (define-key map [(f)] 'gitmerge-show-files) + (define-key map [(s)] 'gitmerge-toggle-skip) + (define-key map [(m)] 'gitmerge-start-merge) + map) + "Keymap for gitmerge major mode.") + +(defvar gitmerge--commits nil) +(defvar gitmerge--from nil) + +(defun gitmerge-get-sha1 () + "Get SHA1 from commit at point." + (save-excursion + (goto-char (point-at-bol)) + (when (looking-at "^[A-Z ]\\s-*\\([a-f0-9]+\\)") + (match-string 1)))) + +(defun gitmerge-show-log () + "Show log of commit at point." + (interactive) + (save-selected-window + (let ((commit (gitmerge-get-sha1))) + (when commit + (pop-to-buffer (get-buffer-create gitmerge-output-buffer)) + (fundamental-mode) + (erase-buffer) + (call-process "git" nil t nil "log" "-1" commit) + (goto-char (point-min)) + (gitmerge-highlight-skip-regexp))))) + +(defun gitmerge-show-diff () + "Show diff of commit at point." + (interactive) + (save-selected-window + (let ((commit (gitmerge-get-sha1))) + (when commit + (pop-to-buffer (get-buffer-create gitmerge-output-buffer)) + (erase-buffer) + (call-process "git" nil t nil "diff-tree" "-p" commit) + (goto-char (point-min)) + (diff-mode))))) + +(defun gitmerge-show-files () + "Show changed files of commit at point." + (interactive) + (save-selected-window + (let ((commit (gitmerge-get-sha1))) + (when commit + (pop-to-buffer (get-buffer-create gitmerge-output-buffer)) + (erase-buffer) + (fundamental-mode) + (call-process "git" nil t nil "diff" "--name-only" (concat commit "^!")) + (goto-char (point-min)))))) + +(defun gitmerge-toggle-skip () + "Toggle skipping of commit at point." + (interactive) + (let ((commit (gitmerge-get-sha1)) + skip) + (when commit + (save-excursion + (goto-char (point-at-bol)) + (when (looking-at "^\\([A-Z ]\\)\\s-*\\([a-f0-9]+\\)") + (setq skip (string= (match-string 1) " ")) + (goto-char (match-beginning 2)) + (gitmerge-handle-skip-overlay skip) + (dolist (ct gitmerge--commits) + (when (string-match commit (car ct)) + (setcdr ct (when skip "M")))) + (goto-char (point-at-bol)) + (setq buffer-read-only nil) + (delete-char 1) + (insert (if skip "M" " ")) + (setq buffer-read-only t)))))) + +(defun gitmerge-highlight-skip-regexp () + "Highlight strings that match `gitmerge-skip-regexp'." + (save-excursion + (while (re-search-forward gitmerge-skip-regexp nil t) + (put-text-property (match-beginning 0) (match-end 0) + 'face 'font-lock-warning-face)))) + +(defun gitmerge-missing (from) + "Return the list of revisions that need to be merged from FROM. +Will detect a default set of skipped revision by looking at +cherry mark and search for `gitmerge-skip-regexp'. The result is +a list with entries of the form (SHA1 . SKIP), where SKIP denotes +if and why this commit should be skipped." + (let (commits) + ;; Go through the log and remember all commits that match + ;; `gitmerge-skip-regexp' or are marked by --cherry-mark. + (with-temp-buffer + (call-process "git" nil t nil "log" "--cherry-mark" from + (concat "^" (car (vc-git-branches)))) + (goto-char (point-max)) + (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t) + (let ((cherrymark (match-string 1)) + (commit (match-string 2))) + (push (list commit) commits) + (if (string= cherrymark "=") + ;; Commit was recognized as backported by cherry-mark. + (setcdr (car commits) "C") + (save-excursion + (let ((case-fold-search t)) + (while (not (looking-at "^\\s-+[^ ]+")) + (forward-line)) + (when (re-search-forward gitmerge-skip-regexp nil t) + (setcdr (car commits) "R")))))) + (delete-region (point) (point-max)))) + (nreverse commits))) + +(defun gitmerge-setup-log-buffer (commits from) + "Create the buffer for choosing commits." + (with-current-buffer (get-buffer-create gitmerge-buffer) + (erase-buffer) + (call-process "git" nil t nil "log" + "--pretty=format:%h %<(20,trunc) %an: %<(100,trunc) %s" + from (concat "^" (car (vc-git-branches)))) + (goto-char (point-min)) + (while (looking-at "^\\([a-f0-9]+\\)") + (let ((skipreason (gitmerge-skip-commit-p (match-string 1) commits))) + (if (null skipreason) + (insert " ") + (insert skipreason " ") + (gitmerge-handle-skip-overlay t))) + (forward-line)) + (current-buffer))) + +(defun gitmerge-handle-skip-overlay (skip) + "Create or delete overlay on SHA1, depending on SKIP." + (when (looking-at "[0-9a-f]+") + (if skip + (let ((ov (make-overlay (point) + (match-end 0)))) + (overlay-put ov 'face 'gitmerge-skip-face)) + (remove-overlays (point) (match-end 0) + 'face 'gitmerge-skip-face)))) + +(defun gitmerge-skip-commit-p (commit skips) + "Tell whether COMMIT should be skipped. +COMMIT is an (possibly abbreviated) SHA1. SKIPS is list of +cons'es with commits that should be skipped and the reason. +Return value is string which denotes reason, or nil if commit +should not be skipped." + (let (found skip) + (while (and (setq skip (pop skips)) + (not found)) + (when (string-match commit (car skip)) + (setq found (cdr skip)))) + found)) + +(defun gitmerge-resolve (file) + "Try to resolve conflicts in FILE with smerge. +Returns non-nil if conflicts remain." + (unless (file-exists-p file) (error "Gitmerge-resolve: Can't find %s" file)) + (with-demoted-errors + (let ((exists (find-buffer-visiting file))) + (with-current-buffer (let ((enable-local-variables :safe) + (enable-local-eval nil)) + (find-file-noselect file)) + (if (buffer-modified-p) + (user-error "Unsaved changes in %s" (current-buffer))) + (save-excursion + (cond + ((derived-mode-p 'change-log-mode) + ;; Fix up dates before resolving the conflicts. + (goto-char (point-min)) + (let ((diff-auto-refine-mode nil)) + (while (re-search-forward smerge-begin-re nil t) + (smerge-match-conflict) + (smerge-ensure-match 3) + (let ((start1 (match-beginning 1)) + (end1 (match-end 1)) + (start3 (match-beginning 3)) + (end3 (copy-marker (match-end 3) t))) + (goto-char start3) + (while (re-search-forward change-log-start-entry-re end3 t) + (let* ((str (match-string 0)) + (newstr (save-match-data + (concat (add-log-iso8601-time-string) + (when (string-match " *\\'" str) + (match-string 0 str)))))) + (replace-match newstr t t))) + ;; change-log-resolve-conflict prefers to put match-1's + ;; elements first (for equal dates), whereas we want to put + ;; match-3's first. + (let ((match3 (buffer-substring start3 end3)) + (match1 (buffer-substring start1 end1))) + (delete-region start3 end3) + (goto-char start3) + (insert match1) + (delete-region start1 end1) + (goto-char start1) + (insert match3))))) + ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve) + )) + ;; Try to resolve the conflicts. + (cond + ((member file '("configure" "lisp/ldefs-boot.el" + "lisp/emacs-lisp/cl-loaddefs.el")) + ;; We are in the file's buffer, so names are relative. + (call-process "git" nil t nil "checkout" "--" + (file-name-nondirectory file)) + (revert-buffer nil 'noconfirm)) + (t + (goto-char (point-max)) + (while (re-search-backward smerge-begin-re nil t) + (save-excursion + (ignore-errors + (smerge-match-conflict) + (smerge-resolve)))) + ;; (when (derived-mode-p 'change-log-mode) + ;; (pop-to-buffer (current-buffer)) (debug 'after-resolve)) + (save-buffer))) + (goto-char (point-min)) + (prog1 (re-search-forward smerge-begin-re nil t) + (unless exists (kill-buffer)))))))) + +(defun gitmerge-commit-message (beg end skip branch) + "Create commit message for merging BEG to END from BRANCH. +SKIP denotes whether those commits are actually skipped. If END +is nil, only the single commit BEG is merged." + (with-temp-buffer + (insert "Merge from " branch "\n\n" + (if skip + (concat "The following commit" + (if end "s were " " was ") + "skipped:\n\n") + "")) + (apply 'call-process "git" nil t nil "log" "--oneline" + (if end (list (concat beg "~.." end)) + `("-1" ,beg))) + (insert "\n") + (buffer-string))) + +(defun gitmerge-apply (missing from) + "Merge commits in MISSING from branch FROM. +MISSING must be a list of SHA1 strings." + (with-current-buffer (get-buffer-create gitmerge-output-buffer) + (erase-buffer) + (let* ((skip (cdar missing)) + (beg (car (pop missing))) + end commitmessage) + ;; Determine last revision with same boolean skip status. + (while (and missing + (eq (null (cdar missing)) + (null skip))) + (setq end (car (pop missing)))) + (setq commitmessage + (gitmerge-commit-message beg end skip from)) + (message "%s %s%s" + (if skip "Skipping" "Merging") + (substring beg 0 6) + (if end (concat ".." (substring end 0 6)) "")) + (unless end + (setq end beg)) + (unless (zerop + (apply 'call-process "git" nil t nil "merge" "--no-ff" + (append (when skip '("-s" "ours")) + `("-m" ,commitmessage ,end)))) + (gitmerge-write-missing missing from) + (gitmerge-resolve-unmerged))) + missing)) + +(defun gitmerge-resolve-unmerged () + "Resolve all files that are unmerged. +Throw an user-error if we cannot resolve automatically." + (with-current-buffer (get-buffer-create gitmerge-output-buffer) + (erase-buffer) + (let (files conflicted) + ;; List unmerged files + (if (not (zerop + (call-process "git" nil t nil + "diff" "--name-only" "--diff-filter=U"))) + (error "Error listing unmerged files. Resolve manually.") + (goto-char (point-min)) + (while (not (eobp)) + (push (buffer-substring (point) (line-end-position)) files) + (forward-line)) + (dolist (file files) + (if (gitmerge-resolve file) + ;; File still has conflicts + (setq conflicted t) + ;; Mark as resolved + (call-process "git" nil t nil "add" file))) + (when conflicted + (with-current-buffer (get-buffer-create gitmerge-warning-buffer) + (erase-buffer) + (insert "For the following files, conflicts could\n" + "not be resolved automatically:\n\n") + (call-process "git" nil t nil + "diff" "--name-only" "--diff-filter=U") + (insert "\nResolve the conflicts manually, then run gitmerge again." + "\nNote:\n - You don't have to add resolved files or " + "commit the merge yourself (but you can)." + "\n - You can safely close this Emacs session and do this " + "in a new one." + "\n - When running gitmerge again, remember that you must " + "that from within the Emacs repo.\n") + (pop-to-buffer (current-buffer))) + (user-error "Resolve the conflicts manually")))))) + +(defun gitmerge-repo-clean () + "Return non-nil if repository is clean." + (with-temp-buffer + (call-process "git" nil t nil + "diff" "--staged" "--name-only") + (call-process "git" nil t nil + "diff" "--name-only") + (zerop (buffer-size)))) + +(defun gitmerge-maybe-resume () + "Check if we have to resume a merge. +If so, add no longer conflicted files and commit." + (let ((mergehead (file-exists-p + (expand-file-name ".git/MERGE_HEAD" default-directory))) + (statusexist (file-exists-p gitmerge-status-file))) + (when (and mergehead (not statusexist)) + (user-error "Unfinished merge, but no record of a previous gitmerge run")) + (when (and (not mergehead) + (not (gitmerge-repo-clean))) + (user-error "Repository is not clean")) + (when statusexist + (if (not (y-or-n-p "Resume merge? ")) + (progn + (delete-file gitmerge-status-file) + ;; No resume. + nil) + (message "OK, resuming...") + (gitmerge-resolve-unmerged) + ;; Commit the merge. + (when mergehead + (with-current-buffer (get-buffer-create gitmerge-output-buffer) + (erase-buffer) + (unless (zerop (call-process "git" nil t nil + "commit" "--no-edit")) + (error "Git error during merge - fix it manually")))) + ;; Sucesfully resumed. + t)))) + +(defun gitmerge-get-all-branches () + "Return list of all branches, including remotes." + (with-temp-buffer + (unless (zerop (call-process "git" nil t nil + "branch" "-a")) + (error "Git error listing remote branches")) + (goto-char (point-min)) + (let (branches branch) + (while (not (eobp)) + (when (looking-at "^[^\\*]\\s-*\\(?:remotes/\\)?\\(.+\\)$") + (setq branch (match-string 1)) + (unless (string-match gitmerge-ignore-branches-regexp branch) + (push branch branches))) + (forward-line)) + (nreverse branches)))) + +(defun gitmerge-write-missing (missing from) + "Write list of commits MISSING into `gitmerge-status-file'. +Branch FROM will be prepended to the list." + (with-current-buffer + (find-file-noselect gitmerge-status-file) + (erase-buffer) + (insert + (prin1-to-string (append (list from) missing)) + "\n") + (save-buffer) + (kill-buffer))) + +(defun gitmerge-read-missing () + "Read list of missing commits from `gitmerge-status-file'." + (with-current-buffer + (find-file-noselect gitmerge-status-file) + (unless (zerop (buffer-size)) + (prog1 (read (buffer-string)) + (kill-buffer))))) + +(defun gitmerge-mode () + "Major mode for Emacs branch merging." + (interactive) + (kill-all-local-variables) + (setq major-mode 'gitmerge-mode) + (setq mode-name "gitmerge") + (set-syntax-table text-mode-syntax-table) + (use-local-map gitmerge-mode-map) + (make-local-variable 'font-lock-defaults) + (setq gitmerge-mode-font-lock-keywords + (list (list gitmerge-log-regexp + '(1 font-lock-warning-face) + '(2 font-lock-constant-face) + '(3 font-lock-builtin-face) + '(4 font-lock-comment-face)))) + (setq buffer-read-only t) + (setq font-lock-defaults '(gitmerge-mode-font-lock-keywords))) + +(defun gitmerge (from) + "Merge from branch FROM into `default-directory'." + (interactive + (if (not (vc-git-root default-directory)) + (user-error "Not in a git tree") + (let ((default-directory (vc-git-root default-directory))) + (list + (if (gitmerge-maybe-resume) + 'resume + (completing-read "Merge branch: " (gitmerge-get-all-branches) + nil t gitmerge-default-branch)))))) + (let ((default-directory (vc-git-root default-directory))) + (if (eq from 'resume) + (progn + (setq gitmerge--commits (gitmerge-read-missing)) + (setq gitmerge--from (pop gitmerge--commits)) + ;; Directly continue with the merge. + (gitmerge-start-merge)) + (setq gitmerge--commits (gitmerge-missing from)) + (setq gitmerge--from from) + (when (null gitmerge--commits) + (user-error "Nothing to merge")) + (with-current-buffer + (gitmerge-setup-log-buffer gitmerge--commits gitmerge--from) + (goto-char (point-min)) + (insert (propertize "Commands: " 'font-lock-face 'bold) + "(s) Toggle skip, (l) Show log, (d) Show diff, " + "(f) Show files, (m) Start merge\n" + (propertize "Flags: " 'font-lock-face 'bold) + "(C) Detected backport (cherry-mark), (R) Log matches " + "regexp, (M) Manually picked\n\n") + (gitmerge-mode) + (pop-to-buffer (current-buffer)))))) + +(defun gitmerge-start-merge () + (interactive) + (when (not (vc-git-root default-directory)) + (user-error "Not in a git tree")) + (let ((default-directory (vc-git-root default-directory))) + (while gitmerge--commits + (setq gitmerge--commits + (gitmerge-apply gitmerge--commits gitmerge--from))) + (when (file-exists-p gitmerge-status-file) + (delete-file gitmerge-status-file)) + (message "Merging from %s...done" gitmerge--from))) + +(provide 'gitmerge) + +;;; gitmerge.el ends here commit 9ec7bd97faa0085694377426ca4cca8593fa3606 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 17:52:08 2014 +0100 (eww-mode): Revert mistanken removal of `buffer-disable-undo'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6f22474..8d875b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,6 +7,7 @@ (eww-restore-history): Inhibit change functions while restoring the history. (eww-process-text-input): Fix deletion at the start of the field, too. + (eww-mode): Revert mistanken removal of `buffer-disable-undo'. * dom.el (dom-pp): New function. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index a082fe5..3883767 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -674,6 +674,7 @@ the like." (setq-local tool-bar-map eww-tool-bar-map)) ;; desktop support (setq-local desktop-save-buffer 'eww-desktop-misc-data) + (buffer-disable-undo) (setq buffer-read-only t)) ;;;###autoload commit 7c449b8f0dc926a12dcb6d3abbdbd6fe8decadc8 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 17:50:05 2014 +0100 Add more sanity checks to the last eww after-change-function patch diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 63a6c0d..a082fe5 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -953,53 +953,55 @@ appears in a or tag." See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (defun eww-process-text-input (beg end length) - (let* ((pos (cond - ((get-text-property (1- end) 'eww-form) - (1- end)) - ((get-text-property (1+ end) 'eww-form) - (1+ end)))) - (form (get-text-property pos 'eww-form)) - (properties (text-properties-at pos)) - (inhibit-read-only t) - (type (plist-get form :type))) - (when (and form - (member type eww-text-input-types)) - (cond - ((zerop length) - ;; Delete some space at the end. - (save-excursion - (goto-char - (if (equal type "textarea") - (1- (line-end-position)) - (eww-end-of-field))) - (let ((new (- end beg))) - (while (and (> new 0) - (eql (following-char) ? )) - (delete-region (point) (1+ (point))) - (setq new (1- new)))) - (set-text-properties beg end properties))) - ((> length 0) - ;; Add padding. - (save-excursion - (goto-char (1- end)) - (goto-char - (if (equal type "textarea") - (1- (line-end-position)) - (1+ (eww-end-of-field)))) - (let ((start (point))) - (insert (make-string length ? )) - (set-text-properties start (point) properties))))) - (let ((value (buffer-substring-no-properties - (eww-beginning-of-field) - (eww-end-of-field)))) - (when (string-match " +\\'" value) - (setq value (substring value 0 (match-beginning 0)))) - (plist-put form :value value) - (when (equal type "password") - ;; Display passwords as asterisks. - (let ((start (eww-beginning-of-field))) - (put-text-property start (+ start (length value)) - 'display (make-string (length value) ?*)))))))) + (when-let (pos (and (< (1+ end) (point-max)) + (> (1- end) (point-min)) + (cond + ((get-text-property (1- end) 'eww-form) + (1- end)) + ((get-text-property (1+ end) 'eww-form) + (1+ end))))) + (let* ((form (get-text-property pos 'eww-form)) + (properties (text-properties-at pos)) + (inhibit-read-only t) + (type (plist-get form :type))) + (when (and form + (member type eww-text-input-types)) + (cond + ((zerop length) + ;; Delete some space at the end. + (save-excursion + (goto-char + (if (equal type "textarea") + (1- (line-end-position)) + (eww-end-of-field))) + (let ((new (- end beg))) + (while (and (> new 0) + (eql (following-char) ? )) + (delete-region (point) (1+ (point))) + (setq new (1- new)))) + (set-text-properties beg end properties))) + ((> length 0) + ;; Add padding. + (save-excursion + (goto-char (1- end)) + (goto-char + (if (equal type "textarea") + (1- (line-end-position)) + (1+ (eww-end-of-field)))) + (let ((start (point))) + (insert (make-string length ? )) + (set-text-properties start (point) properties))))) + (let ((value (buffer-substring-no-properties + (eww-beginning-of-field) + (eww-end-of-field)))) + (when (string-match " +\\'" value) + (setq value (substring value 0 (match-beginning 0)))) + (plist-put form :value value) + (when (equal type "password") + ;; Display passwords as asterisks. + (let ((start (eww-beginning-of-field))) + (put-text-property start (+ start (length value)) + 'display (make-string (length value) ?*))))))))) (defun eww-tag-textarea (dom) (let ((start (point)) commit 604ce9124efd295b46e3fbb2d6880302fe55a33f Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 17:42:28 2014 +0100 (eww-process-text-input): Fix deletion at the start of the field, too. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26c68df..6f22474 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,6 +6,7 @@ deleting at the last character (bug#19085). (eww-restore-history): Inhibit change functions while restoring the history. + (eww-process-text-input): Fix deletion at the start of the field, too. * dom.el (dom-pp): New function. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 75af7fb..63a6c0d 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -674,7 +674,6 @@ the like." (setq-local tool-bar-map eww-tool-bar-map)) ;; desktop support (setq-local desktop-save-buffer 'eww-desktop-misc-data) - (buffer-disable-undo) (setq buffer-read-only t)) ;;;###autoload @@ -954,9 +953,14 @@ appears in a or tag." See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (defun eww-process-text-input (beg end length) - (let* ((form (get-text-property (min (1- end) (point-max)) 'eww-form)) + (let* ((pos (cond + ((get-text-property (1- end) 'eww-form) + (1- end)) + ((get-text-property (1+ end) 'eww-form) + (1+ end)))) + (form (get-text-property pos 'eww-form)) + (properties (text-properties-at pos)) (inhibit-read-only t) - (properties (text-properties-at (1- end))) (type (plist-get form :type))) (when (and form (member type eww-text-input-types)) commit 6b765b8facbdbb03f28028007885236601652515 Author: Eli Zaretskii Date: Thu Nov 27 18:35:27 2014 +0200 Fix bug #19201 with after-strings not being displayed. src/xdisp.c (handle_single_display_spec): When ignoring a fringe bitmap display, reset the ignore_overlay_strings_at_pos_p flag. (next_element_from_buffer): When done with overlays, reset the ignore_overlay_strings_at_pos_p flag. diff --git a/src/ChangeLog b/src/ChangeLog index 23fd46b..5ecb022 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-11-27 Eli Zaretskii + + * xdisp.c (handle_single_display_spec): When ignoring a fringe + bitmap display, reset the ignore_overlay_strings_at_pos_p flag. + (next_element_from_buffer): When done with overlays, reset the + ignore_overlay_strings_at_pos_p flag. (Bug#19201) + 2014-11-25 Eli Zaretskii * w32fns.c (Fw32_shell_execute): Convert forward slashes in diff --git a/src/xdisp.c b/src/xdisp.c index 0558aa8..bd26281 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -5106,6 +5106,11 @@ 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; } } @@ -5125,6 +5130,9 @@ 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; } @@ -8327,6 +8335,10 @@ next_element_from_buffer (struct it *it) unsigned char *p; ptrdiff_t stop; + /* 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; + /* Maybe run the redisplay end trigger hook. Performance note: This doesn't seem to cost measurable time. */ if (it->redisplay_end_trigger_charpos commit 5519c34ef8b5f06fa20e8de7dc54b5bd6fc88421 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 17:23:32 2014 +0100 (eww-restore-history): Inhibit change functions while restoring the history. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 50c8e40..26c68df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,6 +4,8 @@ HTTP fetch fails, we have the right URL in the buffer. (eww-process-text-input): Don't shorten the input field if deleting at the last character (bug#19085). + (eww-restore-history): Inhibit change functions while restoring + the history. * dom.el (dom-pp): New function. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 23f3653..75af7fb 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -711,6 +711,7 @@ the like." (defun eww-restore-history (elem) (let ((inhibit-read-only t) + (after-change-functions nil) (text (plist-get elem :text))) (setq eww-data elem) (if (null text) commit a5b07aa6b55b4158bf51457e4cb8649d48423a4d Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 17:19:52 2014 +0100 eww input field fixup Fixes: debbugs:19085 (eww-process-text-input): Don't shorten the input field if deleting at the last character. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0b1d74..50c8e40 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,8 @@ * net/eww.el (eww): Record the new URL immediately, so that if the HTTP fetch fails, we have the right URL in the buffer. + (eww-process-text-input): Don't shorten the input field if + deleting at the last character (bug#19085). * dom.el (dom-pp): New function. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index a8c9109..23f3653 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -953,9 +953,9 @@ appears in a or tag." See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (defun eww-process-text-input (beg end length) - (let* ((form (get-text-property (min (1+ end) (point-max)) 'eww-form)) + (let* ((form (get-text-property (min (1- end) (point-max)) 'eww-form)) (inhibit-read-only t) - (properties (text-properties-at end)) + (properties (text-properties-at (1- end))) (type (plist-get form :type))) (when (and form (member type eww-text-input-types)) @@ -976,10 +976,11 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") ((> length 0) ;; Add padding. (save-excursion + (goto-char (1- end)) (goto-char (if (equal type "textarea") (1- (line-end-position)) - (eww-end-of-field))) + (1+ (eww-end-of-field)))) (let ((start (point))) (insert (make-string length ? )) (set-text-properties start (point) properties))))) commit 4c555e9afaf74d513d1fa7717a07abe662594cd3 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 17:06:26 2014 +0100 Record the right URL in eww * net/eww.el (eww): Record the new URL immediately, so that if the HTTP fetch fails, we have the right URL in the buffer. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85748e6..b0b1d74 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-11-27 Lars Magne Ingebrigtsen + * net/eww.el (eww): Record the new URL immediately, so that if the + HTTP fetch fails, we have the right URL in the buffer. + * dom.el (dom-pp): New function. 2014-11-17 Eli Zaretskii diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 10298b1..a8c9109 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -255,6 +255,7 @@ word(s) will be searched for via `eww-search-prefix'." (replace-regexp-in-string " " "+" url)))))) (unless (eq major-mode 'eww-mode) (eww-setup-buffer) + (plist-put eww-data :url url) (eww-update-header-line-format) (let ((inhibit-read-only t)) (insert (format "Loading %s..." url)))) @@ -503,11 +504,8 @@ See the `eww-search-prefix' variable for the search engine used." (doc-view-mode))) (goto-char (point-min))) -(defun eww-setup-buffer (&optional buffer) - (switch-to-buffer - (if (buffer-live-p buffer) - buffer - (get-buffer-create "*eww*"))) +(defun eww-setup-buffer () + (switch-to-buffer (get-buffer-create "*eww*")) (let ((inhibit-read-only t)) (remove-overlays) (erase-buffer)) commit 2d431afee4061515a593da1f0a29bcd5fb152f07 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 16:57:22 2014 +0100 Add a DOM pretty-printing function * doc/lispref/text.texi (Document Object Model): Mention `dom-pp'. * lisp/dom.el (dom-pp): New function. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 37f16a1..7496643 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2014-11-27 Lars Magne Ingebrigtsen + + * text.texi (Document Object Model): Mention `dom-pp'. + 2014-11-26 Lars Magne Ingebrigtsen * text.texi (Document Object Model): New node to document dom.el. diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 3d9451a..9c878a0 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -4353,13 +4353,13 @@ A call to @code{libxml-parse-html-region} returns this @acronym{DOM} (document object model): @example -(html () - (head ()) - (body ((width . "101")) - (div ((class . "thing")) - "Foo" - (div () - "Yes")))) +(html nil + (head nil) + (body ((width . "101")) + (div ((class . "thing")) + "Foo" + (div nil + "Yes")))) @end example @end defun @@ -4396,13 +4396,10 @@ node has a node name (called a @dfn{tag}), and optional key/value nodes are either strings or @acronym{DOM} objects. @example -(body - ((width . "101")) - (div - ((class . "thing")) +(body ((width . "101")) + (div ((class . "thing")) "Foo" - (div - nil + (div nil "Yes"))) @end example @@ -4434,6 +4431,9 @@ would be: @item dom-children @var{node} Return all the children of the node. +@item dom-non-text-children @var{node} +Return all the non-string children of the node. + @item dom-attributes @var{node} Return the key/value pair list of attributes of the node. @@ -4494,6 +4494,14 @@ which is a regular expression. @end table +Utility functions: + +@table @code +@item dom-pp @var{dom} &optional @var{remove-empty} +Pretty-print @var{dom} at point. If @var{remove-empty}, don't print +textual nodes that just contain white-space. +@end table + @node Atomic Changes @section Atomic Change Groups diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 92b50d9..85748e6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-27 Lars Magne Ingebrigtsen + + * dom.el (dom-pp): New function. + 2014-11-17 Eli Zaretskii * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry): diff --git a/lisp/dom.el b/lisp/dom.el index 04d6c21..6b24e4f 100644 --- a/lisp/dom.el +++ b/lisp/dom.el @@ -179,6 +179,44 @@ If BEFORE is nil, make CHILD NODE's first child." (setcdr node (list nil))) node) +(defun dom-pp (dom &optional remove-empty) + "Pretty-print DOM at point. +If REMOVE-EMPTY, ignore textual nodes that contain just +white-space." + (let ((column (current-column))) + (insert (format "(%S " (dom-tag dom))) + (let* ((attr (dom-attributes dom)) + (times (length attr)) + (column (1+ (current-column)))) + (if (null attr) + (insert "nil") + (insert "(") + (dolist (elem attr) + (insert (format "(%S . %S)" (car elem) (cdr elem))) + (if (zerop (cl-decf times)) + (insert ")") + (insert "\n" (make-string column ? )))))) + (let* ((children (if remove-empty + (cl-remove-if + (lambda (child) + (and (stringp child) + (string-match "\\`[\n\r\t  ]*\\'" child))) + (dom-children dom)) + (dom-children dom))) + (times (length children))) + (if (null children) + (insert ")") + (insert "\n" (make-string (1+ column) ? )) + (dolist (child children) + (if (stringp child) + (if (or (not remove-empty) + (not (string-match "\\`[\n\r\t  ]*\\'" child))) + (insert (format "%S" child))) + (dom-pp child remove-empty)) + (if (zerop (cl-decf times)) + (insert ")") + (insert "\n" (make-string (1+ column) ? )))))))) + (provide 'dom) ;;; dom.el ends here commit 2f5134c2766be5dcc3eb32b391183a229ee57e19 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 12:36:08 2014 +0100 * NEWS: Mention dom.el. diff --git a/etc/ChangeLog b/etc/ChangeLog index 5d61612..a23524a 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-11-27 Lars Magne Ingebrigtsen + + * NEWS: Mention dom.el. + 2014-11-24 Lars Magne Ingebrigtsen * NEWS: Mention NSM. diff --git a/etc/NEWS b/etc/NEWS index 6cad6a3..9c34bb2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -187,6 +187,11 @@ pages visited) is now preserved in the desktop file. *** `eww-after-render-hook' is now called after eww has rendered the data in the buffer. +*** The DOM shr and eww uses has been changed to the general Emacs +xml.el/libxml2 DOM, and a new package dom.el has been added to +interact with this DOM. See the Emacs Lisp manual for interface +details. + ** Message mode *** text/html messages that contain inline image parts will be commit b3910f653938fc8625f4e0c970123e826bbf427e Author: Stephen Berman Date: Thu Nov 27 11:03:58 2014 +0100 outline.el: Fix subtree movement. Fixes: debbugs:19102 Co-authored-by: Stefan Monnier * outline.el (outline-move-subtree-down): Make sure we can move forward to find the end of the subtree and the insertion point. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d88ecfe..8c48019 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-11-27 Stephen Berman + Stefan Monnier + + * outline.el (outline-move-subtree-down): Make sure we can move + forward to find the end of the subtree and the insertion point + (bug#19102). + 2014-11-27 Leonard Randall * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search diff --git a/lisp/outline.el b/lisp/outline.el index c7cad31..61ee7ff 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -649,27 +649,32 @@ the match data is set appropriately." 'outline-get-last-sibling)) (ins-point (make-marker)) (cnt (abs arg)) + ;; Make sure we can move forward to find the end of the + ;; subtree and the insertion point. + (maybe-forward-char (lambda () + (if (eq (char-after) ?\n) (forward-char 1) + (if (and (eobp) (not (bolp))) (insert "\n"))))) beg end folded) - ;; Select the tree + ;; Select the tree. (outline-back-to-heading) (setq beg (point)) (save-match-data (save-excursion (outline-end-of-heading) (setq folded (outline-invisible-p))) (outline-end-of-subtree)) - (if (= (char-after) ?\n) (forward-char 1)) + (funcall maybe-forward-char) (setq end (point)) - ;; Find insertion point, with error handling + ;; Find insertion point, with error handling. (goto-char beg) (while (> cnt 0) (or (funcall movfunc) (progn (goto-char beg) - (error "Cannot move past superior level"))) + (user-error "Cannot move past superior level"))) (setq cnt (1- cnt))) (if (> arg 0) - ;; Moving forward - still need to move over subtree + ;; Moving forward - still need to move over subtree. (progn (outline-end-of-subtree) - (if (= (char-after) ?\n) (forward-char 1)))) + (funcall maybe-forward-char))) (move-marker ins-point (point)) (insert (delete-and-extract-region beg end)) (goto-char ins-point) commit b66511f7680a195c5f56f2275f21e1d571706fba Author: Leonard Randall Date: Thu Nov 27 09:38:21 2014 +0100 Backport regexp stack overflow fix from emacs-24. * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search for comment lines non-greedy and stopping at newlines to fix stack overflows with large files. [Backport] Signed-off-by: Tassilo Horn diff --git a/lisp/ChangeLog b/lisp/ChangeLog index af75f8d..d88ecfe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-27 Leonard Randall + + * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search + for comment lines non-greedy and stopping at newlines to fix stack + overflows with large files. [Backport] + 2014-11-27 Fabián Ezequiel Gallina * progmodes/python.el (python-shell-completion-setup-code): Use diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 71bec89..a557211 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -357,7 +357,7 @@ of master file." (member "biblatex" TeX-active-styles) ;; poor-man's check... (save-excursion - (re-search-forward "^[^%]*\\\\usepackage.*{biblatex}" nil t)))) + (re-search-forward "^[^%\n]*?\\\\usepackage.*{biblatex}" nil t)))) (defun reftex-locate-bibliography-files (master-dir &optional files) "Scan buffer for bibliography macros and return file list." commit 1ed5c2d9bcc99c92cff1f6382e4c39c70a126f62 Author: Oscar Fuentes Date: Thu Nov 27 04:03:07 2014 +0100 Replace uses of _W64 with MINGW_W64 This is the `master' branch follow-up to the change made previously on the emacs-24 branch (81e0cca7bbc99dbfda898a8aaab740ae121cf045). * src/w32.c: Use MINGW_W64 instead of _W64. * src/w32heap.c: Likewise. diff --git a/src/ChangeLog b/src/ChangeLog index e6bbeb8..dcb4666 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-11-27 Oscar Fuentes + + * src/w32.c: Use MINGW_W64 instead of _W64. + + * src/w32heap.c: Likewise. + 2014-11-17 Oscar Fuentes * src/w32.c: Use MINGW_W64 instead of _W64. diff --git a/src/w32.c b/src/w32.c index ca5e14b..8d8f536 100644 --- a/src/w32.c +++ b/src/w32.c @@ -72,7 +72,7 @@ along with GNU Emacs. If not, see . */ #include #include -/* MinGW64 (_W64) defines these in its _mingw.h. */ +/* MinGW64 defines these in its _mingw.h. */ #ifndef _ANONYMOUS_UNION # define _ANONYMOUS_UNION #endif diff --git a/src/w32heap.c b/src/w32heap.c index c431b87..2a76641 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -214,7 +214,7 @@ dumped_data_commit (PVOID Base, PVOID *CommitAddress, PSIZE_T CommitSize) /* We want to turn on Low Fragmentation Heap for XP and older systems. MinGW32 lacks those definitions. */ -#ifndef _W64 +#ifndef MINGW_W64 typedef enum _HEAP_INFORMATION_CLASS { HeapCompatibilityInformation } HEAP_INFORMATION_CLASS; @@ -244,7 +244,7 @@ init_heap (void) /* Create the private heap. */ heap = HeapCreate (0, 0, 0); -#ifndef _W64 +#ifndef MINGW_W64 /* Set the low-fragmentation heap for OS before Vista. */ HMODULE hm_kernel32dll = LoadLibrary ("kernel32.dll"); HeapSetInformation_Proc s_pfn_Heap_Set_Information = (HeapSetInformation_Proc) GetProcAddress (hm_kernel32dll, "HeapSetInformation"); commit 7bf7edf53f65752f408d0f5e9d0af56bfcf683f5 Author: Fabián Ezequiel Gallina Date: Wed Nov 26 23:45:24 2014 -0300 * lisp/progmodes/python.el (python-shell-completion-setup-code): Use __builtin__ module (or builtins in Python 3) and catch all errors when importing readline and rlcompleter. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5947c76..af75f8d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-27 Fabián Ezequiel Gallina + + * progmodes/python.el (python-shell-completion-setup-code): Use + __builtin__ module (or builtins in Python 3) and catch all errors + when importing readline and rlcompleter. + 2014-11-26 Stephen Berman * calendar/todo-mode.el: Handle calling revert-buffer (bug#19187). diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 4c27136..48d80b9 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2653,25 +2653,30 @@ This function takes the list of setup code to send from the (defcustom python-shell-completion-setup-code "try: - import readline, rlcompleter + import __builtin__ except ImportError: + # Python 3 + import builtins as __builtin__ +try: + import readline, rlcompleter +except: def __PYTHON_EL_get_completions(text): return [] else: def __PYTHON_EL_get_completions(text): + builtins = dir(__builtin__) completions = [] try: splits = text.split() is_module = splits and splits[0] in ('from', 'import') - is_ipython = getattr( - __builtins__, '__IPYTHON__', - getattr(__builtins__, '__IPYTHON__active', False)) + is_ipython = ('__IPYTHON__' in builtins or + '__IPYTHON__active' in builtins) if is_module: from IPython.core.completerlib import module_completion completions = module_completion(text.strip()) - elif is_ipython and getattr(__builtins__, '__IP', None): + elif is_ipython and '__IP' in builtins: completions = __IP.complete(text) - elif is_ipython and getattr(__builtins__, 'get_ipython', None): + elif is_ipython and 'get_ipython' in builtins: completions = get_ipython().Completer.all_completions(text) else: i = 0 commit ba4502fe1465f7803beca3ae187e41f0b25bef10 Merge: b121ef1 81e0cca Author: Ted Zlatanov Date: Wed Nov 26 21:31:11 2014 -0500 Merge branch 'emacs-24' Conflicts: nt/addsection.c nt/inc/ms-w32.h src/w32.c commit b121ef10f500c0377c2ce665e8ccd8b97a6aedfd Author: Katsumi Yamaoka Date: Thu Nov 27 01:33:09 2014 +0000 Gnus: fix XEmacs compilation diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f53bf02..736cb4e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +2014-11-27 Katsumi Yamaoka + + * gnus-art.el (gnus-use-idna): + * gnus-sum.el (gnus-summary-idna-message): + * message.el (message-use-idna): + Protect against nil value for idna-program. + + * message.el (message-use-idna): Load Mule-UCS for XEmacs 21.4. + 2014-11-25 Glenn Morris * gnus-start.el (gnus-save-newsrc-file-check-timestamp): diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 3b343ad..b45638b 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1628,6 +1628,7 @@ It is a string, such as \"PGP\". If nil, ask user." (defcustom gnus-use-idna (and (condition-case nil (require 'idna) (file-error)) (mm-coding-system-p 'utf-8) + idna-program (executable-find idna-program)) "Whether IDNA decoding of headers is used when viewing messages. This requires GNU Libidn, and by default only enabled if it is found." diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 69bb106..29f693f 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -9870,6 +9870,7 @@ installed for this command to work." (if (not (and (condition-case nil (require 'idna) (file-error)) (mm-coding-system-p 'utf-8) + (symbol-value 'idna-program) (executable-find (symbol-value 'idna-program)))) (gnus-message 5 "GNU Libidn not installed properly (`idn' or `idna.el' missing)") diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 0af4784..c132215 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1756,13 +1756,17 @@ no, only reply back to the author." :type '(radio (const :format "%v " nil) (string :format "FQDN: %v"))) -(defcustom message-use-idna (and (condition-case nil (require 'idna) - (file-error)) - (mm-coding-system-p 'utf-8) - (executable-find idna-program) - (string= (idna-to-ascii "räksmörgås") - "xn--rksmrgs-5wao1o") - t) +(defcustom message-use-idna + (and (or (mm-coding-system-p 'utf-8) + (condition-case nil + (let (mucs-ignore-version-incompatibilities) + (require 'un-define)) + (error))) + (condition-case nil (require 'idna) (file-error)) + idna-program + (executable-find idna-program) + (string= (idna-to-ascii "räksmörgås") "xn--rksmrgs-5wao1o") + t) "Whether to encode non-ASCII in domain names into ASCII according to IDNA. GNU Libidn, and in particular the elisp package \"idna.el\" and the external program \"idn\", must be installed for this commit 666e90e5ccef2d2b19428b6a5cb41a2efe7d46db Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 00:44:54 2014 +0100 Better display for `paranoid' `network-security-level' * net/nsm.el (nsm-new-fingerprint-ok-p): Display the certificate when querying about new certificates. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0d44df..53414ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-11-26 Lars Magne Ingebrigtsen + * net/nsm.el (nsm-new-fingerprint-ok-p): Display the certificate + when querying about new certificates. + * net/shr.el (shr-make-table-1): dom.el changes for table rendering. * dom.el (dom-by-tag): Use `equal' for comparisons so that tags diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index c5e048a..2b540f3 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -204,7 +204,7 @@ unencrypted." (defun nsm-new-fingerprint-ok-p (host port status) (nsm-query - host port nil 'fingerprint + host port status 'fingerprint "The fingerprint for the connection to %s:%s is new:\n%s" host port (nsm-fingerprint status))) commit 803df8492dd0ecfe7368c279d1f4df2d4fe18fe2 Author: Lars Magne Ingebrigtsen Date: Thu Nov 27 00:03:09 2014 +0100 * net/shr.el (shr-make-table-1): dom.el changes for table rendering. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4884d5c..d0d44df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2014-11-26 Lars Magne Ingebrigtsen + * net/shr.el (shr-make-table-1): dom.el changes for table rendering. + * dom.el (dom-by-tag): Use `equal' for comparisons so that tags can be strings. (dom-elements): Protect against non-text nodes. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 22bceeb..f44ecc2 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1582,7 +1582,7 @@ The preference is a float determined from `shr-prefer-media-type'." (shr-inhibit-decoration (not fill)) (rowspans (make-vector (length widths) 0)) width colspan) - (dolist (row (dom-children dom)) + (dolist (row (dom-non-text-children dom)) (when (eq (dom-tag row) 'tr) (let ((tds nil) (columns (dom-children row)) @@ -1731,7 +1731,7 @@ The preference is a float determined from `shr-prefer-media-type'." ;; Return a summary of the number and shape of the TDs in the table. (defun shr-column-specs (dom) (let ((columns (make-vector (shr-max-columns dom) 1))) - (dolist (row (dom-children dom)) + (dolist (row (dom-non-text-children dom)) (when (eq (dom-tag row) 'tr) (let ((i 0)) (dolist (column (dom-children row)) @@ -1757,7 +1757,8 @@ The preference is a float determined from `shr-prefer-media-type'." (defun shr-max-columns (dom) (let ((max 0)) (dolist (row (dom-children dom)) - (when (eq (dom-tag row) 'tr) + (when (and (not (stringp row)) + (eq (dom-tag row) 'tr)) (setq max (max max (+ (shr-count row 'td) (shr-count row 'th)))))) max)) commit 47f573a4bf6b5126884286690ce1e8818ada74ee Author: Stephen Berman Date: Wed Nov 26 23:17:41 2014 +0100 todo-mode.el: Handle calling revert-buffer. Fixes: debbugs:19187 * calendar/todo-mode.el: (todo-revert-buffer): New function. (todo-modes-set-1): Use it as the buffer-local value of revert-buffer-function. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0741bfd..5947c76 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2014-11-26 Stephen Berman + * calendar/todo-mode.el: Handle calling revert-buffer (bug#19187). + (todo-revert-buffer): New function. + (todo-modes-set-1): Use it as the buffer-local value of + revert-buffer-function. + +2014-11-26 Stephen Berman + * calendar/todo-mode.el (todo-mode): If called interactively, just display a message saying to call todo-show to enter Todo mode (Bug#19112). diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index ed7c607..3ba263f 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -5194,6 +5194,15 @@ Overrides `diary-goto-entry'." (add-function :override diary-goto-entry-function #'todo-diary-goto-entry) +(defun todo-revert-buffer (&optional ignore-auto noconfirm) + "Call `revert-buffer', preserving buffer's current modes. +Also preserve category display, if applicable." + (interactive (list (not current-prefix-arg))) + (let ((revert-buffer-function nil)) + (revert-buffer ignore-auto noconfirm 'preserve-modes) + (when (memq major-mode '(todo-mode todo-archive-mode)) + (todo-category-select)))) + (defun todo-desktop-save-buffer (_dir) `((catnum . ,(todo-category-number (todo-current-category))))) @@ -6540,6 +6549,7 @@ Added to `window-configuration-change-hook' in Todo mode." (defun todo-modes-set-1 () "Make some settings that apply to multiple Todo modes." (setq-local font-lock-defaults '(todo-font-lock-keywords t)) + (setq-local revert-buffer-function 'todo-revert-buffer) (setq-local tab-width todo-indent-to-here) (setq-local indent-line-function 'todo-indent) (when todo-wrap-lines commit fc4d2c7784184a01bdbf9d428fe22aed4039b159 Author: Lars Magne Ingebrigtsen Date: Wed Nov 26 23:11:57 2014 +0100 Only send SNI if the host name is not an IP address * gnutls.c (gnutls_ip_address_p): New function. (Fgnutls_boot): Only send SNI if the host name is not an IP address. diff --git a/src/ChangeLog b/src/ChangeLog index 17e3c59..df704ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-11-26 Lars Magne Ingebrigtsen + + * gnutls.c (gnutls_ip_address_p): New function. + (Fgnutls_boot): Only send SNI if the host name is not an IP address. + 2014-11-26 Toke Høiland-Jørgensen (tiny change) * gnutls.c (Fgnutls_boot): Send the server name over (bug#18208). diff --git a/src/gnutls.c b/src/gnutls.c index 5a4b39f..752df3c 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1095,6 +1095,18 @@ emacs_gnutls_global_init (void) return gnutls_make_error (ret); } +static bool +gnutls_ip_address_p (char *string) +{ + char c; + + while ((c = *string++) != 0) + if (! ((c == '.' || c == ':' || (c >= '0' && c <= '9')))) + return false; + + return true; +} + #if 0 /* Deinitializes global GnuTLS state. See also `gnutls-global-init'. */ @@ -1418,10 +1430,13 @@ one trustfile (usually a CA bundle). */) if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); - ret = fn_gnutls_server_name_set (state, GNUTLS_NAME_DNS, c_hostname, - strlen(c_hostname)); - if (ret < GNUTLS_E_SUCCESS) - return gnutls_make_error (ret); + if (!gnutls_ip_address_p (c_hostname)) + { + ret = fn_gnutls_server_name_set (state, GNUTLS_NAME_DNS, c_hostname, + strlen (c_hostname)); + if (ret < GNUTLS_E_SUCCESS) + return gnutls_make_error (ret); + } GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET; ret = emacs_gnutls_handshake (XPROCESS (proc)); commit ebf026bdd0afb368a8d5f89f29ef792ea21560e5 Author: Stephen Berman Date: Wed Nov 26 23:00:42 2014 +0100 todo-mode.el: Handle calling todo-mode interactively. Fixes: debbugs:19112 * calendar/todo-mode.el (todo-mode): If called interactively, just display a message saying to call todo-show to enter Todo mode. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 351472d..0741bfd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-26 Stephen Berman + + * calendar/todo-mode.el (todo-mode): If called interactively, just + display a message saying to call todo-show to enter Todo mode + (Bug#19112). + 2014-11-24 Dmitry Gutov * vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files. diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index ab12ebc..ed7c607 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -6573,23 +6573,24 @@ Added to `window-configuration-change-hook' in Todo mode." "Major mode for displaying, navigating and editing todo lists. \\{todo-mode-map}" - ;; (easy-menu-add todo-menu) - (todo-modes-set-1) - (todo-modes-set-2) - (todo-modes-set-3) - ;; Initialize todo-current-todo-file. - (when (member (file-truename (buffer-file-name)) - (funcall todo-files-function)) - (setq-local todo-current-todo-file (file-truename (buffer-file-name)))) - (setq-local todo-show-done-only nil) - (setq-local todo-categories-with-marks nil) - ;; (add-hook 'find-file-hook 'todo-add-to-buffer-list nil t) - (add-hook 'post-command-hook 'todo-update-buffer-list nil t) - (when todo-show-current-file - (add-hook 'pre-command-hook 'todo-show-current-file nil t)) - (add-hook 'window-configuration-change-hook - 'todo-reset-and-enable-done-separator nil t) - (add-hook 'kill-buffer-hook 'todo-reset-global-current-todo-file nil t)) + (if (called-interactively-p 'any) + (message "Type `M-x todo-show' to enter Todo mode") + (todo-modes-set-1) + (todo-modes-set-2) + (todo-modes-set-3) + ;; Initialize todo-current-todo-file. + (when (member (file-truename (buffer-file-name)) + (funcall todo-files-function)) + (setq-local todo-current-todo-file (file-truename (buffer-file-name)))) + (setq-local todo-show-done-only nil) + (setq-local todo-categories-with-marks nil) + ;; (add-hook 'find-file-hook 'todo-add-to-buffer-list nil t) + (add-hook 'post-command-hook 'todo-update-buffer-list nil t) + (when todo-show-current-file + (add-hook 'pre-command-hook 'todo-show-current-file nil t)) + (add-hook 'window-configuration-change-hook + 'todo-reset-and-enable-done-separator nil t) + (add-hook 'kill-buffer-hook 'todo-reset-global-current-todo-file nil t))) (put 'todo-archive-mode 'mode-class 'special) commit ccae04f205db7cffa0f247a463272f6c5af77122 Author: Toke Høiland-Jørgensen Date: Wed Nov 26 22:56:57 2014 +0100 * gnutls.c (Fgnutls_boot): Send the server name over Fixes: debbugs:18208 * gnutls.c (Fgnutls_boot): Send the server name over (bug#18208). diff --git a/src/ChangeLog b/src/ChangeLog index da8746c..17e3c59 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-26 Toke Høiland-Jørgensen (tiny change) + + * gnutls.c (Fgnutls_boot): Send the server name over (bug#18208). + 2014-11-25 Paul Eggert Fix gnutls problems caught by static checking. diff --git a/src/gnutls.c b/src/gnutls.c index baadaaf..5a4b39f 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -187,6 +187,9 @@ DEF_GNUTLS_FN (int, gnutls_x509_crt_get_key_id, DEF_GNUTLS_FN (const char*, gnutls_sec_param_get_name, (gnutls_sec_param_t)); DEF_GNUTLS_FN (const char*, gnutls_sign_algorithm_get_name, (gnutls_sign_algorithm_t)); +DEF_GNUTLS_FN (int, gnutls_server_name_set, (gnutls_session_t, + gnutls_server_name_type_t, + const void *, size_t)); static bool init_gnutls_functions (void) @@ -335,6 +338,7 @@ init_gnutls_functions (void) #define fn_gnutls_x509_crt_get_key_id gnutls_x509_crt_get_key_id #define fn_gnutls_sec_param_get_name gnutls_sec_param_get_name #define fn_gnutls_sign_algorithm_get_name gnutls_sign_algorithm_get_name +#define fn_gnutls_server_name_set gnutls_server_name_set #endif /* !WINDOWSNT */ @@ -1414,6 +1418,11 @@ one trustfile (usually a CA bundle). */) if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); + ret = fn_gnutls_server_name_set (state, GNUTLS_NAME_DNS, c_hostname, + strlen(c_hostname)); + if (ret < GNUTLS_E_SUCCESS) + return gnutls_make_error (ret); + GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET; ret = emacs_gnutls_handshake (XPROCESS (proc)); if (ret < GNUTLS_E_SUCCESS) commit 7520f8919ae4030b5b2c3fbcc4141c85bb65aad1 Author: Lars Magne Ingebrigtsen Date: Wed Nov 26 22:08:44 2014 +0100 Further eww dom.el cleanups * net/eww.el (eww-tag-title): Use `dom-text'. * dom.el (dom-by-tag): Use `equal' for comparisons so that tags can be strings. (dom-elements): Protect against non-text nodes. (dom-non-text-children): New function. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1698eb7..4884d5c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2014-11-26 Lars Magne Ingebrigtsen + + * dom.el (dom-by-tag): Use `equal' for comparisons so that tags + can be strings. + (dom-elements): Protect against non-text nodes. + (dom-non-text-children): New function. + + * net/eww.el (eww-tag-title): Use `dom-text'. + 2014-11-26 Sam Steingold * textmodes/sgml-mode.el (sgml-validate-command): Pass -utf8 to tidy. diff --git a/lisp/dom.el b/lisp/dom.el index 3157e0b..04d6c21 100644 --- a/lisp/dom.el +++ b/lisp/dom.el @@ -47,6 +47,12 @@ (cddr (car node)) (cddr node))) +(defun dom-non-text-children (node) + "Return all non-text-node children of NODE." + (cl-loop for child in (dom-children node) + unless (stringp child) + collect child)) + (defun dom-set-attributes (node attributes) "Set the attributes of NODE to ATTRIBUTES." (setq node (dom-ensure-node node)) @@ -93,7 +99,7 @@ A name is a symbol like `td'." (dom-by-tag child tag)) when matches append matches))) - (if (eq (dom-tag dom) tag) + (if (equal (dom-tag dom) tag) (cons dom matches) matches))) @@ -113,7 +119,9 @@ A name is a symbol like `td'." "Find elements matching MATCH (a regexp) in ATTRIBUTE. ATTRIBUTE would typically be `class', `id' or the like." (let ((matches (cl-loop for child in (dom-children dom) - for matches = (dom-elements child attribute match) + for matches = (and (not (stringp child)) + (dom-elements child attribute + match)) when matches append matches)) (attr (dom-attr dom attribute))) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index a1460a8..10298b1 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -453,14 +453,10 @@ See the `eww-search-prefix' variable for the search engine used." (setq header-line-format nil))) (defun eww-tag-title (dom) - (let ((title "")) - (dolist (sub (dom-children dom)) - (when (stringp sub) - (setq title (concat title sub)))) - (plist-put eww-data :title - (replace-regexp-in-string - "^ \\| $" "" - (replace-regexp-in-string "[ \t\r\n]+" " " title)))) + (plist-put eww-data :title + (replace-regexp-in-string + "^ \\| $" "" + (replace-regexp-in-string "[ \t\r\n]+" " " (dom-text dom)))) (eww-update-header-line-format)) (defun eww-tag-body (dom) @@ -589,14 +585,13 @@ the like." (defun eww-highest-readability (node) (let ((result node) highest) - (dolist (elem (dom-children node)) - (when (and (not (stringp elem)) - (> (or (dom-attr - (setq highest (eww-highest-readability elem)) - :eww-readability-score) - most-negative-fixnum) - (or (dom-attr result :eww-readability-score) - most-negative-fixnum))) + (dolist (elem (dom-non-text-children node)) + (when (> (or (dom-attr + (setq highest (eww-highest-readability elem)) + :eww-readability-score) + most-negative-fixnum) + (or (dom-attr result :eww-readability-score) + most-negative-fixnum)) (setq result highest))) result)) commit c9cb3d535b2daf19b53dcaeedc2f2ae923bca2a1 Author: Dani Moncayo Date: Wed Nov 26 20:59:07 2014 +0100 configure.ac [MINGW]: Fix the way of getting the right host platform. * configure.ac [MINGW]: Fix the way of getting the right host platform. diff --git a/ChangeLog b/ChangeLog index 8e34db9..55c6778 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-26 Dani Moncayo + + * configure.ac [MINGW]: Fix the way of getting the right host + platform. + 2014-11-25 Glenn Morris * configure.ac: Fix yesterday's use of uninitialised $version. diff --git a/configure.ac b/configure.ac index 8830ec7..70592d9 100644 --- a/configure.ac +++ b/configure.ac @@ -137,42 +137,41 @@ AM_INIT_AUTOMAKE(1.11) dnl Canonicalize the configuration name. AC_CANONICAL_HOST -canonical=$host -configuration=${host_alias-${build_alias-$host}} -dnl We get MINGW64 with MSYS2, MINGW32 with MSYS. -case $canonical in +case $host in *-mingw*) - . $srcdir/nt/mingw-cfg.site - # When we build with MinGW under MSYS, we are cross-compiling. Hence - # we can't rely on the output of MSYS `uname' for the architecture - # (32 bit MinGW compiler with 64 bit MSYS2, for instance) and must - # use the compiler's target, unless when the user explicitly - # provides one: - if test -z $target_alias; then + if test -z "$host_alias"; then + + # No --host argument was given to 'configure'; therefore $host + # was set to a default value based on the build platform. But + # this default value may be wrong if we are building from a + # 64-bit MSYS[2] pre-configured to build 32-bit MinGW programs. + # Therefore, we'll try to get the right host platform from the + # compiler's target. + AC_MSG_CHECKING([the compiler's target]) - if test -z $CC; then + if test -z "$CC"; then cc=gcc else cc=$CC fi - t=`$cc -v 2>&1 | sed -n 's/Target: //p'` - case "$t" in - *-*) canonical=$t + cc_target=`$cc -v 2>&1 | sed -n 's/Target: //p'` + case "$cc_target" in + *-*) host=$cc_target ;; "") AC_MSG_ERROR([Impossible to obtain $cc compiler target. -Please explicitly provide --target]) +Please explicitly provide --host.]) ;; *) AC_MSG_WARN([Compiler reported non-standard target. -Defaulting to $canonical.]) +Defaulting to $host.]) ;; esac - AC_MSG_RESULT([$canonical]) - else - canonical=$target_alias + AC_MSG_RESULT([$host]) fi + . $srcdir/nt/mingw-cfg.site + case $srcdir in /* | ?:*) # srcdir is an absolute path. In this case, force the format @@ -185,6 +184,9 @@ Defaulting to $canonical.]) esac;; esac +canonical=$host +configuration=${host_alias-${build_alias-$host}} + dnl Support for --program-prefix, --program-suffix and dnl --program-transform-name options AC_ARG_PROGRAM commit b67e8b793f27a4f7e0d2786aed2308d4ba37ff76 Author: Lars Magne Ingebrigtsen Date: Wed Nov 26 20:46:51 2014 +0100 * text.texi (Document Object Model): Typo fix diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 2280a8e..3d9451a 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -4422,8 +4422,8 @@ Simple accessors: @item dom-tag @var{node} Return the @dfn{tag} (also called ``node name'') of the node. -@item dom-attr @var{node} @var{attributes} -Return the value of @var{attributes} in the node. A common usage +@item dom-attr @var{node} @var{attribute} +Return the value of @var{attribute} in the node. A common usage would be: @lisp commit 41a1fd3638a62277cd057b598d70b55233340989 Author: Sam Steingold Date: Wed Nov 26 14:38:35 2014 -0500 Pass -utf8 to tidy. * lisp/textmodes/sgml-mode.el (sgml-validate-command): Pass -utf8 to tidy. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6a34f02..1698eb7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-26 Sam Steingold + + * textmodes/sgml-mode.el (sgml-validate-command): Pass -utf8 to tidy. + 2014-11-26 Lars Magne Ingebrigtsen * net/eww.el (eww-highest-readability): More dom.el fixes. diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 73b5292..fbcc0ed 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -245,7 +245,7 @@ Currently, only Latin-1 characters are supported.") ;; which makes it next to useless (cond ((executable-find "tidy") ;; tidy is available from http://tidy.sourceforge.net/ - "tidy --gnu-emacs yes -e -q") + "tidy --gnu-emacs yes -utf8 -e -q") ((executable-find "nsgmls") ;; nsgmls is a free SGML parser in the SP suite available from ;; ftp.jclark.com, replaced old `sgmls'. commit 28653a727efaca298f6346ff35509f542add033d Author: Lars Magne Ingebrigtsen Date: Wed Nov 26 20:30:59 2014 +0100 * net/eww.el (eww-highest-readability): More dom.el fixes. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8c41bdb..6a34f02 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-26 Lars Magne Ingebrigtsen + + * net/eww.el (eww-highest-readability): More dom.el fixes. + 2014-11-26 Ulf Jasper * net/newst-backend.el (newsticker--parse-generic-items): Take diff --git a/lisp/net/eww.el b/lisp/net/eww.el index f9be0b6..a1460a8 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -590,12 +590,13 @@ the like." (let ((result node) highest) (dolist (elem (dom-children node)) - (when (> (or (dom-attr - (setq highest (eww-highest-readability elem)) - :eww-readability-score) - most-negative-fixnum) - (or (dom-attr (cdr result) :eww-readability-score) - most-negative-fixnum)) + (when (and (not (stringp elem)) + (> (or (dom-attr + (setq highest (eww-highest-readability elem)) + :eww-readability-score) + most-negative-fixnum) + (or (dom-attr result :eww-readability-score) + most-negative-fixnum))) (setq result highest))) result)) commit 97d6e7e71182a421050601db662ee95c5b2cc172 Author: Lars Magne Ingebrigtsen Date: Wed Nov 26 20:23:06 2014 +0100 * text.texi (Document Object Model): New node to document dom.el. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index b0da266..37f16a1 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2014-11-26 Lars Magne Ingebrigtsen + + * text.texi (Document Object Model): New node to document dom.el. + 2014-11-24 Lars Magne Ingebrigtsen * processes.texi (Network Security): Made into its own section and diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 7c88a5b..2280a8e 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -4349,7 +4349,8 @@ document: @end example @noindent -A call to @code{libxml-parse-html-region} returns this: +A call to @code{libxml-parse-html-region} returns this @acronym{DOM} +(document object model): @example (html () @@ -4377,6 +4378,123 @@ that it parses the text as XML rather than HTML (so it is stricter about syntax). @end defun +@menu +* Document Object Model:: Access, manipulate and search the @acronym{DOM}. +@end menu + +@node Document Object Model +@subsection Document Object Model +@cindex HTML DOM +@cindex XML DOM +@cindex DOM +@cindex Document Object Model + +The @acronym{DOM} returned by @code{libxml-parse-html-region} (and the +other @acronym{XML} parsing functions) is a tree structure where each +node has a node name (called a @dfn{tag}), and optional key/value +@dfn{attribute} list, and then a list of @dfn{child nodes}. The child +nodes are either strings or @acronym{DOM} objects. + +@example +(body + ((width . "101")) + (div + ((class . "thing")) + "Foo" + (div + nil + "Yes"))) +@end example + +@defun dom-node tag &optional attributes &rest children +This function creates a @acronym{DOM} node of type @var{tag}. If +given, @var{attributes} should be a key/value pair list. +If given, @var{children} should be @acronym{DOM} nodes. +@end defun + +The following functions can be used to work with this structure. Each +function takes a @acronym{DOM} node, or a list of nodes. In the +latter case, only the first node in the list is used. + +Simple accessors: + +@table @code +@item dom-tag @var{node} +Return the @dfn{tag} (also called ``node name'') of the node. + +@item dom-attr @var{node} @var{attributes} +Return the value of @var{attributes} in the node. A common usage +would be: + +@lisp +(dom-attr img 'href) +=> "http://fsf.org/logo.png" +@end lisp + +@item dom-children @var{node} +Return all the children of the node. + +@item dom-attributes @var{node} +Return the key/value pair list of attributes of the node. + +@item dom-text @var{node} +Return all the textual elements of the node as a concatenated string. + +@item dom-texts @var{node} +Return all the textual elements of the node, as well as the textual +elements of all the children of the node, recursively, as a +concatenated string. This function also takes an optional separator +to be inserted between the textual elements. + +@item dom-parent @var{dom} @var{node} +Return the parent of @var{node} in @var{dom}. +@end table + +The following are functions for altering the @acronym{DOM}. + +@table @code +@item dom-set-attribute @var{node} @var{attribute} @var{value} +Set the @var{attribute} of the node to @var{value}. + +@item dom-append-child @var{node} @var{child} +Append @var{child} as the last child of @var{node}. + +@item dom-add-child-before @var{node} @var{child} @var{before} +Add @var{child} to @var{node}'s child list before the @var{before} +node. If @var{before} is nil, make @var{child} the first child. + +@item dom-set-attributes @var{node} @var{attributes} +Replace all the attributes of the node with a new key/value list. +@end table + +The following are functions for searching for elements in the +@acronym{DOM}. They all return lists of matching nodes. + +@table @code +@item dom-by-tag @var{dom} @var{tag} +Return all nodes in @var{dom} that are of type @var{tag}. A typical +use would be: + +@lisp +(dom-by-tag dom 'td) +=> '((td ...) (td ...) (td ...)) +@end lisp + +@item dom-by-class @var{dom} @var{match} +Return all nodes in @var{dom} that have class names that match +@var{match}, which is a regular expression. + +@item dom-by-style @var{dom} @var{style} +Return all nodes in @var{dom} that have styles that match @var{match}, +which is a regular expression. + +@item dom-by-id @var{dom} @var{style} +Return all nodes in @var{dom} that have IDs that match @var{match}, +which is a regular expression. + +@end table + + @node Atomic Changes @section Atomic Change Groups @cindex atomic changes commit f054f0f265a09adde84c9f543d0a2f810cdafe8e Author: Lars Magne Ingebrigtsen Date: Wed Nov 26 19:41:52 2014 +0100 ChangeLog for last checkin diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 794f5f8..8c41bdb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -10,6 +10,10 @@ 2014-11-26 Lars Magne Ingebrigtsen + * net/eww.el: Use the new dom.el accessors throughout. + + * net/shr.el: Ditto. + * dom.el: New file. 2014-11-26 Glenn Morris commit d9ba097fe4c17ed77e730c627f85ee0ed94da294 Author: Lars Magne Ingebrigtsen Date: Wed Nov 26 19:41:13 2014 +0100 Use the new dom.el accessors in shr and eww * net/shr.el: Ditto. * net/eww.el: Use the new dom.el accessors throughout. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 97939cb..f9be0b6 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -406,38 +406,38 @@ See the `eww-search-prefix' variable for the search engine used." (setq eww-history-position 0) (eww-update-header-line-format)))) -(defun eww-handle-link (cont) - (let* ((rel (assq :rel cont)) - (href (assq :href cont)) - (where (assoc - ;; The text associated with :rel is case-insensitive. - (if rel (downcase (cdr rel))) - '(("next" . :next) - ;; Texinfo uses "previous", but HTML specifies - ;; "prev", so recognize both. - ("previous" . :previous) - ("prev" . :previous) - ;; HTML specifies "start" but also "contents", - ;; and Gtk seems to use "home". Recognize - ;; them all; but store them in different - ;; variables so that we can readily choose the - ;; "best" one. - ("start" . :start) - ("home" . :home) - ("contents" . :contents) - ("up" . up))))) +(defun eww-handle-link (dom) + (let* ((rel (dom-attr dom 'rel)) + (href (dom-attr dom 'href)) + (where (assoc + ;; The text associated with :rel is case-insensitive. + (if rel (downcase rel)) + '(("next" . :next) + ;; Texinfo uses "previous", but HTML specifies + ;; "prev", so recognize both. + ("previous" . :previous) + ("prev" . :previous) + ;; HTML specifies "start" but also "contents", + ;; and Gtk seems to use "home". Recognize + ;; them all; but store them in different + ;; variables so that we can readily choose the + ;; "best" one. + ("start" . :start) + ("home" . :home) + ("contents" . :contents) + ("up" . up))))) (and href where - (plist-put eww-data (cdr where) (cdr href))))) + (plist-put eww-data (cdr where) href)))) -(defun eww-tag-link (cont) - (eww-handle-link cont) - (shr-generic cont)) +(defun eww-tag-link (dom) + (eww-handle-link dom) + (shr-generic dom)) -(defun eww-tag-a (cont) - (eww-handle-link cont) +(defun eww-tag-a (dom) + (eww-handle-link dom) (let ((start (point))) - (shr-tag-a cont) + (shr-tag-a dom) (put-text-property start (point) 'keymap eww-link-keymap))) (defun eww-update-header-line-format () @@ -452,25 +452,24 @@ See the `eww-search-prefix' variable for the search engine used." (?t . ,(or (plist-get eww-data :title) "")))))) (setq header-line-format nil))) -(defun eww-tag-title (cont) +(defun eww-tag-title (dom) (let ((title "")) - (dolist (sub cont) - (when (eq (car sub) 'text) - (setq title (concat title (cdr sub))))) + (dolist (sub (dom-children dom)) + (when (stringp sub) + (setq title (concat title sub)))) (plist-put eww-data :title (replace-regexp-in-string "^ \\| $" "" (replace-regexp-in-string "[ \t\r\n]+" " " title)))) (eww-update-header-line-format)) -(defun eww-tag-body (cont) +(defun eww-tag-body (dom) (let* ((start (point)) - (fgcolor (cdr (or (assq :fgcolor cont) - (assq :text cont)))) - (bgcolor (cdr (assq :bgcolor cont))) + (fgcolor (or (dom-attr dom 'fgcolor) (dom-attr dom 'text))) + (bgcolor (dom-attr dom 'bgcolor)) (shr-stylesheet (list (cons 'color fgcolor) (cons 'background-color bgcolor)))) - (shr-generic cont) + (shr-generic dom) (shr-colorize-region start (point) fgcolor bgcolor))) (defun eww-display-raw (buffer &optional encode) @@ -550,18 +549,16 @@ contains the main textual portion, leaving out navigation menus and the like." (interactive) (let* ((old-data eww-data) - (dom (shr-transform-dom - (with-temp-buffer - (insert (plist-get old-data :source)) - (condition-case nil - (decode-coding-region (point-min) (point-max) 'utf-8) - (coding-system-error nil)) - (libxml-parse-html-region (point-min) (point-max)))))) + (dom (with-temp-buffer + (insert (plist-get old-data :source)) + (condition-case nil + (decode-coding-region (point-min) (point-max) 'utf-8) + (coding-system-error nil)) + (libxml-parse-html-region (point-min) (point-max))))) (eww-score-readability dom) (eww-save-history) (eww-display-html nil nil - (shr-retransform-dom - (eww-highest-readability dom)) + (eww-highest-readability dom) nil (current-buffer)) (dolist (elem '(:source :url :title :next :previous :up)) (plist-put eww-data elem (plist-get old-data elem))) @@ -570,41 +567,35 @@ the like." (defun eww-score-readability (node) (let ((score -1)) (cond - ((memq (car node) '(script head comment)) + ((memq (dom-tag node) '(script head comment)) (setq score -2)) - ((eq (car node) 'meta) + ((eq (dom-tag node) 'meta) (setq score -1)) - ((eq (car node) 'img) + ((eq (dom-tag node) 'img) (setq score 2)) - ((eq (car node) 'a) - (setq score (- (length (split-string - (or (cdr (assoc 'text (cdr node))) "")))))) + ((eq (dom-tag node) 'a) + (setq score (- (length (split-string (dom-text node)))))) (t - (dolist (elem (cdr node)) - (cond - ((and (stringp (cdr elem)) - (eq (car elem) 'text)) - (setq score (+ score (length (split-string (cdr elem)))))) - ((consp (cdr elem)) + (dolist (elem (dom-children node)) + (if (stringp elem) + (setq score (+ score (length (split-string elem)))) (setq score (+ score (or (cdr (assoc :eww-readability-score (cdr elem))) - (eww-score-readability elem))))))))) + (eww-score-readability elem)))))))) ;; Cache the score of the node to avoid recomputing all the time. - (setcdr node (cons (cons :eww-readability-score score) (cdr node))) + (dom-set-attribute node :eww-readability-score score) score)) (defun eww-highest-readability (node) (let ((result node) highest) - (dolist (elem (cdr node)) - (when (and (consp (cdr elem)) - (> (or (cdr (assoc - :eww-readability-score - (setq highest - (eww-highest-readability elem)))) - most-negative-fixnum) - (or (cdr (assoc :eww-readability-score (cdr result))) - most-negative-fixnum))) + (dolist (elem (dom-children node)) + (when (> (or (dom-attr + (setq highest (eww-highest-readability elem)) + :eww-readability-score) + most-negative-fixnum) + (or (dom-attr (cdr result) :eww-readability-score) + most-negative-fixnum)) (setq result highest))) result)) @@ -864,13 +855,12 @@ appears in a or tag." (1- (next-single-property-change (point) 'eww-form nil (point-max)))) -(defun eww-tag-form (cont) - (let ((eww-form - (list (assq :method cont) - (assq :action cont))) +(defun eww-tag-form (dom) + (let ((eww-form (list (cons :method (dom-attr dom 'method)) + (cons :action (dom-attr dom 'action)))) (start (point))) (shr-ensure-paragraph) - (shr-generic cont) + (shr-generic dom) (unless (bolp) (insert "\n")) (insert "\n") @@ -878,9 +868,9 @@ appears in a or tag." (put-text-property start (1+ start) 'eww-form eww-form)))) -(defun eww-form-submit (cont) +(defun eww-form-submit (dom) (let ((start (point)) - (value (cdr (assq :value cont)))) + (value (dom-attr dom 'value))) (setq value (if (zerop (length value)) "Submit" @@ -891,28 +881,28 @@ appears in a or tag." (list :eww-form eww-form :value value :type "submit" - :name (cdr (assq :name cont)))) + :name (dom-attr dom 'name))) (put-text-property start (point) 'keymap eww-submit-map) (insert " "))) -(defun eww-form-checkbox (cont) +(defun eww-form-checkbox (dom) (let ((start (point))) - (if (cdr (assq :checked cont)) + (if (dom-attr dom 'checked) (insert eww-form-checkbox-selected-symbol) (insert eww-form-checkbox-symbol)) (add-face-text-property start (point) 'eww-form-checkbox) (put-text-property start (point) 'eww-form (list :eww-form eww-form - :value (cdr (assq :value cont)) - :type (downcase (cdr (assq :type cont))) - :checked (cdr (assq :checked cont)) - :name (cdr (assq :name cont)))) + :value (dom-attr dom 'value) + :type (downcase (dom-attr dom 'type)) + :checked (dom-attr dom 'checked) + :name (dom-attr dom 'name))) (put-text-property start (point) 'keymap eww-checkbox-map) (insert " "))) -(defun eww-form-file (cont) +(defun eww-form-file (dom) (let ((start (point)) - (value (cdr (assq :value cont)))) + (value (dom-attr dom 'value))) (setq value (if (zerop (length value)) " No file selected" @@ -922,9 +912,9 @@ appears in a or tag." (insert value) (put-text-property start (point) 'eww-form (list :eww-form eww-form - :value (cdr (assq :value cont)) - :type (downcase (cdr (assq :type cont))) - :name (cdr (assq :name cont)))) + :value (dom-attr dom 'value) + :type (downcase (dom-attr dom 'type)) + :name (dom-attr dom 'name))) (put-text-property start (point) 'keymap eww-submit-file) (insert " "))) @@ -938,16 +928,13 @@ appears in a or tag." (eww-update-field filename (length "Browse")) (plist-put input :filename filename)))) -(defun eww-form-text (cont) +(defun eww-form-text (dom) (let ((start (point)) - (type (downcase (or (cdr (assq :type cont)) - "text"))) - (value (or (cdr (assq :value cont)) "")) - (width (string-to-number - (or (cdr (assq :size cont)) - "40"))) - (readonly-property (if (or (cdr (assq :disabled cont)) - (cdr (assq :readonly cont))) + (type (downcase (or (dom-attr dom 'type) "text"))) + (value (or (dom-attr dom 'value) "")) + (width (string-to-number (or (dom-attr dom 'size) "40"))) + (readonly-property (if (or (dom-attr dom 'disabled) + (dom-attr dom 'readonly)) 'read-only 'inhibit-read-only))) (insert value) @@ -961,7 +948,7 @@ appears in a or tag." (list :eww-form eww-form :value value :type type - :name (cdr (assq :name cont)))) + :name (dom-attr dom 'name))) (insert " "))) (defconst eww-text-input-types '("text" "password" "textarea" @@ -1014,15 +1001,11 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (put-text-property start (+ start (length value)) 'display (make-string (length value) ?*)))))))) -(defun eww-tag-textarea (cont) +(defun eww-tag-textarea (dom) (let ((start (point)) - (value (or (cdr (assq :value cont)) "")) - (lines (string-to-number - (or (cdr (assq :rows cont)) - "10"))) - (width (string-to-number - (or (cdr (assq :cols cont)) - "10"))) + (value (or (dom-attr dom 'value) "")) + (lines (string-to-number (or (dom-attr dom 'rows) "10"))) + (width (string-to-number (or (dom-attr dom 'cols) "10"))) end) (shr-ensure-newline) (insert value) @@ -1047,23 +1030,22 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (list :eww-form eww-form :value value :type "textarea" - :name (cdr (assq :name cont)))))) + :name (dom-attr dom 'name))))) -(defun eww-tag-input (cont) - (let ((type (downcase (or (cdr (assq :type cont)) - "text"))) +(defun eww-tag-input (dom) + (let ((type (downcase (or (dom-attr dom 'type) "text"))) (start (point))) (cond ((or (equal type "checkbox") (equal type "radio")) - (eww-form-checkbox cont)) + (eww-form-checkbox dom)) ((equal type "file") - (eww-form-file cont)) + (eww-form-file dom)) ((equal type "submit") - (eww-form-submit cont)) + (eww-form-submit dom)) ((equal type "hidden") (let ((form eww-form) - (name (cdr (assq :name cont)))) + (name (dom-attr dom 'name))) ;; Don't add elements repeatedly. (while (and form (or (not (consp (car form))) @@ -1075,34 +1057,33 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (nconc eww-form (list (list 'hidden :name name - :value (cdr (assq :value cont)))))))) + :value (dom-attr dom 'value))))))) (t - (eww-form-text cont))) + (eww-form-text dom))) (unless (= start (point)) (put-text-property start (1+ start) 'help-echo "Input field")))) -(defun eww-tag-select (cont) +(defun eww-tag-select (dom) (shr-ensure-paragraph) - (let ((menu (list :name (cdr (assq :name cont)) + (let ((menu (list :name (dom-attr dom 'name) :eww-form eww-form)) (options nil) (start (point)) (max 0) opelem) - (if (eq (car (car cont)) 'optgroup) - (dolist (groupelem cont) - (unless (cdr (assq :disabled (cdr groupelem))) - (setq opelem (append opelem (cdr (cdr groupelem)))))) - (setq opelem cont)) + (if (eq (dom-tag dom) 'optgroup) + (dolist (groupelem (dom-children dom)) + (unless (dom-attr groupelem 'disabled) + (setq opelem (append opelem (list groupelem))))) + (setq opelem (list dom))) (dolist (elem opelem) - (when (eq (car elem) 'option) - (when (cdr (assq :selected (cdr elem))) - (nconc menu (list :value - (cdr (assq :value (cdr elem)))))) - (let ((display (or (cdr (assq 'text (cdr elem))) ""))) + (when (eq (dom-tag elem) 'option) + (when (dom-attr elem 'selected) + (nconc menu (list :value (dom-attr elem 'value)))) + (let ((display (dom-text elem))) (setq max (max max (length display))) (push (list 'item - :value (cdr (assq :value (cdr elem))) + :value (dom-attr elem 'value) :display display) options)))) (when options @@ -1302,8 +1283,7 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (eww-browse-url (concat (if (cdr (assq :action form)) - (shr-expand-url (cdr (assq :action form)) - (plist-get eww-data :url)) + (shr-expand-url (cdr (assq :action form)) (plist-get eww-data :url)) (plist-get eww-data :url)) "?" (mm-url-encode-www-form-urlencoded values)))))) diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 1ced4e0..22bceeb 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -33,6 +33,8 @@ (eval-when-compile (require 'cl)) (eval-when-compile (require 'url)) ;For url-filename's setf handler. (require 'browse-url) +(require 'subr-x) +(require 'dom) (defgroup shr nil "Simple HTML Renderer" @@ -205,7 +207,7 @@ DOM should be a parse tree as generated by (shr-depth 0) (shr-warning nil) (shr-internal-width (or shr-width (1- (window-width))))) - (shr-descend (shr-transform-dom dom)) + (shr-descend dom) (shr-remove-trailing-whitespace start (point)) (when shr-warning (message "%s" shr-warning)))) @@ -366,53 +368,20 @@ size, and full-buffer size." ;;; Utility functions. -(defun shr-transform-dom (dom) - (let ((result (list (pop dom)))) - (dolist (arg (pop dom)) - (push (cons (intern (concat ":" (symbol-name (car arg))) obarray) - (cdr arg)) - result)) - (dolist (sub dom) - (if (stringp sub) - (push (cons 'text sub) result) - (push (shr-transform-dom sub) result))) - (nreverse result))) - -(defun shr-retransform-dom (dom) - "Transform the shr DOM back into the libxml DOM." - (let ((tag (car dom)) - (attributes nil) - (sub-nodes nil)) - (dolist (elem (cdr dom)) - (cond - ((and (stringp (cdr elem)) - (eq (car elem) 'text)) - (push (cdr elem) sub-nodes)) - ((not (listp (cdr elem))) - (push (cons (intern (substring (symbol-name (car elem)) 1) obarray) - (cdr elem)) - attributes)) - (t - (push (shr-retransform-dom elem) sub-nodes)))) - (append (list tag (nreverse attributes)) - (nreverse sub-nodes)))) - -(defsubst shr-generic (cont) - (dolist (sub cont) - (cond - ((eq (car sub) 'text) - (shr-insert (cdr sub))) - ((listp (cdr sub)) - (shr-descend sub))))) +(defsubst shr-generic (dom) + (dolist (sub (dom-children dom)) + (if (stringp sub) + (shr-insert sub) + (shr-descend sub)))) (defun shr-descend (dom) (let ((function (or ;; Allow other packages to override (or provide) rendering ;; of elements. - (cdr (assq (car dom) shr-external-rendering-functions)) - (intern (concat "shr-tag-" (symbol-name (car dom))) obarray))) - (style (cdr (assq :style (cdr dom)))) + (cdr (assq (dom-tag dom) shr-external-rendering-functions)) + (intern (concat "shr-tag-" (symbol-name (dom-tag dom))) obarray))) + (style (dom-attr dom 'style)) (shr-stylesheet shr-stylesheet) (shr-depth (1+ shr-depth)) (start (point))) @@ -427,10 +396,10 @@ size, and full-buffer size." ;; If we have a display:none, then just ignore this part of the DOM. (unless (equal (cdr (assq 'display shr-stylesheet)) "none") (if (fboundp function) - (funcall function (cdr dom)) - (shr-generic (cdr dom))) + (funcall function dom) + (shr-generic dom)) (when (and shr-target-id - (equal (cdr (assq :id (cdr dom))) shr-target-id)) + (equal (dom-attr dom 'id) shr-target-id)) ;; If the element was empty, we don't have anything to put the ;; anchor on. So just insert a dummy character. (when (= start (point)) @@ -684,9 +653,9 @@ size, and full-buffer size." (when (> shr-indentation 0) (insert (make-string shr-indentation ? )))) -(defun shr-fontize-cont (cont &rest types) +(defun shr-fontize-dom (dom &rest types) (let (shr-start) - (shr-generic cont) + (shr-generic dom) (dolist (type types) (shr-add-font (or shr-start (point)) (point) type)))) @@ -879,8 +848,7 @@ Return a string with image data." (when (eq content-type 'image/svg+xml) (setq data (shr-dom-to-xml - (shr-transform-dom - (libxml-parse-xml-region (point) (point-max)))))) + (libxml-parse-xml-region (point) (point-max))))) (list data content-type))) (defun shr-image-displayer (content-function) @@ -903,9 +871,9 @@ START, and END. Note that START and END should be markers." (list (current-buffer) start end) t t))))) -(defun shr-heading (cont &rest types) +(defun shr-heading (dom &rest types) (shr-ensure-paragraph) - (apply #'shr-fontize-cont cont types) + (apply #'shr-fontize-dom dom types) (shr-ensure-paragraph)) (defun shr-urlify (start url &optional title) @@ -1014,105 +982,98 @@ ones, in case fg and bg are nil." ;;; Tag-specific rendering rules. -(defun shr-tag-body (cont) +(defun shr-tag-body (dom) (let* ((start (point)) - (fgcolor (cdr (or (assq :fgcolor cont) - (assq :text cont)))) - (bgcolor (cdr (assq :bgcolor cont))) + (fgcolor (or (dom-attr dom 'fgcolor) (dom-attr dom 'text))) + (bgcolor (dom-attr dom 'bgcolor)) (shr-stylesheet (list (cons 'color fgcolor) (cons 'background-color bgcolor)))) - (shr-generic cont) + (shr-generic dom) (shr-colorize-region start (point) fgcolor bgcolor))) -(defun shr-tag-style (_cont) +(defun shr-tag-style (_dom) ) -(defun shr-tag-script (_cont) +(defun shr-tag-script (_dom) ) -(defun shr-tag-comment (_cont) +(defun shr-tag-comment (_dom) ) (defun shr-dom-to-xml (dom) + (with-temp-buffer + (shr-dom-print dom) + (buffer-string))) + +(defun shr-dom-print (dom) "Convert DOM into a string containing the xml representation." - (let ((arg " ") - (text "") - url) - (dolist (sub (cdr dom)) - (cond - ((listp (cdr sub)) - ;; Ignore external image definitions if required. - ;; - (when (or (not (eq (car sub) 'image)) - (not (setq url (cdr (assq ':xlink:href (cdr sub))))) - (not shr-blocked-images) - (not (string-match shr-blocked-images url))) - (setq text (concat text (shr-dom-to-xml sub))))) - ((eq (car sub) 'text) - (setq text (concat text (cdr sub)))) - (t - (setq arg (concat arg (format "%s=\"%s\" " - (substring (symbol-name (car sub)) 1) - (cdr sub))))))) - (format "<%s%s>%s" - (car dom) - (substring arg 0 (1- (length arg))) - text - (car dom)))) - -(defun shr-tag-svg (cont) + (insert (format "<%s" (dom-tag dom))) + (dolist (attr (dom-attributes dom)) + ;; Ignore attributes that start with a colon. + (unless (= (aref (format "%s" (car attr)) 0) ?:) + (insert (format " %s=\"%s\"" (car attr) (cdr attr))))) + (insert ">") + (let (url) + (dolist (elem (dom-children dom)) + (when (or (not (eq (dom-tag elem) 'image)) + (not (setq url (dom-attr elem ':xlink:href))) + (not shr-blocked-images) + (not (string-match shr-blocked-images url))) + (insert " ") + (shr-dom-print elem)))) + (insert (format "" (dom-tag dom)))) + +(defun shr-tag-svg (dom) (when (and (image-type-available-p 'svg) (not shr-inhibit-images)) - (funcall shr-put-image-function - (shr-dom-to-xml (cons 'svg cont)) - "SVG Image"))) + (funcall shr-put-image-function (shr-dom-to-xml dom) "SVG Image"))) -(defun shr-tag-sup (cont) +(defun shr-tag-sup (dom) (let ((start (point))) - (shr-generic cont) + (shr-generic dom) (put-text-property start (point) 'display '(raise 0.5)))) -(defun shr-tag-sub (cont) +(defun shr-tag-sub (dom) (let ((start (point))) - (shr-generic cont) + (shr-generic dom) (put-text-property start (point) 'display '(raise -0.5)))) -(defun shr-tag-label (cont) - (shr-generic cont) +(defun shr-tag-label (dom) + (shr-generic dom) (shr-ensure-paragraph)) -(defun shr-tag-p (cont) +(defun shr-tag-p (dom) (shr-ensure-paragraph) (shr-indent) - (shr-generic cont) + (shr-generic dom) (shr-ensure-paragraph)) -(defun shr-tag-div (cont) +(defun shr-tag-div (dom) (shr-ensure-newline) (shr-indent) - (shr-generic cont) + (shr-generic dom) (shr-ensure-newline)) -(defun shr-tag-s (cont) - (shr-fontize-cont cont 'shr-strike-through)) +(defun shr-tag-s (dom) + (shr-fontize-dom dom 'shr-strike-through)) -(defun shr-tag-del (cont) - (shr-fontize-cont cont 'shr-strike-through)) +(defun shr-tag-del (dom) + (shr-fontize-dom dom 'shr-strike-through)) -(defun shr-tag-b (cont) - (shr-fontize-cont cont 'bold)) +(defun shr-tag-b (dom) + (shr-fontize-dom dom 'bold)) -(defun shr-tag-i (cont) - (shr-fontize-cont cont 'italic)) +(defun shr-tag-i (dom) + (shr-fontize-dom dom 'italic)) -(defun shr-tag-em (cont) - (shr-fontize-cont cont 'italic)) +(defun shr-tag-em (dom) + (shr-fontize-dom dom 'italic)) -(defun shr-tag-strong (cont) - (shr-fontize-cont cont 'bold)) +(defun shr-tag-strong (dom) + (shr-fontize-dom dom 'bold)) -(defun shr-tag-u (cont) - (shr-fontize-cont cont 'underline)) +(defun shr-tag-u (dom) + (shr-fontize-dom dom 'underline)) (defun shr-parse-style (style) (when style @@ -1134,20 +1095,19 @@ ones, in case fg and bg are nil." plist))))) plist))) -(defun shr-tag-base (cont) - (let ((base (cdr (assq :href cont)))) - (when base - (setq shr-base (shr-parse-base base)))) - (shr-generic cont)) +(defun shr-tag-base (dom) + (when-let (base (dom-attr dom 'href)) + (setq shr-base (shr-parse-base base))) + (shr-generic dom)) -(defun shr-tag-a (cont) - (let ((url (cdr (assq :href cont))) - (title (cdr (assq :title cont))) +(defun shr-tag-a (dom) + (let ((url (dom-attr dom 'href)) + (title (dom-attr dom 'title)) (start (point)) shr-start) - (shr-generic cont) + (shr-generic dom) (when (and shr-target-id - (equal (cdr (assq :name cont)) shr-target-id)) + (equal (dom-attr dom 'name) shr-target-id)) ;; We have a zero-length element, so just ;; insert... something. (when (= start (point)) @@ -1158,33 +1118,33 @@ ones, in case fg and bg are nil." (not shr-inhibit-decoration)) (shr-urlify (or shr-start start) (shr-expand-url url) title)))) -(defun shr-tag-object (cont) +(defun shr-tag-object (dom) (unless shr-inhibit-images (let ((start (point)) url multimedia image) - (dolist (elem cont) + (when-let (type (dom-attr dom 'type)) + (when (string-match "\\`image/svg" type) + (setq url (dom-attr dom 'data) + image t))) + (dolist (child (dom-children dom)) (cond - ((eq (car elem) 'embed) - (setq url (or url (cdr (assq :src (cdr elem)))) - multimedia t)) - ((and (eq (car elem) 'param) - (equal (cdr (assq :name (cdr elem))) "movie")) - (setq url (or url (cdr (assq :value (cdr elem)))) + ((eq (dom-tag child) 'embed) + (setq url (or url (dom-attr child 'src)) multimedia t)) - ((and (eq (car elem) :type) - (string-match "\\`image/svg" (cdr elem))) - (setq url (cdr (assq :data cont)) - image t)))) + ((and (eq (dom-tag child) 'param) + (equal (dom-attr child 'name) "movie")) + (setq url (or url (dom-attr child 'value)) + multimedia t)))) (when url (cond (image - (shr-tag-img cont url) - (setq cont nil)) + (shr-tag-img dom url) + (setq dom nil)) (multimedia (shr-insert " [multimedia] ") (shr-urlify start (shr-expand-url url))))) - (when cont - (shr-generic cont))))) + (when dom + (shr-generic dom))))) (defcustom shr-prefer-media-type-alist '(("webm" . 1.0) ("ogv" . 1.0) @@ -1203,10 +1163,10 @@ url if no type is specified. The value should be a float in the range 0.0 to (defun shr--get-media-pref (elem) "Determine the preference for ELEM. The preference is a float determined from `shr-prefer-media-type'." - (let ((type (cdr (assq :type elem))) + (let ((type (dom-attr elem 'type)) (p 0.0)) (unless type - (setq type (cdr (assq :src elem)))) + (setq type (dom-attr elem 'src))) (when type (dolist (pref shr-prefer-media-type-alist) (when (and @@ -1215,61 +1175,61 @@ The preference is a float determined from `shr-prefer-media-type'." (setq p (cdr pref))))) p)) -(defun shr--extract-best-source (cont &optional url pref) - "Extract the best `:src' property from blocks in CONT." +(defun shr--extract-best-source (dom &optional url pref) + "Extract the best `:src' property from blocks in DOM." (setq pref (or pref -1.0)) (let (new-pref) - (dolist (elem cont) - (when (and (eq (car elem) 'source) + (dolist (elem (dom-children dom)) + (when (and (eq (dom-tag elem) 'source) (< pref (setq new-pref (shr--get-media-pref elem)))) (setq pref new-pref - url (cdr (assq :src elem))) + url (dom-attr elem 'src)) ;; libxml's html parser isn't HTML5 compliant and non terminated ;; source tags might end up as children. So recursion it is... - (dolist (child (cdr elem)) - (when (eq (car child) 'source) + (dolist (child (dom-children elem)) + (when (eq (dom-tag child) 'source) (let ((ret (shr--extract-best-source (list child) url pref))) (when (< pref (cdr ret)) (setq url (car ret) pref (cdr ret))))))))) (cons url pref)) -(defun shr-tag-video (cont) - (let ((image (cdr (assq :poster cont))) - (url (cdr (assq :src cont))) +(defun shr-tag-video (dom) + (let ((image (dom-attr dom 'poster)) + (url (dom-attr dom 'src)) (start (point))) (unless url - (setq url (car (shr--extract-best-source cont)))) + (setq url (car (shr--extract-best-source dom)))) (if image (shr-tag-img nil image) (shr-insert " [video] ")) (shr-urlify start (shr-expand-url url)))) -(defun shr-tag-audio (cont) - (let ((url (cdr (assq :src cont))) +(defun shr-tag-audio (dom) + (let ((url (dom-attr dom 'src)) (start (point))) (unless url - (setq url (car (shr--extract-best-source cont)))) + (setq url (car (shr--extract-best-source dom)))) (shr-insert " [audio] ") (shr-urlify start (shr-expand-url url)))) -(defun shr-tag-img (cont &optional url) +(defun shr-tag-img (dom &optional url) (when (or url - (and cont - (> (length (cdr (assq :src cont))) 0))) + (and dom + (> (length (dom-attr dom 'src)) 0))) (when (and (> (current-column) 0) (not (eq shr-state 'image))) (insert "\n")) - (let ((alt (cdr (assq :alt cont))) - (url (shr-expand-url (or url (cdr (assq :src cont)))))) + (let ((alt (dom-attr dom 'alt)) + (url (shr-expand-url (or url (dom-attr dom 'src))))) (let ((start (point-marker))) (when (zerop (length alt)) (setq alt "*")) (cond - ((or (member (cdr (assq :height cont)) '("0" "1")) - (member (cdr (assq :width cont)) '("0" "1"))) + ((or (member (dom-attr dom 'height) '("0" "1")) + (member (dom-attr dom 'width) '("0" "1"))) ;; Ignore zero-sized or single-pixel images. ) ((and (not shr-inhibit-images) @@ -1315,52 +1275,51 @@ The preference is a float determined from `shr-prefer-media-type'." (put-text-property start (point) 'image-displayer (shr-image-displayer shr-content-function)) (put-text-property start (point) 'help-echo - (or (cdr (assq :title cont)) - alt))) + (or (dom-attr dom 'title) alt))) (setq shr-state 'image))))) -(defun shr-tag-pre (cont) +(defun shr-tag-pre (dom) (let ((shr-folding-mode 'none)) (shr-ensure-newline) (shr-indent) - (shr-generic cont) + (shr-generic dom) (shr-ensure-newline))) -(defun shr-tag-blockquote (cont) +(defun shr-tag-blockquote (dom) (shr-ensure-paragraph) (shr-indent) (let ((shr-indentation (+ shr-indentation 4))) - (shr-generic cont)) + (shr-generic dom)) (shr-ensure-paragraph)) -(defun shr-tag-dl (cont) +(defun shr-tag-dl (dom) (shr-ensure-paragraph) - (shr-generic cont) + (shr-generic dom) (shr-ensure-paragraph)) -(defun shr-tag-dt (cont) +(defun shr-tag-dt (dom) (shr-ensure-newline) - (shr-generic cont) + (shr-generic dom) (shr-ensure-newline)) -(defun shr-tag-dd (cont) +(defun shr-tag-dd (dom) (shr-ensure-newline) (let ((shr-indentation (+ shr-indentation 4))) - (shr-generic cont))) + (shr-generic dom))) -(defun shr-tag-ul (cont) +(defun shr-tag-ul (dom) (shr-ensure-paragraph) (let ((shr-list-mode 'ul)) - (shr-generic cont)) + (shr-generic dom)) (shr-ensure-paragraph)) -(defun shr-tag-ol (cont) +(defun shr-tag-ol (dom) (shr-ensure-paragraph) (let ((shr-list-mode 1)) - (shr-generic cont)) + (shr-generic dom)) (shr-ensure-paragraph)) -(defun shr-tag-li (cont) +(defun shr-tag-li (dom) (shr-ensure-newline) (shr-indent) (let* ((bullet @@ -1371,9 +1330,9 @@ The preference is a float determined from `shr-prefer-media-type'." shr-bullet)) (shr-indentation (+ shr-indentation (length bullet)))) (insert bullet) - (shr-generic cont))) + (shr-generic dom))) -(defun shr-tag-br (cont) +(defun shr-tag-br (dom) (when (and (not (bobp)) ;; Only add a newline if we break the current line, or ;; the previous line isn't a blank line. @@ -1382,42 +1341,42 @@ The preference is a float determined from `shr-prefer-media-type'." (not (= (char-after (- (point) 2)) ?\n))))) (insert "\n") (shr-indent)) - (shr-generic cont)) + (shr-generic dom)) -(defun shr-tag-span (cont) - (shr-generic cont)) +(defun shr-tag-span (dom) + (shr-generic dom)) -(defun shr-tag-h1 (cont) - (shr-heading cont 'bold 'underline)) +(defun shr-tag-h1 (dom) + (shr-heading dom 'bold 'underline)) -(defun shr-tag-h2 (cont) - (shr-heading cont 'bold)) +(defun shr-tag-h2 (dom) + (shr-heading dom 'bold)) -(defun shr-tag-h3 (cont) - (shr-heading cont 'italic)) +(defun shr-tag-h3 (dom) + (shr-heading dom 'italic)) -(defun shr-tag-h4 (cont) - (shr-heading cont)) +(defun shr-tag-h4 (dom) + (shr-heading dom)) -(defun shr-tag-h5 (cont) - (shr-heading cont)) +(defun shr-tag-h5 (dom) + (shr-heading dom)) -(defun shr-tag-h6 (cont) - (shr-heading cont)) +(defun shr-tag-h6 (dom) + (shr-heading dom)) -(defun shr-tag-hr (_cont) +(defun shr-tag-hr (_dom) (shr-ensure-newline) (insert (make-string shr-internal-width shr-hr-line) "\n")) -(defun shr-tag-title (cont) - (shr-heading cont 'bold 'underline)) +(defun shr-tag-title (dom) + (shr-heading dom 'bold 'underline)) -(defun shr-tag-font (cont) +(defun shr-tag-font (dom) (let* ((start (point)) - (color (cdr (assq :color cont))) + (color (dom-attr dom 'color)) (shr-stylesheet (nconc (list (cons 'color color)) shr-stylesheet))) - (shr-generic cont) + (shr-generic dom) (when color (shr-colorize-region start (point) color (cdr (assq 'background-color shr-stylesheet)))))) @@ -1432,23 +1391,22 @@ The preference is a float determined from `shr-prefer-media-type'." ;; main buffer). Now we know how much space each TD really takes, so ;; we then render everything again with the new widths, and finally ;; insert all these boxes into the main buffer. -(defun shr-tag-table-1 (cont) - (setq cont (or (cdr (assq 'tbody cont)) - cont)) +(defun shr-tag-table-1 (dom) + (setq dom (or (dom-child-by-tag dom 'tbody) dom)) (let* ((shr-inhibit-images t) (shr-table-depth (1+ shr-table-depth)) (shr-kinsoku-shorten t) ;; Find all suggested widths. - (columns (shr-column-specs cont)) + (columns (shr-column-specs dom)) ;; Compute how many characters wide each TD should be. (suggested-widths (shr-pro-rate-columns columns)) ;; Do a "test rendering" to see how big each TD is (this can ;; be smaller (if there's little text) or bigger (if there's ;; unbreakable text). - (sketch (shr-make-table cont suggested-widths)) + (sketch (shr-make-table dom suggested-widths)) ;; Compute the "natural" width by setting each column to 500 ;; characters and see how wide they really render. - (natural (shr-make-table cont (make-vector (length columns) 500))) + (natural (shr-make-table dom (make-vector (length columns) 500))) (sketch-widths (shr-table-widths sketch natural suggested-widths))) ;; This probably won't work very well. (when (> (+ (loop for width across sketch-widths @@ -1457,15 +1415,15 @@ The preference is a float determined from `shr-prefer-media-type'." (frame-width)) (setq truncate-lines t)) ;; Then render the table again with these new "hard" widths. - (shr-insert-table (shr-make-table cont sketch-widths t) sketch-widths))) + (shr-insert-table (shr-make-table dom sketch-widths t) sketch-widths))) -(defun shr-tag-table (cont) +(defun shr-tag-table (dom) (shr-ensure-paragraph) - (let* ((caption (cdr (assq 'caption cont))) - (header (cdr (assq 'thead cont))) - (body (or (cdr (assq 'tbody cont)) cont)) - (footer (cdr (assq 'tfoot cont))) - (bgcolor (cdr (assq :bgcolor cont))) + (let* ((caption (dom-child-by-tag dom 'caption)) + (header (dom-child-by-tag dom 'thead)) + (body (or (dom-child-by-tag dom 'tbody) dom)) + (footer (dom-child-by-tag dom 'tfoot)) + (bgcolor (dom-attr dom 'bgcolor)) (start (point)) (shr-stylesheet (nconc (list (cons 'background-color bgcolor)) shr-stylesheet)) @@ -1474,12 +1432,12 @@ The preference is a float determined from `shr-prefer-media-type'." (nfooter (if footer (shr-max-columns footer)))) (if (and (not caption) (not header) - (not (cdr (assq 'tbody cont))) - (not (cdr (assq 'tr cont))) + (not (dom-child-by-tag dom 'tbody)) + (not (dom-child-by-tag dom 'tr)) (not footer)) ;; The table is totally invalid and just contains random junk. ;; Try to output it anyway. - (shr-generic cont) + (shr-generic dom) ;; It's a real table, so render it. (shr-tag-table-1 (nconc @@ -1526,19 +1484,10 @@ The preference is a float determined from `shr-prefer-media-type'." ;; model isn't strong enough to allow us to put the images actually ;; into the tables. (when (zerop shr-table-depth) - (dolist (elem (shr-find-elements cont 'object)) - (shr-tag-object (cdr elem))) - (dolist (elem (shr-find-elements cont 'img)) - (shr-tag-img (cdr elem)))))) - -(defun shr-find-elements (cont type) - (let (result) - (dolist (elem cont) - (cond ((eq (car elem) type) - (push elem result)) - ((consp (cdr elem)) - (setq result (nconc (shr-find-elements (cdr elem) type) result))))) - (nreverse result))) + (dolist (elem (dom-by-tag dom 'object)) + (shr-tag-object elem)) + (dolist (elem (dom-by-tag dom 'img)) + (shr-tag-img elem))))) (defun shr-insert-table (table widths) (let* ((collapse (equal (cdr (assq 'border-collapse shr-stylesheet)) @@ -1621,22 +1570,22 @@ The preference is a float determined from `shr-prefer-media-type'." (aref widths i)))))))) widths)) -(defun shr-make-table (cont widths &optional fill) - (or (cadr (assoc (list cont widths fill) shr-content-cache)) - (let ((data (shr-make-table-1 cont widths fill))) - (push (list (list cont widths fill) data) +(defun shr-make-table (dom widths &optional fill) + (or (cadr (assoc (list dom widths fill) shr-content-cache)) + (let ((data (shr-make-table-1 dom widths fill))) + (push (list (list dom widths fill) data) shr-content-cache) data))) -(defun shr-make-table-1 (cont widths &optional fill) +(defun shr-make-table-1 (dom widths &optional fill) (let ((trs nil) (shr-inhibit-decoration (not fill)) (rowspans (make-vector (length widths) 0)) width colspan) - (dolist (row cont) - (when (eq (car row) 'tr) + (dolist (row (dom-children dom)) + (when (eq (dom-tag row) 'tr) (let ((tds nil) - (columns (cdr row)) + (columns (dom-children row)) (i 0) (width-column 0) column) @@ -1650,12 +1599,12 @@ The preference is a float determined from `shr-prefer-media-type'." (pop columns) (aset rowspans i (1- (aref rowspans i))) '(td))) - (when (or (memq (car column) '(td th)) - (not column)) - (when (cdr (assq :rowspan (cdr column))) + (when (and (not (stringp column)) + (or (memq (dom-tag column) '(td th)) + (not column))) + (when-let (span (dom-attr column 'rowspan)) (aset rowspans i (+ (aref rowspans i) - (1- (string-to-number - (cdr (assq :rowspan (cdr column)))))))) + (1- (string-to-number span))))) ;; Sanity check for invalid column-spans. (when (>= width-column (length widths)) (setq width-column 0)) @@ -1664,7 +1613,7 @@ The preference is a float determined from `shr-prefer-media-type'." (aref widths width-column) 10)) (when (and fill - (setq colspan (cdr (assq :colspan (cdr column))))) + (setq colspan (dom-attr column colspan))) (setq colspan (min (string-to-number colspan) ;; The colspan may be wrong, so ;; truncate it to the length of the @@ -1679,18 +1628,18 @@ The preference is a float determined from `shr-prefer-media-type'." (setq width-column (+ width-column (1- colspan)))) (when (or column (not fill)) - (push (shr-render-td (cdr column) width fill) + (push (shr-render-td column width fill) tds)) (setq i (1+ i) width-column (1+ width-column)))) (push (nreverse tds) trs)))) (nreverse trs))) -(defun shr-render-td (cont width fill) +(defun shr-render-td (dom width fill) (with-temp-buffer - (let ((bgcolor (cdr (assq :bgcolor cont))) - (fgcolor (cdr (assq :fgcolor cont))) - (style (cdr (assq :style cont))) + (let ((bgcolor (dom-attr dom 'bgcolor)) + (fgcolor (dom-attr dom 'fgcolor)) + (style (dom-attr dom 'style)) (shr-stylesheet shr-stylesheet) actual-colors) (when style @@ -1704,7 +1653,7 @@ The preference is a float determined from `shr-prefer-media-type'." (setq shr-stylesheet (append style shr-stylesheet))) (let ((shr-internal-width width) (shr-indentation 0)) - (shr-descend (cons 'td cont))) + (shr-descend dom)) ;; Delete padding at the bottom of the TDs. (delete-region (point) @@ -1725,7 +1674,7 @@ The preference is a float determined from `shr-prefer-media-type'." (if (zerop (buffer-size)) (insert (make-string width ? )) ;; Otherwise, fill the buffer. - (let ((align (cdr (assq :align cont))) + (let ((align (dom-attr dom 'align)) length) (while (not (eobp)) (end-of-line) @@ -1780,14 +1729,15 @@ The preference is a float determined from `shr-prefer-media-type'." widths)) ;; Return a summary of the number and shape of the TDs in the table. -(defun shr-column-specs (cont) - (let ((columns (make-vector (shr-max-columns cont) 1))) - (dolist (row cont) - (when (eq (car row) 'tr) +(defun shr-column-specs (dom) + (let ((columns (make-vector (shr-max-columns dom) 1))) + (dolist (row (dom-children dom)) + (when (eq (dom-tag row) 'tr) (let ((i 0)) - (dolist (column (cdr row)) - (when (memq (car column) '(td th)) - (let ((width (cdr (assq :width (cdr column))))) + (dolist (column (dom-children row)) + (when (and (not (stringp column)) + (memq (dom-tag column) '(td th))) + (let ((width (dom-attr column 'width))) (when (and width (string-match "\\([0-9]+\\)%" width) (not (zerop (setq width (string-to-number @@ -1796,19 +1746,20 @@ The preference is a float determined from `shr-prefer-media-type'." (setq i (1+ i))))))) columns)) -(defun shr-count (cont elem) +(defun shr-count (dom elem) (let ((i 0)) - (dolist (sub cont) - (when (eq (car sub) elem) + (dolist (sub (dom-children dom)) + (when (and (not (stringp sub)) + (eq (dom-tag sub) elem)) (setq i (1+ i)))) i)) -(defun shr-max-columns (cont) +(defun shr-max-columns (dom) (let ((max 0)) - (dolist (row cont) - (when (eq (car row) 'tr) - (setq max (max max (+ (shr-count (cdr row) 'td) - (shr-count (cdr row) 'th)))))) + (dolist (row (dom-children dom)) + (when (eq (dom-tag row) 'tr) + (setq max (max max (+ (shr-count row 'td) + (shr-count row 'th)))))) max)) (provide 'shr) commit 115178cd46b10383a12bd865739d0d55eea20251 Author: Lars Magne Ingebrigtsen Date: Wed Nov 26 19:39:49 2014 +0100 * dom.el: New file. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee47390..794f5f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -8,6 +8,10 @@ Remove spurious reference to symbol category_properties. * progmodes/cc-engine.el (c-state-pp-to-literal): Fix here. +2014-11-26 Lars Magne Ingebrigtsen + + * dom.el: New file. + 2014-11-26 Glenn Morris * arc-mode.el (archive-visit-single-files): Add :version. diff --git a/lisp/dom.el b/lisp/dom.el new file mode 100644 index 0000000..3157e0b --- /dev/null +++ b/lisp/dom.el @@ -0,0 +1,176 @@ +;;; dom.el --- XML/HTML (etc.) DOM manipulation and searching functions + +;; Copyright (C) 2014 Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen +;; Keywords: xml, html + +;; 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: + +;;; Code: + +(require 'cl-lib) + +(defsubst dom-tag (node) + "Return the NODE tag." + ;; Called on a list of nodes. Use the first. + (if (consp (car node)) + (caar node) + (car node))) + +(defsubst dom-attributes (node) + "Return the NODE attributes." + ;; Called on a list of nodes. Use the first. + (if (consp (car node)) + (cadr (car node)) + (cadr node))) + +(defsubst dom-children (node) + "Return the NODE children." + ;; Called on a list of nodes. Use the first. + (if (consp (car node)) + (cddr (car node)) + (cddr node))) + +(defun dom-set-attributes (node attributes) + "Set the attributes of NODE to ATTRIBUTES." + (setq node (dom-ensure-node node)) + (setcar (cdr node) attributes)) + +(defun dom-set-attribute (node attribute value) + "Set ATTRIBUTE in NODE to VALUE." + (setq node (dom-ensure-node node)) + (let ((old (assoc attribute (cadr node)))) + (if old + (setcdr old value) + (setcar (cdr node) (nconc (cadr node) (list (cons attribute value))))))) + +(defmacro dom-attr (node attr) + "Return the attribute ATTR from NODE. +A typical attribute is `href'." + `(cdr (assq ,attr (dom-attributes ,node)))) + +(defun dom-text (node) + "Return all the text bits in the current node concatenated." + (mapconcat 'identity (cl-remove-if-not 'stringp (dom-children node)) " ")) + +(defun dom-texts (node &optional separator) + "Return all textual data under NODE concatenated with SEPARATOR in-between." + (mapconcat + 'identity + (mapcar + (lambda (elem) + (if (stringp elem) + elem + (dom-texts elem separator))) + (dom-children node)) + (or separator " "))) + +(defun dom-child-by-tag (dom tag) + "Return the first child of DOM that is of type TAG." + (assoc tag (dom-children dom))) + +(defun dom-by-tag (dom tag) + "Return elements in DOM that is of type TAG. +A name is a symbol like `td'." + (let ((matches (cl-loop for child in (dom-children dom) + for matches = (and (not (stringp child)) + (dom-by-tag child tag)) + when matches + append matches))) + (if (eq (dom-tag dom) tag) + (cons dom matches) + matches))) + +(defun dom-by-class (dom match) + "Return elements in DOM that have a class name that matches regexp MATCH." + (dom-elements dom 'class match)) + +(defun dom-by-style (dom match) + "Return elements in DOM that have a style that matches regexp MATCH." + (dom-elements dom 'style match)) + +(defun dom-by-id (dom match) + "Return elements in DOM that have an ID that matches regexp MATCH." + (dom-elements dom 'id match)) + +(defun dom-elements (dom attribute match) + "Find elements matching MATCH (a regexp) in ATTRIBUTE. +ATTRIBUTE would typically be `class', `id' or the like." + (let ((matches (cl-loop for child in (dom-children dom) + for matches = (dom-elements child attribute match) + when matches + append matches)) + (attr (dom-attr dom attribute))) + (if (and attr + (string-match match attr)) + (cons dom matches) + matches))) + +(defun dom-parent (dom node) + "Return the parent of NODE in DOM." + (if (memq node (dom-children dom)) + dom + (let ((result nil)) + (dolist (elem (dom-children dom)) + (when (and (not result) + (not (stringp elem))) + (setq result (dom-parent elem node)))) + result))) + +(defun dom-node (tag &optional attributes &rest children) + "Return a DOM node with TAG and ATTRIBUTES." + (if children + `(,tag ,attributes ,@children) + (list tag attributes))) + +(defun dom-append-child (node child) + "Append CHILD to the end of NODE's children." + (setq node (dom-ensure-node node)) + (nconc node (list child))) + +(defun dom-add-child-before (node child &optional before) + "Add CHILD to NODE's children before child BEFORE. +If BEFORE is nil, make CHILD NODE's first child." + (setq node (dom-ensure-node node)) + (let ((children (dom-children node))) + (when (and before + (not (memq before children))) + (error "%s does not exist as a child" before)) + (let ((pos (if before + (cl-position before children) + 0))) + (if (zerop pos) + ;; First child. + (setcdr (cdr node) (cons child (cddr node))) + (setcdr (nthcdr (1- pos) children) + (cons child (nthcdr pos children)))))) + node) + +(defun dom-ensure-node (node) + "Ensure that NODE is a proper DOM node." + ;; Add empty attributes, if none. + (when (consp (car node)) + (setq node (car node))) + (when (= (length node) 1) + (setcdr node (list nil))) + node) + +(provide 'dom) + +;;; dom.el ends here commit 549a1bae4a54c56c4c8d212f1441ac44aac89a4b Author: Ulf Jasper Date: Wed Nov 26 19:29:34 2014 +0100 newsticker: Take care of UIDs when adding elements to cache. * lisp/net/newst-backend.el (newsticker--parse-generic-items): Take care of UIDs when adding elements to cache. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7567c63..ee47390 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-26 Ulf Jasper + + * net/newst-backend.el (newsticker--parse-generic-items): Take + care of UIDs when adding elements to cache. + 2014-11-26 Alan Mackenzie Remove spurious reference to symbol category_properties. diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 7be07c7..41f8b84 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -1579,11 +1579,16 @@ argument, which is one of the items in ITEMLIST." ;; item was not there (setq item-new-p t) (setq something-was-added t)) - (setq newsticker--cache - (newsticker--cache-add - newsticker--cache (intern name) title desc link - time age1 position (funcall extra-fn node) - time age2)) + (let ((extra-elements-with-guid (funcall extra-fn node))) + (unless (assoc 'guid extra-elements-with-guid) + (setq extra-elements-with-guid + (cons `(guid nil ,(funcall guid-fn node)) + extra-elements-with-guid))) + (setq newsticker--cache + (newsticker--cache-add + newsticker--cache (intern name) title desc link + time age1 position extra-elements-with-guid + time age2))) (when item-new-p (let ((item (newsticker--cache-contains newsticker--cache (intern name) title commit 4e0f8f7b2da47a59da317ebcc5c85ef9d3ee3b68 Author: Simon Leinen Date: Wed Nov 26 13:22:35 2014 -0500 Fix for vc-filewise.el unresolved-call glitch. diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el index bc8a8de..4a05c98 100644 --- a/lisp/vc/vc-filewise.el +++ b/lisp/vc/vc-filewise.el @@ -41,7 +41,7 @@ If the file is not registered, or the master name is not known, return nil." ;; vc-BACKEND-registered explicitly (let ((backend (vc-backend file))) (if (and backend - (vc-call-backend backend 'registered file)) + (vc-filewise-registered backend file)) (vc-file-getprop file 'vc-name))))) (defun vc-rename-master (oldmaster newfile templates) commit 181b12e7fd604f59faba0aaa9d0b453dc06eab4d Author: Simon Leinen Date: Wed Nov 26 13:10:26 2014 -0500 Fix up autoloads in vc-rcs.el and vc-sccs.el. diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 0b839a6..341a1d4 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -229,6 +229,8 @@ For a description of possible values, see `vc-check-master-templates'." (vc-rcs-fetch-master-state file) (vc-file-getprop file 'vc-working-revision)))) +(autoload 'vc-master-name "vc-filewise") + (defun vc-rcs-latest-on-branch-p (file &optional version) "Return non-nil if workfile version of FILE is the latest on its branch. When VERSION is given, perform check for that version." @@ -974,7 +976,7 @@ Uses `rcs2log' which only works for RCS and CVS." nil t) (replace-match "$\\1$")))) -(autoload 'vc-rename-master "vc") +(autoload 'vc-rename-master "vc-filewise") (defun vc-rcs-rename-file (old new) ;; Just move the master file (using vc-rcs-master-templates). diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 780efc4..26aa49c 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -174,6 +174,8 @@ For a description of possible values, see `vc-check-master-templates'." (push (list frel state) result)))) (funcall update-function result))) +(autoload 'vc-master-name "vc-filewise") + (defun vc-sccs-working-revision (file) "SCCS-specific version of `vc-working-revision'." (with-temp-buffer @@ -471,7 +473,7 @@ Remaining arguments are ignored." (goto-char (point-min)) (re-search-forward "%[A-Z]%" nil t))) -(autoload 'vc-rename-master "vc") +(autoload 'vc-rename-master "vc-filewise") (defun vc-sccs-rename-file (old new) ;; Move the master file (using vc-rcs-master-templates). commit 7e24ac11d4f458c6524c92caf8117db8f5fc0542 Author: Alan Mackenzie Date: Wed Nov 26 16:42:55 2014 +0000 Remove spurious reference to symbol category_properties. cc-engine.el (c-state-pp-to-literal): Fixed here. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5361e49..7567c63 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-26 Alan Mackenzie + + Remove spurious reference to symbol category_properties. + * progmodes/cc-engine.el (c-state-pp-to-literal): Fix here. + 2014-11-26 Glenn Morris * arc-mode.el (archive-visit-single-files): Add :version. diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index e596f07..a388b42 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2240,8 +2240,7 @@ comment at the start of cc-engine.el for more info." ((and (not not-in-delimiter) ; inside a comment starter (not (bobp)) (progn (backward-char) - (and (not (and (memq 'category-properties c-emacs-features) - (looking-at "\\s!"))) + (and (not (looking-at "\\s!")) (looking-at c-comment-start-regexp)))) (setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++) co-st (point)) commit d9ad26a6df4110d32454496d2d864fb9a15d6d00 Author: Eli Zaretskii Date: Wed Nov 26 17:54:24 2014 +0200 Mention zlib1.dll as a potential reason for libgcc-induced crashes. diff --git a/etc/PROBLEMS b/etc/PROBLEMS index cea2213..771c9d9 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1948,11 +1948,11 @@ accessible by right-clicking "My Computer" or "Computer", selecting ** Emacs crashes when exiting the Emacs session This was reported to happen when some optional DLLs, such as those -used for displaying images or the GnuTLS library, which are loaded -on-demand, have a runtime dependency on the libgcc DLL, -libgcc_s_dw2-1.dll. The reason seems to be a bug in libgcc which -rears its ugly head whenever the libgcc DLL is loaded after Emacs has -started. +used for displaying images or the GnuTLS library or zlib compression +library, which are loaded on-demand, have a runtime dependency on the +libgcc DLL, libgcc_s_dw2-1.dll. The reason seems to be a bug in +libgcc which rears its ugly head whenever the libgcc DLL is loaded +after Emacs has started. One solution for this problem is to find an alternative build of the same optional library that does not depend on the libgcc DLL. commit a10e36a5d7fe95830e3f93dc7ae6f65507738978 Author: John Mastro Date: Wed Nov 26 09:15:08 2014 -0500 auth-source: Fix Mac OS X keychain lookups. * 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/ChangeLog b/lisp/gnus/ChangeLog index 6713df8..3b2a702 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +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). + 2014-11-10 Adam Sjøgren * mml2015.el (mml2015-display-key-image): New variable. diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index a50ad75..72ec5f4 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -1779,29 +1779,29 @@ entries for git.gnus.org: (while (not (eobp)) (cond ((looking-at "^password: \"\\(.+\\)\"$") - (auth-source-macos-keychain-result-append - ret - keychain-generic - "secret" - (lexical-let ((v (match-string 1))) - (lambda () v)))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + "secret" + (lexical-let ((v (match-string 1))) + (lambda () v))))) ;; TODO: check if this is really the label ;; match 0x00000007 ="AppleID" ((looking-at "^[ ]+0x00000007 =\"\\(.+\\)\"") - (auth-source-macos-keychain-result-append - ret - keychain-generic - "label" - (match-string 1))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + "label" + (match-string 1)))) ;; match "crtr"="aapl" ;; match "svce"="AppleID" ((looking-at "^[ ]+\"\\([a-z]+\\)\"[^=]+=\"\\(.+\\)\"") - (auth-source-macos-keychain-result-append - ret - keychain-generic - (match-string 1) - (match-string 2)))) - (forward-line))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + (match-string 1) + (match-string 2))))) + (forward-line))) ;; return `ret' iff it has the :secret key (and (plist-get ret :secret) (list ret)))) commit 9740d86c30fb1ce37097a63c69924257f964c7ca Author: Glenn Morris Date: Tue Nov 25 19:15:55 2014 -0500 * lisp/arc-mode.el (archive-visit-single-files): Add :version. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19ef782..5361e49 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-26 Glenn Morris + + * arc-mode.el (archive-visit-single-files): Add :version. + 2014-11-25 Lars Magne Ingebrigtsen * net/nsm.el (nsm-format-certificate): Don't bug out on missing diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index df04521..2b254cb 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1,7 +1,6 @@ ;;; arc-mode.el --- simple editing of archives -;; Copyright (C) 1995, 1997-1998, 2001-2014 Free Software Foundation, -;; Inc. +;; Copyright (C) 1995, 1997-1998, 2001-2014 Free Software Foundation, Inc. ;; Author: Morten Welinder ;; Keywords: files archives ms-dos editing major-mode @@ -150,9 +149,8 @@ A local copy of the archive will be used when updating." (defcustom archive-visit-single-files nil "If non-nil, opening an archive with a single file visits that file. - - If this option's value is nil, visiting such archives will - display the archive summary." +If nil, visiting such an archive displays the archive summary." + :version "25.1" :type '(choice (const :tag "Visit the single file" t) (const :tag "Show the archive summary" nil)) :group 'archive) commit 873bc1329fe303cff442efbfe3a25c62ef67099e Author: Eric S. Raymond Date: Tue Nov 25 16:42:59 2014 -0500 Minor typo fixes in vc-src.el. diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 520708c..884e050 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992-2014 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) -;; Maintainer: Eric S. Raymond +;; Maintainer: Eric S. Raymond ;; Package: vc ;; This file is part of GNU Emacs. @@ -236,7 +236,7 @@ REV is ignored. COMMENT is ignored." (vc-src-command nil files "add")) -(defun vc-rcs-responsible-p (file) +(defun vc-src-responsible-p (file) "Return non-nil if SRC thinks it would be responsible for registering FILE." (file-directory-p (expand-file-name ".src" (if (file-directory-p file) commit 92f6486a11e01dcac0a83ab5fc0aefb68068159f Author: Paul Eggert Date: Tue Nov 25 09:22:21 2014 -0800 Fix gnutls problems caught by static checking. * gnutls.c (Fgnutls_boot): Remove unused local. (Fgnutls_boot): Fix pointer signedness. diff --git a/src/ChangeLog b/src/ChangeLog index a515080..da8746c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-11-25 Paul Eggert + + Fix gnutls problems caught by static checking. + * gnutls.c (Fgnutls_boot): Remove unused local. + (Fgnutls_boot): Fix pointer signedness. + 2014-11-25 Lars Magne Ingebrigtsen * gnutls.c (gnutls_certificate_details): Don't include certain diff --git a/src/gnutls.c b/src/gnutls.c index 3c06741..baadaaf 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1185,7 +1185,6 @@ one trustfile (usually a CA bundle). */) Lisp_Object verify_error; Lisp_Object prime_bits; Lisp_Object warnings; - Lisp_Object warning; CHECK_PROCESS (proc); CHECK_SYMBOL (type); @@ -1441,7 +1440,7 @@ one trustfile (usually a CA bundle). */) Lisp_Object warning = XCAR (tail); Lisp_Object message = Fgnutls_peer_status_warning_describe (warning); if (!NILP (message)) - GNUTLS_LOG2 (1, max_log_level, "verification:", SDATA (message)); + GNUTLS_LOG2 (1, max_log_level, "verification:", SSDATA (message)); } } commit 50cc8073770db118b51ae16a00112fb3e0607486 Author: Paul Eggert Date: Tue Nov 25 09:20:19 2014 -0800 Use usual GNU style for white space. diff --git a/src/gnutls.c b/src/gnutls.c index 3b345a8..3c06741 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -318,7 +318,7 @@ init_gnutls_functions (void) #define fn_gnutls_x509_crt_deinit gnutls_x509_crt_deinit #define fn_gnutls_x509_crt_import gnutls_x509_crt_import #define fn_gnutls_x509_crt_init gnutls_x509_crt_init -#define fn_gnutls_x509_crt_get_fingerprint gnutls_x509_crt_get_fingerprint +#define fn_gnutls_x509_crt_get_fingerprint gnutls_x509_crt_get_fingerprint #define fn_gnutls_x509_crt_get_version gnutls_x509_crt_get_version #define fn_gnutls_x509_crt_get_serial gnutls_x509_crt_get_serial #define fn_gnutls_x509_crt_get_issuer_dn gnutls_x509_crt_get_issuer_dn @@ -769,7 +769,8 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, } static Lisp_Object -gnutls_hex_string (char *buf, size_t buf_size, const char *prefix) { +gnutls_hex_string (char *buf, size_t buf_size, const char *prefix) +{ size_t prefix_length = strlen (prefix); char *string = malloc (buf_size * 3 + prefix_length); Lisp_Object ret; @@ -778,8 +779,8 @@ gnutls_hex_string (char *buf, size_t buf_size, const char *prefix) { for (int i = 0; i < buf_size; i++) sprintf (string + i * 3 + prefix_length, - i == buf_size - 1? "%02x": "%02x:", - ((unsigned char*)buf)[i]); + i == buf_size - 1 ? "%02x" : "%02x:", + ((unsigned char*) buf)[i]); ret = build_string (string); free (string); @@ -805,15 +806,16 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) size_t serial_size = 0; err = fn_gnutls_x509_crt_get_serial (cert, NULL, &serial_size); - if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { - char *serial = malloc (serial_size); - err = fn_gnutls_x509_crt_get_serial (cert, serial, &serial_size); - if (err >= GNUTLS_E_SUCCESS) { - res = nconc2 (res, list2 (intern (":serial-number"), - gnutls_hex_string (serial, serial_size, ""))); + if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) + { + char *serial = malloc (serial_size); + err = fn_gnutls_x509_crt_get_serial (cert, serial, &serial_size); + if (err >= GNUTLS_E_SUCCESS) + res = nconc2 (res, list2 (intern (":serial-number"), + gnutls_hex_string (serial, serial_size, + ""))); + free (serial); } - free (serial); - } } /* Issuer. */ @@ -821,14 +823,15 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) size_t dn_size = 0; err = fn_gnutls_x509_crt_get_issuer_dn (cert, NULL, &dn_size); - if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { - char *dn = malloc (dn_size); - err = fn_gnutls_x509_crt_get_issuer_dn (cert, dn, &dn_size); - if (err >= GNUTLS_E_SUCCESS) - res = nconc2 (res, list2 (intern (":issuer"), - make_string (dn, dn_size))); - free (dn); - } + if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) + { + char *dn = malloc (dn_size); + err = fn_gnutls_x509_crt_get_issuer_dn (cert, dn, &dn_size); + if (err >= GNUTLS_E_SUCCESS) + res = nconc2 (res, list2 (intern (":issuer"), + make_string (dn, dn_size))); + free (dn); + } } /* Validity. */ @@ -853,14 +856,15 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) size_t dn_size = 0; err = fn_gnutls_x509_crt_get_dn (cert, NULL, &dn_size); - if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { - char *dn = malloc (dn_size); - err = fn_gnutls_x509_crt_get_dn (cert, dn, &dn_size); - if (err >= GNUTLS_E_SUCCESS) - res = nconc2 (res, list2 (intern (":subject"), - make_string (dn, dn_size))); - free (dn); - } + if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) + { + char *dn = malloc (dn_size); + err = fn_gnutls_x509_crt_get_dn (cert, dn, &dn_size); + if (err >= GNUTLS_E_SUCCESS) + res = nconc2 (res, list2 (intern (":subject"), + make_string (dn, dn_size))); + free (dn); + } } /* Versions older than 2.11 doesn't have these four functions. */ @@ -870,17 +874,18 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) unsigned int bits; err = fn_gnutls_x509_crt_get_pk_algorithm (cert, &bits); - if (err >= GNUTLS_E_SUCCESS) { - const char *name = fn_gnutls_pk_algorithm_get_name (err); - if (name) - res = nconc2 (res, list2 (intern (":public-key-algorithm"), + if (err >= GNUTLS_E_SUCCESS) + { + const char *name = fn_gnutls_pk_algorithm_get_name (err); + if (name) + res = nconc2 (res, list2 (intern (":public-key-algorithm"), + build_string (name))); + + name = fn_gnutls_sec_param_get_name (fn_gnutls_pk_bits_to_sec_param + (err, bits)); + res = nconc2 (res, list2 (intern (":certificate-security-level"), build_string (name))); - - name = fn_gnutls_sec_param_get_name (fn_gnutls_pk_bits_to_sec_param - (err, bits)); - res = nconc2 (res, list2 (intern (":certificate-security-level"), - build_string (name))); - } + } } /* Unique IDs. */ @@ -888,25 +893,27 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) size_t buf_size = 0; err = fn_gnutls_x509_crt_get_issuer_unique_id (cert, NULL, &buf_size); - if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { - char *buf = malloc (buf_size); - err = fn_gnutls_x509_crt_get_issuer_unique_id (cert, buf, &buf_size); - if (err >= GNUTLS_E_SUCCESS) - res = nconc2 (res, list2 (intern (":issuer-unique-id"), - make_string (buf, buf_size))); - free (buf); - } + if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) + { + char *buf = malloc (buf_size); + err = fn_gnutls_x509_crt_get_issuer_unique_id (cert, buf, &buf_size); + if (err >= GNUTLS_E_SUCCESS) + res = nconc2 (res, list2 (intern (":issuer-unique-id"), + make_string (buf, buf_size))); + free (buf); + } buf_size = 0; err = fn_gnutls_x509_crt_get_subject_unique_id (cert, NULL, &buf_size); - if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { - char *buf = malloc (buf_size); - err = fn_gnutls_x509_crt_get_subject_unique_id (cert, buf, &buf_size); - if (err >= GNUTLS_E_SUCCESS) - res = nconc2 (res, list2 (intern (":subject-unique-id"), - make_string (buf, buf_size))); - free (buf); - } + if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) + { + char *buf = malloc (buf_size); + err = fn_gnutls_x509_crt_get_subject_unique_id (cert, buf, &buf_size); + if (err >= GNUTLS_E_SUCCESS) + res = nconc2 (res, list2 (intern (":subject-unique-id"), + make_string (buf, buf_size))); + free (buf); + } } #endif @@ -915,23 +922,25 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) size_t buf_size = 0; err = fn_gnutls_x509_crt_get_signature_algorithm (cert); - if (err >= GNUTLS_E_SUCCESS) { - const char *name = fn_gnutls_sign_algorithm_get_name (err); - if (name) - res = nconc2 (res, list2 (intern (":signature-algorithm"), - build_string (name))); - - err = fn_gnutls_x509_crt_get_signature (cert, NULL, &buf_size); - if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { - char *buf = malloc (buf_size); - err = fn_gnutls_x509_crt_get_signature (cert, buf, &buf_size); - if (err >= GNUTLS_E_SUCCESS) { - res = nconc2 (res, list2 (intern (":signature"), - gnutls_hex_string (buf, buf_size, ""))); - } - free (buf); + if (err >= GNUTLS_E_SUCCESS) + { + const char *name = fn_gnutls_sign_algorithm_get_name (err); + if (name) + res = nconc2 (res, list2 (intern (":signature-algorithm"), + build_string (name))); + + err = fn_gnutls_x509_crt_get_signature (cert, NULL, &buf_size); + if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) + { + char *buf = malloc (buf_size); + err = fn_gnutls_x509_crt_get_signature (cert, buf, &buf_size); + if (err >= GNUTLS_E_SUCCESS) { + res = nconc2 (res, list2 (intern (":signature"), + gnutls_hex_string (buf, buf_size, ""))); + } + free (buf); + } } - } } /* Public key ID. */ @@ -939,15 +948,16 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) size_t buf_size = 0; err = fn_gnutls_x509_crt_get_key_id (cert, 0, NULL, &buf_size); - if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { - unsigned char *buf = malloc (buf_size); - err = fn_gnutls_x509_crt_get_key_id (cert, 0, buf, &buf_size); - if (err >= GNUTLS_E_SUCCESS) + if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) + { + unsigned char *buf = malloc (buf_size); + err = fn_gnutls_x509_crt_get_key_id (cert, 0, buf, &buf_size); + if (err >= GNUTLS_E_SUCCESS) res = nconc2 (res, list2 (intern (":public-key-id"), gnutls_hex_string ((char *)buf, buf_size, "sha1:"))); - free (buf); - } + free (buf); + } } /* Certificate fingerprint. */ @@ -956,16 +966,17 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) err = fn_gnutls_x509_crt_get_fingerprint (cert, GNUTLS_DIG_SHA1, NULL, &buf_size); - if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) { - unsigned char *buf = malloc (buf_size); - err = fn_gnutls_x509_crt_get_fingerprint (cert, GNUTLS_DIG_SHA1, - buf, &buf_size); - if (err >= GNUTLS_E_SUCCESS) + if (err == GNUTLS_E_SHORT_MEMORY_BUFFER) + { + unsigned char *buf = malloc (buf_size); + err = fn_gnutls_x509_crt_get_fingerprint (cert, GNUTLS_DIG_SHA1, + buf, &buf_size); + if (err >= GNUTLS_E_SUCCESS) res = nconc2 (res, list2 (intern (":certificate-id"), gnutls_hex_string ((char *)buf, buf_size, "sha1:"))); - free (buf); - } + free (buf); + } } return res; @@ -977,28 +988,28 @@ DEFUN ("gnutls-peer-status-warning-describe", Fgnutls_peer_status_warning_descri { CHECK_SYMBOL (status_symbol); - if ( EQ (status_symbol, intern (":invalid"))) + if (EQ (status_symbol, intern (":invalid"))) return build_string ("certificate could not be verified"); - if ( EQ (status_symbol, intern (":revoked")) ) + if (EQ (status_symbol, intern (":revoked"))) return build_string ("certificate was revoked (CRL)"); - if ( EQ (status_symbol, intern (":self-signed")) ) + if (EQ (status_symbol, intern (":self-signed"))) return build_string ("certificate signer was not found (self-signed)"); - if ( EQ (status_symbol, intern (":not-ca")) ) + if (EQ (status_symbol, intern (":not-ca"))) return build_string ("certificate signer is not a CA"); - if ( EQ (status_symbol, intern (":insecure")) ) + if (EQ (status_symbol, intern (":insecure"))) return build_string ("certificate was signed with an insecure algorithm"); - if ( EQ (status_symbol, intern (":not-activated")) ) + if (EQ (status_symbol, intern (":not-activated"))) return build_string ("certificate is not yet activated"); - if ( EQ (status_symbol, intern (":expired")) ) + if (EQ (status_symbol, intern (":expired"))) return build_string ("certificate has expired"); - if ( EQ (status_symbol, intern (":no-host-match")) ) + if (EQ (status_symbol, intern (":no-host-match"))) return build_string ("certificate host does not match hostname"); return Qnil; @@ -1016,7 +1027,7 @@ The return value is a property list with top-level keys :warnings and CHECK_PROCESS (proc); - if ( GNUTLS_INITSTAGE (proc) < GNUTLS_STAGE_INIT ) + if (GNUTLS_INITSTAGE (proc) < GNUTLS_STAGE_INIT) return Qnil; /* Then collect any warnings already computed by the handshake. */ @@ -1052,7 +1063,7 @@ The return value is a property list with top-level keys :warnings and /* This could get called in the INIT stage, when the certificate is not yet set. */ - if ( XPROCESS (proc)->gnutls_certificate != NULL ) + if (XPROCESS (proc)->gnutls_certificate != NULL) result = nconc2 (result, list2 (intern (":certificate"), gnutls_certificate_details (XPROCESS (proc)->gnutls_certificate))); @@ -1413,7 +1424,7 @@ one trustfile (usually a CA bundle). */) http://www.gnu.org/software/gnutls/manual/html_node/Verifying-peer_0027s-certificate.html. The peer should present at least one certificate in the chain; do a check of the certificate's hostname with - gnutls_x509_crt_check_hostname() against :hostname. */ + gnutls_x509_crt_check_hostname against :hostname. */ ret = fn_gnutls_certificate_verify_peers2 (state, &peer_verification); if (ret < GNUTLS_E_SUCCESS) @@ -1422,15 +1433,15 @@ one trustfile (usually a CA bundle). */) XPROCESS (proc)->gnutls_peer_verification = peer_verification; warnings = Fplist_get (Fgnutls_peer_status (proc), intern (":warnings")); - if ( !NILP (warnings) ) + if (!NILP (warnings)) { Lisp_Object tail; for (tail = warnings; CONSP (tail); tail = XCDR (tail)) { Lisp_Object warning = XCAR (tail); Lisp_Object message = Fgnutls_peer_status_warning_describe (warning); - if ( !NILP (message) ) - GNUTLS_LOG2 (1, max_log_level, "verification:", SDATA(message)); + if (!NILP (message)) + GNUTLS_LOG2 (1, max_log_level, "verification:", SDATA (message)); } } commit 73cad916c8a225dac3bd0abd116a89ce52052574 Author: Eli Zaretskii Date: Tue Nov 25 19:04:14 2014 +0200 Fix bug #19141 with UNCs in w32-shell-execute. src/w32fns.c (Fw32_shell_execute): Convert forward slashes in DOCUMENT to backslashes, if DOCUMENT is a file. diff --git a/src/ChangeLog b/src/ChangeLog index b17f719..23fd46b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-11-25 Eli Zaretskii + + * w32fns.c (Fw32_shell_execute): Convert forward slashes in + DOCUMENT to backslashes, if DOCUMENT is a file. (Bug#19141) + 2014-11-25 Ulrich Müller * Makefile.in (temacs$(EXEEXT)): Use consistent flag settings diff --git a/src/w32fns.c b/src/w32fns.c index bc95005..8bd5e81 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6987,7 +6987,14 @@ a ShowWindow flag: Lisp_Object absdoc_encoded = ENCODE_FILE (absdoc); if (faccessat (AT_FDCWD, SSDATA (absdoc_encoded), F_OK, AT_EACCESS) == 0) - document = absdoc_encoded; + { + /* ShellExecute fails if DOCUMENT is a UNC with forward + slashes (expand-file-name above converts all backslashes + to forward slashes). Now that we know DOCUMENT is a + file, we can mirror all forward slashes into backslashes. */ + unixtodos_filename (SSDATA (absdoc_encoded)); + document = absdoc_encoded; + } else document = ENCODE_FILE (document); } commit c8a2d631966f6a9569d68a3ac08c186d044e3a88 Author: Ted Zlatanov Date: Tue Nov 25 11:45:20 2014 -0500 * net/gnutls.el (gnutls): Set :group to 'comm so it's near NSM. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7fb1291..19ef782 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,6 +7,8 @@ 2014-11-25 Teodor Zlatanov + * net/gnutls.el (gnutls): Set :group to 'comm so it's near NSM. + * net/nsm.el (nsm-check-tls-connection, nsm-save-host) (nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'. diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 3ad92c4..cf8e6a4 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -41,7 +41,7 @@ "Emacs interface to the GnuTLS library." :version "24.1" :prefix "gnutls-" - :group 'net-utils) + :group 'comm) (defcustom gnutls-algorithm-priority nil "If non-nil, this should be a TLS priority string. commit 7dbd10d530f9c5688ad76e5ddabf53e3cd5579cf Author: Glenn Morris Date: Tue Nov 25 08:43:52 2014 -0800 * configure.ac: Fix yesterday's use of uninitialised $version. diff --git a/ChangeLog b/ChangeLog index 808f3a0..8e34db9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-25 Glenn Morris + + * configure.ac: Fix yesterday's use of uninitialised $version. + 2014-11-25 Oscar Fuentes * configure.ac [MINGW]: Set $canonical default value as per the diff --git a/configure.ac b/configure.ac index 6b6b1c7..8830ec7 100644 --- a/configure.ac +++ b/configure.ac @@ -1914,7 +1914,7 @@ if test "${HAVE_W32}" = "yes"; then *) EMACS_MANIFEST="emacs-x86.manifest" ;; esac dnl Construct something of the form "24,4,0,0" with 4 components. - comma_version=`echo "$version.0.0" | sed -e 's/\./,/g' -e 's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'` + comma_version=`echo "${PACKAGE_VERSION}.0.0" | sed -e 's/\./,/g' -e 's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'` comma_space_version=`echo "$comma_version" | sed 's/,/, /g'` AC_SUBST(comma_version) commit cfe0d44ecbaf5fb79fbbe2a1dec8c722a289f266 Author: Lars Magne Ingebrigtsen Date: Tue Nov 25 16:34:55 2014 +0100 * misc.texi (Network Security): Use "untrustworthy" instead of "unsafe" diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 3db0e85..e608248 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2014-11-25 Lars Magne Ingebrigtsen + + * misc.texi (Network Security): Use "untrustworthy" instead of + "unsafe". + 2014-11-24 Eli Zaretskii * misc.texi (Network Security): Improve wording and indexing of diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index f2828c5..5bd0fc8 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -271,11 +271,12 @@ security checks are performed. If this variable is @code{medium} (which is the default), a number of checks will be performed. If as result @acronym{NSM} determines that -the network connection might be unsafe, it will make you aware of -that, and will ask you what to do about the network connection. +the network connection might not be trustworthy, it will make you +aware of that, and will ask you what to do about the network +connection. You can decide to register a permanent security exception for an -unsafe connection, a temporary exception, or refuse the connection +unverified connection, a temporary exception, or refuse the connection entirely. Below is a list of the checks done on the @code{medium} level. commit ee4eb2810c4d9e5f4964d99e9ea9d3838f41f3d1 Author: Lars Magne Ingebrigtsen Date: Tue Nov 25 16:30:36 2014 +0100 Fix previous version of nsm-warnings-ok-p * net/nsm.el (nsm-format-certificate): Don't bug out on missing elements. (nsm-warnings-ok-p): The new version of this function always returned nil when everything was OK. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bd21991..7fb1291 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,8 @@ * net/nsm.el (nsm-format-certificate): Don't bug out on missing elements. + (nsm-warnings-ok-p): The new version of this function always + returned nil when everything was OK. 2014-11-25 Teodor Zlatanov diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index daf4bf5..c5e048a 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -342,9 +342,12 @@ unencrypted." result)) (defun nsm-warnings-ok-p (status settings) - (null (cl-intersection - (plist-get settings :conditions) - (plist-get status :warnings)))) + (let ((ok t) + (conditions (plist-get settings :conditions))) + (dolist (warning (plist-get status :warnings)) + (unless (memq warning conditions) + (setq ok nil))) + ok)) (defun nsm-remove-permanent-setting (id) (setq nsm-permanent-host-settings commit 88871ef6112df666bdd334596b1ed420cc87ebaa Author: Lars Magne Ingebrigtsen Date: Tue Nov 25 16:13:10 2014 +0100 (gnutls_certificate_details): Reversed check in last checkin. diff --git a/src/ChangeLog b/src/ChangeLog index 067684c..a515080 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,6 +3,7 @@ * gnutls.c (gnutls_certificate_details): Don't include certain certificate details on older gnutls versions (bug#19168). (syms_of_gnutls): Export gnutls_peer_status_warning_describe. + (gnutls_certificate_details): Reversed check in last checkin. 2014-11-25 Teodor Zlatanov diff --git a/src/gnutls.c b/src/gnutls.c index ff4399b..3b345a8 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -864,7 +864,7 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) } /* Versions older than 2.11 doesn't have these four functions. */ -#if GNUTLS_VERSION_NUMBER < 0x020b00 +#if GNUTLS_VERSION_NUMBER >= 0x020b00 /* SubjectPublicKeyInfo. */ { unsigned int bits; commit 63ca64241c057695aa5d5a189b3de6d8ada310b8 Author: Lars Magne Ingebrigtsen Date: Tue Nov 25 16:12:47 2014 +0100 * net/nsm.el (nsm-format-certificate): Don't bug out on missing elements diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81e2872..bd21991 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-25 Lars Magne Ingebrigtsen + + * net/nsm.el (nsm-format-certificate): Don't bug out on missing + elements. + 2014-11-25 Teodor Zlatanov * net/nsm.el (nsm-check-tls-connection, nsm-save-host) diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 35edd07..daf4bf5 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -373,13 +373,19 @@ unencrypted." (nsm-certificate-part (plist-get cert :subject) "OU" t)) "\n" "Hostname:" - (nsm-certificate-part (plist-get cert :subject) "CN" t) "\n" - "Public key:" (plist-get cert :public-key-algorithm) - ", signature: " (plist-get cert :signature-algorithm) "\n" - "Security level:" - (propertize (plist-get cert :certificate-security-level) - 'face 'bold) - "\n" + (nsm-certificate-part (plist-get cert :subject) "CN" t) "\n") + (when (and (plist-get cert :public-key-algorithm) + (plist-get cert :signature-algorithm)) + (insert + "Public key:" (plist-get cert :public-key-algorithm) + ", signature: " (plist-get cert :signature-algorithm) "\n")) + (when (plist-get cert :certificate-security-level) + (insert + "Security level:" + (propertize (plist-get cert :certificate-security-level) + 'face 'bold) + "\n")) + (insert "Valid:From " (plist-get cert :valid-from) " to " (plist-get cert :valid-to) "\n\n") (goto-char (point-min)) commit d3739fec5304e39defa90d200222add58fd79b30 Author: Lars Magne Ingebrigtsen Date: Tue Nov 25 16:04:47 2014 +0100 Make gnutls.c compile on older gnutls installations * gnutls.c (gnutls_certificate_details): Don't include certain certificate details on older gnutls versions (bug#19168). (syms_of_gnutls): Export gnutls_peer_status_warning_describe. diff --git a/src/ChangeLog b/src/ChangeLog index d78e1cd..067684c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-11-25 Lars Magne Ingebrigtsen + + * gnutls.c (gnutls_certificate_details): Don't include certain + certificate details on older gnutls versions (bug#19168). + (syms_of_gnutls): Export gnutls_peer_status_warning_describe. + 2014-11-25 Teodor Zlatanov * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p. diff --git a/src/gnutls.c b/src/gnutls.c index 8268901..ff4399b 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -863,6 +863,8 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) } } + /* Versions older than 2.11 doesn't have these four functions. */ +#if GNUTLS_VERSION_NUMBER < 0x020b00 /* SubjectPublicKeyInfo. */ { unsigned int bits; @@ -906,6 +908,7 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) free (buf); } } +#endif /* Signature. */ { @@ -1585,6 +1588,7 @@ syms_of_gnutls (void) defsubr (&Sgnutls_bye); defsubr (&Sgnutls_available_p); defsubr (&Sgnutls_peer_status); + defsubr (&Sgnutls_peer_status_warning_describe); DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level, doc: /* Logging level used by the GnuTLS functions. commit 2428e38d763614280679ca15b52b8c5076b792f1 Author: Ted Zlatanov Date: Tue Nov 25 09:48:37 2014 -0500 * gnutls.c (Fgnutls_boot): Minor logging fixes. diff --git a/src/ChangeLog b/src/ChangeLog index 922b61a..d78e1cd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,7 +4,7 @@ (Fgnutls_peer_status_warning_describe): Add function to describe a peer verification warning symbol. (Fgnutls_peer_status): Use it. - (Fgnutls_boot): Use it. + (Fgnutls_boot): Use it. Minor logging fixes. 2014-11-24 Lars Magne Ingebrigtsen diff --git a/src/gnutls.c b/src/gnutls.c index 604c595..8268901 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1218,6 +1218,8 @@ one trustfile (usually a CA bundle). */) XPROCESS (proc)->gnutls_log_level = max_log_level; } + GNUTLS_LOG2 (1, max_log_level, "connecting to host:", c_hostname); + /* always initialize globals. */ global_init = emacs_gnutls_global_init (); if (! NILP (Fgnutls_errorp (global_init))) @@ -1420,13 +1422,12 @@ one trustfile (usually a CA bundle). */) if ( !NILP (warnings) ) { Lisp_Object tail; - for (tail = warnings; CONSP (tail); tail = XCDR (tail)) { Lisp_Object warning = XCAR (tail); Lisp_Object message = Fgnutls_peer_status_warning_describe (warning); if ( !NILP (message) ) - GNUTLS_LOG2 (1, max_log_level, "verification: %s", SDATA(message)); + GNUTLS_LOG2 (1, max_log_level, "verification:", SDATA(message)); } } commit 59bf524c77cfc84b41b9b6085b08126495bc5d0e Author: Ted Zlatanov Date: Tue Nov 25 09:09:11 2014 -0500 net/nsm.el: Use `gnutls-peer-status-warning-describe'. * net/nsm.el (nsm-check-tls-connection, nsm-save-host) (nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d4f1dbd..81e2872 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-25 Teodor Zlatanov + + * net/nsm.el (nsm-check-tls-connection, nsm-save-host) + (nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'. + 2014-11-20 Nicolas Richard * emacs-lisp/byte-run.el (function-put): Match argument names to diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index fdbcd13..35edd07 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -169,7 +169,9 @@ unencrypted." host port (if (> (length warnings) 1) "s" "") - (mapconcat 'cadr warnings "\n")))) + (mapconcat #'gnutls-peer-status-warning-describe + warnings + "\n")))) (progn (delete-process process) nil) @@ -298,7 +300,7 @@ unencrypted." (nconc saved `(:conditions (:unencrypted)))) ((plist-get status :warnings) (nconc saved - `(:conditions ,(mapcar 'car (plist-get status :warnings))))))) + `(:conditions ,(plist-get status :warnings)))))) (if (eq permanency 'always) (progn (nsm-remove-temporary-setting id) @@ -340,12 +342,9 @@ unencrypted." result)) (defun nsm-warnings-ok-p (status settings) - (let ((not-ok nil) - (conditions (plist-get settings :conditions))) - (dolist (warning (plist-get status :warnings)) - (when (memq (car warning) conditions) - (setq not-ok t))) - not-ok)) + (null (cl-intersection + (plist-get settings :conditions) + (plist-get status :warnings)))) (defun nsm-remove-permanent-setting (id) (setq nsm-permanent-host-settings commit 8608c1009dafa7bf657e8835087bb8ad81357202 Author: Ted Zlatanov Date: Tue Nov 25 09:07:13 2014 -0500 Use a simple list of symbols in GnuTLS peer verification. * gnutls.c (Fgnutls_peer_status_warning_describe): Add function to describe a peer verification warning symbol. (Fgnutls_peer_status): Use it. (Fgnutls_boot): Use it. diff --git a/src/ChangeLog b/src/ChangeLog index 220c2bf..922b61a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,10 @@ 2014-11-25 Teodor Zlatanov * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p. + (Fgnutls_peer_status_warning_describe): Add function to describe a + peer verification warning symbol. + (Fgnutls_peer_status): Use it. + (Fgnutls_boot): Use it. 2014-11-24 Lars Magne Ingebrigtsen diff --git a/src/gnutls.c b/src/gnutls.c index bfa6078..604c595 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -968,9 +968,44 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) return res; } +DEFUN ("gnutls-peer-status-warning-describe", Fgnutls_peer_status_warning_describe, Sgnutls_peer_status_warning_describe, 1, 1, 0, + doc: /* Describe the warning of a GnuTLS peer status from `gnutls-peer-status'.*/) + (Lisp_Object status_symbol) +{ + CHECK_SYMBOL (status_symbol); + + if ( EQ (status_symbol, intern (":invalid"))) + return build_string ("certificate could not be verified"); + + if ( EQ (status_symbol, intern (":revoked")) ) + return build_string ("certificate was revoked (CRL)"); + + if ( EQ (status_symbol, intern (":self-signed")) ) + return build_string ("certificate signer was not found (self-signed)"); + + if ( EQ (status_symbol, intern (":not-ca")) ) + return build_string ("certificate signer is not a CA"); + + if ( EQ (status_symbol, intern (":insecure")) ) + return build_string ("certificate was signed with an insecure algorithm"); + + if ( EQ (status_symbol, intern (":not-activated")) ) + return build_string ("certificate is not yet activated"); + + if ( EQ (status_symbol, intern (":expired")) ) + return build_string ("certificate has expired"); + + if ( EQ (status_symbol, intern (":no-host-match")) ) + return build_string ("certificate host does not match hostname"); + + return Qnil; +} + DEFUN ("gnutls-peer-status", Fgnutls_peer_status, Sgnutls_peer_status, 1, 1, 0, - doc: /* Return the status of the gnutls PROC peer certificate. -The return value is a property list. */) + doc: /* Describe a GnuTLS PROC peer certificate and any warnings about it. +The return value is a property list with top-level keys :warnings and +:certificate. The :warnings entry is a list of symbols you can describe with +`gnutls-peer-status-warning-describe'. */) (Lisp_Object proc) { Lisp_Object warnings = Qnil, result = Qnil; @@ -985,52 +1020,39 @@ The return value is a property list. */) verification = XPROCESS (proc)->gnutls_peer_verification; if (verification & GNUTLS_CERT_INVALID) - warnings = Fcons (list2 (intern (":invalid"), - build_string("certificate could not be verified")), - warnings); + warnings = Fcons (intern (":invalid"), warnings); if (verification & GNUTLS_CERT_REVOKED) - warnings = Fcons (list2 (intern (":revoked"), - build_string("certificate was revoked (CRL)")), - warnings); + warnings = Fcons (intern (":revoked"), warnings); if (verification & GNUTLS_CERT_SIGNER_NOT_FOUND) - warnings = Fcons (list2 (intern (":self-signed"), - build_string("certificate signer was not found (self-signed)")), - warnings); + warnings = Fcons (intern (":self-signed"), warnings); if (verification & GNUTLS_CERT_SIGNER_NOT_CA) - warnings = Fcons (list2 (intern (":not-ca"), - build_string("certificate signer is not a CA")), - warnings); + warnings = Fcons (intern (":not-ca"), warnings); if (verification & GNUTLS_CERT_INSECURE_ALGORITHM) - warnings = Fcons (list2 (intern (":insecure"), - build_string("certificate was signed with an insecure algorithm")), - warnings); + warnings = Fcons (intern (":insecure"), warnings); if (verification & GNUTLS_CERT_NOT_ACTIVATED) - warnings = Fcons (list2 (intern (":not-activated"), - build_string("certificate is not yet activated")), - warnings); + warnings = Fcons (intern (":not-activated"), warnings); if (verification & GNUTLS_CERT_EXPIRED) - warnings = Fcons (list2 (intern (":expired"), - build_string("certificate has expired")), - warnings); + warnings = Fcons (intern (":expired"), warnings); if (XPROCESS (proc)->gnutls_extra_peer_verification & CERTIFICATE_NOT_MATCHING) - warnings = Fcons (list2 (intern (":no-host-match"), - build_string("certificate host does not match hostname")), - warnings); + warnings = Fcons (intern (":no-host-match"), warnings); if (!NILP (warnings)) result = list2 (intern (":warnings"), warnings); - result = nconc2 (result, list2 - (intern (":certificate"), - gnutls_certificate_details(XPROCESS (proc)->gnutls_certificate))); + /* This could get called in the INIT stage, when the certificate is + not yet set. */ + if ( XPROCESS (proc)->gnutls_certificate != NULL ) + result = nconc2 (result, list2 + (intern (":certificate"), + gnutls_certificate_details (XPROCESS (proc)->gnutls_certificate))); return result; } @@ -1148,6 +1170,8 @@ one trustfile (usually a CA bundle). */) Lisp_Object hostname; Lisp_Object verify_error; Lisp_Object prime_bits; + Lisp_Object warnings; + Lisp_Object warning; CHECK_PROCESS (proc); CHECK_SYMBOL (type); @@ -1392,33 +1416,19 @@ one trustfile (usually a CA bundle). */) XPROCESS (proc)->gnutls_peer_verification = peer_verification; - if (XINT (loglevel) > 0 && peer_verification & GNUTLS_CERT_INVALID) - message ("%s certificate could not be verified.", c_hostname); - - if (peer_verification & GNUTLS_CERT_REVOKED) - GNUTLS_LOG2 (1, max_log_level, "certificate was revoked (CRL):", - c_hostname); - - if (peer_verification & GNUTLS_CERT_SIGNER_NOT_FOUND) - GNUTLS_LOG2 (1, max_log_level, "certificate signer was not found:", - c_hostname); - - if (peer_verification & GNUTLS_CERT_SIGNER_NOT_CA) - GNUTLS_LOG2 (1, max_log_level, "certificate signer is not a CA:", - c_hostname); - - if (peer_verification & GNUTLS_CERT_INSECURE_ALGORITHM) - GNUTLS_LOG2 (1, max_log_level, - "certificate was signed with an insecure algorithm:", - c_hostname); - - if (peer_verification & GNUTLS_CERT_NOT_ACTIVATED) - GNUTLS_LOG2 (1, max_log_level, "certificate is not yet activated:", - c_hostname); + warnings = Fplist_get (Fgnutls_peer_status (proc), intern (":warnings")); + if ( !NILP (warnings) ) + { + Lisp_Object tail; - if (peer_verification & GNUTLS_CERT_EXPIRED) - GNUTLS_LOG2 (1, max_log_level, "certificate has expired:", - c_hostname); + for (tail = warnings; CONSP (tail); tail = XCDR (tail)) + { + Lisp_Object warning = XCAR (tail); + Lisp_Object message = Fgnutls_peer_status_warning_describe (warning); + if ( !NILP (message) ) + GNUTLS_LOG2 (1, max_log_level, "verification: %s", SDATA(message)); + } + } if (peer_verification != 0) { commit 8be099a2c10ce4718e6630cef6b6ca1983617264 Author: Nicolas Richard Date: Thu Nov 20 12:09:30 2014 +0100 byte-run.el (function-put): Match argument names to docstring (bug#19118). diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12f81b7..d4f1dbd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-20 Nicolas Richard + + * emacs-lisp/byte-run.el (function-put): Match argument names to + docstring. + 2014-11-24 Sam Steingold * vc/vc-hooks.el (vc-directory-exclusion-list): diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 1f8b04e..8bf63ea 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -34,10 +34,11 @@ ;; We don't want people to just use `put' because we can't conveniently ;; hook into `put' to remap old properties to new ones. But for now, there's ;; no such remapping, so we just call `put'. - #'(lambda (f prop value) (put f prop value)) - "Set function F's property PROP to VALUE. + #'(lambda (function prop value) + "Set FUNCTION's property PROP to VALUE. The namespace for PROP is shared with symbols. -So far, F can only be a symbol, not a lambda expression.") +So far, FUNCTION can only be a symbol, not a lambda expression." + (put function prop value))) (function-put 'defmacro 'doc-string-elt 3) (function-put 'defmacro 'lisp-indent-function 2) commit 10f2f8aafa5de5821718cc4a7fc8ed87dfdf895a Author: Ted Zlatanov Date: Tue Nov 25 05:15:23 2014 -0500 * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p. diff --git a/src/ChangeLog b/src/ChangeLog index 448de36..220c2bf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-25 Teodor Zlatanov + + * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p. + 2014-11-24 Lars Magne Ingebrigtsen * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. diff --git a/src/gnutls.c b/src/gnutls.c index dd9c801..bfa6078 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -978,7 +978,7 @@ The return value is a property list. */) CHECK_PROCESS (proc); - if (XPROCESS (proc)->gnutls_p == 0) + if ( GNUTLS_INITSTAGE (proc) < GNUTLS_STAGE_INIT ) return Qnil; /* Then collect any warnings already computed by the handshake. */ commit ed54567c7cf958bb5658f4b6da1b0b7decc1d31a Author: Ulrich Müller Date: Sun Nov 16 12:37:54 2014 +0100 Use consistent paxctl and setfattr flags for temacs. * Makefile.in (temacs$(EXEEXT)): Use consistent flag settings for paxctl and setfattr. Fixes temacs startup failure with grsecurity/PaX enabled Linux kernel (bug#19067). diff --git a/src/ChangeLog b/src/ChangeLog index 63ead8d..b17f719 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-11-25 Ulrich Müller + + * Makefile.in (temacs$(EXEEXT)): Use consistent flag settings + for paxctl and setfattr. Fixes temacs startup failure with + grsecurity/PaX enabled Linux kernel (bug#19067). + 2014-11-17 Oscar Fuentes * src/w32.c: Use MINGW_W64 instead of _W64. diff --git a/src/Makefile.in b/src/Makefile.in index 70e31b5..99f9981 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -497,7 +497,7 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \ test "$(CANNOT_DUMP)" = "yes" || \ test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) test "$(CANNOT_DUMP)" = "yes" || test -z "$(SETFATTR)" || \ - $(SETFATTR) -n user.pax.flags -v r $@ + $(SETFATTR) -n user.pax.flags -v er $@ ## The following oldxmenu-related rules are only (possibly) used if ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them. commit 5da3f6c2fe817081615ebf2e0a2cfed755ee74ef Author: Paul Eggert Date: Mon Nov 24 17:47:29 2014 -0800 Adjust copyright notice and obviously-wrong dates. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 323eba8..5ad9ba9 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -23110,8 +23110,7 @@ See ChangeLog.6 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, - Inc. + Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index c8281bf..4ed24ce 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -386,11 +386,11 @@ * gnus-start.el (gnus-save-newsrc-file): Use coding system. -1980-06-08 Mike McEwan +1998-08-18 Mike McEwan * gnus-agent.el (gnus-agent-braid-nov): Go to right place. -1980-06-08 Shuhei KOBAYASHI +1998-08-18 Shuhei KOBAYASHI * gnus-group.el (gnus-group-suspend): Fix. commit f24c8f98ec50a3725ccf793dbd09752fec79a3a1 Author: Paul Eggert Date: Mon Nov 24 17:14:29 2014 -0800 Fix white-space problems in ChangeLogs. diff --git a/ChangeLog b/ChangeLog index 22f0698..dba1ff3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,7 +113,7 @@ corresponding commit comments. (The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org. - The last CVS commit was 2009-12-27T08:11:12Z!cyd@stupidchicken.com.) + The last CVS commit was 2009-12-27T08:11:12Z!cyd@stupidchicken.com.) Committer/author email addresses are generally correct for the transition day, not necessarily when the comit was originally diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 363e7ae..9f8461c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -4464,7 +4464,7 @@ (texinputdir, $(infodir)/elisp): Use $(MAKEINFO_OPTS). 2011-01-25 Chong Yidong - Richard Kim + Richard Kim * loading.texi (Library Search): Document list-load-path-shadows (Bug#7757). diff --git a/etc/ChangeLog b/etc/ChangeLog index 9f66788..a416c86 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -19,7 +19,7 @@ * Version 24.4 released. -2014-09-30 Bill Wohler +2014-09-30 Bill Wohler Release MH-E version 8.6 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5798e96..351472d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -42,7 +42,7 @@ 2014-11-20 Michael Albinus - Improve XEmacs compatibility. + Improve XEmacs compatibility. * net/tramp.el (tramp-autoload-file-name-handler): Wrap `temporary-file-directory' by `symbol-value', it doesn't @@ -52,8 +52,8 @@ (tramp-time-less-p, tramp-time-subtract): Remove functions. (tramp-handle-file-newer-than-file-p, tramp-time-diff): * net/tramp-adb.el (tramp-adb-ls-output-time-less-p): - * net/tramp-cache.el (tramp-get-file-property): - * net/tramp-smb.el (tramp-smb-handle-insert-directory): + * net/tramp-cache.el (tramp-get-file-property): + * net/tramp-smb.el (tramp-smb-handle-insert-directory): Use `time-less-p' and `time-subtract, respectively. * net/tramp-adb.el (top): Do not require time-date.el. @@ -190,9 +190,9 @@ 2014-11-04 Michael Albinus - * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use - a local copy; setting `inhibit-file-name-handlers' proper might be - more performant. (Bug#18751) + * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use + a local copy; setting `inhibit-file-name-handlers' proper might be + more performant. (Bug#18751) 2014-11-04 Glenn Morris @@ -1203,7 +1203,7 @@ (bug#17818). * mouse.el (mouse-drag-line): Don't re-add to unread-comment-events, - since it's already done inside the loop (bug#17819). + since it's already done inside the loop (bug#17819). 2014-06-20 Martin Rudalics @@ -1575,7 +1575,7 @@ methods which do not have a doc string. (Bug#17490) 2014-05-14 Stephen Berman - Stefan Monnier + Stefan Monnier * minibuffer.el (completion-pcm--merge-try): Merge trailing / with suffix (bug#15419). diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 7d868b9..8e2edb8 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -32494,7 +32494,7 @@ (bibtex-field-list, bibtex-find-crossref): Fix typos in error messages. 2005-01-24 Dan Nicolaescu - Juri Linkov + Juri Linkov * textmodes/reftex-global.el (reftex-isearch-push-state-function) (reftex-isearch-pop-state-function, reftex-isearch-isearch-search) diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index f6bdc43..e0adfdd 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -3984,7 +3984,7 @@ * ibuffer.el (ibuffer-mode): Fix typo in previous change. 2008-01-17 Vinicius Jose Latorre - Miles Bader + Miles Bader * blank-mode.el: New file. Minor mode to visualize (HARD) SPACE, TAB, NEWLINE. Miles Bader wrote the original code @@ -5480,7 +5480,7 @@ (verilog-insert-indices): Escape braces in doc strings. 2007-12-08 Michael McNamara - Wilson Snyder + Wilson Snyder * progmodes/verilog-mode.el: New file. @@ -13486,7 +13486,7 @@ Use native Emacs functions, when appropriate. 2007-08-01 Dan Nicolaescu - Stefan Monnier + Stefan Monnier * vc.el: Document new VC operation `extra-menu'. diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index 52612a7..0e6ee4a 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -3016,12 +3016,12 @@ Don't activate node nil. (Bug#1569) 2009-01-22 Paul Reilly - Henrik Enberg - Alex Schroeder - Chong Yidong - Richard M Stallman - Glenn Morris - Juanma Barranquero + Henrik Enberg + Alex Schroeder + Chong Yidong + Richard M Stallman + Glenn Morris + Juanma Barranquero * mail/rmail.el: Code implementing Rmail-mbox functionality. (rmail-attribute-header, rmail-keyword-header) @@ -4314,7 +4314,7 @@ was orderly adjusted, nil otherwise. 2008-12-12 Juanma Barranquero - Stefan Monnier + Stefan Monnier * server.el (server-sentinel): Uncomment code to delete connection file. (server-start): Save the connection file in the server property list. @@ -4373,7 +4373,7 @@ terminal variable assignment. 2008-12-10 Yukihiro Matsumoto - Nobuyoshi Nakada + Nobuyoshi Nakada * progmodes/ruby-mode.el: New file. @@ -5603,7 +5603,7 @@ New aliases, to satisfy `define-derived-mode' expectations. 2008-11-15 Glenn Morris - Martin Rudalics + Martin Rudalics * emacs-lisp/find-func.el (find-function-advised-original): New. (find-function-C-source, find-function-noselect): @@ -10312,8 +10312,8 @@ (newsticker--treeview-propertize-tag): Show item title in tooltip. 2008-06-20 Martin Blais - Stefan Merten - David Goodger + Stefan Merten + David Goodger * textmodes/rst.el: New file. @@ -10631,7 +10631,7 @@ * term/linux.el (terminal-init-linux): Load t-mouse. 2008-06-13 Stefan Monnier - Drew Adams + Drew Adams * info.el (Info-breadcrumbs-depth): New var. (Info-insert-breadcrumbs): New function. @@ -18798,7 +18798,7 @@ for useful options. 2008-03-01 Dan Nicolaescu - Glenn Morris + Glenn Morris * emacs-lisp/bytecomp.el (byte-recompile-directory) (byte-compile-file, batch-byte-compile, batch-byte-compile-file): diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 6f71a6a..8922767 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -628,7 +628,7 @@ (global-auto-revert-ignore-buffer): Remove leading "*" from docs. 2011-02-19 Dmitry Bolshakov - Dima Kogan (tiny change) + Dima Kogan (tiny change) * progmodes/hideshow.el (hs-find-block-beginning) (hs-hide-level-recursive): Ignore comments when parsing braces @@ -2970,7 +2970,7 @@ * loadup.el (symbol-file-load-history-loaded): Remove; unused. 2010-12-15 Jari Aalto - Scott Evans + Scott Evans * rect.el (rectange--default-line-number-format) (rectangle-number-line-callback): New functions. @@ -7986,7 +7986,7 @@ * iswitchb.el (iswitchb-kill-buffer): Re-make the list. 2010-08-22 Kirk Kelsey - Stefan Monnier + Stefan Monnier * progmodes/make-mode.el (makefile-fill-paragraph): Account for the extra backslash added to each line (bug#6890). @@ -9002,7 +9002,7 @@ another buffer (e.g gnus-art). 2010-07-13 Karl Fogel - Thierry Volpiatto + Thierry Volpiatto Preparation for setting bookmarks in Gnus article buffers (Bug#5975). @@ -10301,7 +10301,7 @@ (rcirc-user-name-history): Add variable. 2010-05-25 Ryan Yeske - Jonathan Rockway + Jonathan Rockway * net/rcirc.el (rcirc-server-alist): Add :pass. (rcirc): When prompting for connection parameters, also prompt for @@ -10969,7 +10969,7 @@ * Version 23.2 released. 2010-05-07 Deniz Dogan - Stefan Monnier + Stefan Monnier Highlight vendor specific properties. * textmodes/css-mode.el (css-proprietary-nmstart-re): New var. @@ -11162,7 +11162,7 @@ (filter-buffer-substring): Use it. Remove unused arg `noprops'. 2010-05-01 Toru TSUNEYOSHI - Michael Albinus + Michael Albinus Implement compression for inline methods. @@ -12209,7 +12209,7 @@ values. 2010-03-29 Phil Hagelberg - Chong Yidong + Chong Yidong * subr.el: Extend progress reporters to perform "spinning". (progress-reporter-update, progress-reporter-do-update): @@ -15603,7 +15603,7 @@ * Makefile.in (ELCFILES): Adapt to subword.el move. 2009-11-21 Thierry Volpiatto - Stefan Monnier + Stefan Monnier * bookmark.el (bookmark-bmenu-bookmark-column): Remove var. (bookmark-bmenu-list): Save name on `bookmark-name-prop' text-prop. @@ -19070,7 +19070,7 @@ indent buffer only if called interactively (Bug#4452). 2009-09-19 Juanma Barranquero - Eli Zaretskii + Eli Zaretskii This fixes bug#4197 (merged to bug#865, though not identical). * server.el (server-auth-dir): Add docstring note about FAT32. @@ -19887,7 +19887,7 @@ Don't call substitute-in-file-name on diary-file. 2009-09-03 Eduard Wiebe - Stefan Monnier + Stefan Monnier * mail/footnote.el (footnote-prefix): Make it a defcustom. (footnote-mode-map): Move initialization into the declaration. @@ -20998,7 +20998,7 @@ * progmodes/hideshow.el (hs-special-modes-alist): Add js-mode entry. 2009-08-14 Daniel Colascione - Karl Landstrom + Karl Landstrom * progmodes/js.el: New file. @@ -22765,7 +22765,7 @@ XZ is the successor to LZMA: 2009-06-22 Dmitry Dzhus - Nick Roberts + Nick Roberts * progmodes/gdb-mi.el: Pull further modified changes from Dmitry's repository (http://sphinx.net.ru/hg/gdb-mi/). diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index 1f3c786..728a04e 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -3340,7 +3340,7 @@ already registered with a different backend (Bug#10589). 2012-11-29 Jambunathan K - Stefan Monnier + Stefan Monnier * icomplete.el: Change separator; add ido-style commands. (icomplete-show-key-bindings): Remove custom var. @@ -4571,7 +4571,7 @@ to `bookmark' (bug#11131). 2012-10-26 Bastien Guerry - Stefan Monnier + Stefan Monnier * face-remap.el: Use lexical-binding. (text-scale-adjust): Improve docstring. Use itself for the temporary @@ -5879,7 +5879,7 @@ * international/uni-numeric.el: Regenerate. 2012-09-26 Tomohiro Matsuyama - Stefan Monnier + Stefan Monnier * profiler.el: New file. diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index dc27221..c8e07b6 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -3687,7 +3687,7 @@ When changing the environment, avoid need for setenv. 1996-01-05 Karl Eichwalder - Karl Fogel + Karl Fogel * bookmark.el: "cyclic.com" addresses changed to "red-bean.com". (bookmark-bmenu-mode-map): Don't bind C-k. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index a4f0287..323eba8 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -2749,7 +2749,7 @@ * abbrev.el: Likewise. 1998-05-26 Emilio Lopes - Karl Fogel + Karl Fogel * bookmark.el: Changes so bookmark list mode works with Info: (bookmark-jump-noselect): Use an inner save-window-excursion. diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index e57659e..0e61e16 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -84,7 +84,7 @@ (erc-channel-user): Add members for new modes. (erc-channel-member-halfop-p, erc-channel-user-admin-p) (erc-channel-user-owner-p): Use new struct members. - (erc-format-nick, erc-format-@nick): Display user modes as nick prefix. + (erc-format-nick, erc-format-@nick): Display user modes as nick prefix. (erc-nick-prefix-face, erc-my-nick-prefix-face): Add new faces (erc-get-user-mode-prefix): Return symbol for mode prefix. (erc-update-channel-member, erc-update-current-channel-member) @@ -718,4 +718,3 @@ See ChangeLog.08 for earlier changes. ;; coding: utf-8 ;; add-log-time-zone-rule: t ;; End: - diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02 index 77d4855..1b4a52c 100644 --- a/lisp/erc/ChangeLog.02 +++ b/lisp/erc/ChangeLog.02 @@ -2091,7 +2091,7 @@ * erc.el 2002-07-15T00:01:34Z!raeburn@raeburn.org: silly typo corrected - * erc.el: * erc.el: * New variable: erc-common-server-name-suffixes + * erc.el: New variable: erc-common-server-name-suffixes This alist can be used to change the server names displayed in mode-line to a shorter version.. * New function: erc-shorten-server-name (uses var above) diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 5f04cf8..029e29e 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -323,7 +323,7 @@ * erc.el(erc-modules): Add some more symbols to the set - * erc.el(erc-modules): * erc.el(erc-modules): Add :greedy t to the set in + * erc.el(erc-modules): Add :greedy t to the set in * erc-dcc.el: More autoloads which make dcc autoload upon ctcp dcc query received. @@ -714,7 +714,7 @@ defcustom `erc-log-insert-log-on-open' defcustom `erc-generate-log-file-name-function' defun `erc-save-buffer-in-logs' (autoloads from erc-log.el) - defuns `erc-generate-log-file-name-*' + defuns `erc-generate-log-file-name-*' defun `erc-current-logfile' defun `erc-logging-enabled' (autoloads from erc-log.el) - erc-truncate-buffer-to-size: fix for double-saving bug when @@ -744,7 +744,7 @@ 2003-04-27 Damien Elmes - * erc.el: * erc.el: erc-modules: added + * erc.el: erc-modules: added 2003-04-27 Alex Schroeder @@ -1567,7 +1567,7 @@ * (erc-cmd-NAMES): Ditto. * (erc-cmd-ME): Put 'do-not-parse-args property. - * erc-dcc.el:nick: * erc-dcc.el: * erc-dcc-list: Renamed + * erc-dcc-list: Renamed * (erc-dcc-member). Treat :nick as either a nick!user@host or nick, do appropriate comparisons, simplified. * (erc-dcc-list-add): New functions @@ -1692,12 +1692,12 @@ 2003-01-11 Mario Lang - * erc-dcc.el: * erc-dcc.el: * (erc-dcc-do-LIST-command): Fix + * erc-dcc.el (erc-dcc-do-LIST-command): Fix * erc-dcc.el: * buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed Keep This info in erc-dcc-member :sent and :confirmed plist values - * : * :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer + :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer * erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-connected, which now prints a msg... * erc-dcc.el: diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index 540db9d..c8281bf 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -638,7 +638,7 @@ 1998-08-09 Simon Josefsson - * gnus-srvr.el (gnus-browse-make-menu-bar): select did read + * gnus-srvr.el (gnus-browse-make-menu-bar): select did read 1998-08-09 Lars Magne Ingebrigtsen @@ -794,7 +794,7 @@ 1998-07-19 16:59 Simon Josefsson - * gnus-util.el (gnus-netrc-syntax-table): @ is whitespace + * gnus-util.el (gnus-netrc-syntax-table): @ is whitespace 1998-07-17 Gordon Matzigkeit @@ -972,7 +972,7 @@ 1998-07-01 Simon Josefsson * gnus-int.el (gnus-get-function): returned non-nil when - function wasn't bound, if noerror=t + function wasn't bound, if noerror=t 1998-07-01 Lars Magne Ingebrigtsen @@ -1260,8 +1260,8 @@ 1998-06-09 Sam Steingold - * gnus-uu.el (gnus-uu-default-view-rules): make sed kill ^M only - at the end of line. + * gnus-uu.el (gnus-uu-default-view-rules): make sed kill ^M only + at the end of line. 1998-06-05 Hrvoje Niksic @@ -1798,7 +1798,7 @@ 1998-03-18 Simon Josefsson - * nndoc.el: dummy request-accept-article + * nndoc.el: dummy request-accept-article 1998-03-19 Lars Magne Ingebrigtsen @@ -2316,9 +2316,9 @@ 1998-01-17 Simon Josefsson - * gnus-sum.el (gnus-summary-work-articles): change buffer - before looking at marked articles - (gnus-summary-work-articles): better check of marked articles + * gnus-sum.el (gnus-summary-work-articles): change buffer + before looking at marked articles + (gnus-summary-work-articles): better check of marked articles 1998-02-14 Lars Magne Ingebrigtsen @@ -2607,7 +2607,7 @@ 1997-12-22 Simon Josefsson - * nnmail.el (nnmail-get-new-mail): Make nnmail-tmp-directory + * nnmail.el (nnmail-get-new-mail): Make nnmail-tmp-directory 1997-12-28 Per Abrahamsen diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 475f766..8c237ab 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -15661,12 +15661,12 @@ * mm-util.el, message.el, rfc2047.el, gnus-sum.el, gnus-score.el: Sync with Emacs 21 (tag EMACS_PRETEST_21_0_100). -;;Has been fixed -- zsh. -;;2001-03-05 Dave Love -;; -;; * mm-util.el (mm-mime-mule-charset-alist): Fix utf-8 case. -;; Move it after definition of mm-coding-system-p. -;; + ;;Has been fixed -- zsh. + ;;2001-03-05 Dave Love + ;; + ;; * mm-util.el (mm-mime-mule-charset-alist): Fix utf-8 case. + ;; Move it after definition of mm-coding-system-p. + ;; 2001-03-01 Dave Love * mm-util.el (mm-inhibit-file-name-handlers): Add @@ -16138,9 +16138,9 @@ * mm-util.el (mm-multibyte-string-p): New. -;; * qp.el: Remove un-logged bogus changes from 2000-12-20. -;; (quoted-printable-encode-region): Doc fix. Don't call -;; string-as-multibyte on class. Clarify line-folding. + ;; * qp.el: Remove un-logged bogus changes from 2000-12-20. + ;; (quoted-printable-encode-region): Doc fix. Don't call + ;; string-as-multibyte on class. Clarify line-folding. (quoted-printable-encode-string): Make temp buffer inherit string's multibyteness. @@ -16981,10 +16981,10 @@ * nnlistserv.el: Ignore errors when requiring nnweb and avoid a compiler warning. -;2000-11-26 Dave Love -; -; * mm-uu.el (mm-uu-configure-list): Fix typo in :type. -; + ;2000-11-26 Dave Love + ; + ; * mm-uu.el (mm-uu-configure-list): Fix typo in :type. + ; 2000-11-23 Dave Love * uu-post.pbm, uu-decode.pbm: New files from XPMs. @@ -17017,7 +17017,7 @@ * gnus-art.el (gnus-mime-button-map): Don't inherit from gnus-article-mode-map. -; (gnus-mime-button-menu): Use mouse-set-point. + ; (gnus-mime-button-menu): Use mouse-set-point. (gnus-insert-mime-button, gnus-mime-display-alternative) (gnus-mime-display-alternative): Don't use local-map property. @@ -17081,9 +17081,9 @@ * time-date.el (timezone-make-date-arpa-standard): Autoload. (date-to-time): Use it. -; * message.el (message-mode) : -; : Use [:alnum:] in regexp range. -; (message-newline-and-reformat): Likewise. + ; * message.el (message-mode) : + ; : Use [:alnum:] in regexp range. + ; (message-newline-and-reformat): Likewise. (message-forward-as-mime, message-forward-ignored-headers) (message-buffer-naming-style, message-default-charset) (message-dont-reply-to-names, message-send-mail-partially-limit): @@ -17188,16 +17188,16 @@ (uudecode-char-int): New alias, replacing char-int. (uudecode-decode-region): Don't call buffer-disable-undo. -; * mm-uu.el (mm-uu-configure): Unquote lambda. -; (mm-uu-configure-list): Doc fix. -; -; * earcon.el (running-xemacs): Don't define. -; -;2000-11-03 Stefan Monnier -; -; * message.el (message-font-lock-keywords): Match a final newline -; to help font-lock's multiline support. -; + ; * mm-uu.el (mm-uu-configure): Unquote lambda. + ; (mm-uu-configure-list): Doc fix. + ; + ; * earcon.el (running-xemacs): Don't define. + ; + ;2000-11-03 Stefan Monnier + ; + ; * message.el (message-font-lock-keywords): Match a final newline + ; to help font-lock's multiline support. + ; 2000-11-03 Dave Love * gnus-nocem.el (gnus-nocem-check-article-limit): Default to 500. @@ -17211,10 +17211,10 @@ * mm-decode.el (mm-display-external): Space-prefix temp buffer name. Don't disable undo explicitly. -;2000-11-02 Dave Love -; -; * message.el (message-font-lock-keywords): Use [:alpha:] for -; cite-prefix. + ;2000-11-02 Dave Love + ; + ; * message.el (message-font-lock-keywords): Use [:alpha:] for + ; cite-prefix. 2000-11-01 Dave Love diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index bc5f8e4..0e28a27 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -2,7 +2,7 @@ * Version 24.4 released. -2014-09-30 Bill Wohler +2014-09-30 Bill Wohler Release MH-E version 8.6. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 261fcd1..2c4ca6d 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -4,16 +4,16 @@ 2014-10-12 Marco Wahl - * org-agenda.el (org-get-entries-from-diary): Use + * org-agenda.el (org-get-entries-from-diary): Use `diary-fancy-display' instead of the obsolete `diary-display-hook'. 2014-10-12 Nicolas Goaziou - * ox.el (org-export-async-start): Limit first argument to lambda + * ox.el (org-export-async-start): Limit first argument to lambda expressions. - * ox-publish.el (org-publish, org-publish-all) + * ox-publish.el (org-publish, org-publish-all) (org-publish-current-file): Replace `ignore', per limit stated above. @@ -25352,7 +25352,7 @@ (org-ascii-replace-entities): New function. 2010-04-10 Carsten Dominik - Ulf Stegemann + Ulf Stegemann * org-entities.el: New file. diff --git a/nt/ChangeLog b/nt/ChangeLog index cb2f33f..e657e2b 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1776,7 +1776,7 @@ * config.nt (HAVE_FACES): Remove, unused. 2008-06-26 Juanma Barranquero - Eli Zaretskii + Eli Zaretskii * nmake.defs (FONT_CFLAGS): * gmake.defs (FONT_CFLAGS): Remove. @@ -1792,7 +1792,7 @@ * config.nt: Remove reference to UNEXEC_SRC. 2008-06-23 Juanma Barranquero - Eli Zaretskii + Eli Zaretskii * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]: Don't hardcode -gstabs+, use DEBUG_INFO. diff --git a/src/ChangeLog b/src/ChangeLog index 1f2a0c4..63ead8d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -10,8 +10,8 @@ 2014-11-15 Jan Djärv - * nsterm.m (ns_send_appdefined): Check for application defined - event on Cocoa (Bug#18993). Backport from trunk. + * nsterm.m (ns_send_appdefined): Check for application defined + event on Cocoa (Bug#18993). Backport from trunk. 2014-11-15 Eli Zaretskii diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index fc6ff1f..100b0cb 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -4200,7 +4200,7 @@ (record_property_change, Fprimitive_undo): Adjust prototypes. 2010-09-22 Juanma Barranquero - Eli Zaretskii + Eli Zaretskii * w32.c (get_emacs_configuration_options): Fix buffer overrun. @@ -6753,7 +6753,7 @@ to standard C. 2010-07-04 Tetsurou Okazaki (tiny change) - Stefan Monnier + Stefan Monnier * lread.c (read1): Fix up last change to not mess up `c'. @@ -8069,7 +8069,7 @@ can specify the frame to use, when applicable. Adjust callers. 2010-05-07 Vincent Belaïche - Stefan Monnier + Stefan Monnier * floatfns.c (Fisnan, Fcopysign, Ffrexp, Fldexp): New functions. @@ -8697,7 +8697,7 @@ (Frename_file): Preserve selinux context when renaming by copy-file. 2010-04-21 Juanma Barranquero - Eli Zaretskii + Eli Zaretskii Don't depend on cm.c or termcap.c on Windows, use stubs. * makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O). @@ -16878,7 +16878,7 @@ : Reflow docstrings. 2008-08-04 Adrian Robert - Ken Raeburn + Ken Raeburn Dock menu customization, based on a patch by Ken Raeburn, plus some other fixes. @@ -17943,7 +17943,7 @@ batch-compiling for bootstrap). 2008-07-15 Chris Hall (tiny change) - YAMAMOTO Mitsuharu + YAMAMOTO Mitsuharu * frame.c (make_initial_frame): Call init_frame_faces(f) in CANNOT_DUMP case -- fix crash due to different init order. @@ -18561,7 +18561,7 @@ (USG_SHARED_LIBRARIES): Remove duplicate definition. 2008-06-26 Juanma Barranquero - Eli Zaretskii + Eli Zaretskii * makefile.w32-in (LOCAL_FLAGS): Don't include WINDOWSNT, DOS_NT and _UCHAR_T. @@ -18809,7 +18809,7 @@ the property of LFACE_FONT of LFACE (if any). 2008-06-21 Seiji Zenitani - Ryo Yoshitake + Ryo Yoshitake * xterm.c (x_set_frame_alpha): Add x_catch_errors for bug#437. @@ -19905,7 +19905,7 @@ * xterm.c (x_set_frame_alpha): Move declarations before statements. 2008-05-21 Seiji Zenitani - Ryo Yoshitake + Ryo Yoshitake * frame.c (Qalpha): Add a new frame parameter `alpha'. (Vframe_alpha_lower_limit): New variable. diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index c852328..f8fc9b1 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -2508,7 +2508,7 @@ If `suspend-emacs-hook' returns t don't suspend -- assume the hook did the equivalent of `suspending' for us (including calling suspend-resume-hook if necessary.) - Otherwise, call sys_suspend and so forth normally. + Otherwise, call sys_suspend and so forth normally. 1986-12-20 Richard M. Stallman (rms@prep) @@ -4050,7 +4050,7 @@ 1986-08-21 Richard Mlynarik (mly@prep) - * process.c (handle_process_output): + * process.c (handle_process_output): do a set-buffer back to original buffer after calling a process' filter function so that all filter functions needn't save-excursion. @@ -4221,7 +4221,7 @@ * unexec.c (write_segment): Kludgy coercions ("(int)") to get this line to compile: - nwrite = (((int) ptr + 128) & ~127) - (int) ptr; + nwrite = (((int) ptr + 128) & ~127) - (int) ptr; Also changed incorrect ~128 to ~127. * process.c: diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index dcb7f66..1de7775 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 @@ -473,10 +473,10 @@ 1995-05-28 Morten Welinder - * s/osf1.h (COFF): Define. - * m/alpha.h (LD_SWITCH_MACHINE) [!__GNUC__]: Don't define. - (r_alloc, r_re_alloc, r_alloc_free) [REL_ALLOC, - !_MALLOC_INTERNAL, !NOT_C_CODE]: Prototype. + * s/osf1.h (COFF): Define. + * m/alpha.h (LD_SWITCH_MACHINE) [!__GNUC__]: Don't define. + (r_alloc, r_re_alloc, r_alloc_free) [REL_ALLOC, + !_MALLOC_INTERNAL, !NOT_C_CODE]: Prototype. 1995-05-28 Richard Stallman @@ -1281,18 +1281,18 @@ * ntinevt.c (nt_kdb_patch_event): Created. - * callproc.c (child_setup) [WINDOWSNT]: Removed syntax errors. + * callproc.c (child_setup) [WINDOWSNT]: Removed syntax errors. * dired.c (Ffile_attributes) [WINDOWSNT]: Removed syntax errors. * fileio.c (Fexpand_file_name) [DOS_NT]: Preserve drive letter case. Fix syntax errors. - Check drive letter when expanding ~\. + Check drive letter when expanding ~\. * sysdep.c (sys_subshell) [WINDOWSNT]: Don't invoke restore_console. * ntproc.c (win32_wait): Reap synchronous subprocesses, and place - return code in synch_process_retcode. + return code in synch_process_retcode. * s/windowsnt.h (ctime): Defined to be nt_ctime. (NULL): Defined when missing from included system files. @@ -1351,7 +1351,7 @@ (get_inode_and_device_vals): Handle directories. * fileio.c (Fexpand_file_name) [DOS_NT]: Don't strip slash from - default dirs like "C:\\" + default dirs like "C:\\" * makefile.nt (all): Use COMPAT_LIB in library list. Use DEL_TREE instead of delnode. @@ -1503,9 +1503,9 @@ 1995-04-08 Noah Friedman - * window.c (Fnext_window, Fprevious_window): If all_frames is a - frame and window is not on that frame, return the first window on - that frame. + * window.c (Fnext_window, Fprevious_window): If all_frames is a + frame and window is not on that frame, return the first window on + that frame. 1995-04-07 Richard Stallman @@ -2899,7 +2899,7 @@ 1995-01-10 Richard Stallman * emacs.c (main): Handle SIGABRT, SIGHWE, SIGPRE, SIGORE, SIGDLK, - SIGCPULIM, if they are defined. + SIGCPULIM, if they are defined. * alloc.c (DONT_COPY_FLAG): New bit flag. (mark_object, gc_sweep, compact_strings): Use it. @@ -3547,7 +3547,7 @@ 1994-11-16 Roland McGrath * xdisp.c (try_window): Don't pass window to Fget_char_property; - pass its buffer. + pass its buffer. (display_text_line): Likewise. 1994-11-16 Francesco Potortì (pot@cnuce.cnr.it) @@ -3770,7 +3770,7 @@ 1994-11-07 Roland McGrath * keyboard.c: Move decl of input_fd outside of #ifdef - HAVE_X_WINDOWS. + HAVE_X_WINDOWS. 1994-11-03 Karl Heuer @@ -3788,7 +3788,7 @@ (HAVE_MOUSE): Defined. * ntheap.c (sbrk): Allow request sizes to be different than the - page size. + page size. * makefile.nt: Changed references of m\m-windowsnt.h to m\intel386.h and of s\s-windowsnt.h to s\windowsnt.h. @@ -4087,7 +4087,7 @@ 1994-10-25 Karl Fogel (kfogel@phylo.life.uiuc.edu) - * window.c (Vtemp_buffer_show_function): Doc fix. + * window.c (Vtemp_buffer_show_function): Doc fix. 1994-10-25 Richard Stallman @@ -4780,7 +4780,7 @@ * xmenu.c: Delete HAVE_X11 conditionals. * xfaces.c (compute_base_face): Use FRAME_FOREGROUND_PIXEL, - FRAME_BACKGROUND_PIXEL, FRAME_FONT. + FRAME_BACKGROUND_PIXEL, FRAME_FONT. * xterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL) (FRAME_FONT): New macros. @@ -4973,59 +4973,59 @@ 1994-10-09 Jim Blandy - Cache the results of some scans, to improve performance in buffers - containing very long lines. - * region-cache.c, region-cache.h: New files. - * Makefile.in.in (obj) Add region-cache.o to the list of files. - (region-cache.o): New target. - (buffer.o, indent.o, search.o): Depend on region-cache.h. - * buffer.h (struct buffer): New members: newline_cache, - width_run_cache, width_table, and cache_long_line_scans. - * buffer.c: #include region-cache.h. - (Fget_buffer_create): Initialize new members of struct buffer. - (Fkill_buffer): Free memory occupied by caches. - (init_buffer_once): Set default value for cache_long_line_scans in - buffer_defaults, and give it a bit in buffer_local_flags. - (syms_of_buffer): Add DEFVAR_PER_BUFFER for cache_long_line_scans. - * insdel.c (prepare_to_modify_buffer): Invalidate width run and - newline caches, if they exist. - * search.c: #include "region-cache.h". - (max, min): Make these functions, not macros; we'd like to pass - them arguments that would be bad to evaluate more than once. - (newline_cache_on_off): New function. - (scan_buffer): New argument END. Call newline_cache_on_off. If - this buffer's newline cache is enabled, consult it to see if we - need to scan a region for newlines, and store information in the - cache after doing so. - (find_next_newline): Pass new arg to scan_buffer. - (find_before_next_newline): New function. - * cmds.c (Fforward_line): Call scan_buffer with new args. - (Fend_of_line): Replace call to Fforward_line and search loop with - call to find_before_next_newline. - * syntax.c (find_defun_start): Call scan_buffer with new args. - * indent.c: #include "region-cache.h". - (character_width, disptab_matches_widthtab, recompute_width_table, - width_run_cache_on_off): New functions. - (compute_motion): Call width_run_cache_on_off. If this buffer's - width run cache is enabled, consult it to see if we need to - traverse a region character-by-character; store information in the - cache after doing so. Call find_before_next_newline instead of - writing out an equivalent loop explicitly, to take advantage of - the newline cache. - Doc fixes. - * xdisp.c (redisplay_window): Invalidate width_run_cache, if the - buffer's display table doesn't match the width table the cache was - built for. - (display_text_line): Use compute_motion to skip forward to the - left edge of the window when the window is hscrolled; this is - faster than rendering all the characters into the bit bucket when - the hscroll is large. - Doc fixes. - (display_count_lines): Call scan_buffer with new args. - * disptab.h (window_display_table): Doc fix. - (buffer_display_table): New declaration. - * indent.h (disptab_matches_widthtab, recompute_width_table): New - declarations. + Cache the results of some scans, to improve performance in buffers + containing very long lines. + * region-cache.c, region-cache.h: New files. + * Makefile.in.in (obj) Add region-cache.o to the list of files. + (region-cache.o): New target. + (buffer.o, indent.o, search.o): Depend on region-cache.h. + * buffer.h (struct buffer): New members: newline_cache, + width_run_cache, width_table, and cache_long_line_scans. + * buffer.c: #include region-cache.h. + (Fget_buffer_create): Initialize new members of struct buffer. + (Fkill_buffer): Free memory occupied by caches. + (init_buffer_once): Set default value for cache_long_line_scans in + buffer_defaults, and give it a bit in buffer_local_flags. + (syms_of_buffer): Add DEFVAR_PER_BUFFER for cache_long_line_scans. + * insdel.c (prepare_to_modify_buffer): Invalidate width run and + newline caches, if they exist. + * search.c: #include "region-cache.h". + (max, min): Make these functions, not macros; we'd like to pass + them arguments that would be bad to evaluate more than once. + (newline_cache_on_off): New function. + (scan_buffer): New argument END. Call newline_cache_on_off. If + this buffer's newline cache is enabled, consult it to see if we + need to scan a region for newlines, and store information in the + cache after doing so. + (find_next_newline): Pass new arg to scan_buffer. + (find_before_next_newline): New function. + * cmds.c (Fforward_line): Call scan_buffer with new args. + (Fend_of_line): Replace call to Fforward_line and search loop with + call to find_before_next_newline. + * syntax.c (find_defun_start): Call scan_buffer with new args. + * indent.c: #include "region-cache.h". + (character_width, disptab_matches_widthtab, recompute_width_table, + width_run_cache_on_off): New functions. + (compute_motion): Call width_run_cache_on_off. If this buffer's + width run cache is enabled, consult it to see if we need to + traverse a region character-by-character; store information in the + cache after doing so. Call find_before_next_newline instead of + writing out an equivalent loop explicitly, to take advantage of + the newline cache. + Doc fixes. + * xdisp.c (redisplay_window): Invalidate width_run_cache, if the + buffer's display table doesn't match the width table the cache was + built for. + (display_text_line): Use compute_motion to skip forward to the + left edge of the window when the window is hscrolled; this is + faster than rendering all the characters into the bit bucket when + the hscroll is large. + Doc fixes. + (display_count_lines): Call scan_buffer with new args. + * disptab.h (window_display_table): Doc fix. + (buffer_display_table): New declaration. + * indent.h (disptab_matches_widthtab, recompute_width_table): New + declarations. 1994-10-08 Richard Stallman @@ -5194,13 +5194,13 @@ independence. Enable using editres for X11R5. * widget.c (EmacsFrameSetCharSize): Use lw_refigure_widget for - widget set independence. + widget set independence. * widget.h: Declare resources showGrip, allowResize, and - resizeToPreferred. + resizeToPreferred. * keyboard.c (make_lispy_event): Do not set item. Now handled in - xmenu.c by popup_get_selection. + xmenu.c by popup_get_selection. 1994-10-01 Richard Stallman @@ -5375,7 +5375,7 @@ * process.c (Fprocess_send_eof): Delete DID_REMOTE conditional. - * buffer.c (get-file-buffer): Doc fix. + * buffer.c (get-file-buffer): Doc fix. 1994-09-23 Richard Stallman @@ -5580,7 +5580,7 @@ 1994-09-19 Jim Blandy - Add a new element to display tables controlling side-by-side + Add a new element to display tables controlling side-by-side window borders. * buffer.c (syms_of_buffer): Update doc string for `buffer-display-table'. @@ -6207,7 +6207,7 @@ * Makefile.in.in (FRAME_SUPPORT): Add faces.elc. * search.c (Freplace_match): Treat caseless initial like a - lowercase initial. + lowercase initial. * keymap.c (Fdefine_key): Fix error message. (Fsingle_key_description): Likewise. @@ -6418,8 +6418,8 @@ 1994-07-23 Jim Blandy (jimb@totoro.bio.indiana.edu) - * .gdbinit: Set the breakpoint in x_error_quitter instead of - _XPrintDefaultError. + * .gdbinit: Set the breakpoint in x_error_quitter instead of + _XPrintDefaultError. 1994-07-20 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -6910,7 +6910,7 @@ 1994-06-16 Roland McGrath (roland@geech.gnu.ai.mit.edu) * unexec.c: Include and [USG5] to define - O_* macros. + O_* macros. (O_RDONLY, O_RDWR): Define if undefined. [emacs] (report_error): Use report_file_error so the user can tell what the errno code was. commit 4e7112e8a32e537044341a38749bbdc8c234c134 Author: Paul Eggert Date: Mon Nov 24 08:38:57 2014 -0800 Spelling fix. diff --git a/lisp/startup.el b/lisp/startup.el index 17930b4..fb49958 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1524,7 +1524,7 @@ Each element in the list should be a list of strings or pairs (title (with-temp-buffer (insert-file-contents (expand-file-name tut tutorial-directory) - ;; Reat the entire file, to make sure any + ;; Read the entire file, to make sure any ;; coding cookies and other local variables ;; get acted upon. nil) commit 3e3b940fc1b60681fb28cdbba99527bdd7ba08cc Author: Glenn Morris Date: Sun Nov 23 23:49:39 2014 -0800 * src/keyboard.c: Fix comment typo. diff --git a/src/keyboard.c b/src/keyboard.c index eb27d6f..29bf9ed 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11721,7 +11721,7 @@ keys_of_keyboard (void) - we enter the second prompt. current-prefix-arg is non-nil, prefix-arg is nil. - before running the first real event, we run the special iconify-frame - event, but we pass the `special' arg to execute-command so + event, but we pass the `special' arg to command-execute so current-prefix-arg and prefix-arg are left untouched. - here we foolishly copy the non-nil current-prefix-arg to prefix-arg. - the next key event will have a spuriously non-nil current-prefix-arg. */ commit 5ceb233b2ddf189333a3ccd199d80ed639fe74c2 Author: Dmitry Gutov Date: Mon Nov 24 04:11:36 2014 +0200 Fixes: debbugs:18579 * lisp/vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5c367b4..5798e96 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-11-24 Dmitry Gutov + * vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files. + (Bug#18579) + * vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored files. (Bug#18579) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index a66fb9f..c8b811f 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -628,7 +628,7 @@ REV is the revision to check out into WORKFILE." (vc-hg-after-dir-status update-function))) (defun vc-hg-dir-status-files (dir files _default-state update-function) - (apply 'vc-hg-command (current-buffer) 'async dir "status" "-C" files) + (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files) (vc-run-delayed (vc-hg-after-dir-status update-function))) commit 7aac8f171bc163972dfa972a2ffe0daa089b155b Author: Dmitry Gutov Date: Mon Nov 24 03:44:42 2014 +0200 Fixes: debbugs:18579 * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored files. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index afa0c68..5c367b4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-24 Dmitry Gutov + + * vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored + files. (Bug#18579) + 2014-11-23 Michael Albinus * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index e607f9d..66c7ac4 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -983,7 +983,7 @@ stream. Standard error output is discarded." (push (list new-name 'edited (vc-bzr-create-extra-fileinfo old-name)) result))) ;; do nothing for non existent files - ((memq translated '(not-found ignored))) + ((eq translated 'not-found)) (t (push (list (file-relative-name (buffer-substring-no-properties commit 4de28b1a76a6b5fe86122ab4dea9c7764d8b5866 Author: Michael Albinus Date: Sun Nov 23 11:49:31 2014 +0100 * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for remote `buffer-file-name'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ec822f..afa0c68 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-23 Michael Albinus + + * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for + remote `buffer-file-name'. + 2014-11-23 Leo Liu * calendar/diary-lib.el (calendar-mark-1): Fix thinko. diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el index b97c632..3c8bc42 100644 --- a/lisp/textmodes/makeinfo.el +++ b/lisp/textmodes/makeinfo.el @@ -253,11 +253,12 @@ Use the \\[next-error] command to move to the next error (setq makeinfo-output-node-name (makeinfo-current-node)) (save-excursion - (makeinfo-compile - (concat makeinfo-run-command " " makeinfo-options - " " buffer-file-name) - nil - 'makeinfo-compilation-sentinel-buffer))) + (let ((default-directory (file-name-directory buffer-file-name))) + (makeinfo-compile + (concat makeinfo-run-command " " makeinfo-options + " " (file-name-nondirectory buffer-file-name)) + nil + 'makeinfo-compilation-sentinel-buffer)))) (defun makeinfo-compilation-sentinel-buffer (proc msg) "Sentinel for `makeinfo-compile' run from `makeinfo-buffer'." commit b7b18c73f98aa429151f8dafc949774d1eb8807b Author: Leo Liu Date: Sun Nov 23 15:51:24 2014 +0800 Fix calendar-mark-1 * calendar/diary-lib.el (calendar-mark-1): Fix thinko. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e59c391..8ec822f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-23 Leo Liu + + * calendar/diary-lib.el (calendar-mark-1): Fix thinko. + 2014-11-22 Fabián Ezequiel Gallina Set PYTHONUNBUFFERED on shell startup. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 7b07f4f..128b629 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1668,8 +1668,7 @@ COLOR is passed to `calendar-mark-visible-date' as MARK." (setq date (calendar-gregorian-from-absolute (funcall toabs (list month day y))))) (calendar-mark-visible-date date color))))) - (calendar-mark-complex month day year - 'calendar-bahai-from-absolute color)))) + (calendar-mark-complex month day year fromabs color)))) (defun diary-entry-time (s) commit 00981cbdfff391d858d262083d24b685217a8353 Author: Paul Eggert Date: Sat Nov 22 15:46:17 2014 -0800 Add git commit hooks that do some simple checks on commits. * autogen.sh: Install Git hooks, if using Git. * build-aux/git-hooks/commit-msg, build-aux/git-hooks/pre-commit: New files, which are Git hooks that check for portable file names, and do some simple checks for commit message format. diff --git a/autogen.sh b/autogen.sh index bc8a73d..69812cd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -208,6 +208,46 @@ autoreconf -i -I m4 || exit $? ## cause 'make' to needlessly run 'autoheader'. echo timestamp > src/stamp-h.in || exit +## Install Git hooks, if using Git. +if test -d .git/hooks; then + tailored_hooks= + sample_hooks= + + for hook in commit-msg pre-commit; do + cmp build-aux/git-hooks/$hook .git/hooks/$hook >/dev/null 2>&1 || + tailored_hooks="$tailored_hooks $hook" + done + for hook in applypatch-msg pre-applypatch; do + cmp .git/hooks/$hook.sample .git/hooks/$hook >/dev/null 2>&1 || + sample_hooks="$sample_hooks $hook" + done + + if test -n "$tailored_hooks$sample_hooks"; then + echo "Installing git hooks..." + + case `cp --help 2>/dev/null` in + *--backup*--verbose*) + cp_options='--backup=numbered --verbose';; + *) + cp_options='';; + esac + + if test -n "$tailored_hooks"; then + for hook in $tailored_hooks; do + cp $cp_options build-aux/git-hooks/$hook .git/hooks || exit + chmod a-w .git/hooks/$hook || exit + done + fi + + if test -n "$sample_hooks"; then + for hook in $sample_hooks; do + cp $cp_options .git/hooks/$hook.sample .git/hooks/$hook || exit + chmod a-w .git/hooks/$hook || exit + done + fi + fi +fi + echo "You can now run \`./configure'." exit 0 diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg new file mode 100755 index 0000000..6a09edd --- /dev/null +++ b/build-aux/git-hooks/commit-msg @@ -0,0 +1,90 @@ +#!/bin/sh +# Check the format of GNU Emacs change log entries. + +# Copyright 2014 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 . + +# Written by Paul Eggert. + +# Use a UTF-8 locale if available, so that the UTF-8 check works. +# Use U+00A2 CENT SIGN to test whether the locale works. +cent_sign_utf8_octal='\302\242' +at_sign=` + printf "${cent_sign_utf8_octal}@" | + awk '{print substr($0, 2)}' 2>/dev/null +` +if test "$at_sign" != @; then + at_sign=` + printf "${cent_sign_utf8_octal}@" | + LC_ALL=en_US.utf8 awk '{print substr($0, 2)}' 2>/dev/null + ` + if test "$at_sign" = @; then + LC_ALL=en_US.utf8; export LC_ALL + fi +fi + +# Check the log entry. +exec awk ' + /^#/ { next } + + !/^.*$/ { + print "Invalid character (not UTF-8)" + status = 1 + } + + nlines == 0 && !/[^[:space:]]/ { next } + + { nlines++ } + + nlines == 1 && /^[[:space:]]/ { + print "White space at start of first line" + status = 1 + } + + nlines == 2 && /[^[:space:]]/ { + print "Nonempty second line" + status = 1 + } + + /[[:cntrl:]]/ { + print "Text contains control character; please use spaces instead of tabs" + status = 1 + } + + 72 < length && /[[:space:]]/ { + print "Line longer than 72 characters" + status = 1 + } + + 140 < length { + print "Word longer than 140 characters" + status = 1 + } + + /^Signed-off-by: / { + print "'Signed-off-by:' present" + status = 1 + } + + END { + if (nlines == 0) { + print "Empty change log entry" + status = 1 + } + exit status + } +' <"$1" diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit new file mode 100755 index 0000000..c24f9bb --- /dev/null +++ b/build-aux/git-hooks/pre-commit @@ -0,0 +1,46 @@ +#!/bin/sh +# Check file names in git commits for GNU Emacs. + +# Copyright 2014 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 . + +LC_ALL=C +export LC_ALL + +exec >&2 + +. git-sh-setup + +git_diff='git diff --cached --name-only --diff-filter=A' +ok_chars='\0+[=-=]./0-9A-Z_a-z' +nbadchars=`$git_diff -z HEAD | tr -d "$ok_chars" | wc -c` + +if test "$nbadchars" -ne 0; then + echo "File name does not consist of -+./_ or ASCII letters or digits." + exit 1 +fi + +new_names=`$git_diff HEAD` || exit +case " +$new_names" in + */-* | *' +'-*) + echo "File name component begins with '-'." + exit 1;; +esac + +exec git diff-index --check --cached HEAD -- commit 238c052fdb9da3b1f96c09809461b70813c5bebc Author: Fabián Ezequiel Gallina Date: Sat Nov 22 20:09:30 2014 -0300 Set PYTHONUNBUFFERED on shell startup. Fixes: debbugs:18595 * lisp/progmodes/python.el (python-shell-unbuffered): New var. (python-shell-calculate-process-environment): Use it. * test/automated/python-tests.el (python-shell-calculate-process-environment-4) (python-shell-calculate-process-environment-5): New tests. (python-shell-make-comint-3): Use file-equal-p. (python-shell-get-or-create-process-1) (python-shell-get-or-create-process-2) (python-shell-get-or-create-process-3): Fix interpreter for Windows. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f16eab..e59c391 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-11-22 Fabián Ezequiel Gallina + + Set PYTHONUNBUFFERED on shell startup. + + * progmodes/python.el (python-shell-unbuffered): New var. + (python-shell-calculate-process-environment): Use it. + 2014-11-22 Michael Albinus * net/tramp.el (tramp-action-password): Clean password on subsequent diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 5a5a039..4c27136 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -94,13 +94,13 @@ ;; python-shell-interpreter-args ;; "-i C:\\Python27\\Scripts\\ipython-script.py") -;; If you are experiencing missing or delayed output in your shells, -;; that's likely caused by your Operating System's pipe buffering -;; (e.g. this is known to happen running CPython 3.3.4 in Windows 7. +;; Missing or delayed output used to happen due to differences between +;; Operating Systems' pipe buffering (e.g. CPython 3.3.4 in Windows 7. ;; See URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17304'). To -;; fix this, using CPython's "-u" commandline argument or setting the -;; "PYTHONUNBUFFERED" environment variable should help: See URL -;; `https://docs.python.org/3/using/cmdline.html#cmdoption-u'. +;; avoid this, the `python-shell-unbuffered' defaults to non-nil and +;; controls whether `python-shell-calculate-process-environment' +;; should set the "PYTHONUNBUFFERED" environment variable on startup: +;; See URL `https://docs.python.org/3/using/cmdline.html#cmdoption-u'. ;; The interaction relies upon having prompts for input (e.g. ">>> " ;; and "... " in standard Python shell) and output (e.g. "Out[1]: " in @@ -1813,6 +1813,14 @@ Restart the Python shell after changing this variable for it to take effect." :group 'python :safe 'booleanp) +(defcustom python-shell-unbuffered t + "Should shell output be unbuffered?. +When non-nil, this may prevent delayed and missing output in the +Python shell. See commentary for details." + :type 'boolean + :group 'python + :safe 'booleanp) + (defcustom python-shell-process-environment nil "List of environment variables for Python shell. This variable follows the same rules as `process-environment' @@ -2087,6 +2095,8 @@ uniqueness for different types of configurations." (virtualenv (if python-shell-virtualenv-path (directory-file-name python-shell-virtualenv-path) nil))) + (when python-shell-unbuffered + (setenv "PYTHONUNBUFFERED" "1")) (when python-shell-extra-pythonpaths (setenv "PYTHONPATH" (format "%s%s%s" diff --git a/test/ChangeLog b/test/ChangeLog index 4f7f068..0da5f99 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,14 @@ +2014-11-22 Fabián Ezequiel Gallina + + * automated/python-tests.el + (python-shell-calculate-process-environment-4) + (python-shell-calculate-process-environment-5): New tests. + (python-shell-make-comint-3): Use file-equal-p. + (python-shell-get-or-create-process-1) + (python-shell-get-or-create-process-2) + (python-shell-get-or-create-process-3): Fix interpreter for + Windows (Bug#18595). + 2014-11-15 Fabián Ezequiel Gallina * automated/python-tests.el (python-indent-dedenters-8): New test diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el index f368f99..f84ded8 100644 --- a/test/automated/python-tests.el +++ b/test/automated/python-tests.el @@ -1872,6 +1872,23 @@ Using `python-shell-interpreter' and python-shell-virtualenv-path path-separator original-path))))) +(ert-deftest python-shell-calculate-process-environment-4 () + "Test `python-shell-unbuffered' modification." + (setenv "PYTHONUNBUFFERED") + (let* ((process-environment + (python-shell-calculate-process-environment))) + ;; Defaults to t + (should python-shell-unbuffered) + (should (string= (getenv "PYTHONUNBUFFERED") "1")))) + +(ert-deftest python-shell-calculate-process-environment-5 () + (setenv "PYTHONUNBUFFERED") + "Test `python-shell-unbuffered' modification." + (let* ((python-shell-unbuffered nil) + (process-environment + (python-shell-calculate-process-environment))) + (should (not (getenv "PYTHONUNBUFFERED"))))) + (ert-deftest python-shell-calculate-exec-path-1 () "Test `python-shell-exec-path' modification." (let* ((original-exec-path exec-path) @@ -1961,8 +1978,9 @@ and `python-shell-interpreter-args' in the new shell buffer." (should (process-live-p process)) (with-current-buffer shell-buffer (should (eq major-mode 'inferior-python-mode)) - (should (string= python-shell-interpreter - (executable-find python-tests-shell-interpreter))) + (should (file-equal-p + python-shell-interpreter + (executable-find python-tests-shell-interpreter))) (should (string= python-shell-interpreter-args "-i")))) (kill-buffer shell-buffer)))) @@ -2050,12 +2068,11 @@ and `python-shell-interpreter-args' in the new shell buffer." (skip-unless (executable-find python-tests-shell-interpreter)) (python-tests-with-temp-file "" - (let* ((python-shell-interpreter - (executable-find python-tests-shell-interpreter)) + (let* ((cmd + (concat (executable-find python-tests-shell-interpreter) " -i")) (use-dialog-box) (dedicated-process-name (python-shell-get-process-name t)) - (dedicated-process - (python-shell-get-or-create-process python-shell-interpreter t)) + (dedicated-process (python-shell-get-or-create-process cmd t)) (dedicated-shell-buffer (process-buffer dedicated-process))) (unwind-protect (progn @@ -2073,12 +2090,11 @@ and `python-shell-interpreter-args' in the new shell buffer." (skip-unless (executable-find python-tests-shell-interpreter)) (python-tests-with-temp-file "" - (let* ((python-shell-interpreter - (executable-find python-tests-shell-interpreter)) + (let* ((cmd + (concat (executable-find python-tests-shell-interpreter) " -i")) (use-dialog-box) (process-name (python-shell-get-process-name nil)) - (process - (python-shell-get-or-create-process python-shell-interpreter)) + (process (python-shell-get-or-create-process cmd)) (shell-buffer (process-buffer process))) (unwind-protect (progn @@ -2088,43 +2104,42 @@ and `python-shell-interpreter-args' in the new shell buffer." (kill-buffer shell-buffer) ;; Check there are no processes for current buffer. (should (not (python-shell-get-process)))) - (ignore-errors (kill-buffer dedicated-shell-buffer)))))) + (ignore-errors (kill-buffer shell-buffer)))))) (ert-deftest python-shell-get-or-create-process-3 () "Check shell dedicated/global process preference." (skip-unless (executable-find python-tests-shell-interpreter)) (python-tests-with-temp-file "" - (let* ((python-shell-interpreter - (executable-find python-tests-shell-interpreter)) + (let* ((cmd + (concat (executable-find python-tests-shell-interpreter) " -i")) + (python-shell-interpreter python-tests-shell-interpreter) (use-dialog-box) (dedicated-process-name (python-shell-get-process-name t)) (global-process) (dedicated-process)) - (unwind-protect - (progn - ;; Create global process - (run-python python-shell-interpreter nil) - (setq global-process (get-buffer-process "*Python*")) - (should global-process) - (set-process-query-on-exit-flag global-process nil) - ;; Create dedicated process - (run-python python-shell-interpreter t) - (setq dedicated-process (get-process dedicated-process-name)) - (should dedicated-process) - (set-process-query-on-exit-flag dedicated-process nil) - ;; Prefer dedicated. - (should (equal (python-shell-get-or-create-process) - dedicated-process)) - ;; Kill the dedicated so the global takes over. - (kill-buffer (process-buffer dedicated-process)) - ;; Detect global. - (should (equal (python-shell-get-or-create-process) global-process)) - ;; Kill the global. - (kill-buffer (process-buffer global-process)) - ;; Check there are no processes for current buffer. - (should (not (python-shell-get-process)))) - (ignore-errors (kill-buffer dedicated-shell-buffer)))))) + (progn + ;; Create global process + (run-python cmd nil) + (setq global-process (get-buffer-process "*Python*")) + (should global-process) + (set-process-query-on-exit-flag global-process nil) + ;; Create dedicated process + (run-python cmd t) + (setq dedicated-process (get-process dedicated-process-name)) + (should dedicated-process) + (set-process-query-on-exit-flag dedicated-process nil) + ;; Prefer dedicated. + (should (equal (python-shell-get-or-create-process) + dedicated-process)) + ;; Kill the dedicated so the global takes over. + (kill-buffer (process-buffer dedicated-process)) + ;; Detect global. + (should (equal (python-shell-get-or-create-process) global-process)) + ;; Kill the global. + (kill-buffer (process-buffer global-process)) + ;; Check there are no processes for current buffer. + (should (not (python-shell-get-process))))))) (ert-deftest python-shell-internal-get-or-create-process-1 () "Check internal shell process creation fallback." commit bd3625c432ee3d05ae4316d3b0ad2c0225e6d532 Author: Michael Albinus Date: Sat Nov 22 17:04:47 2014 +0100 Fixes: debbugs:19047 * net/tramp.el (tramp-action-password): Clean password on subsequent attempts even if there was no wrong password indication. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 148d77f..0f16eab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-11-22 Michael Albinus + * net/tramp.el (tramp-action-password): Clean password on subsequent + attempts even if there was no wrong password indication. (Bug#19047) + * net/tramp-sh.el (tramp-get-remote-locale): Return "LC_ALL=C" as fallback. (tramp-open-connection-setup-interactive-shell): No need to check diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 085b527..fc9950d 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3445,9 +3445,9 @@ of." ;; Let's check whether a wrong password has been sent already. ;; Sometimes, the process returns a new password request ;; immediately after rejecting the previous (wrong) one. - (goto-char (point-min)) - (when (search-forward-regexp tramp-wrong-passwd-regexp nil t) + (unless (tramp-get-connection-property vec "first-password-request" nil) (tramp-clear-passwd vec)) + (goto-char (point-min)) (tramp-check-for-regexp proc tramp-password-prompt-regexp) (tramp-message vec 3 "Sending %s" (match-string 1)) ;; We don't call `tramp-send-string' in order to hide the commit 176f2077aa8ad043382b333a9d1eaf2c164e9e30 Author: Michael Albinus Date: Sat Nov 22 10:30:36 2014 +0100 * net/tramp-sh.el (tramp-get-remote-locale): Return "LC_ALL=C" as fallback. (tramp-open-connection-setup-interactive-shell): No need to check for nil as `tramp-get-remote-locale' return value. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ce22d0..148d77f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-11-22 Michael Albinus + + * net/tramp-sh.el (tramp-get-remote-locale): Return "LC_ALL=C" as + fallback. + (tramp-open-connection-setup-interactive-shell): No need to check + for nil as `tramp-get-remote-locale' return value. + 2014-11-21 Eli Zaretskii * vc/vc-git.el (vc-git-command, vc-git--call): Bind diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 21ec741..ff00b55 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3972,8 +3972,7 @@ process to set up. VEC specifies the connection." ;; Use MULE to select the right EOL convention for communicating ;; with the process. (let ((cs (or (and (memq 'utf-8 (coding-system-list)) - (string-match - "utf8" (or (tramp-get-remote-locale vec) "")) + (string-match "utf8" (tramp-get-remote-locale vec)) (cons 'utf-8 'utf-8)) (tramp-compat-funcall 'process-coding-system proc) (cons 'undecided 'undecided))) @@ -4080,8 +4079,7 @@ process to set up. VEC specifies the connection." ;; Set the environment. (tramp-message vec 5 "Setting default environment") - (let ((env (append (when (tramp-get-remote-locale vec) ; Discard `(nil)'. - `(,(tramp-get-remote-locale vec))) + (let ((env (append `(,(tramp-get-remote-locale vec)) (copy-sequence tramp-remote-process-environment))) unset vars item) (while env @@ -5077,7 +5075,7 @@ Return ATTR." (defun tramp-get-remote-locale (vec) (with-tramp-connection-property vec "locale" (tramp-send-command vec "locale -a") - (let ((candidates '("en_US.utf8" "C.utf8" "C")) + (let ((candidates '("en_US.utf8" "C.utf8")) locale) (with-current-buffer (tramp-get-connection-buffer vec) (while candidates @@ -5087,7 +5085,7 @@ Return ATTR." candidates nil) (setq candidates (cdr candidates))))) ;; Return value. - (when locale (format "LC_ALL=%s" locale))))) + (format "LC_ALL=%s" (or locale "C"))))) (defun tramp-get-ls-command (vec) (with-tramp-connection-property vec "ls" commit d24e558f7700fa07f014c73f284f5185f8de427b Author: Paul Eggert Date: Fri Nov 21 09:11:25 2014 -0800 Add more of the old .bzrignore to .gitignore. Plus a few more .gitignore improvements. * .gitignore: Add copyright notice, since it's big enough. Put exceptions immediately after the patterns they're exceptions to, to make them easier to follow. Give four exceptions for the Makefile pattern. Ignore /confdefs.h, test/indent/*.new, TAGS, GPATH, GSYMS, GRTAGS, GTAGS, ID, *.exe, some nextstep-related files, jisx2131-filter, *.orig, *.rej, etc/emacs.tmpdesktop, *.in-h _* (except for build-aux/snippet/_Noreturn.h), /bin/, /BIN/, /data/, etc/icons/, lib/cxxdefs.h, lib/SYS/, /libexec/, /lock/, /README.W32, /share/, /site-lisp/, src/gdb.ini, /var/. Ignore /configure.lineno, since POSIX requires LINENO only with the User Portability Utilities option. Ignore *cust-load.el and *loaddefs.el only under lisp. Ignore core files of various flavors. Do not ignore etc/refcards/gnus-logo.pdf. diff --git a/.gitignore b/.gitignore index 584e978..989bbb0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,23 @@ +# Files that Git should ignore in the Emacs source directory. + +# Copyright 2009-2014 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 . + + # Built by 'autogen.sh'. /aclocal.m4 /configure @@ -14,9 +34,15 @@ src/config.in Info.plist InfoPlist.strings Makefile +!admin/charsets/Makefile +!etc/refcards/Makefile +!test/automated/flymake/warnpred/Makefile +!test/indent/Makefile makefile /*.cache +/confdefs.h /config.status +/configure.lineno src/config.h src/epaths.h @@ -46,10 +72,10 @@ src/buildobj.h src/globals.h # Lisp-level sources built by 'make'. -*cus-load.el -*loaddefs.el leim/changed.misc leim/changed.tit +lisp/**/*cus-load.el +lisp/**/*loaddefs.el lisp/cedet/semantic/bovine/c-by.el lisp/cedet/semantic/bovine/make-by.el lisp/cedet/semantic/bovine/scm-by.el @@ -103,13 +129,32 @@ src/stamp-h1 # Object files and debugging. *.a *.dSYM/ +*.core *.elc *.o *.res +[0-9]*.core +core +core.*[0-9] oo/ oo-spd/ src/*.map +# Tests. +test/indent/*.new + +# ctags, etags. +TAGS + +# GNU global. +GPATH +GSYMS +GRTAGS +GTAGS + +# GNU idutils. +ID + # Executables. *.exe a.out @@ -124,7 +169,11 @@ lib-src/movemail lib-src/profile lib-src/test-distrib lib-src/update-game-score +nextstep/Cocoa/Emacs.base/Contents/Info.plist +nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj nextstep/Emacs.app/ +nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop +nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist src/bootstrap-emacs src/emacs src/emacs-[0-9]* @@ -133,6 +182,7 @@ src/temacs # Character-set info. admin/charsets/*.el admin/charsets/*.map +admin/charsets/jisx2131-filter admin/unidata/unidata.txt lisp/international/charprop.el lisp/international/uni-*.el @@ -153,6 +203,10 @@ lisp/international/uni-*.el *.op *.ops *.pdf +!doc/lispintro/cons-*.pdf +!doc/lispintro/drawers.pdf +!doc/lispintro/lambda-*.pdf +!etc/refcards/gnus-logo.pdf *.pg *.pgs *.pj @@ -167,20 +221,37 @@ lisp/international/uni-*.el *.tps *.vr *.vrs -!doc/lispintro/cons-*.pdf -!doc/lispintro/drawers.pdf -!doc/lispintro/lambda-*.pdf doc/misc/cc-mode.ss etc/DOC -!etc/refcards/gnus-logo.pdf info/dir -# Backup files and locks. +# Version control and locks. +*.orig +*.rej *~ .#* - -# Git output. [0-9]*.patch +# Built by 'make install'. +etc/emacs.tmpdesktop + # Distribution directories. /emacs-[1-9]*/ + +# Microsoft-related builds and installations. +*.in-h +_* +!build-aux/snippet/_Noreturn.h +/bin/ +/BIN/ +/data/ +etc/icons/ +lib/cxxdefs.h +lib/SYS/ +/libexec/ +/lock/ +/README.W32 +/share/ +/site-lisp/ +src/gdb.ini +/var/ diff --git a/ChangeLog b/ChangeLog index 9de9407..22f0698 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2014-11-21 Paul Eggert + + Add more of the old .bzrignore to .gitignore. + Plus a few more .gitignore improvements. + * .gitignore: Add copyright notice, since it's big enough. + Put exceptions immediately after the patterns they're exceptions + to, to make them easier to follow. + Give four exceptions for the Makefile pattern. + Ignore /confdefs.h, test/indent/*.new, TAGS, GPATH, GSYMS, GRTAGS, + GTAGS, ID, *.exe, some nextstep-related files, + jisx2131-filter, *.orig, *.rej, etc/emacs.tmpdesktop, *.in-h + _* (except for build-aux/snippet/_Noreturn.h), /bin/, /BIN/, + /data/, etc/icons/, lib/cxxdefs.h, lib/SYS/, /libexec/, /lock/, + /README.W32, /share/, /site-lisp/, src/gdb.ini, /var/. + Ignore /configure.lineno, since POSIX requires + LINENO only with the User Portability Utilities option. + Ignore *cust-load.el and *loaddefs.el only under lisp. + Ignore core files of various flavors. + Do not ignore etc/refcards/gnus-logo.pdf. + 2014-11-21 Eli Zaretskii * .gitignore: Add back src/_gdbinit, which is a temporary file commit 04ed42002130c7ae940eea8d5b9af9e11a60a055 Author: Eli Zaretskii Date: Fri Nov 21 12:34:59 2014 +0200 Use "~1" instead of "^" in vc-git.el to specify the parent of a Git commit. lisp/vc/vc-git.el (vc-git-previous-revision): Use "~1" instead of "^", since the latter is a special character for MS-Windows system shells. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 13bc0ba..1ce22d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,8 @@ * vc/vc-git.el (vc-git-command, vc-git--call): Bind coding-system-for-read and coding-system-for-write to vc-git-commits-coding-system. + (vc-git-previous-revision): Use "~1" instead of "^", since the + latter is a special character for MS-Windows system shells. 2014-11-20 Michael Albinus diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 0ff5ba2..ae6b13a 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -987,7 +987,11 @@ or BRANCH^ (where \"^\" can be repeated)." (point) (1- (point-max))))))) (or (vc-git-symbolic-commit prev-rev) prev-rev)) - (vc-git--rev-parse (concat rev "^")))) + ;; We used to use "^" here, but that fails on MS-Windows if git is + ;; invoked via a batch file, in which case cmd.exe strips the "^" + ;; because it is a special character for cmd which process-file + ;; does not (and cannot) quote. + (vc-git--rev-parse (concat rev "~1")))) (defun vc-git--rev-parse (rev) (with-temp-buffer commit f9b9251f8c506c10bfeafc44101edc5081dbdb47 Author: Eli Zaretskii Date: Fri Nov 21 12:26:35 2014 +0200 Use correct encoding to communicate with Git. lisp/vc/vc-git.el (vc-git-command, vc-git--call): Bind coding-system-for-read and coding-system-for-write to vc-git-commits-coding-system. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 510cd32..13bc0ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-21 Eli Zaretskii + + * vc/vc-git.el (vc-git-command, vc-git--call): Bind + coding-system-for-read and coding-system-for-write to + vc-git-commits-coding-system. + 2014-11-20 Michael Albinus Improve XEmacs compatibility. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 9c8ab3b..0ff5ba2 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1209,16 +1209,18 @@ This command shares argument histories with \\[rgrep] and \\[grep]." "A wrapper around `vc-do-command' for use in vc-git.el. The difference to vc-do-command is that this function always invokes `vc-git-program'." - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program - ;; http://debbugs.gnu.org/16897 - (unless (and (not (cdr-safe file-or-list)) - (let ((file (or (car-safe file-or-list) - file-or-list))) - (and file - (eq ?/ (aref file (1- (length file)))) - (equal file (vc-git-root file))))) - file-or-list) - (cons "--no-pager" flags))) + (let ((coding-system-for-read vc-git-commits-coding-system) + (coding-system-for-write vc-git-commits-coding-system)) + (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program + ;; http://debbugs.gnu.org/16897 + (unless (and (not (cdr-safe file-or-list)) + (let ((file (or (car-safe file-or-list) + file-or-list))) + (and file + (eq ?/ (aref file (1- (length file)))) + (equal file (vc-git-root file))))) + file-or-list) + (cons "--no-pager" flags)))) (defun vc-git--empty-db-p () "Check if the git db is empty (no commit done yet)." @@ -1231,6 +1233,8 @@ The difference to vc-do-command is that this function always invokes ;; directories. We enable `inhibit-null-byte-detection', otherwise ;; Tramp's eol conversion might be confused. (let ((inhibit-null-byte-detection t) + (coding-system-for-read vc-git-commits-coding-system) + (coding-system-for-write vc-git-commits-coding-system) (process-environment (cons "PAGER=" process-environment))) (apply 'process-file vc-git-program nil buffer nil command args))) commit 30c94ebea137e0733b1ee902f4ec1bd15014a8d2 Author: Eli Zaretskii Date: Fri Nov 21 10:56:15 2014 +0200 Add src/_gdbinit to .gitignore. .gitignore: Add back src/_gdbinit, which is a temporary file created by the MS-DOS build. diff --git a/.gitignore b/.gitignore index 7a17aa9..584e978 100644 --- a/.gitignore +++ b/.gitignore @@ -91,6 +91,8 @@ deps/ # Logs and temporaries. *.log *.tmp +# Created by MS-DOS builds +src/_gdbinit # Time stamps. stamp_BLD diff --git a/ChangeLog b/ChangeLog index 8475418..9de9407 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-21 Eli Zaretskii + + * .gitignore: Add back src/_gdbinit, which is a temporary file + created by the MS-DOS build. + 2014-11-20 Paul Eggert Add a.out to .gitignore. commit 54a29f4a7cd3ff02efc1d038e9d7f6de4fbcb23e Author: Paul Eggert Date: Thu Nov 20 12:40:41 2014 -0800 Add a.out to .gitignore. Suggested by Lee Duhem in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01665.html * .gitignore: Add a.out. Move *.log next to *.tmp, since it's generic. Put *.exe before non-generics. diff --git a/.gitignore b/.gitignore index a35ab93..7a17aa9 100644 --- a/.gitignore +++ b/.gitignore @@ -88,7 +88,8 @@ lisp/subdirs.el .deps/ deps/ -# Temporaries. +# Logs and temporaries. +*.log *.tmp # Time stamps. @@ -108,6 +109,8 @@ oo-spd/ src/*.map # Executables. +*.exe +a.out lib-src/blessmail lib-src/ctags lib-src/ebrowse @@ -124,7 +127,6 @@ src/bootstrap-emacs src/emacs src/emacs-[0-9]* src/temacs -*.exe # Character-set info. admin/charsets/*.el @@ -146,7 +148,6 @@ lisp/international/uni-*.el *.info *.ky *.kys -*.log *.op *.ops *.pdf diff --git a/ChangeLog b/ChangeLog index fdf40a1..8475418 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-11-20 Paul Eggert + + Add a.out to .gitignore. + Suggested by Lee Duhem in: + http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01665.html + * .gitignore: Add a.out. + Move *.log next to *.tmp, since it's generic. + Put *.exe before non-generics. + 2014-11-19 Eli Zaretskii * .gitignore: Resurrect Windows-specific ignorables lost in last commit 4fdddb20c55dd88f3f3e864dd5d7ea933a6ea5bc Author: Michael Albinus Date: Thu Nov 20 20:17:35 2014 +0100 Fix typo in ChangeLog. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 164d8c1..510cd32 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -9,16 +9,16 @@ `with-timeout-unsuspend' if they don't exist, like in XEmacs. (tramp-time-less-p, tramp-time-subtract): Remove functions. (tramp-handle-file-newer-than-file-p, tramp-time-diff): - * net/ttramp-adb.el (tramp-adb-ls-output-time-less-p): - * net/ttramp-cache.el (tramp-get-file-property): - * net/ttramp-smb.el (tramp-smb-handle-insert-directory): + * net/tramp-adb.el (tramp-adb-ls-output-time-less-p): + * net/tramp-cache.el (tramp-get-file-property): + * net/tramp-smb.el (tramp-smb-handle-insert-directory): Use `time-less-p' and `time-subtract, respectively. - * net/ttramp-adb.el (top): Do not require time-date.el. + * net/tramp-adb.el (top): Do not require time-date.el. - * net/ttramp-compat.el (top): Require time-date.el for XEmacs. + * net/tramp-compat.el (top): Require time-date.el for XEmacs. - * net/ttramp-sh.el (tramp-open-connection-setup-interactive-shell): + * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell): Check, whether `utf-8' is a valid coding system. 2014-11-19 Eli Zaretskii commit 6ec5ee8872bfb8b0ebc53d98fcb8f284e08c147f Author: Michael Albinus Date: Thu Nov 20 20:10:15 2014 +0100 Improve XEmacs compatibility. * net/tramp.el (tramp-autoload-file-name-handler): Wrap `temporary-file-directory' by `symbol-value', it doesn't exist in XEmacs. (tramp-read-passwd): Don't use `with-timeout-suspend' and `with-timeout-unsuspend' if they don't exist, like in XEmacs. (tramp-time-less-p, tramp-time-subtract): Remove functions. (tramp-handle-file-newer-than-file-p, tramp-time-diff): * net/ttramp-adb.el (tramp-adb-ls-output-time-less-p): * net/ttramp-cache.el (tramp-get-file-property): * net/ttramp-smb.el (tramp-smb-handle-insert-directory): Use `time-less-p' and `time-subtract, respectively. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 306882e..164d8c1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,26 @@ +2014-11-20 Michael Albinus + + Improve XEmacs compatibility. + + * net/tramp.el (tramp-autoload-file-name-handler): + Wrap `temporary-file-directory' by `symbol-value', it doesn't + exist in XEmacs. + (tramp-read-passwd): Don't use `with-timeout-suspend' and + `with-timeout-unsuspend' if they don't exist, like in XEmacs. + (tramp-time-less-p, tramp-time-subtract): Remove functions. + (tramp-handle-file-newer-than-file-p, tramp-time-diff): + * net/ttramp-adb.el (tramp-adb-ls-output-time-less-p): + * net/ttramp-cache.el (tramp-get-file-property): + * net/ttramp-smb.el (tramp-smb-handle-insert-directory): + Use `time-less-p' and `time-subtract, respectively. + + * net/ttramp-adb.el (top): Do not require time-date.el. + + * net/ttramp-compat.el (top): Require time-date.el for XEmacs. + + * net/ttramp-sh.el (tramp-open-connection-setup-interactive-shell): + Check, whether `utf-8' is a valid coding system. + 2014-11-19 Eli Zaretskii * vc/vc.el (vc-retrieve-tag): Doc fix. diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 2401b4a..1695631 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -34,7 +34,6 @@ ;;; Code: (require 'tramp) -(require 'time-date) ;; Pacify byte-compiler. (defvar directory-sep-char) @@ -468,7 +467,7 @@ Emacs dired can't find files." (setq time-a (apply 'encode-time (parse-time-string (match-string 0 a)))) (string-match tramp-adb-ls-date-regexp b) (setq time-b (apply 'encode-time (parse-time-string (match-string 0 b)))) - (tramp-time-less-p time-b time-a))) + (time-less-p time-b time-a))) (defun tramp-adb-ls-output-name-less-p (a b) "Sort \"ls\" output by name, ascending." diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index a6b7500..50c8e24 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -136,7 +136,7 @@ Returns DEFAULT if not set." (tramp-time-diff (current-time) (car value)) remote-file-name-inhibit-cache)) (and (consp remote-file-name-inhibit-cache) - (tramp-time-less-p + (time-less-p remote-file-name-inhibit-cache (car value))))) (setq value (cdr value)) (setq value default)) diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index cd336ec..de63d8c 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -44,7 +44,8 @@ (require 'outline) (require 'passwd) (require 'pp) - (require 'regexp-opt)) + (require 'regexp-opt) + (require 'time-date)) (require 'advice) (require 'custom) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 6e46df2..21ec741 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3971,9 +3971,10 @@ process to set up. VEC specifies the connection." (if (featurep 'mule) ;; Use MULE to select the right EOL convention for communicating ;; with the process. - (let ((cs (or (when (string-match - "utf8" (or (tramp-get-remote-locale vec) "")) - (cons 'utf-8 'utf-8)) + (let ((cs (or (and (memq 'utf-8 (coding-system-list)) + (string-match + "utf8" (or (tramp-get-remote-locale vec) "")) + (cons 'utf-8 'utf-8)) (tramp-compat-funcall 'process-coding-system proc) (cons 'undecided 'undecided))) cs-decode cs-encode) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 15ae9ed..3d48f47 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -976,7 +976,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (lambda (x y) (if (string-match "t" switches) ;; Sort by date. - (tramp-time-less-p (nth 3 y) (nth 3 x)) + (time-less-p (nth 3 y) (nth 3 x)) ;; Sort by name. (string-lessp (nth 0 x) (nth 0 y)))))) @@ -1010,8 +1010,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (or (nth 3 attr) "nogroup") ; gid (or (nth 7 attr) (nth 2 x)) ; size (format-time-string - (if (tramp-time-less-p - (tramp-time-subtract (current-time) (nth 3 x)) + (if (time-less-p (time-subtract (current-time) (nth 3 x)) tramp-half-a-year) "%b %e %R" "%b %e %Y") diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5889743..085b527 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2253,8 +2253,9 @@ Falls back to normal file name handler if no Tramp file name handler exists." ;;;###autoload (progn (defun tramp-autoload-file-name-handler (operation &rest args) "Load Tramp file name handler, and perform OPERATION." - ;; Avoid recursive loading of tramp.el. - (let ((default-directory temporary-file-directory)) + ;; 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) "/"))) (load "tramp" nil t)) (apply operation args))) @@ -2968,8 +2969,8 @@ User is always nil." (cond ((not (file-exists-p file1)) nil) ((not (file-exists-p file2)) t) - (t (tramp-time-less-p (nth 5 (file-attributes file2)) - (nth 5 (file-attributes file1)))))) + (t (time-less-p (nth 5 (file-attributes file2)) + (nth 5 (file-attributes file1)))))) (defun tramp-handle-file-regular-p (filename) "Like `file-regular-p' for Tramp files." @@ -4171,7 +4172,8 @@ Invokes `password-read' if available, `read-passwd' else." (tramp-check-for-regexp proc tramp-password-prompt-regexp) (format "%s for %s " (capitalize (match-string 1)) key)))) ;; We suspend the timers while reading the password. - (stimers (with-timeout-suspend)) + (stimers (and (functionp 'with-timeout-suspend) + (tramp-compat-funcall 'with-timeout-suspend))) auth-info auth-passwd) (unwind-protect @@ -4211,7 +4213,8 @@ Invokes `password-read' if available, `read-passwd' else." (read-passwd pw-prompt)) (tramp-set-connection-property v "first-password-request" nil))) ;; Reenable the timers. - (with-timeout-unsuspend stimers)))) + (and (functionp 'with-timeout-unsuspend) + (tramp-compat-funcall 'with-timeout-unsuspend stimers))))) ;;;###tramp-autoload (defun tramp-clear-passwd (vec) @@ -4236,26 +4239,6 @@ Invokes `password-read' if available, `read-passwd' else." ("oct" . 10) ("nov" . 11) ("dec" . 12)) "Alist mapping month names to integers.") -;; FIXME: Shouldn't this also look at any subseconds parts of T1 and T2? -;;;###tramp-autoload -(defun tramp-time-less-p (t1 t2) - "Say whether time value T1 is less than time value T2." - (unless t1 (setq t1 '(0 0))) - (unless t2 (setq t2 '(0 0))) - (or (< (car t1) (car t2)) - (and (= (car t1) (car t2)) - (< (nth 1 t1) (nth 1 t2))))) - -;; FIXME: Shouldn't this also look at any subseconds parts of T1 and T2? -(defun tramp-time-subtract (t1 t2) - "Subtract two time values. -Return the difference in the format of a time value." - (unless t1 (setq t1 '(0 0))) - (unless t2 (setq t2 '(0 0))) - (let ((borrow (< (cadr t1) (cadr t2)))) - (list (- (car t1) (car t2) (if borrow 1 0)) - (- (+ (if borrow 65536 0) (cadr t1)) (cadr t2))))) - ;;;###tramp-autoload (defun tramp-time-diff (t1 t2) "Return the difference between the two times, in seconds. @@ -4274,7 +4257,7 @@ T1 and T2 are time values (as returned by `current-time' for example)." (if (< (length t1) 3) (append t1 '(0)) t1) (if (< (length t2) 3) (append t2 '(0)) t2))) (t - (let ((time (tramp-time-subtract t1 t2))) + (let ((time (time-subtract t1 t2))) (+ (* (car time) 65536.0) (cadr time) (/ (or (nth 2 time) 0) 1000000.0)))))) commit cd2e816cd3ebf562c680ed15b53cf2a88a01f14f Author: Paul Eggert Date: Wed Nov 19 11:29:40 2014 -0800 Lessen focus on ChangeLog files, as opposed to change log entries. This is in preparation for generating the former automatically from the latter. * admin/notes/bugtracker, admin/notes/copyright, admin/notes/newfile: ChangeLog -> change log * admin/notes/changelogs: Remove, merging old contents to ... * admin/notes/repo: ... here. * doc/emacs/maintaining.texi (Change Log): Mention that ChangeLog files may be copied to or from a version control system. * doc/emacs/trouble.texi (Sending Patches): Point to the commit messages. * doc/lispref/intro.texi (Acknowledgments): ChangeLog file -> change log entries. * doc/lispref/tips.texi (Library Headers): Emacs uses a version control system. * etc/CONTRIBUTE: Give advice about git commit messages and how to generate proposed patches containing them. diff --git a/admin/ChangeLog b/admin/ChangeLog index 0ec6d92..82974dc 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,13 @@ +2014-11-19 Paul Eggert + + Lessen focus on ChangeLog files, as opposed to change log entries. + This is in preparation for generating the former automatically + from the latter. + * notes/bugtracker, notes/copyright, notes/newfile: + ChangeLog -> change log + * notes/changelogs: Remove, merging old contents to ... + * notes/repo: ... here. + 2014-11-17 Oscar Fuentes * admin/CPP-DEFINES: Mention MINGW_W64. diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index 3d9df20..fd7bd08 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -463,10 +463,10 @@ time, rather than by increasing bug number "raw" = ? -** ChangeLog issues +** Change log issues *** When you fix a bug, it can be helpful to put the bug number in the -ChangeLog entry, for example: +change log entry, for example: * foo.el (foofunc): Fix the `foo' case. (Bug#123) @@ -475,7 +475,7 @@ obvious fix (e.g. a typo), there's no need to clutter the log with the bug number. Similarly, when you close a bug, it can be helpful to include the -relevant ChangeLog entry in the message to the bug tracker, so people +relevant change log entry in the message to the bug tracker, so people can see exactly what the fix was. *** bug-reference-mode diff --git a/admin/notes/changelogs b/admin/notes/changelogs deleted file mode 100644 index 1025cfc..0000000 --- a/admin/notes/changelogs +++ /dev/null @@ -1,23 +0,0 @@ -If installing changes written by someone else, make the ChangeLog -entry in their name, not yours. - - -http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html - There is no need to make change log entries for files such as NEWS, - MAINTAINERS, and FOR-RELEASE. -"There is no need" means you don't have to, but you can if you want to. - - -http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html - There is no need to indicate regeneration of files such as configure - in ChangeLog. - - -http://lists.gnu.org/archive/html/emacs-devel/2008-11/msg00940.html -Preferred form for several entries with the same content: - - * help.el (view-lossage): - * kmacro.el (kmacro-edit-lossage): - * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys. - -(Rather than anything involving "ditto" and suchlike.) diff --git a/admin/notes/copyright b/admin/notes/copyright index 74aa73b..c5452c3 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -22,7 +22,7 @@ author to make a non-trivial total. If so, make sure they have an assignment. If adding a whole file adjust the copyright statements in the file. -2. When installing code written by someone else, the ChangeLog entry +2. When installing code written by someone else, the commit should be in the name of the author of the code, not the person who installs it. Also use commit's "--author" option. Do not install any of your own changes in the same commit. @@ -115,8 +115,8 @@ else it is possible the file should not be in Emacs at all (please report!). Note that it seems painfully clear that one cannot rely on commit logs, -or even ChangeLogs, for older changes. People often installed changes -from others, without recording the true authorship. +or even change log entries, for older changes. People often installed +changes from others, without recording the true authorship. [For reference, most of these points were established via email with rms, 2007/1, "Copyright years". diff --git a/admin/notes/newfile b/admin/notes/newfile index 0b66b80..a682fec 100644 --- a/admin/notes/newfile +++ b/admin/notes/newfile @@ -15,7 +15,7 @@ output under the headings "The following files are not valid DOS file names:" and "The following resolve to the same DOS file names:" should not include any files that end up in the release tarball. -** Make the ChangeLog entry in the name of the author(s), not your own name. +** Commit in the name of the author(s), not your own name. ** If appropriate, check that the file compiles OK and that Emacs builds fine with it. Address any compilation warnings. diff --git a/admin/notes/repo b/admin/notes/repo index ded1032..46a9e08 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -1,9 +1,16 @@ NOTES ON COMMITTING TO EMACS'S REPOSITORY -*- outline -*- -* Use DVCS commenting conventions +* Commit metainformation -Commits should follow the conventions used in all modern distributed -version-control systems. That is, they should consist of +** Commit in the author's name + +If installing changes written by someone else, commit them in their +name, not yours. + +** Commit message format + +Commit messages should follow the conventions used in all modern +distributed version-control systems. That is, they should consist of - A self-contained topic line, preferably no more than 75 chars long. @@ -15,6 +22,21 @@ version-control systems. That is, they should consist of files, just copy the entries you made in them to the commit message after the blank line.) +- Preferred form for several entries with the same content: + + * help.el (view-lossage): + * kmacro.el (kmacro-edit-lossage): + * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys. + + (Rather than anything involving "ditto" and suchlike.) + +** Unnecessary metainformation + +There is no need to make separate change log entries for files such as +NEWS, MAINTAINERS, and FOR-RELEASE, or to indicate regeneration of +files such as 'configure'. "There is no need" means you don't have +to, but you can if you want to. + * Commit to the right branch Development normally takes places on the trunk. @@ -112,9 +134,9 @@ http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html [The section on git merge procedure has not yet been written] -Inspect the ChangeLog entries (e.g. in case too many entries have been +Inspect the change log entries (e.g. in case too many entries have been included or whitespace between entries needs fixing). If someone made -multiple ChangeLog entries on different days in the branch, you may +multiple change log entries on different days in the branch, you may wish to collapse them all to a single entry for that author in the trunk (because in the trunk they all appear under the same date). Obviously, if there are multiple changes to the same file by different @@ -166,4 +188,3 @@ again. This is a semi-automated way to find the revision that introduced a bug. Browse `git help bisect' for technical instructions. - diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a72c2a8..e307ff3 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,10 @@ +2014-11-19 Paul Eggert + + Lessen focus on ChangeLog files, as opposed to change log entries. + * maintaining.texi (Change Log): Mention that ChangeLog files may + be copied to or from a version control system. + * trouble.texi (Sending Patches): Point to the commit messages. + 2014-11-19 Eli Zaretskii * maintaining.texi (Switching Branches): Mention "C-x v r". diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index fef3cde..dd1c826 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1474,9 +1474,11 @@ different revision with @kbd{C-u C-x v v}. @cindex change log Many software projects keep a @dfn{change log}. This is a file, normally named @file{ChangeLog}, containing a chronological record of -when and how the program was changed. Sometimes, there are several -change log files, each recording the changes in one directory or -directory tree. +when and how the program was changed. Sometimes, these files are +automatically generated from the change log entries stored in version +control systems, or are used to generate these change log entries. +Sometimes, there are several change log files, each recording the +changes in one directory or directory tree. @menu * Change Log Commands:: Commands for editing change log files. diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 09260a1..5f3cf92 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -1137,9 +1137,9 @@ new function, all you need to say about it is that it is new. If you feel that the purpose needs explaining, it probably does---but put the explanation in comments in the code. It will be more useful there. -Please read the @file{ChangeLog} files in the @file{src} and -@file{lisp} directories to see what sorts of information to put in, -and to learn the style that we use. @xref{Change Log}. +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. +@xref{Change Log}. @item When you write the fix, keep in mind that we can't install a change that diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9123194..363e7ae 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2014-11-19 Paul Eggert + + Lessen focus on ChangeLog files, as opposed to change log entries. + * intro.texi (Acknowledgments): ChangeLog file -> change log entries. + * tips.texi (Library Headers): Emacs uses a version control system. + 2014-11-09 Glenn Morris * Makefile.in (version): Remove variable. diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 0c5346f..1cd79bb 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -552,4 +552,4 @@ Trost, Rickard Westman, Jean White, Eduard Wiebe, Matthew Wilding, Carl Witty, Dale Worley, Rusty Wright, and David D. Zuhn. For a more complete list of contributors, please see the relevant -ChangeLog file in the Emacs sources. +change log entries in the Emacs source repository. diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index d8b906d..f7f07e8 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -1062,9 +1062,9 @@ context. @item ;;; Change Log: This begins an optional log of changes to the file over time. Don't put too much information in this section---it is better to keep the -detailed logs in a separate @file{ChangeLog} file (as Emacs does), -and/or to use a version control system. @samp{History} is an -alternative to @samp{Change Log}. +detailed logs in a version control system (as Emacs does) or in a +separate @file{ChangeLog} file. @samp{History} is an alternative to +@samp{Change Log}. @item ;;; Code: This begins the actual code of the program. diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE index d1ee9f4..b07b6c6 100644 --- a/etc/CONTRIBUTE +++ b/etc/CONTRIBUTE @@ -118,13 +118,23 @@ documentation, i.e. Texinfo files. Ref: "Change Log Concepts" node of the GNU Coding Standards Info Manual, for how to write good log entries. +When using git, commit messages should use ChangeLog format, with a +single short line explaining the change, then an empty line, then +unindented ChangeLog entries. (Essentially, a commit message should +be a duplicate of what the patch adds to the ChangeLog files. We are +planning to automate this better, to avoid the duplication.) + ** The patch itself. If you are accessing the Emacs repository, make sure your copy is -up-to-date (e.g. with `git pull'), then use +up-to-date (e.g. with 'git pull'). You can commit your changes +to a private branch and generate a patch from the master version +by using + git format-patch master +Or you can leave your changes uncommitted and use git diff -Else, use - diff -cp OLD NEW +With no repository, you can use + diff -u OLD NEW ** Mail format. diff --git a/etc/ChangeLog b/etc/ChangeLog index 851af7f..9f66788 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,9 @@ +2014-11-19 Paul Eggert + + Lessen focus on ChangeLog files, as opposed to change log entries. + * CONTRIBUTE: Give advice about git commit messages and how + to generate proposed patches containing them. + 2014-11-13 Paul Eggert Backport fix for minor Bazaar leftovers. commit ff953bc93bb41ef573cd6962424ece340ad5a394 Author: Eli Zaretskii Date: Wed Nov 19 21:13:34 2014 +0200 .gitignore: Resurrect Windows-specific ignorables lost in last changes. diff --git a/.gitignore b/.gitignore index cd60123..a35ab93 100644 --- a/.gitignore +++ b/.gitignore @@ -102,6 +102,7 @@ src/stamp-h1 *.dSYM/ *.elc *.o +*.res oo/ oo-spd/ src/*.map @@ -123,6 +124,7 @@ src/bootstrap-emacs src/emacs src/emacs-[0-9]* src/temacs +*.exe # Character-set info. admin/charsets/*.el diff --git a/ChangeLog b/ChangeLog index ebc1497..fdf40a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-19 Eli Zaretskii + + * .gitignore: Resurrect Windows-specific ignorables lost in last + changes. + 2014-11-19 Paul Eggert * .gitignore: Add /emacs-[1-9]*/, and sort better. commit 2fa082c00315801f0215685aa6032179615d2b55 Author: Eli Zaretskii Date: Wed Nov 19 20:33:17 2014 +0200 Fix VC documentation related to switching branches. lisp/vc/vc.el (vc-retrieve-tag): Doc fix. doc/emacs/maintaining.texi (Switching Branches): Mention "C-x v r". Correct commands for switching branches in various VCSs. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 84722b2..a72c2a8 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2014-11-19 Eli Zaretskii + + * maintaining.texi (Switching Branches): Mention "C-x v r". + Correct commands for switching branches in various VCSs. + 2014-11-16 Tassilo Horn * misc.texi (DocView Slicing): Describe how to slice with the diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index e066c49..fef3cde 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1317,11 +1317,18 @@ implemented, and these differences cannot be entirely concealed by VC. On some decentralized version control systems, including Bazaar and Mercurial in its normal mode of operation, each branch has its own working directory tree, so switching between branches just involves -switching directories. On Git, switching between branches is done -using the @command{git branch} command, which changes the contents of -the working tree itself. - - On centralized version control systems, you can switch between +switching directories. On Git, branches are normally @dfn{co-located} +in the same directory, and switching between branches is done using +the @command{git checkout} command, which changes the contents of the +working tree to match the branch you switch to. Bazaar also supports +co-located branches, in which case the @command{bzr switch} command +will switch branches in the current directory. With Subversion, you +switch to another branch using the @command{svn switch} command. + + The VC command to switch to another branch in the current directory +is @kbd{C-x v r @var{branch-name} @key{RET}} (@code{vc-retrieve-tag}). + + On centralized version control systems, you can also switch between branches by typing @kbd{C-u C-x v v} in an up-to-date work file (@pxref{Advanced C-x v v}), and entering the revision ID for a revision on another branch. On CVS, for instance, revisions on the diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 54df183..306882e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-19 Eli Zaretskii + + * vc/vc.el (vc-retrieve-tag): Doc fix. + 2014-11-17 Eli Zaretskii * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry): diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 4a53690..0f4d789 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2135,8 +2135,12 @@ checked out in that new branch." ;;;###autoload (defun vc-retrieve-tag (dir name) - "Descending recursively from DIR, retrieve the tag called NAME. -If NAME is empty, it refers to the latest revisions. + "For each file in or below DIR, retrieve their tagged version NAME. +NAME can name a branch, in which case this command will switch to the +named branch in the directory DIR. +Interactively, prompt for DIR only for VCS that works at file level; +otherwise use the default directory of the current buffer. +If NAME is empty, it refers to the latest revisions of the current branch. If locking is used for the files in DIR, then there must not be any locked files at or below DIR (but if NAME is empty, locked files are allowed and simply skipped)." commit f773d35aa218d25ff8d933fce21643971ec713e5 Author: Paul Eggert Date: Wed Nov 19 10:30:30 2014 -0800 * .gitignore: Add /emacs-[1-9]*/, and sort better. diff --git a/.gitignore b/.gitignore index ededdee..cd60123 100644 --- a/.gitignore +++ b/.gitignore @@ -11,14 +11,14 @@ lib/Makefile.in src/config.in # Built by 'configure'. +Info.plist +InfoPlist.strings Makefile makefile /*.cache /config.status src/config.h src/epaths.h -Info.plist -InfoPlist.strings # C-level sources built by 'make'. lib/alloca.h @@ -99,12 +99,12 @@ src/stamp-h1 # Object files and debugging. *.a +*.dSYM/ *.elc *.o oo/ oo-spd/ src/*.map -*.dSYM/ # Executables. lib-src/blessmail @@ -118,11 +118,11 @@ lib-src/movemail lib-src/profile lib-src/test-distrib lib-src/update-game-score +nextstep/Emacs.app/ src/bootstrap-emacs src/emacs src/emacs-[0-9]* src/temacs -nextstep/Emacs.app/ # Character-set info. admin/charsets/*.el @@ -176,3 +176,6 @@ info/dir # Git output. [0-9]*.patch + +# Distribution directories. +/emacs-[1-9]*/ diff --git a/ChangeLog b/ChangeLog index cb02ee6..ebc1497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-19 Paul Eggert + + * .gitignore: Add /emacs-[1-9]*/, and sort better. + 2014-11-18 Ivan Andrus * .gitignore: Add some nextstep/mac ignorables. commit fe1b545d773b18a053bd7878d36296e28b52cfe6 Author: Ivan Andrus Date: Fri Nov 14 23:41:09 2014 -0700 * .gitignore: Add some nextstep/mac ignorables. diff --git a/.gitignore b/.gitignore index bd48c28..ededdee 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,8 @@ makefile /config.status src/config.h src/epaths.h +Info.plist +InfoPlist.strings # C-level sources built by 'make'. lib/alloca.h @@ -32,6 +34,7 @@ lib/inttypes.h lib/libgnu.a lib/signal.h lib/stdalign.h +lib/stdint.h lib/stdio.h lib/stdlib.h lib/string.h @@ -101,6 +104,7 @@ src/stamp-h1 oo/ oo-spd/ src/*.map +*.dSYM/ # Executables. lib-src/blessmail @@ -118,6 +122,7 @@ src/bootstrap-emacs src/emacs src/emacs-[0-9]* src/temacs +nextstep/Emacs.app/ # Character-set info. admin/charsets/*.el diff --git a/ChangeLog b/ChangeLog index 8cc6635..cb02ee6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-18 Ivan Andrus + + * .gitignore: Add some nextstep/mac ignorables. + 2014-11-18 Paul Eggert .gitignore cleanup. commit 342bc0e04b68d9c52503816bedaf67c9e77be8d2 Author: Paul Eggert Date: Mon Nov 17 17:56:49 2014 -0800 .gitignore cleanup. * .gitignore: Merge contents of subsidiary files and organize the result so as to avoid duplication. Remove no-longer needed entries. * admin/charsets/.gitignore, admin/unidata/.gitignore: * doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore: * leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore: * lisp/calc/.gitignore, lisp/calendar/.gitignore: * lisp/cedet/.gitignore, lisp/emulation/.gitignore: * lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore: * lisp/international/.gitignore, lisp/language/.gitignore: * lisp/leim/.gitignore, lisp/leim/quail/.gitignore: * lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore: * lisp/nxml/.gitignore, lisp/obsolete/.gitignore: * lisp/play/.gitignore, lisp/progmodes/.gitignore: * lisp/term/.gitignore, lisp/textmodes/.gitignore: * lisp/url/.gitignore, nt/.gitignore, src/.gitignore: Remove; no longer needed. diff --git a/.gitignore b/.gitignore index 7f6aca7..bd48c28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,48 +1,24 @@ -**/Makefile -**/makefile - -configure -aclocal.m4 -compile -config.guess -config.sub -depcomp -install-sh -missing +# Built by 'autogen.sh'. +/aclocal.m4 +/configure +build-aux/compile +build-aux/config.guess +build-aux/config.sub +build-aux/depcomp +build-aux/install-sh +build-aux/missing lib/Makefile.in src/config.in -autom4te.cache -TAGS -*~ -.#* -/README.W32 -/bin/ -/site-lisp/ -/leim/ja-dic/ -etc/refcards/*.aux -etc/refcards/*.log -info/dir -info/*.info -test/biditest.txt +# Built by 'configure'. +Makefile +makefile +/*.cache +/config.status +src/config.h +src/epaths.h -config.log -config.status -config.cache -lib-src/blessmail -lib-src/ctags -lib-src/ebrowse -lib-src/emacsclient -lib-src/etags -lib-src/hexl -lib-src/make-docfile -lib-src/movemail -lib-src/profile -lib-src/test-distrib -lib-src/update-game-score -*.o -*.exe -*.res +# C-level sources built by 'make'. lib/alloca.h lib/arg-nonnull.h lib/byteswap.h @@ -55,59 +31,143 @@ lib/getopt.h lib/inttypes.h lib/libgnu.a lib/signal.h +lib/stdalign.h lib/stdio.h lib/stdlib.h -lib/stdalign.h lib/string.h lib/sys/ lib/time.h lib/unistd.h lib/warn-on-use.h +src/buildobj.h +src/globals.h + +# Lisp-level sources built by 'make'. +*cus-load.el +*loaddefs.el +leim/changed.misc +leim/changed.tit +lisp/cedet/semantic/bovine/c-by.el +lisp/cedet/semantic/bovine/make-by.el +lisp/cedet/semantic/bovine/scm-by.el +lisp/cedet/semantic/wisent/javat-wy.el +lisp/cedet/semantic/wisent/js-wy.el +lisp/cedet/semantic/wisent/python-wy.el +lisp/cedet/srecode/srt-wy.el +lisp/eshell/esh-groups.el +lisp/finder-inf.el +lisp/leim/ja-dic/ +lisp/leim/leim-list.el +lisp/leim/quail/4Corner.el +lisp/leim/quail/ARRAY30.el +lisp/leim/quail/CCDOSPY.el +lisp/leim/quail/CTLau.el +lisp/leim/quail/CTLau-b5.el +lisp/leim/quail/ECDICT.el +lisp/leim/quail/ETZY.el +lisp/leim/quail/PY-b5.el +lisp/leim/quail/PY.el +lisp/leim/quail/Punct.el +lisp/leim/quail/Punct-b5.el +lisp/leim/quail/QJ.el +lisp/leim/quail/QJ-b5.el +lisp/leim/quail/SW.el +lisp/leim/quail/TONEPY.el +lisp/leim/quail/ZIRANMA.el +lisp/leim/quail/ZOZY.el +lisp/leim/quail/quick-b5.el +lisp/leim/quail/quick-cns.el +lisp/leim/quail/tsang-b5.el +lisp/leim/quail/tsang-cns.el +lisp/subdirs.el + +# Dependencies. +.deps/ +deps/ + +# Temporaries. +*.tmp + +# Time stamps. +stamp_BLD +src/gl-stamp +src/stamp-h.in +src/stamp-h1 + +# Object files and debugging. +*.a +*.elc +*.o +oo/ +oo-spd/ +src/*.map + +# Executables. +lib-src/blessmail +lib-src/ctags +lib-src/ebrowse +lib-src/emacsclient +lib-src/etags +lib-src/hexl +lib-src/make-docfile +lib-src/movemail +lib-src/profile +lib-src/test-distrib +lib-src/update-game-score src/bootstrap-emacs -src/deps/ src/emacs src/emacs-[0-9]* -src/gl-stamp -src/globals.h -src/stamp-h1 src/temacs -src/temacs.map -src/temacs.tmp -doc/*/*.aux -doc/*/*.cm -doc/*/*.cms -doc/*/*.cp -doc/*/*.cps -doc/*/*.dvi -doc/*/*.fn -doc/*/*.fns -doc/*/*.html -doc/*/*.ky -doc/*/*.kys -doc/*/*.log -doc/*/*.op -doc/*/*.ops -doc/*/*.pdf -doc/*/*.pg -doc/*/*.pgs -doc/*/*.pj -doc/*/*.pjs -doc/*/*.ps -doc/*/*.sc -doc/*/*.scs -doc/*/*.tg -doc/*/*.tgs -doc/*/*.tmp -doc/*/*.toc -doc/*/*.tp -doc/*/*.tps -doc/*/*.vr -doc/*/*.vrs -doc/*/texput.log + +# Character-set info. +admin/charsets/*.el +admin/charsets/*.map +admin/unidata/unidata.txt +lisp/international/charprop.el +lisp/international/uni-*.el + +# Documentation. +*.aux +*.cm +*.cms +*.cp +*.cps +*.dvi +*.fn +*.fns +*.html +*.info +*.ky +*.kys +*.log +*.op +*.ops +*.pdf +*.pg +*.pgs +*.pj +*.pjs +*.ps +*.sc +*.scs +*.tg +*.tgs +*.toc +*.tp +*.tps +*.vr +*.vrs +!doc/lispintro/cons-*.pdf +!doc/lispintro/drawers.pdf +!doc/lispintro/lambda-*.pdf doc/misc/cc-mode.ss -lib/.deps/ -lisp/international/uni-brackets.el -lwlib/deps/ -lwlib/liblw.a -leim/changed.misc -leim/changed.tit +etc/DOC +!etc/refcards/gnus-logo.pdf +info/dir + +# Backup files and locks. +*~ +.#* + +# Git output. +[0-9]*.patch diff --git a/ChangeLog b/ChangeLog index 239b5ef..8cc6635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2014-11-18 Paul Eggert + + .gitignore cleanup. + * .gitignore: Merge contents of subsidiary files and organize the + result so as to avoid duplication. Remove no-longer needed entries. + * admin/charsets/.gitignore, admin/unidata/.gitignore: + * doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore: + * leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore: + * lisp/calc/.gitignore, lisp/calendar/.gitignore: + * lisp/cedet/.gitignore, lisp/emulation/.gitignore: + * lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore: + * lisp/international/.gitignore, lisp/language/.gitignore: + * lisp/leim/.gitignore, lisp/leim/quail/.gitignore: + * lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore: + * lisp/nxml/.gitignore, lisp/obsolete/.gitignore: + * lisp/play/.gitignore, lisp/progmodes/.gitignore: + * lisp/term/.gitignore, lisp/textmodes/.gitignore: + * lisp/url/.gitignore, nt/.gitignore, src/.gitignore: + Remove; no longer needed. + 2014-11-17 Paul Eggert Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode. diff --git a/admin/charsets/.gitignore b/admin/charsets/.gitignore deleted file mode 100644 index ea375dc..0000000 --- a/admin/charsets/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.map -*.el diff --git a/admin/unidata/.gitignore b/admin/unidata/.gitignore deleted file mode 100644 index 3f2d8ca..0000000 --- a/admin/unidata/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.elc -unidata.txt - diff --git a/doc/lispintro/.gitignore b/doc/lispintro/.gitignore deleted file mode 100644 index cf992dc..0000000 --- a/doc/lispintro/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -!cons-*.pdf -!drawers.pdf -!lambda-*.pdf diff --git a/etc/.gitignore b/etc/.gitignore deleted file mode 100644 index 8e12acb..0000000 --- a/etc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -DOC -icons/ diff --git a/leim/.gitignore b/leim/.gitignore deleted file mode 100644 index 02175a1..0000000 --- a/leim/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.elc -leim-list.el diff --git a/leim/ja-dic/.gitignore b/leim/ja-dic/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/leim/ja-dic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lib-src/.gitignore b/lib-src/.gitignore deleted file mode 100644 index c931a15..0000000 --- a/lib-src/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -DOC -ctags.c -stamp_BLD -echolisp.tmp - -oo/ -oo-spd/ diff --git a/lisp/.gitignore b/lisp/.gitignore deleted file mode 100644 index 6d5166e..0000000 --- a/lisp/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.elc -*-loaddefs.el -loaddefs.el -subdirs.el -finder-inf.el -cus-load.el diff --git a/lisp/calc/.gitignore b/lisp/calc/.gitignore deleted file mode 100644 index a46b68d..0000000 --- a/lisp/calc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.elc -calc-loaddefs.el diff --git a/lisp/calendar/.gitignore b/lisp/calendar/.gitignore deleted file mode 100644 index d0de296..0000000 --- a/lisp/calendar/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.elc -cal-loaddefs.el -diary-loaddefs.el -hol-loaddefs.el diff --git a/lisp/cedet/.gitignore b/lisp/cedet/.gitignore deleted file mode 100644 index 976586e..0000000 --- a/lisp/cedet/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -## Generated grammar files. -semantic/bovine/c-by.el -semantic/bovine/make-by.el -semantic/bovine/scm-by.el -semantic/wisent/javat-wy.el -semantic/wisent/js-wy.el -semantic/wisent/python-wy.el -srecode/srt-wy.el diff --git a/lisp/emulation/.gitignore b/lisp/emulation/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/emulation/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/erc/.gitignore b/lisp/erc/.gitignore deleted file mode 100644 index 7053c31..0000000 --- a/lisp/erc/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -{arch} -.arch-ids -*.elc diff --git a/lisp/eshell/.gitignore b/lisp/eshell/.gitignore deleted file mode 100644 index 2abf84b..0000000 --- a/lisp/eshell/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -esh-groups.el - diff --git a/lisp/gnus/.gitignore b/lisp/gnus/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/gnus/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/international/.gitignore b/lisp/international/.gitignore deleted file mode 100644 index 161b312..0000000 --- a/lisp/international/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# Generated Unicode files. -charprop.el -uni-bidi.el -uni-category.el -uni-combining.el -uni-comment.el -uni-decimal.el -uni-decomposition.el -uni-digit.el -uni-lowercase.el -uni-mirrored.el -uni-name.el -uni-numeric.el -uni-old-name.el -uni-titlecase.el -uni-uppercase.el diff --git a/lisp/language/.gitignore b/lisp/language/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/language/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/leim/.gitignore b/lisp/leim/.gitignore deleted file mode 100644 index 57b77ba..0000000 --- a/lisp/leim/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -ja-dic/ -leim-list.el diff --git a/lisp/leim/quail/.gitignore b/lisp/leim/quail/.gitignore deleted file mode 100644 index c3f9e36..0000000 --- a/lisp/leim/quail/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -4Corner.el -ARRAY30.el -CCDOSPY.el -CTLau-b5.el -CTLau.el -ECDICT.el -ETZY.el -PY-b5.el -PY.el -Punct-b5.el -Punct.el -QJ-b5.el -QJ.el -SW.el -TONEPY.el -ZIRANMA.el -ZOZY.el -quick-b5.el -quick-cns.el -tsang-b5.el -tsang-cns.el - diff --git a/lisp/mail/.gitignore b/lisp/mail/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/mail/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/mh-e/.gitignore b/lisp/mh-e/.gitignore deleted file mode 100644 index 2e5b174..0000000 --- a/lisp/mh-e/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -mh-autoloads.el -mh-cus-load.el -mh-loaddefs.el diff --git a/lisp/net/.gitignore b/lisp/net/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/net/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/nxml/.gitignore b/lisp/nxml/.gitignore deleted file mode 100644 index f18ed02..0000000 --- a/lisp/nxml/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.elc -subdirs.el diff --git a/lisp/obsolete/.gitignore b/lisp/obsolete/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/lisp/play/.gitignore b/lisp/play/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/play/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/progmodes/.gitignore b/lisp/progmodes/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/progmodes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/term/.gitignore b/lisp/term/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/term/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/textmodes/.gitignore b/lisp/textmodes/.gitignore deleted file mode 100644 index c531d98..0000000 --- a/lisp/textmodes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/url/.gitignore b/lisp/url/.gitignore deleted file mode 100644 index 362a9c8..0000000 --- a/lisp/url/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -auto-autoloads.el -custom-load.el -url-auto.el diff --git a/nt/.gitignore b/nt/.gitignore deleted file mode 100644 index 4e2fa24..0000000 --- a/nt/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -config.log -stamp_BLD - -oo/ -oo-spd/ diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index ebacd57..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -buildobj.h -config.h -epaths.h -stamp_BLD -stamp-h.in - -oo/ -oo-spd/ commit 81e0cca7bbc99dbfda898a8aaab740ae121cf045 Author: Oscar Fuentes Date: Mon Nov 17 23:06:13 2014 +0100 Define MINGW_W64 and use it instead of _W64 ... for detecting MinGW-w64. _W64 is not specific of MinGW-w64, it is defined for compatibility with MS VC++. * nt/inc/ms-w32.h: Define MINGW_W64. * admin/CPP-DEFINES: Mention MINGW_W64. * nt/addpm.c: Use it. * nt/addsection.c: Use it. * nt/preprep.c: Use it. * src/w32.c: Use MINGW_W64 instead of _W64 * src/w32term.c: Likewise. diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 27d87dc..e475b42 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -19,8 +19,9 @@ __MSDOS__ Ditto. __DJGPP_MINOR__ Minor version number of the DJGPP library; used only in msdos.c and dosfns.c. DOS_NT Compiling for either the MS-DOS or native MS-Windows port. WINDOWSNT Compiling the native MS-Windows (W32) port. -__MINGW32__ Compiling the W32 port with the MinGW port of GCC. +__MINGW32__ Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC. _MSC_VER Compiling the W32 port with the Microsoft C compiler. +MINGW_W64 Compiling the W32 port with the MinGW-w64 port of GCC. DARWIN_OS Compiling on Mac OS X or pure Darwin (and using s/darwin.h). SOLARIS2 USG diff --git a/admin/ChangeLog b/admin/ChangeLog index 72ce74b..0ec6d92 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-11-17 Oscar Fuentes + + * admin/CPP-DEFINES: Mention MINGW_W64. + 2014-11-15 Glenn Morris * update_autogen: Auto-detect VCS in use. diff --git a/nt/ChangeLog b/nt/ChangeLog index 5ffab4d..cb2f33f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,13 @@ +2014-11-17 Oscar Fuentes + + * inc/ms-w32.h: Define MINGW_W64. + + * nt/addpm.c: Use it. + + * nt/addsection.c: Use it. + + * nt/preprep.c: Use it. + 2014-10-31 Eric S. Raymond * Neutralize language specific to a repository type. diff --git a/nt/addpm.c b/nt/addpm.c index 18057b5..f7cfba3 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -38,9 +38,8 @@ along with GNU Emacs. If not, see . */ #include #include -/* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything - below 0x500. */ -#ifndef _W64 +/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x500. */ +#ifndef MINGW_W64 #define _WIN32_IE 0x400 #endif /* Request C Object macros for COM interfaces. */ diff --git a/nt/addsection.c b/nt/addsection.c index a897573..832066b 100644 --- a/nt/addsection.c +++ b/nt/addsection.c @@ -25,7 +25,7 @@ along with GNU Emacs. If not, see . #include #include #include -#if defined(__GNUC__) && !defined(_W64) +#if defined(__GNUC__) && !defined(MINGW_W64) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 8f7c36a..1d45df7 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -26,6 +26,16 @@ along with GNU Emacs. If not, see . */ #include +/* MinGW-w64 gcc does not automotically define a macro for + differentiating it fom MinGW gcc. We need to test the presence of + __MINGW64_VERSION_MAJOR in _mingw.h: */ +#ifdef __MINGW32__ +# include <_mingw.h> +# ifdef __MINGW64_VERSION_MAJOR +# define MINGW_W64 +# endif +#endif + /* #undef const */ /* Number of chars of output in the buffer of a stdio stream. */ @@ -139,7 +149,7 @@ extern char *getenv (); versions we still support. MinGW64 defines this to a higher value in its system headers, and is not really compatible with values lower than 0x0500, so leave it alone. */ -#ifndef _W64 +#ifndef MINGW_W64 # define _WIN32_WINNT 0x0400 #endif @@ -165,7 +175,7 @@ extern char *getenv (); #ifdef emacs -#ifdef _W64 +#ifdef MINGW_W64 /* MinGW64 specific stuff. */ /* Make sure 'struct timespec' and 'struct timezone' are defined. */ #include @@ -368,7 +378,7 @@ typedef int sigset_t; typedef int ssize_t; #endif -#ifdef _W64 /* MinGW64 */ +#ifdef MINGW_W64 #ifndef _POSIX typedef _sigset_t sigset_t; #endif diff --git a/nt/preprep.c b/nt/preprep.c index fda937d..39a9b70 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -25,7 +25,7 @@ along with GNU Emacs. If not, see . #include #include #include -#if defined(__GNUC__) && !defined(_W64) +#if defined(__GNUC__) && !defined(MINGW_W64) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif diff --git a/src/ChangeLog b/src/ChangeLog index f9f3a0f..1f2a0c4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-11-17 Oscar Fuentes + + * src/w32.c: Use MINGW_W64 instead of _W64. + + * src/w32term.c: Likewise. + 2014-11-16 Stefan Monnier * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). diff --git a/src/w32.c b/src/w32.c index aba0b5a..34f28d0 100644 --- a/src/w32.c +++ b/src/w32.c @@ -72,8 +72,8 @@ along with GNU Emacs. If not, see . */ #include #include -/* MinGW64 (_W64) defines these in its _mingw.h. */ -#if defined(__GNUC__) && !defined(_W64) +/* MinGW64 defines these in its _mingw.h. */ +#if defined(__GNUC__) && !defined(MINGW_W64) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif @@ -149,7 +149,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX { #define SDDL_REVISION_1 1 #endif /* SDDL_REVISION_1 */ -#if defined(_MSC_VER) || defined(_W64) +#if defined(_MSC_VER) || defined(MINGW_W64) /* MSVC and MinGW64 don't provide the definition of REPARSE_DATA_BUFFER and the associated macros, except on ntifs.h, which cannot be included because it triggers conflicts with other diff --git a/src/w32term.c b/src/w32term.c index 66cdbfa..41ab645 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -100,10 +100,10 @@ extern Cursor w32_load_cursor (LPCTSTR name); struct w32_display_info one_w32_display_info; struct w32_display_info *x_display_list; -#if _WIN32_WINNT < 0x0500 && !defined(_W64) +#if _WIN32_WINNT < 0x0500 && !defined(MINGW_W64) /* Pre Windows 2000, this was not available, but define it here so that Emacs compiled on such a platform will run on newer versions. - MinGW64 (_W64) defines these unconditionally, so avoid redefining. */ + MinGW64 defines these unconditionally, so avoid redefining. */ typedef struct tagWCRANGE { commit 67a22c6062fdaff39c27611d21cd5866661f8e15 Author: Eli Zaretskii Date: Mon Nov 17 19:36:29 2014 +0200 Don't assume "bzr log" uses --long format by default. lisp/vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry): Don't assume --long is the default for "bzr log", always specify it explicitly, in case the user defined an alias for 'log' that uses some other format. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d47a97f..54df183 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-11-17 Eli Zaretskii + + * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry): + Don't assume --long is the default for "bzr log", always specify + it explicitly, in case the user defined an alias for 'log' that + uses some other format. + 2014-11-16 Fabián Ezequiel Gallina * progmodes/python.el (python-eldoc--get-doc-at-point): Strip diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 0730a9c..e607f9d 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -722,7 +722,7 @@ If LIMIT is non-nil, show no more than this many entries." (with-current-buffer buffer (apply 'vc-bzr-command "log" buffer 'async files (append - (when shortlog '("--line")) + (if shortlog '("--line") '("--long")) ;; The extra complications here when start-revision and limit ;; are set are due to bzr log's --forward argument, which ;; could be enabled via an alias in bazaar.conf. @@ -757,7 +757,7 @@ If LIMIT is non-nil, show no more than this many entries." (defun vc-bzr-expanded-log-entry (revision) (with-temp-buffer (apply 'vc-bzr-command "log" t nil nil - (list (format "-r%s" revision))) + (list "--long" (format "-r%s" revision))) (goto-char (point-min)) (when (looking-at "^-+\n") ;; Indent the expanded log entry. commit 2e007571951887a94daad3a46ec3380ab83497b4 Author: Paul Eggert Date: Sun Nov 16 19:43:26 2014 -0800 Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode. * .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1"). See Glenn Morris in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html diff --git a/.dir-locals.el b/.dir-locals.el index afc68ea..5e73e0d 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -3,7 +3,9 @@ (fill-column . 70))) (c-mode . ((c-file-style . "GNU"))) (objc-mode . ((c-file-style . "GNU"))) - (log-edit-mode . ((log-edit-font-lock-gnu-style . t) + (log-edit-mode . ((log-edit-rewrite-fixes + "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1") + (log-edit-font-lock-gnu-style . t) (log-edit-setup-add-author . t))) (change-log-mode . ((add-log-time-zone-rule . t) (fill-column . 74) diff --git a/ChangeLog b/ChangeLog index c9ea640..239b5ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-11-17 Paul Eggert + Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode. + * .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes + "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1"). See Glenn Morris in: + http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html + Simplify and fix doc-related .gitignore files. This fixes some unwanted 'git status' output after 'make docs'. * .gitignore: Add **/Makefile, **/makefile. commit 790c69057269dbed855375b91120ccf3cce0f830 Author: Paul Eggert Date: Sun Nov 16 17:19:05 2014 -0800 Simplify and fix doc-related .gitignore files. This fixes some unwanted 'git status' output after 'make docs'. * .gitignore: Add **/Makefile, **/makefile. Remove Makefile, makefile. Add doc/*/*.xxx rules for the usual kinds of documentation outputs and temporaries. Add doc/misc/cc-mode.ss. * doc/emacs/.gitignore, doc/lispref/.gitignore, doc/misc/.gitignore: * lwlib/.gitignore, oldXMenu/.gitignore: Remove, as these .gitignore files are no longer needed. * doc/lispintro/.gitignore: Replace with list of exceptional PDF files. diff --git a/.gitignore b/.gitignore index 6903c46..7f6aca7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +**/Makefile +**/makefile + configure aclocal.m4 compile @@ -9,10 +12,9 @@ missing lib/Makefile.in src/config.in autom4te.cache -makefile TAGS *~ -.#* +.#* /README.W32 /bin/ @@ -24,7 +26,6 @@ info/dir info/*.info test/biditest.txt -Makefile config.log config.status config.cache @@ -72,9 +73,38 @@ src/stamp-h1 src/temacs src/temacs.map src/temacs.tmp -doc/emacs/emacsver.texi -doc/man/emacs.1 -etc/refcards/emacsver.tex +doc/*/*.aux +doc/*/*.cm +doc/*/*.cms +doc/*/*.cp +doc/*/*.cps +doc/*/*.dvi +doc/*/*.fn +doc/*/*.fns +doc/*/*.html +doc/*/*.ky +doc/*/*.kys +doc/*/*.log +doc/*/*.op +doc/*/*.ops +doc/*/*.pdf +doc/*/*.pg +doc/*/*.pgs +doc/*/*.pj +doc/*/*.pjs +doc/*/*.ps +doc/*/*.sc +doc/*/*.scs +doc/*/*.tg +doc/*/*.tgs +doc/*/*.tmp +doc/*/*.toc +doc/*/*.tp +doc/*/*.tps +doc/*/*.vr +doc/*/*.vrs +doc/*/texput.log +doc/misc/cc-mode.ss lib/.deps/ lisp/international/uni-brackets.el lwlib/deps/ diff --git a/ChangeLog b/ChangeLog index 5ec8127..c9ea640 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2014-11-17 Paul Eggert + + Simplify and fix doc-related .gitignore files. + This fixes some unwanted 'git status' output after 'make docs'. + * .gitignore: Add **/Makefile, **/makefile. + Remove Makefile, makefile. + Add doc/*/*.xxx rules for the usual kinds of documentation outputs + and temporaries. Add doc/misc/cc-mode.ss. + * doc/emacs/.gitignore, doc/lispintro/.gitignore, doc/misc/.gitignore: + * lwlib/.gitignore, oldXMenu/.gitignore: + Remove, as these .gitignore files are no longer needed. + * doc/lispintro/.gitignore: Replace with list of exceptional PDF files. + 2014-11-15 Christoph Scholtes * .gitignore: Ignore generated file lib/stdalign.h. diff --git a/doc/emacs/.gitignore b/doc/emacs/.gitignore deleted file mode 100644 index 3ff56b4..0000000 --- a/doc/emacs/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -*.aux -*.cp -*.cps -*.dvi -*.fn -*.fns -*.ky -*.kys -*.log -*.op -*.ops -*.pdf -*.pg -*.pgs -*.ps -*.tmp -*.toc -*.tp -*.tps -*.vr -*.vrs -Makefile -makefile diff --git a/doc/lispintro/.gitignore b/doc/lispintro/.gitignore index e1af5a9..cf992dc 100644 --- a/doc/lispintro/.gitignore +++ b/doc/lispintro/.gitignore @@ -1,21 +1,3 @@ -*.aux -*.fn -*.fns -*.cps -*.cp -*.kys -*.ky -*.toc -*.pgs -*.pg -*.log -*.vrs -*.vr -*.dvi -*.ps -*.tp -*.tps -*.tmp -*.txt -Makefile -makefile +!cons-*.pdf +!drawers.pdf +!lambda-*.pdf diff --git a/doc/lispref/.gitignore b/doc/lispref/.gitignore deleted file mode 100644 index ba74d36..0000000 --- a/doc/lispref/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -texput.log -elisp.?? -elisp.??? -config.log -config.cache -config.status -Makefile -makefile -elisp -elisp-? -elisp-?? -elisp1* -elisp2* diff --git a/doc/misc/.gitignore b/doc/misc/.gitignore deleted file mode 100644 index 3ff56b4..0000000 --- a/doc/misc/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -*.aux -*.cp -*.cps -*.dvi -*.fn -*.fns -*.ky -*.kys -*.log -*.op -*.ops -*.pdf -*.pg -*.pgs -*.ps -*.tmp -*.toc -*.tp -*.tps -*.vr -*.vrs -Makefile -makefile diff --git a/lwlib/.gitignore b/lwlib/.gitignore deleted file mode 100644 index f3c7a7c..0000000 --- a/lwlib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/oldXMenu/.gitignore b/oldXMenu/.gitignore deleted file mode 100644 index f3c7a7c..0000000 --- a/oldXMenu/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile commit cf100f60a6fbed0446dbc091649df4f17e4f5694 Author: Fabián Ezequiel Gallina Date: Sun Nov 16 11:11:49 2014 -0300 Prevent resizing the echo area when iPython is enabled Fixes: debbugs:18794 * lisp/progmodes/python.el (python-eldoc--get-doc-at-point): Strip shell output before returning. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 442b8f6..d47a97f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-16 Fabián Ezequiel Gallina + + * progmodes/python.el (python-eldoc--get-doc-at-point): Strip + shell output before returning. (bug#18794) + 2014-11-16 Dmitry Gutov Fix indentation before `!=' and after `+='. Originally reported diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 89b2f1f..5a5a039 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -3408,9 +3408,12 @@ returns will be used. If not FORCE-PROCESS is passed what (let ((input (or force-input (python-info-current-symbol t)))) (and input - (python-shell-send-string-no-output - (format python-eldoc-string-code input) - process)))))) + ;; Prevent resizing the echo area when iPython is + ;; enabled. Bug#18794. + (python-util-strip-string + (python-shell-send-string-no-output + (format python-eldoc-string-code input) + process))))))) (defun python-eldoc-function () "`eldoc-documentation-function' for Python. commit c613f4d6c12ad7a8ebbc88dcef48949c6a775996 Author: Dmitry Gutov Date: Sun Nov 16 14:19:16 2014 +0200 Fix indentation before `!=' and after `+=' Originally reported in https://github.com/mooz/js2-mode/issues/174. * lisp/progmodes/js.el (js--indent-operator-re): Make assignments and (in)equality operator a separate case. (js--continued-expression-p): Escape the second `+' in the regexp. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ea9c8c6..442b8f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-11-16 Dmitry Gutov + + Fix indentation before `!=' and after `+='. Originally reported + in https://github.com/mooz/js2-mode/issues/174. + * progmodes/js.el (js--indent-operator-re): Make assignments and + (in)equality operator a separate case. + (js--continued-expression-p): Escape the second `+' in the regexp. + 2014-11-16 Stefan Monnier * window.el (handle-select-window): Deactivate shift-region (bug#19003). diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index a8f0d55..56569e1 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1685,7 +1685,7 @@ This performs fontification according to `js--class-styles'." "Regular expression matching variable declaration keywords.") (defconst js--indent-operator-re - (concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|" + (concat "[-+*/%<>&^|?:.]\\([^-+*/]\\|$\\)\\|!?=\\|" (js--regexp-opt-symbol '("in" "instanceof"))) "Regexp matching operators that affect indentation of continued expressions.") @@ -1712,7 +1712,7 @@ This performs fontification according to `js--class-styles'." (save-excursion (backward-char) (not (looking-at "[/*]/"))) (js--looking-at-operator-p) (and (progn (backward-char) - (not (looking-at "++\\|--\\|/[/*]")))))))))) + (not (looking-at "+\\+\\|--\\|/[/*]")))))))))) (defun js--end-of-do-while-loop-p () diff --git a/test/indent/js.js b/test/indent/js.js index d623a0d..1924094 100644 --- a/test/indent/js.js +++ b/test/indent/js.js @@ -47,3 +47,11 @@ var p = { var evens = [e for each (e in range(0, 21)) if (ed % 2 == 0)]; + +!b + !=b + !==b + +a++ +b += + c commit 202f4941dc13c82aea36258421351420a34b7133 Author: Tassilo Horn Date: Sun Nov 16 09:39:01 2014 +0100 Fix DocView slicing docs * doc/emacs/misc.texi (DocView Slicing): Describe how to slice with the mouse. Fix command mentioned by slice by BoundingBox paragraph. (Bug#18040) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 8eb2083..84722b2 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2014-11-16 Tassilo Horn + + * misc.texi (DocView Slicing): Describe how to slice with the + mouse. Fix command mentioned by slice by BoundingBox paragraph. + (Bug#18040) + 2014-11-09 Glenn Morris * Makefile.in (version): Remove variable. diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 386fd6f..39b36cf 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -419,12 +419,14 @@ and the slice's width and height. A more convenient graphical way to specify the slice is with @kbd{s m} (@code{doc-view-set-slice-using-mouse}), where you use the mouse to -select the slice. -@c ??? How does this work? +select the slice. Simply press and hold the left mouse button at the +upper-left corner of the region you want to have in the slice, then +move the mouse pointer to the lower-right corner and release the +button. The most convenient way is to set the optimal slice by using BoundingBox information automatically determined from the document by -typing @kbd{s b} (@code{doc-view-set-slice-using-mouse}). +typing @kbd{s b} (@code{doc-view-set-slice-from-bounding-box}). @findex doc-view-reset-slice To cancel the selected slice, type @kbd{s r} commit 86790826398fa5e83853680899c8309890c7a766 Author: Stefan Monnier Date: Sun Nov 16 00:30:12 2014 -0500 * src/frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). * lisp/window.el (handle-select-window): Deactivate shift-region. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a4bebf2..ea9c8c6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-16 Stefan Monnier + + * window.el (handle-select-window): Deactivate shift-region (bug#19003). + 2014-11-15 Andreas Schwab * version.el (emacs-repository-get-version): Use git rev-parse diff --git a/lisp/window.el b/lisp/window.el index 7692c79..7d76649 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7715,7 +7715,7 @@ is active. This function is run by `mouse-autoselect-window-timer'." (defun handle-select-window (event) "Handle select-window events." - (interactive "e") + (interactive "^e") (let ((window (posn-window (event-start event)))) (unless (or (not (window-live-p window)) ;; Don't switch if we're currently in the minibuffer. diff --git a/src/ChangeLog b/src/ChangeLog index 4aa9958..f9f3a0f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-16 Stefan Monnier + + * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). + 2014-11-15 Jan Djärv * nsterm.m (ns_send_appdefined): Check for application defined diff --git a/src/frame.c b/src/frame.c index e894d21..307119c 100644 --- a/src/frame.c +++ b/src/frame.c @@ -913,7 +913,7 @@ This function returns FRAME, or nil if FRAME has been deleted. */) return do_switch_frame (frame, 1, 0, norecord); } -DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e", +DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "^e", doc: /* Handle a switch-frame event EVENT. Switch-frame events are usually bound to this function. A switch-frame event tells Emacs that the window manager has requested