commit 696f32c95c96f120ed1dc10193d27b7bc2adaba9 (HEAD, refs/remotes/origin/master) Author: Michael Albinus Date: Tue Jan 12 10:37:06 2016 +0100 Merge missing commit from emacs-25 branch * test/Makefile.in (SELECTOR_DEFAULT, SELECTOR_EXPENSIVE, SELECTOR): New variables. (check-expensive, check-doit): New targets. * Makefile.in (check-expensive): New target. * test/lisp/autorevert-tests.el (auto-revert-test01-auto-revert-several-files): * test/lisp/filenotify-tests.el (file-notify--deftest-remote) (file-notify-test06-many-events): * test/lisp/net/tramp-tests.el (tramp-test26-process-file) (tramp-test27-start-file-process, tramp-test28-shell-command) (tramp-test29-vc-registered) (tramp-test31-special-characters-with-stat) (tramp-test31-special-characters-with-perl) (tramp-test31-special-characters-with-ls) (tramp-test32-utf8-with-stat, tramp-test32-utf8-with-perl) (tramp-test32-utf8-with-ls, tramp-test33-asynchronous-requests) (tramp-test35-unload): Tag the tests as :expensive-test. diff --git a/Makefile.in b/Makefile.in index fdaa63a..55c7571 100644 --- a/Makefile.in +++ b/Makefile.in @@ -929,7 +929,7 @@ have-tests: exit 1; \ fi -check check-maybe: have-tests all +check check-maybe check-expensive: have-tests all $(MAKE) -C test $@ dist: @@ -946,7 +946,7 @@ $(DOCS): $(MAKE) -C doc/$(subst -, ,$@) .PHONY: $(DOCS) docs pdf ps -.PHONY: info dvi dist check check-maybe html info-real info-dir check-info +.PHONY: info dvi dist check check-maybe check-expensive html info-real info-dir check-info ## TODO add etc/refcards. docs: $(DOCS) diff --git a/test/Makefile.in b/test/Makefile.in index 62443a1..388ea53 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -87,6 +87,9 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@ ## to change this; bug#17848 - if that gets done, this can be simplified). ## ## Beware: it approximates 'no-byte-compile', so watch out for false-positives! +SELECTOR_DEFAULT=(quote (not (tag :expensive-test))) +SELECTOR_EXPENSIVE=nil +SELECTOR= %.log: %.el @if grep '^;.*no-byte-compile: t' $< > /dev/null; then \ loadfile=$<; \ @@ -98,7 +101,7 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@ stat=OK ; \ mkdir --parents $(dir $@) ; \ $(emacs) -l ert -l $$loadfile \ - -f ert-run-tests-batch-and-exit ${WRITE_LOG} + --eval "(ert-run-tests-batch-and-exit ${SELECTOR})" ${WRITE_LOG} ELFILES = $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \ -path "*resources" -prune -o -name "*el" -print) @@ -135,7 +138,17 @@ $(foreach test,${TESTS},$(eval $(call test_template,${test}))) -include make-test-deps.mk ## Rerun default tests. check: - -@for f in $(LOGFILES); do test ! -f $$f || mv $$f $$f~; done + @${MAKE} check-doit SELECTOR="${SELECTOR_DEFAULT}" + +## Rerun also expensive tests. +.PHONY: check-expensive +check-expensive: + @${MAKE} check-doit SELECTOR="${SELECTOR_EXPENSIVE}" + +## Re-run all the tests every time. +.PHONY: check-doit +check-doit: + -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done @${MAKE} check-maybe ## Only re-run tests whose .log is older than the test. diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el index b378500..a6f8cb2 100644 --- a/test/lisp/autorevert-tests.el +++ b/test/lisp/autorevert-tests.el @@ -94,6 +94,7 @@ ;; This is inspired by Bug#21841. (ert-deftest auto-revert-test01-auto-revert-several-files () "Check autorevert for several files at once." + :tags '(:expensive-test) (skip-unless (executable-find "cp")) (let* ((cp (executable-find "cp")) @@ -138,7 +139,7 @@ ;; Strange, that `copy-directory' does not work as expected. ;; The following shell command is not portable on all ;; platforms, unfortunately. - (shell-command (format "%s %s/* %s" cp tmpdir2 tmpdir1)) + (shell-command (format "%s -f %s/* %s" cp tmpdir2 tmpdir1)) ;; Check, that the buffers have been reverted. (dolist (buf (list buf1 buf2)) diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 4cde86c..de64f50 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -152,6 +152,7 @@ remote host, or nil." (declare (indent 1)) `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () ,docstring + :tags '(:expensive-test) (let* ((temporary-file-directory file-notify-test-remote-temporary-file-directory) (ert-test (ert-get-test ',test))) @@ -783,6 +784,7 @@ longer than timeout seconds for the events to be delivered." (ert-deftest file-notify-test06-many-events () "Check that events are not dropped." + :tags '(:expensive-test) (skip-unless (file-notify--test-local-enabled)) ;; Under cygwin events arrive in random order. Impossible to define a test. (skip-unless (not (eq system-type 'cygwin))) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 305ca9d..a29e42e 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -1395,6 +1395,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ert-deftest tramp-test26-process-file () "Check `process-file'." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (not @@ -1441,6 +1442,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ert-deftest tramp-test27-start-file-process () "Check `start-file-process'." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (not @@ -1510,6 +1512,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ert-deftest tramp-test28-shell-command () "Check `shell-command'." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (not @@ -1597,6 +1600,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ert-deftest tramp-test29-vc-registered () "Check `vc-registered'." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -1967,6 +1971,7 @@ Several special characters do not work properly there." (ert-deftest tramp-test31-special-characters-with-stat () "Check special characters in file names. Use the `stat' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -1985,6 +1990,7 @@ Use the `stat' command." (ert-deftest tramp-test31-special-characters-with-perl () "Check special characters in file names. Use the `perl' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2006,6 +2012,7 @@ Use the `perl' command." (ert-deftest tramp-test31-special-characters-with-ls () "Check special characters in file names. Use the `ls' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2045,6 +2052,7 @@ Use the `ls' command." (ert-deftest tramp-test32-utf8-with-stat () "Check UTF8 encoding in file names and file contents. Use the `stat' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2063,6 +2071,7 @@ Use the `stat' command." (ert-deftest tramp-test32-utf8-with-perl () "Check UTF8 encoding in file names and file contents. Use the `perl' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2084,6 +2093,7 @@ Use the `perl' command." (ert-deftest tramp-test32-utf8-with-ls () "Check UTF8 encoding in file names and file contents. Use the `ls' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2109,6 +2119,7 @@ Such requests could arrive from timers, process filters and process sentinels. They shall not disturb each other." ;; Mark as failed until bug has been fixed. :expected-result :failed + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2220,6 +2231,7 @@ process sentinels. They shall not disturb each other." Since it unloads Tramp, it shall be the last test to run." ;; Mark as failed until all symbols are unbound. :expected-result (if (featurep 'tramp) :failed :passed) + :tags '(:expensive-test) (when (featurep 'tramp) (unload-feature 'tramp 'force) ;; No Tramp feature must be left. commit c7bef6a4f033fa6b22906de0be6da54958d5b3c3 Merge: f5d90b5 1f6898d Author: John Wiegley Date: Mon Jan 11 22:51:27 2016 -0800 Merge from origin/emacs-25 1f6898d test/automated/vc-hg.el: Support out-of-tree build 3adb56e Minor change in tramp-tests.el 2b535ba ; * etc/NEWS: Update the js.el entry. 76b518c * etc/HELLO: Add Armenian and Mongolian greetings. b51f1ef Java Mode: Fontify identifiers in the presence of annotations. 36b9539 Avoid an infloop when we run out of memory 2006752 Avoid unnecessary failures of auto-saving after fatal error eef6784 Simplify HAVE_MODULES use in mark_maybe_pointer 552694a Revert attempt to use 'noexcept' in typedef 6ad0d39 Update documentation of 'indirect-function' c6a5314 ; * etc/NEWS: Move entry of 'inhibit-point-motion-hooks'. 303141a Update documentation for obsoleting 'syntax-begin-function' 4e6f61c ; * etc/NEWS: Mark documented and not-to-be-documented entries. e667bbb Document new features if Eshell 9c4e4e0 ; * etc/NEWS: Update EUDC entries. 1089dc9 Handle too long commands in Tramp 684eb58 * .gitattributes: *.cur and *.pif are binary files too. d2c7fda * src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined bd3f53d * sh-script.el (sh-smie-sh-rules): Improve indentation inside $(...) 09b2b8a * src/alloc.c (mark_maybe_pointer): Also check wide-int's emacs_value cca0f93 ; Account for spaces before the filename c71e1e8 Use short date for 'hg annotate', and output the author f50027b Spelling fix c7dff67 ; * etc/NEWS: Fix the Xref entries that got separated. cc140bc Document user-level functions in project.el f8208b6 Document the user-level features of the Xref package b131fb8 * loading.texi: Add `define-type' entry for load-history db3c2a8 Improve doc strings and prompts in xref.el f6117ef Allow the use of `font-lock-extend-region-multiline' in CC Mode. 90fd798 Fix coding system for Tramp on OS X. e985a0e ; * etc/NEWS: Mark the 'check-expensive' entry not to be documented. 9dfcbf0 Update 'load-history' docs 207e191 Fix (error ...) error 457738f Correctly analyze brace arguments in templated C++ function declarations. d57724a * lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare. 2a9532d * lisp/ffap.el (ffap-latex-mode): Avoid free variable. 1a6b084 * lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`. 8be046f Respect fontification region calculated by major mode. Fixes bug #22316. 4b37cba Improve documentation of Delete Selection mode a034dd3 Fix two project-find-file issues 30abf29 Clarify doc string of 'dired-current-directory' e990bb2 Use the face of preceding text for displaying the ellipsis 5810ac3 Suppress Chinese file name test for OSX in tramp-tests.el eeb710a ; * lisp/startup.el: Sentences end with two spaces. 428b3de * admin/admin.el (set-version): Also handle the NEWS file. 648de81 ; Add NEWS entry for project.el 671862f apropos-library: Skip obvious duplicates; don't error on generics 51668a5 ; Grammar fix ed41d11 Add project-find-file and project-or-external-find-file 056da45 ; Improve commentary in 'setup_for_ellipsis' 269d008 ; Improve docstring for `inhibit-startup-echo-area-message' commit f5d90b5fcf0251466055c7dbed6069c1850d802d Merge: fee9e3f 07442de Author: John Wiegley Date: Mon Jan 11 22:51:27 2016 -0800 ; Merge from origin/emacs-25 The following commit was skipped: 07442de ; * etc/NEWS: Backport edit made on wrong branch. commit fee9e3ff5e3181e5e477849b5db94e7e39a4e0c4 Merge: 2d7f4d9 ce4a052 Author: John Wiegley Date: Mon Jan 11 22:50:30 2016 -0800 Merge from origin/emacs-25 ce4a052 Add defvar-local to lisp-imenu-generic-expression a0121bc Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd 76fe2d5 * lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix. 1ae088f * lisp/emacs-lisp/autoload.el (autoload-find-destination): b6b47af Properly encode/decode base64Binary data in SOAP c632466 Obey coding-system-for-write when writing stdout/stderr in batch 2f32cb5 * doc/misc/efaq.texi (Packages that do not come with Emacs): Update the URI of MELPA and marmalade-repo. Reported by CHENG Goa in https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html. d2937aa * lisp/progmodes/opascal.el (opascal-mode-syntax-table): 5330c25 * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit): 7380990 Remove function wrongly on AWK Mode value of context fontification hook. d400753 * src/buffer.c: Stick with ASCII in doc string. 221240c Reword transient-mark-mode doc string 977d3ea Update doc string of 'selective-display' 229c3fa Make C++ buffers writeable when writing their initial text properties. f5c762c Additional changes for "make check-expensive" 1729cf3 ; * admin/MAINTAINERS: Remove myself. 33219d3 Apply text properties for <, > in new after-change function (C++ Java Modes). commit 2d7f4d99f715a3b32bb2873be6e9b4e7e1dad1da Merge: a8dd976 31a97ac Author: John Wiegley Date: Mon Jan 11 22:48:10 2016 -0800 ; Merge from origin/emacs-25 The following commits were skipped: 31a97ac Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 4e62197 Introduce check-expensive tests. 9fb185a shr-tag-video bug fix commit a8dd976aa5299060ee3670f8d693887960aa6ad8 Merge: 91b263e 9fb185a Author: John Wiegley Date: Mon Jan 11 22:48:10 2016 -0800 Merge from origin/emacs-25 9fb185a shr-tag-video bug fix 6300655 Minor fixes in tramp-tests.el 50575b1 Ensure redisplay when 'truncate-lines' is set 0d9e80d Fix a doc string of 'transient-mark-mode' 0000ae5 MS-Windows followup to latest gnulib update 4bc5e02 Spelling fix f1093f7 Do secure signed Bcc handling commit 91b263e76f5ce170c1c8cbc34a2e7614c32612b8 Merge: fb74bee e79b06e Author: John Wiegley Date: Mon Jan 11 22:48:10 2016 -0800 ; Merge from origin/emacs-25 The following commit was skipped: e79b06e Avoid stdio in SIGINT handler commit fb74beed3cf7ed158f18508766ce0ac2685f1d9a Merge: 70f3e4e 861022f Author: John Wiegley Date: Mon Jan 11 22:48:10 2016 -0800 Merge from origin/emacs-25 861022f * doc/misc/texinfo.tex: Revert unwanted copyright change. 46e47a5 ; * etc/refcards/ru-refcard.tex (cyear): Update via M-x set-copyright. 71ea138 * lisp/align.el (align): Simplify a lambda 5618a50 * lisp/align.el (align): Fix arg order in call to `align-region' 1f680db Fix compilation next-error in buffers with selective-display d20a948 * nsm.el (nsm-check-protocol): Fix typo in the message. 1da116f Add SHA1 warnings for high network security settings e48bacd ; * etc/NEWS: Typo fix. commit 70f3e4e61fc4433ca8ac4517d247df7e7af7b248 Merge: 4b739f7 5213ded Author: John Wiegley Date: Mon Jan 11 22:48:10 2016 -0800 ; Merge from origin/emacs-25 The following commit was skipped: 5213ded Refactor mml-smime.el, mml1991.el, mml2015.el commit 4b739f70a54579b134ab6da313a3d665640a6a3f Merge: 540bfa7 43662a2 Author: John Wiegley Date: Mon Jan 11 22:48:10 2016 -0800 Merge from origin/emacs-25 43662a2 ; Clarify that xref is still experimental 0a6e6ca ; * admin/release-process: Remove some obsolete records. c2e9e3d * lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function): 8637f3d (semantic-symref-derive-find-filepatterns): Return a list 0a7ad07 ; Re-arrange xref-related entries in NEWS. fe903ef Fix xref-find-references on MS-Windows 55a28d8 ; Fixed visual bell artifact problem on NextStep. d064034 Document new features of tildify-mode 964bea7 Document new features of Whitespace mode cd68f47 Improve documentation of new Hide-IfDef features 723b8bf Fix regression in font-locking cl-assert and cl-check-type commit 540bfa7680268a55fc617ffb822e962cb9fb6c59 Merge: 1dd4f26 372d00a Author: John Wiegley Date: Mon Jan 11 22:48:09 2016 -0800 ; Merge from origin/emacs-25 The following commit was skipped: 372d00a ; Auto-commit of loaddefs files. commit 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 Merge: c043d97 ef33bc7 Author: John Wiegley Date: Mon Jan 11 22:48:07 2016 -0800 Merge from origin/emacs-25 ef33bc7 Spelling and grammar fixes 9c3dbab Fix copyright years by hand 0e96320 Update copyright year to 2016 commit c043d9731b499a241830d705e9055c9e42ccf28c Merge: 8d7128c 9825305 Author: John Wiegley Date: Mon Jan 11 22:48:07 2016 -0800 ; Merge from origin/emacs-25 The following commit was skipped: 9825305 Merge from gnulib commit 8d7128c46de2af10d50c1495a075d66b702f6d21 Merge: 8df9e56 9ee6ecb Author: John Wiegley Date: Mon Jan 11 22:48:07 2016 -0800 Merge from origin/emacs-25 9ee6ecb lisp/emacs-lisp/chart.el (chart-new-buffer): Move to silence byte compiler. 526d80c Port chart.el methods to cl-generic. 410bb69 Add nt/INSTALL.W64 build instructions 8f5b524 Add new input method 'programmer-dvorak' 6d11f6e Allow to invoke original M-TAB binding in 'flyspell-prog-mode' bb83bb1 Fix EWW rendering of long RTL lines b1a8509 fix bug#21054 ce5ad12 Clean up cairo printing code commit 8df9e56b4ad9704747dd8af7a049da9ee6ab3a00 Merge: 9278e97 30f4a89 Author: John Wiegley Date: Mon Jan 11 22:48:07 2016 -0800 ; Merge from origin/emacs-25 The following commit was skipped: 30f4a89 Move variables to inner loop, preparing for Mac port merge commit 9278e970c5319672a05c7bce6358af0e2794205b Merge: eb0643c 6ee327d Author: John Wiegley Date: Mon Jan 11 22:48:07 2016 -0800 Merge from origin/emacs-25 6ee327d Add handle_user_signal_hook 47580e0 Avoid writing to purespace 0588be7 Remove unused variable 89e7483 * configure.ac: Find libxml2 headers in Xcode SDK dir on Darwin. 3b95e9c Use posix_openpt instead of openpty on Darwin 86312ff Document support for ':documentation' in Lisp mode c930e75b Document new features of TeX mode 7c83d84 Clarify docs of hscroll in RTL text 4c8f8db Fix rendering of HTML pages that use character composition a8d37ca Avoid some compiler warnings in w32.c ce106f3de Undo ill-advised change be0bba4 Unbreak completion in python-mode buffers commit 1f6898d0510cd15455f665c0f38451755a374243 (refs/remotes/origin/emacs-25) Author: Dmitry Gutov Date: Tue Jan 12 00:17:49 2016 +0300 test/automated/vc-hg.el: Support out-of-tree build * test/automated/vc-hg.el (vc-hg-annotate-extract-revision-at-line-with-filename) (vc-hg-annotate-extract-revision-at-line-with-both): Don't refer to source-directory. http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00755.html diff --git a/test/automated/vc-hg.el b/test/automated/vc-hg.el index 6828271..ba96659 100644 --- a/test/automated/vc-hg.el +++ b/test/automated/vc-hg.el @@ -34,8 +34,7 @@ (should (equal (vc-hg-annotate-extract-revision-at-line) (cons "215" - (expand-file-name "test/automated/CONTENTS" - source-directory)))))) + (expand-file-name "CONTENTS")))))) (ert-deftest vc-hg-annotate-extract-revision-at-line-with-user () (with-temp-buffer @@ -49,8 +48,7 @@ (should (equal (vc-hg-annotate-extract-revision-at-line) (cons "218075" - (expand-file-name "test/automated/CLOBBER" - source-directory)))))) + (expand-file-name "CLOBBER")))))) (ert-deftest vc-hg-annotate-time () (with-temp-buffer commit 3adb56e7b2565ff7502bf0e9fb71eba0f82959ac Author: Michael Albinus Date: Mon Jan 11 19:43:36 2016 +0100 Minor change in tramp-tests.el * test/automated/tramp-tests.el (tramp-test29-vc-registered): Use `dired-uncache' instead of a Tramp internal function. diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 915b30f..a29e42e 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -44,6 +44,7 @@ (require 'vc-git) (require 'vc-hg) +(autoload 'dired-uncache "dired") (declare-function tramp-find-executable "tramp-sh") (declare-function tramp-get-remote-path "tramp-sh") (declare-function tramp-get-remote-stat "tramp-sh") @@ -1660,8 +1661,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (list (file-name-nondirectory tmp-name2)))))) ;; vc-git uses an own process sentinel, Tramp's sentinel ;; for flushing the cache isn't used. - (with-parsed-tramp-file-name tmp-name1 nil - (tramp-flush-directory-property v localname)) + (dired-uncache (concat (file-remote-p default-directory) "/")) (should (vc-registered (file-name-nondirectory tmp-name2))))) ;; Cleanup. commit 2b535ba929e5a97e85156a841bff3dd0fba06a09 Author: Shakthi Kannan Date: Mon Jan 11 20:17:43 2016 +0200 ; * etc/NEWS: Update the js.el entry. diff --git a/etc/NEWS b/etc/NEWS index 06cd38e..85ec30a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -724,7 +724,10 @@ If the output of ERT tests in batch mode execution can be saved to a log file, then it can be passed as an argument to the above function to produce a neat summary. +--- ** New js.el option `js-indent-first-init'. +It was renamed from `js-indent-first-initialiser', to avoid issues +with American vs British spelling. ** Info commit 76b518c7e3b5bc2adc8edc8e7064ad69208f05f2 Author: Peter Feigl Date: Mon Jan 11 20:12:12 2016 +0200 * etc/HELLO: Add Armenian and Mongolian greetings. (Bug#22346) Copyright-paperwork-exempt: yes. diff --git a/etc/HELLO b/etc/HELLO index 3675299..1dc402a 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -19,6 +19,7 @@ LANGUAGE (NATIVE NAME) HELLO ---------------------- ----- Amharic ($,1O M[MmN{(B) $,1M`MKM](B Arabic ($,1-g.$-y-q-h.*.1-i(B) $,1-g.$-s.1.$-g.%(B $,1-y.$.*.#.%(B +Armenian ($,1+p+a+u+e, +e+v(B) $,1+2+a, ,'(B $,1+q+e+f(B Bengali ($,17,7>6b727>(B) $,17(7.787M6u7>70(B Braille $,2(3(1('('(5(B Burmese ($,1H9H\H4HZH9HL(B) $,1H9H$HZHYH"HRJRERG(B) (1JP:R-4U(B / (1"mcKib*!4U(B Malayalam ($,1@N@R@O@^@S@"(B) $,1@H@N@X@m@5@^@P@"(B Maltese (il-Malti) Bon,Cu(Bu / Sa,C11(Ba Mathematics $,1x (B p $,1x((B world $,1s"(B hello p $,2!a(B +Mongolian (,L\^]S^[(B ,Lem[(B) ,LAPY](B ,LQPY]P(B ,Lcc(B? Norwegian (norsk) Hei / God dag Oriya ($,1:s;\;?:f(B) $,1;6;A;#;?;,;G(B Polish (j,Bj(Bzyk polski) Dzie,Bq(B dobry! / Cze,B6f(B! commit b51f1ef82fa324f08fe94b8fa8aaf8b8ebb3a48e Author: Alan Mackenzie Date: Mon Jan 11 17:46:04 2016 +0000 Java Mode: Fontify identifiers in the presence of annotations. * lisp/progmodes/cc-engine.el (c-forward-annotation): Tidy up the coding: Don't move point when the defun fails. (c-forward-decl-or-cast-1): Correct a usage of match data. * lisp/progmodes/cc-fonts.el (c-font-lock-maybe-decl-faces): Remove. (c-font-lock-declarations): Use the new c-maybe-decl-faces in place of the removed variable. * lisp/progmodes/cc-langs.el (c-maybe-decl-faces): New language variable. diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 98699df..b08c555 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -6641,16 +6641,22 @@ comment at the start of cc-engine.el for more info." res)) (defun c-forward-annotation () - ;; Used for Java code only at the moment. Assumes point is on the - ;; @, moves forward an annotation. returns nil if there is no - ;; annotation at point. - (and (looking-at "@") - (progn (forward-char) t) - (c-forward-type) - (progn (c-forward-syntactic-ws) t) - (if (looking-at "(") - (c-go-list-forward) - t))) + ;; Used for Java code only at the moment. Assumes point is on the @, moves + ;; forward an annotation and returns t. Leaves point unmoved and returns + ;; nil if there is no annotation at point. + (let ((pos (point))) + (or + (and (looking-at "@") + (not (looking-at c-keywords-regexp)) + (progn (forward-char) t) + (looking-at c-symbol-key) + (progn (goto-char (match-end 0)) + (c-forward-syntactic-ws) + t) + (if (looking-at "(") + (c-go-list-forward) + t)) + (progn (goto-char pos) nil)))) (defmacro c-pull-open-brace (ps) ;; Pull the next open brace from PS (which has the form of paren-state), @@ -6959,9 +6965,8 @@ comment at the start of cc-engine.el for more info." (when (or (looking-at c-prefix-spec-kwds-re) ;FIXME!!! includes auto (and (c-major-mode-is 'java-mode) (looking-at "@[A-Za-z0-9]+"))) - (save-match-data - (if (looking-at c-typedef-key) - (setq at-typedef t))) + (if (save-match-data (looking-at c-typedef-key)) + (setq at-typedef t)) (setq kwd-sym (c-keyword-sym (match-string 1))) (save-excursion (c-forward-keyword-clause 1) diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index f74e5cb..03e67a9 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1157,15 +1157,6 @@ casts and declarations are fontified. Used on level 2 and higher." (setq pos (point)))))) ; acts to make the `while' form continue. nil) -(defconst c-font-lock-maybe-decl-faces - ;; List of faces that might be put at the start of a type when - ;; `c-font-lock-declarations' runs. This needs to be evaluated to - ;; ensure that face name aliases in Emacs are resolved. - (list nil - font-lock-type-face - c-reference-face-name - font-lock-keyword-face)) - (defun c-font-lock-declarations (limit) ;; Fontify all the declarations, casts and labels from the point to LIMIT. ;; Assumes that strings and comments have been fontified already. @@ -1256,7 +1247,7 @@ casts and declarations are fontified. Used on level 2 and higher." (c-find-decl-spots limit c-decl-start-re - c-font-lock-maybe-decl-faces + (eval c-maybe-decl-faces) (lambda (match-pos inside-macro) ;; Note to maintainers: don't use `limit' inside this lambda form; diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 08d84fb..b52da3f 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -3251,6 +3251,19 @@ way." objc t) (c-lang-defvar c-type-decl-end-used (c-lang-const c-type-decl-end-used)) +(c-lang-defconst c-maybe-decl-faces + "List of faces that might be put at the start of a type when +`c-font-lock-declarations' runs. This must be evaluated (with `eval') at +runtime to get the actual list of faces. This ensures that face name +aliases in Emacs are resolved." + t '(list nil + font-lock-type-face + c-reference-face-name + font-lock-keyword-face) + java (append (c-lang-const c-maybe-decl-faces) + '(font-lock-preprocessor-face))) +(c-lang-defvar c-maybe-decl-faces (c-lang-const c-maybe-decl-faces)) + ;;; Wrap up the `c-lang-defvar' system. commit 36b953947ee2ee0411139bd4ad7dcffdcc403036 Author: Eli Zaretskii Date: Mon Jan 11 18:05:40 2016 +0200 Avoid an infloop when we run out of memory * src/alloc.c (garbage_collect_1): Don't bother saving and restoring the echo-area message if we are GC'ing after running out of memory. This avoids an infloop due to repeated attempts to allocate memory for the cons cell needed to save the message, which signals the memory-full error, which attempts to save the echo-area message, which signals memory-full again, etc. diff --git a/src/alloc.c b/src/alloc.c index 8ceacfe..03dacc7 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -5525,9 +5525,16 @@ garbage_collect_1 (void *end) don't let that cause a recursive GC. */ consing_since_gc = 0; - /* Save what's currently displayed in the echo area. */ - message_p = push_message (); - record_unwind_protect_void (pop_message_unwind); + /* Save what's currently displayed in the echo area. Don't do that + if we are GC'ing because we've run out of memory, since + push_message will cons, and we might have no memory for that. */ + if (NILP (Vmemory_full)) + { + message_p = push_message (); + record_unwind_protect_void (pop_message_unwind); + } + else + message_p = false; /* Save a copy of the contents of the stack, for debugging. */ #if MAX_SAVE_STACK > 0 @@ -5658,7 +5665,7 @@ garbage_collect_1 (void *end) } } - if (garbage_collection_messages) + if (garbage_collection_messages && NILP (Vmemory_full)) { if (message_p || minibuf_level > 0) restore_message (); commit 200675299e24139ccce444a7ca5d59a2aed2891c Author: Eli Zaretskii Date: Mon Jan 11 18:00:13 2016 +0200 Avoid unnecessary failures of auto-saving after fatal error * src/w32.c (map_w32_filename): Avoid non-trivial system calls for the benefit of FAT volumes if we are called as part of shutting down due to a fatal error, which probably means we are trying to auto-save the session. * src/lread.c (check_obarray): Don't bother making the obarray valid if we are shutting down due to a fatal error. This avoids interfering with auto-saving the crashed session. diff --git a/src/lread.c b/src/lread.c index e9f3d7d..25e3ff0 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3720,7 +3720,11 @@ static size_t oblookup_last_bucket_number; Lisp_Object check_obarray (Lisp_Object obarray) { - if (!VECTORP (obarray) || ASIZE (obarray) == 0) + /* We don't want to signal a wrong-type-argument error when we are + shutting down due to a fatal error, and we don't want to hit + assertions in VECTORP and ASIZE if the fatal error was during GC. */ + if (!fatal_error_in_progress + && (!VECTORP (obarray) || ASIZE (obarray) == 0)) { /* If Vobarray is now invalid, force it to be valid. */ if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; diff --git a/src/w32.c b/src/w32.c index c77ed87..4770718 100644 --- a/src/w32.c +++ b/src/w32.c @@ -3210,7 +3210,8 @@ map_w32_filename (const char * name, const char ** pPath) return shortname; } - if (is_fat_volume (name, (const char **)&path)) /* truncate to 8.3 */ + if (!fatal_error_in_progress /* disable fancy processing during crash */ + && is_fat_volume (name, (const char **)&path)) /* truncate to 8.3 */ { register int left = 8; /* maximum number of chars in part */ register int extn = 0; /* extension added? */ commit eef6784ea4932adbce24030b171df6c09bb4736a Author: Paul Eggert Date: Sun Jan 10 21:41:59 2016 -0800 Simplify HAVE_MODULES use in mark_maybe_pointer * src/alloc.c (HAVE_MODULES): Now a constant 0 if not defined, so that later code can use 'if' rather than '#ifdef'. (mark_maybe_pointer): Simplify based on HAVE_MODULES now always working. diff --git a/src/alloc.c b/src/alloc.c index 9d876a5..8ceacfe 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -3732,7 +3732,7 @@ make_event_array (ptrdiff_t nargs, Lisp_Object *args) #ifdef HAVE_MODULES /* Create a new module user ptr object. */ Lisp_Object -make_user_ptr (void (*finalizer) (void*), void *p) +make_user_ptr (void (*finalizer) (void *), void *p) { Lisp_Object obj; struct Lisp_User_Ptr *uptr; @@ -4594,6 +4594,10 @@ maybe_lisp_pointer (void *p) return (uintptr_t) p % GCALIGNMENT == 0; } +#ifndef HAVE_MODULES +enum { HAVE_MODULES = false }; +#endif + /* If P points to Lisp data, mark that as live if it isn't already marked. */ @@ -4607,21 +4611,17 @@ mark_maybe_pointer (void *p) VALGRIND_MAKE_MEM_DEFINED (&p, sizeof (p)); #endif - if ( -#ifdef HAVE_MODULES - sizeof (Lisp_Object) == sizeof (void *) -#else - true -#endif - ) + if (sizeof (Lisp_Object) == sizeof (void *) || !HAVE_MODULES) { if (!maybe_lisp_pointer (p)) return; } else - /* For the wide-int case, we also have to accept emacs_value "tagged - pointers", which can be generated by emacs-module.c's value_to_lisp. */ - p = (void*)((uintptr_t) p & ~(GCALIGNMENT - 1)); + { + /* For the wide-int case, also mark emacs_value tagged pointers, + which can be generated by emacs-module.c's value_to_lisp. */ + p = (void *) ((uintptr_t) p & ~(GCALIGNMENT - 1)); + } m = mem_find (p); if (m != MEM_NIL) @@ -4729,7 +4729,7 @@ mark_memory (void *start, void *end) away. The only reference to the life string is through the pointer `s'. */ - for (pp = start; (void*)pp < end; pp = pp + GC_POINTER_ALIGNMENT) + for (pp = start; (void *) pp < end; pp += GC_POINTER_ALIGNMENT) { mark_maybe_pointer (*(void **) pp); mark_maybe_object (*(Lisp_Object *) pp); diff --git a/src/lisp.h b/src/lisp.h index 15aa2e8..f33a8f2 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3927,7 +3927,7 @@ extern bool let_shadows_global_binding_p (Lisp_Object symbol); #ifdef HAVE_MODULES /* Defined in alloc.c. */ -extern Lisp_Object make_user_ptr (void (*finalizer) (void*), void *p); +extern Lisp_Object make_user_ptr (void (*finalizer) (void *), void *p); /* Defined in emacs-module.c. */ extern void module_init (void); commit 552694a2653b4f9cde515139d01793a5a0e964b7 Author: Paul Eggert Date: Sun Jan 10 21:39:55 2016 -0800 Revert attempt to use 'noexcept' in typedef This use of 'noexcept' runs afoul of the C++11 standard. Problem reported by Philipp Stephani in: http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00706.html * src/emacs-module.c (emacs_finalizer_function): Move this typedef here ... * src/emacs-module.h: ... from here, and use only the C version of the typedef. The typedef is now private since it is never used in the .h file now and anyway it seemed to be causing more confusion than it cured. (make_user_ptr, get_user_finalizer, set_user_finalizer): Open-code the type instead. diff --git a/src/emacs-module.c b/src/emacs-module.c index 2fec7e5..b5e044e 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -65,6 +65,12 @@ enum && INTPTR_MAX == EMACS_INT_MAX) }; +/* Function prototype for module user-pointer finalizers. These + should not throw C++ exceptions, so emacs-module.h declares the + corresponding interfaces with EMACS_NOEXCEPT. There is only C code + in this module, though, so this constraint is not enforced here. */ +typedef void (*emacs_finalizer_function) (void *); + /* Private runtime and environment members. */ diff --git a/src/emacs-module.h b/src/emacs-module.h index 3efea34..575966e 100644 --- a/src/emacs-module.h +++ b/src/emacs-module.h @@ -26,19 +26,8 @@ along with GNU Emacs. If not, see . */ #if defined __cplusplus && __cplusplus >= 201103L # define EMACS_NOEXCEPT noexcept - -/* Function prototype for module user-pointer finalizers. - - NOTE: C++11 15.4: An exception-specification shall not appear in a - typedef declaration or alias-declaration. - -*/ -void emacs_dummy_finalizer_function (void *) noexcept; -typedef decltype(emacs_dummy_finalizer_function) *emacs_finalizer_function; - #else # define EMACS_NOEXCEPT -typedef void (*emacs_finalizer_function) (void *); #endif #ifdef __cplusplus @@ -184,17 +173,17 @@ struct emacs_env_25 /* Embedded pointer type. */ emacs_value (*make_user_ptr) (emacs_env *env, - emacs_finalizer_function fin, + void (*fin) (void *) EMACS_NOEXCEPT, void *ptr); void *(*get_user_ptr) (emacs_env *env, emacs_value uptr); void (*set_user_ptr) (emacs_env *env, emacs_value uptr, void *ptr); - emacs_finalizer_function (*get_user_finalizer) (emacs_env *env, - emacs_value uptr); + void (*(*get_user_finalizer) (emacs_env *env, emacs_value uptr)) + (void *) EMACS_NOEXCEPT; void (*set_user_finalizer) (emacs_env *env, emacs_value uptr, - emacs_finalizer_function fin); + void (*fin) (void *) EMACS_NOEXCEPT); /* Vector functions. */ emacs_value (*vec_get) (emacs_env *env, emacs_value vec, ptrdiff_t i); commit 6ad0d39680cc82e660e3016b11c9f29d2666c79f Author: Eli Zaretskii Date: Sun Jan 10 20:22:01 2016 +0200 Update documentation of 'indirect-function' * doc/lispref/eval.texi (Function Indirection): Update the documentation of 'indirect-function'. diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index 28bf600..d2a8ff5 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -328,13 +328,12 @@ This function returns the meaning of @var{function} as a function. If definition and starts over with that value. If @var{function} is not a symbol, then it returns @var{function} itself. -This function signals a @code{void-function} error if the final symbol -is unbound and optional argument @var{noerror} is @code{nil} or -omitted. Otherwise, if @var{noerror} is non-@code{nil}, it returns -@code{nil} if the final symbol is unbound. +This function returns @code{nil} if the final symbol is unbound. It +signals a @code{cyclic-function-indirection} error if there is a loop +in the chain of symbols. -It signals a @code{cyclic-function-indirection} error if there is a -loop in the chain of symbols. +The optional argument @var{noerror} is obsolete, kept for backward +compatibility, and has no effect. Here is how you could define @code{indirect-function} in Lisp: diff --git a/etc/NEWS b/etc/NEWS index e6a3150..06cd38e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1202,10 +1202,12 @@ to the special value `dragging' in the body of the form. has any effect. (This change was made in Emacs 24.4 but was not advertised at the time.) ++++ ** `indirect-function' does not signal `void-function' any more. This is mostly a bug-fix, since this change was missed back in 24.4 when symbol-function was changed not to signal `void-function' any more. ++++ *** As a consequence, the second arg of `indirect-function' is now obsolete. ** Comint, term, and compile do not set the EMACS env var any more. commit c6a5314302fabc0031630e15cde2c40dc07dc5fa Author: Eli Zaretskii Date: Sun Jan 10 20:15:10 2016 +0200 ; * etc/NEWS: Move entry of 'inhibit-point-motion-hooks'. diff --git a/etc/NEWS b/etc/NEWS index f5f3d86..e6a3150 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1183,12 +1183,11 @@ file and still expect it to be run after startup should set `package-enable-at-startup' to t after the call to `package-initialize'. +--- ** `:global' minor mode use `setq-default' rather than `setq'. This means that you can't use `make-local-variable' and expect them to "magically" become buffer-local. -** `inhibit-point-motion-hooks' now defaults to t and is obsolete. - +++ ** `track-mouse' no longer freezes the shape of the mouse pointer. The `track-mouse' form no longer refrains from changing the shape of @@ -1336,6 +1335,8 @@ Replaced by properties `cursor-intangible' and `cursor-sensor-functions', implemented by the new `cursor-intangible-mode' and `cursor-sensor-mode' minor modes. +** `inhibit-point-motion-hooks' now defaults to t and is obsolete. + +++ ** New process type `pipe', which can be used in combination with the `:stderr' keyword of make-process to handle standard error output commit 303141ae6eddf690a851f917e285a40a2356021a Author: Eli Zaretskii Date: Sun Jan 10 20:05:46 2016 +0200 Update documentation for obsoleting 'syntax-begin-function' * doc/lispref/syntax.texi (Position Parse): Undocument 'syntax-begin-function' that is now obsolete. diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index af24b99..19782d0 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -787,17 +787,6 @@ used on hooks such as @code{before-change-functions} (@pxref{Change Hooks}). @end defun - Major modes can make @code{syntax-ppss} run faster by specifying -where it needs to start parsing. - -@defvar syntax-begin-function -If this is non-@code{nil}, it should be a function that moves to an -earlier buffer position where the parser state is equivalent to -@code{nil}---in other words, a position outside of any comment, -string, or parenthesis. @code{syntax-ppss} uses it to further -optimize its computations, when the cache gives no help. -@end defvar - @node Parser State @subsection Parser State @cindex parser state diff --git a/etc/NEWS b/etc/NEWS index 5feaa78..f5f3d86 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1171,6 +1171,7 @@ arguments. The earlier behavior of silently supplying a nil to the last variable when there was an odd number of arguments has been eliminated. ++++ ** `syntax-begin-function' is declared obsolete. Removed font-lock-beginning-of-syntax-function and the SYNTAX-BEGIN slot in font-lock-defaults. commit 4e6f61ce01cb77088c1d2b709e134eca9286b80b Author: Eli Zaretskii Date: Sun Jan 10 19:59:17 2016 +0200 ; * etc/NEWS: Mark documented and not-to-be-documented entries. diff --git a/etc/NEWS b/etc/NEWS index 4f23dd8..5feaa78 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1062,6 +1062,7 @@ make the new option `eshell-destroy-buffer-when-process-dies' non-nil. ** Browse-url +--- *** Support for the Conkeror web browser. --- @@ -1114,11 +1115,13 @@ few or no entries have changed. --- *** gulp.el +--- *** landmark.el (moved to elpa.gnu.org) * New Modes and Packages in Emacs 25.1 +--- ** pinentry.el allows GnuPG passphrase to be prompted through the minibuffer instead of a graphical dialog, depending on whether the gpg command is called from Emacs (i.e., INSIDE_EMACS environment variable @@ -1127,28 +1130,35 @@ later) and Pinentry (0.9.5 or later). ** cl-generic.el provides CLOS-style multiple-dispatch generic functions. +--- ** scss-mode (a minor variant of css-mode) +--- ** let-alist is a new macro (and a package) that allows one to easily let-bind the values stored in an alist. +--- ** `tildify-mode' allows to automatically insert hard spaces as one types the text. Breaking line after a single-character words is forbidden by Czech and Polish typography (and may be discouraged in other languages), so `auto-tildify-mode' makes it easier to create a typographically-correct documents. +--- ** The `seq' library adds sequence manipulation functions and macros that complement basic functions provided by subr.el. All functions are prefixed with `seq-' and work on lists, strings and vectors. +--- ** The `map' library provides map-manipulation functions that work on alists, hash-table and arrays. All functions are prefixed with `map-'. +--- ** The `thunk' library provides functions and macros to control the evaluation of forms. +--- ** js-jsx-mode (a minor variant of js-mode) provides indentation support for JSX, an XML-like syntax extension to ECMAScript. @@ -1227,10 +1237,12 @@ group ID instead of `t'. any reference to a buffer position. The 6th member of the mouse position list returned for such events is now nil. +--- ** Menu items in keymaps do not support the "key shortcut cache" any more. These slots used to hold key-shortcut data, but have been obsolete since Emacs-21. +--- ** Emacs no longer downcases the first letter of a system diagnostic when signaling a file error. For example, it now reports "Permission denied" instead of "permission denied". The old behavior was problematic @@ -1276,6 +1288,7 @@ use [:multibyte:] instead. ** The `diff' command uses the unified format now. To restore the old behavior, set `diff-switches' to `-c'. +--- ** `grep-template' and `grep-find-template' values don't include the --color argument anymore. It's added at the place holder position dynamically. Any third-party code that changes these templates should @@ -1301,6 +1314,7 @@ that happen, `unhandled-file-name-directory' now defaults to calling +++ *** New vector QPattern. +--- ** syntax-propertize is now automatically called on-demand during forward parsing functions like `forward-sexp'. @@ -1321,10 +1335,12 @@ Replaced by properties `cursor-intangible' and `cursor-sensor-functions', implemented by the new `cursor-intangible-mode' and `cursor-sensor-mode' minor modes. ++++ ** New process type `pipe', which can be used in combination with the `:stderr' keyword of make-process to handle standard error output of subprocess. ++++ ** New function `make-process' provides an alternative interface to `start-process'. It allows programs to set process parameters such as process filter, sentinel, etc., through keyword arguments (similar to @@ -1353,13 +1369,17 @@ buffers to allow certain parts of the text to be writable. ** `read-buffer' takes a new `predicate' argument. ++++ ** Emacs Lisp now supports generators. +See the "Generators" section of the ELisp manual for the details. -** New finalizer facility for running code when objects - become unreachable. ++++ +** New finalizer facility for running code when objects become unreachable. +See the "Finalizer Type" subsection in the ELisp manual for the +details. -** lexical closures can use (:documentation
) to build their docstring. -It should be placed right where the docstring would be, and is then +** lexical closures can use (:documentation FORM) to build their docstring. +It should be placed right where the docstring would be, and FORM is then evaluated (and should return a string) when the closure is built. ** define-inline provides a new way to define inlinable functions. @@ -1430,6 +1450,7 @@ have side effects. ** New macro `with-file-modes', for evaluating expressions with default file permissions set to temporary values (e.g., for creating private files). ++++ ** You can access the slots of structures using `cl-struct-slot-value'. ** Function `sort' can deal with vectors. @@ -1442,6 +1463,7 @@ name. The variable `system-name' is now obsolete. +++ ** Function `write-region' no longer outputs "Wrote FILE" in batch mode. +--- ** If `pwd' is called with a prefix argument, insert the current default directory at point. @@ -1542,11 +1564,16 @@ a directory file name. It returns non-nil if the last character in the name is a directory separator character (forward slash on GNU and Unix systems, forward- or backslash on MS-Windows and MS-DOS). +--- ** ASCII approximations to curved quotes are put in standard-display-table if the terminal cannot display curved quotes. ++++ ** Standard output and error streams now transliterate characters via standard-display-table, and encode output using locale-coding-system. +To force a specific encoding, bind `coding-system-for-write' to the +coding-system of your choice when invoking functions like `prin1' and +`message'. +++ ** New var `truncate-string-ellipsis' to choose how to indicate truncation. @@ -1557,6 +1584,7 @@ This is used by Google's Native Client (NaCl). ** Miscellaneous name change +--- For consistency with the usual Emacs spelling, the Lisp variable `hfy-optimisations' has been renamed to `hfy-optimizations'. The old name should still work, as an obsolescent alias. @@ -1567,22 +1595,30 @@ The old name should still work, as an obsolescent alias. *** Emacs can now draw horizontal scroll bars on some platforms that provide toolkit scroll bars, namely Gtk+, Lucid, Motif and Windows. Horizontal scroll bars are turned off by default. + **** New function `horizontal-scroll-bars-available-p' telling whether horizontal scroll bars are available on the underlying system. + **** New mode `horizontal-scroll-bar-mode' to toggle horizontal scroll bars on all existing and future frames. + **** New function `toggle-horizontal-scroll-bar' to toggle horizontal scroll bars on the selected frame. + **** New frame parameters `horizontal-scroll-bars' and `scroll-bar-height' to set horizontal scroll bars and their height for individual frames and in `default-frame-alist'. + **** New functions `frame-scroll-bar-height' and `window-scroll-bar-height' return the height of horizontal scroll bars on a specific frame or window. + **** `set-window-scroll-bars' now accepts five parameters where the last two specify height and type of the window's horizontal scroll bar. + **** `window-scroll-bars' now returns type and sizes of horizontal scroll bars too. + **** New buffer-local variables `horizontal-scroll-bar' and `scroll-bar-height'. @@ -1649,6 +1685,7 @@ Those features have been deprecated in Gtk+ for a long time. ** Etags ++++ *** etags no longer qualifies class members by default. By default, `etags' will not qualify class members for C-like @@ -1664,11 +1701,13 @@ using -Q might make some class members become "unknown" to `M-.' (`xref-find-definitions'); if so, you can use `C-u M-.' to specify the qualified names by hand. ++++ *** New language Ruby Names of modules, classes, methods, and functions are tagged. Overloaded operators are also tagged. ++++ *** Improved support for Lua Etags now tags functions even if the "function" keyword follows some @@ -1692,6 +1731,7 @@ of Windows starting with Windows 9X. +++ ** Emacs running on MS-Windows now supports the daemon mode. +--- ** The byte counts in etags-generated TAGS files are now the same on MS-Windows as they are on other platforms. @@ -1699,8 +1739,10 @@ MS-Windows as they are on other platforms. ** On OS X, configure creates a Cocoa ("Nextstep") build by default. Pass '--without-ns' to configure to create an X11 build, the old default. +--- ** OS X 10.5 or older is no longer supported. +--- ** OS X on PowerPC is no longer supported. --- commit e667bbb62863675fd93854a3b8e41c67d1ff9709 Author: Eli Zaretskii Date: Sun Jan 10 19:24:54 2016 +0200 Document new features if Eshell * doc/misc/eshell.texi (Input/Output): Document the new '#' syntax. (Input/Output): Document 'eshell-destroy-buffer-when-process-dies'. Disable "Key Index" generation, as there are no @kindex entries in this manual. diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 9b14dcf..f90c7d3 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -84,7 +84,9 @@ such as @command{bash}, @command{zsh}, @command{rc}, or * Concept Index:: * Function and Variable Index:: * Command Index:: +@ignore * Key Index:: +@end ignore @end menu @node Introduction @@ -670,6 +672,12 @@ page long. If that occurs to you, search for configuration options for calling @samp{less} without the @samp{-F} option. For Git, you can do that using @samp{git config --global core.pager 'less -+F'}. +@vindex eshell-destroy-buffer-when-process-dies +If you want the buffers created by visual programs killed when the +program exits, customize the variable +@code{eshell-destroy-buffer-when-process-dies} to a non-@code{nil} +value; the default is @code{nil}. + @section Redirection Redirection is mostly the same in Eshell as it is in other command shells. The output redirection operators @code{>} and @code{>>} as @@ -682,6 +690,8 @@ The buffer redirection operator, @code{>>>}, expects a buffer object on the right-hand side, into which it inserts the output of the left-hand side. e.g., @samp{echo hello >>> #} inserts the string @code{"hello"} into the @file{*scratch*} buffer. +The convenience shorthand variant @samp{#<@var{buffer-name}>}, as in +@samp{#<*scratch*>}, is also accepted. @code{eshell-virtual-targets} is a list of mappings of virtual device names to functions. Eshell comes with two virtual devices: @@ -1241,8 +1251,13 @@ Since it keeps the cursor up where the command was invoked. @printindex cm +@c There are no @kindex entries in this manual; avoid generating an +@c empty menu. +@ignore @node Key Index @unnumbered Key Index @printindex ky +@end ignore + @bye diff --git a/etc/NEWS b/etc/NEWS index 8130e27..4f23dd8 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1044,12 +1044,14 @@ EUDC's PH backend (eudcb-ph.el) is obsolete. *** The new built-in command `clear' can scroll window contents out of sight. If provided with an optional non-nil argument, the scrollback contents will be cleared. ++++ *** New buffer syntax '#', which is equivalent to '#'. This shorthand makes interacting with buffers from eshell more convenient. Custom variable `eshell-buffer-shorthand', which has been broken for a while, has been removed. ++++ *** By default, eshell "visual" program buffers (created by `eshell-visual-commands' and similar custom vars) are no longer killed when their processes die. This fixes issues with short-lived commands commit 9c4e4e0cc9a63b529118339d5adf4d719702fb90 Author: Eli Zaretskii Date: Sun Jan 10 18:30:10 2016 +0200 ; * etc/NEWS: Update EUDC entries. diff --git a/etc/NEWS b/etc/NEWS index 4e32e48..8130e27 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -990,40 +990,52 @@ The Lisp API of this package is still experimental. ** EUDC EUDC's LDAP backend has been improved. ++++ *** EUDC supports LDAP-over-SSL URLs (ldaps://). +--- *** EUDC passes LDAP passwords through a pipe to the ldapsearch subprocess instead of on the command line. +--- *** EUDC handles LDAP wildcards automatically so the user shouldn't need to configure this manually anymore. ++++ *** The LDAP configuration section of EUDC's manual has been rewritten. There have also been customization changes. ++++ *** New custom variable `eudc-server-hotlist' to allow specifying multiple EUDC servers in init file. ++++ *** Custom variable `eudc-inline-query-format' defaults to completing on email and firstname instead of surname. +--- *** Custom variable `eudc-expansion-overwrites-query' defaults to nil to avoid interfering with the kill ring. ++++ *** Custom variable `eudc-inline-expansion-format' defaults to "Firstname Surname ". ++++ *** Custom variable `eudc-options-file' defaults to "~/.emacs.d/eudc-options". +--- *** New custom variable `ldap-ldapsearch-password-prompt-regexp' to allow overriding the regular expression that recognizes the ldapsearch command line's password prompt. +--- EUDC's BBDB backend now supports BBDB 3. +--- EUDC's PH backend (eudcb-ph.el) is obsolete. ** Eshell commit 1089dc98b778d1c6eb190dbd840d40c33aea9bea Author: Michael Albinus Date: Sun Jan 10 13:07:21 2016 +0100 Handle too long commands in Tramp * lisp/net/tramp-sh.el (tramp-sh-handle-make-symbolic-link) (tramp-do-file-attributes-with-ls): Send sequence of commands, in order to not exceed shell command line limit. * test/automated/tramp-tests.el (tramp--test-darwin-p): Remove. (tramp--test-utf8): Include Arabic file name, again. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 1357db0..7ace886 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1100,15 +1100,19 @@ target of the symlink differ." ;; Right, they are on the same host, regardless of user, method, ;; etc. We now make the link on the remote machine. This will ;; occur as the user that FILENAME belongs to. - (tramp-send-command-and-check - l - (format - "cd %s && %s -sf %s %s" - (tramp-shell-quote-argument cwd) - ln - (tramp-shell-quote-argument filename) - (tramp-shell-quote-argument l-localname)) - t)))) + (and (tramp-send-command-and-check + l (format "cd %s" (tramp-shell-quote-argument cwd))) + (tramp-send-command-and-check + l (format + "%s -sf %s %s" + ln + (tramp-shell-quote-argument filename) + ;; The command could exceed PATH_MAX, so we use + ;; relative file names. However, relative file names + ;; could start with "-". `tramp-shell-quote-argument' + ;; does not handle this, we must do it ourselves. + (tramp-shell-quote-argument + (concat "./" (file-name-nondirectory l-localname))))))))) (defun tramp-sh-handle-file-truename (filename) "Like `file-truename' for Tramp files." @@ -1266,100 +1270,108 @@ target of the symlink differ." res-inode res-filemodes res-numlinks res-uid res-gid res-size res-symlink-target) (tramp-message vec 5 "file attributes with ls: %s" localname) - (tramp-send-command - vec - (format "(%s %s || %s -h %s) && %s %s %s %s" - (tramp-get-file-exists-command vec) - (tramp-shell-quote-argument localname) - (tramp-get-test-command vec) - (tramp-shell-quote-argument localname) - (tramp-get-ls-command vec) - (if (eq id-format 'integer) "-ildn" "-ild") - ;; On systems which have no quoting style, file names - ;; with special characters could fail. - (cond - ((tramp-get-ls-command-with-quoting-style vec) - "--quoting-style=c") - ((tramp-get-ls-command-with-w-option vec) - "-w") - (t "")) - (tramp-shell-quote-argument localname))) - ;; Parse `ls -l' output ... - (with-current-buffer (tramp-get-buffer vec) - (when (> (buffer-size) 0) - (goto-char (point-min)) - ;; ... inode - (setq res-inode - (condition-case err - (read (current-buffer)) - (invalid-read-syntax - (when (and (equal (cadr err) - "Integer constant overflow in reader") - (string-match - "^[0-9]+\\([0-9][0-9][0-9][0-9][0-9]\\)\\'" - (car (cddr err)))) - (let* ((big (read (substring (car (cddr err)) 0 - (match-beginning 1)))) - (small (read (match-string 1 (car (cddr err))))) - (twiddle (/ small 65536))) - (cons (+ big twiddle) - (- small (* twiddle 65536)))))))) - ;; ... file mode flags - (setq res-filemodes (symbol-name (read (current-buffer)))) - ;; ... number links - (setq res-numlinks (read (current-buffer))) - ;; ... uid and gid - (setq res-uid (read (current-buffer))) - (setq res-gid (read (current-buffer))) - (if (eq id-format 'integer) + ;; We cannot send all three commands combined, it could exceed + ;; NAME_MAX or PATH_MAX. Happened on Mac OS X, for example. + (when (or (tramp-send-command-and-check + vec + (format "%s %s" + (tramp-get-file-exists-command vec) + (tramp-shell-quote-argument localname))) + (tramp-send-command-and-check + vec + (format "%s -h %s" + (tramp-get-test-command vec) + (tramp-shell-quote-argument localname)))) + (tramp-send-command + vec + (format "%s %s %s %s" + (tramp-get-ls-command vec) + (if (eq id-format 'integer) "-ildn" "-ild") + ;; On systems which have no quoting style, file names + ;; with special characters could fail. + (cond + ((tramp-get-ls-command-with-quoting-style vec) + "--quoting-style=c") + ((tramp-get-ls-command-with-w-option vec) + "-w") + (t "")) + (tramp-shell-quote-argument localname))) + ;; Parse `ls -l' output ... + (with-current-buffer (tramp-get-buffer vec) + (when (> (buffer-size) 0) + (goto-char (point-min)) + ;; ... inode + (setq res-inode + (condition-case err + (read (current-buffer)) + (invalid-read-syntax + (when (and (equal (cadr err) + "Integer constant overflow in reader") + (string-match + "^[0-9]+\\([0-9][0-9][0-9][0-9][0-9]\\)\\'" + (car (cddr err)))) + (let* ((big (read (substring (car (cddr err)) 0 + (match-beginning 1)))) + (small (read (match-string 1 (car (cddr err))))) + (twiddle (/ small 65536))) + (cons (+ big twiddle) + (- small (* twiddle 65536)))))))) + ;; ... file mode flags + (setq res-filemodes (symbol-name (read (current-buffer)))) + ;; ... number links + (setq res-numlinks (read (current-buffer))) + ;; ... uid and gid + (setq res-uid (read (current-buffer))) + (setq res-gid (read (current-buffer))) + (if (eq id-format 'integer) + (progn + (unless (numberp res-uid) (setq res-uid -1)) + (unless (numberp res-gid) (setq res-gid -1))) (progn - (unless (numberp res-uid) (setq res-uid -1)) - (unless (numberp res-gid) (setq res-gid -1))) - (progn - (unless (stringp res-uid) (setq res-uid (symbol-name res-uid))) - (unless (stringp res-gid) (setq res-gid (symbol-name res-gid))))) - ;; ... size - (setq res-size (read (current-buffer))) - ;; From the file modes, figure out other stuff. - (setq symlinkp (eq ?l (aref res-filemodes 0))) - (setq dirp (eq ?d (aref res-filemodes 0))) - ;; If symlink, find out file name pointed to. - (when symlinkp - (search-forward "-> ") - (setq res-symlink-target - (if (tramp-get-ls-command-with-quoting-style vec) - (read (current-buffer)) - (buffer-substring (point) (point-at-eol))))) - ;; Return data gathered. - (list - ;; 0. t for directory, string (name linked to) for symbolic - ;; link, or nil. - (or dirp res-symlink-target) - ;; 1. Number of links to file. - res-numlinks - ;; 2. File uid. - res-uid - ;; 3. File gid. - res-gid - ;; 4. Last access time, as a list of integers. Normally this - ;; would be in the same format as `current-time', but the - ;; subseconds part is not currently implemented, and (0 0) - ;; denotes an unknown time. - ;; 5. Last modification time, likewise. - ;; 6. Last status change time, likewise. - '(0 0) '(0 0) '(0 0) ;CCC how to find out? - ;; 7. Size in bytes (-1, if number is out of range). - res-size - ;; 8. File modes, as a string of ten letters or dashes as in ls -l. - res-filemodes - ;; 9. t if file's gid would change if file were deleted and - ;; recreated. Will be set in `tramp-convert-file-attributes'. - t - ;; 10. Inode number. - res-inode - ;; 11. Device number. Will be replaced by a virtual device number. - -1 - ))))) + (unless (stringp res-uid) (setq res-uid (symbol-name res-uid))) + (unless (stringp res-gid) (setq res-gid (symbol-name res-gid))))) + ;; ... size + (setq res-size (read (current-buffer))) + ;; From the file modes, figure out other stuff. + (setq symlinkp (eq ?l (aref res-filemodes 0))) + (setq dirp (eq ?d (aref res-filemodes 0))) + ;; If symlink, find out file name pointed to. + (when symlinkp + (search-forward "-> ") + (setq res-symlink-target + (if (tramp-get-ls-command-with-quoting-style vec) + (read (current-buffer)) + (buffer-substring (point) (point-at-eol))))) + ;; Return data gathered. + (list + ;; 0. t for directory, string (name linked to) for symbolic + ;; link, or nil. + (or dirp res-symlink-target) + ;; 1. Number of links to file. + res-numlinks + ;; 2. File uid. + res-uid + ;; 3. File gid. + res-gid + ;; 4. Last access time, as a list of integers. Normally + ;; this would be in the same format as `current-time', but + ;; the subseconds part is not currently implemented, and (0 + ;; 0) denotes an unknown time. + ;; 5. Last modification time, likewise. + ;; 6. Last status change time, likewise. + '(0 0) '(0 0) '(0 0) ;CCC how to find out? + ;; 7. Size in bytes (-1, if number is out of range). + res-size + ;; 8. File modes, as a string of ten letters or dashes as in ls -l. + res-filemodes + ;; 9. t if file's gid would change if file were deleted and + ;; recreated. Will be set in `tramp-convert-file-attributes'. + t + ;; 10. Inode number. + res-inode + ;; 11. Device number. Will be replaced by a virtual device number. + -1 + )))))) (defun tramp-do-file-attributes-with-perl (vec localname &optional id-format) diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index c956f9c..915b30f 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1785,14 +1785,6 @@ Several special characters do not work properly there." (file-truename tramp-test-temporary-file-directory) nil (string-match "^HP-UX" (tramp-get-connection-property v "uname" "")))) -(defun tramp--test-darwin-p () - "Check, whether the remote host runs Mac OS X. -Several special characters do not work properly there." - ;; We must refill the cache. `file-truename' does it. - (with-parsed-tramp-file-name - (file-truename tramp-test-temporary-file-directory) nil - (string-match "^Darwin" (tramp-get-connection-property v "uname" "")))) - (defun tramp--test-check-files (&rest files) "Run a simple but comprehensive test over every file in FILES." ;; We must use `file-truename' for the temporary directory, because @@ -2046,7 +2038,7 @@ Use the `ls' command." (file-name-coding-system 'utf-8)) (tramp--test-check-files (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ") - (unless (or (tramp--test-hpux-p) (tramp--test-darwin-p)) + (unless (tramp--test-hpux-p) "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت") "银河系漫游指南系列" "Автостопом по гала́ктике"))) commit 684eb58db992dec56a05719732edc547fa77c1be Author: Paul Eggert Date: Sun Jan 10 00:51:10 2016 -0800 * .gitattributes: *.cur and *.pif are binary files too. diff --git a/.gitattributes b/.gitattributes index 8f61c80..5ccf9a5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -34,12 +34,14 @@ test/etags/html-src/algrthms.html whitespace=cr-at-eol doc/misc/texinfo.tex -whitespace=blank-at-eol # Some files should not be treated as text when diffing or merging. +*.cur binary *.gpg binary *.gz binary *.icns binary *.ico binary *.pbm binary *.pdf binary +*.pif binary *.png binary *.sig binary *.tiff binary commit d2c7fda9654a79423be8320bc2028263aefccced Author: Stefan Monnier Date: Sun Jan 10 00:32:13 2016 -0500 * src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined diff --git a/src/alloc.c b/src/alloc.c index e1b0d2e..9d876a5 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -4607,7 +4607,13 @@ mark_maybe_pointer (void *p) VALGRIND_MAKE_MEM_DEFINED (&p, sizeof (p)); #endif - if (sizeof (Lisp_Object) == sizeof (void *) || !HAVE_MODULES) + if ( +#ifdef HAVE_MODULES + sizeof (Lisp_Object) == sizeof (void *) +#else + true +#endif + ) { if (!maybe_lisp_pointer (p)) return; commit bd3f53dd2e14b886ec46667a10611c549d4f09be Author: Stefan Monnier Date: Sun Jan 10 00:31:29 2016 -0500 * sh-script.el (sh-smie-sh-rules): Improve indentation inside $(...) * lisp/progmodes/sh-script.el (sh-smie-sh-rules): Improve indentation within $(...). * test/indent/shell.sh: Add corresponding test. diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 02d329d..7f89ab2 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -2115,7 +2115,11 @@ May return nil if the line should not be treated as continued." ;; sh-indent-after-done: aligned completely differently. (`(:after . "in") (sh-var-value 'sh-indent-for-case-label)) ;; sh-indent-for-continuation: Line continuations are handled differently. - (`(:after . ,(or `"(" `"{" `"[")) (sh-var-value 'sh-indent-after-open)) + (`(:after . ,(or `"(" `"{" `"[")) + (if (not (looking-at ".[ \t]*[^\n \t#]")) + (sh-var-value 'sh-indent-after-open) + (goto-char (1- (match-end 0))) + `(column . ,(current-column)))) ;; sh-indent-after-function: we don't handle it differently. )) diff --git a/test/indent/shell.sh b/test/indent/shell.sh index b0f69bd..dc184ea 100755 --- a/test/indent/shell.sh +++ b/test/indent/shell.sh @@ -3,6 +3,9 @@ setlock -n /tmp/getmail.lock && echo getmail isn\'t running +toto=$(grep hello foo | + wc) + # adsgsdg if foo; then commit 09b2b8a5ce5b542856f93b645db51eb11cf9855a Author: Stefan Monnier Date: Sat Jan 9 21:15:12 2016 -0500 * src/alloc.c (mark_maybe_pointer): Also check wide-int's emacs_value (mark_memory): Simplify loop. Don't assume a pointer-sized word can be cast to Lisp_Object. diff --git a/src/alloc.c b/src/alloc.c index 9ec44b8..e1b0d2e 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -4607,8 +4607,15 @@ mark_maybe_pointer (void *p) VALGRIND_MAKE_MEM_DEFINED (&p, sizeof (p)); #endif - if (!maybe_lisp_pointer (p)) - return; + if (sizeof (Lisp_Object) == sizeof (void *) || !HAVE_MODULES) + { + if (!maybe_lisp_pointer (p)) + return; + } + else + /* For the wide-int case, we also have to accept emacs_value "tagged + pointers", which can be generated by emacs-module.c's value_to_lisp. */ + p = (void*)((uintptr_t) p & ~(GCALIGNMENT - 1)); m = mem_find (p); if (m != MEM_NIL) @@ -4685,8 +4692,7 @@ mark_maybe_pointer (void *p) static void ATTRIBUTE_NO_SANITIZE_ADDRESS mark_memory (void *start, void *end) { - void **pp; - int i; + char *pp; /* Make START the pointer to the start of the memory region, if it isn't already. */ @@ -4697,6 +4703,8 @@ mark_memory (void *start, void *end) end = tem; } + eassert (((uintptr_t) start) % GC_POINTER_ALIGNMENT == 0); + /* Mark Lisp data pointed to. This is necessary because, in some situations, the C compiler optimizes Lisp objects away, so that only a pointer to them remains. Example: @@ -4715,13 +4723,11 @@ mark_memory (void *start, void *end) away. The only reference to the life string is through the pointer `s'. */ - for (pp = start; (void *) pp < end; pp++) - for (i = 0; i < sizeof *pp; i += GC_POINTER_ALIGNMENT) - { - void *p = *(void **) ((char *) pp + i); - mark_maybe_pointer (p); - mark_maybe_object (XIL ((intptr_t) p)); - } + for (pp = start; (void*)pp < end; pp = pp + GC_POINTER_ALIGNMENT) + { + mark_maybe_pointer (*(void **) pp); + mark_maybe_object (*(Lisp_Object *) pp); + } } #if !defined GC_SAVE_REGISTERS_ON_STACK && !defined GC_SETJMP_WORKS commit cca0f933594a22a834ffae5475488a6066c584c1 Author: Dmitry Gutov Date: Sun Jan 10 04:38:34 2016 +0300 ; Account for spaces before the filename diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 85e2376..8cb3547 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -397,7 +397,7 @@ Optional arg REVISION is a revision to annotate from." (concat "^\\(?: *[^ ]+ +\\)?\\([0-9]+\\) " ;User and revision. "\\([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]\\)" ;Date. - "\\( [^:]+\\)?:")) ;Filename, + "\\(?: +\\([^:]+\\)\\)?:")) ;Filename. (defun vc-hg-annotate-time () (when (looking-at vc-hg-annotate-re) @@ -415,7 +415,7 @@ Optional arg REVISION is a revision to annotate from." (when (looking-at vc-hg-annotate-re) (if (match-beginning 3) (cons (match-string-no-properties 1) - (expand-file-name (substring (match-string-no-properties 3) 1) + (expand-file-name (match-string-no-properties 3) (vc-hg-root default-directory))) (match-string-no-properties 1))))) diff --git a/test/automated/vc-hg.el b/test/automated/vc-hg.el index 6a746ce..6828271 100644 --- a/test/automated/vc-hg.el +++ b/test/automated/vc-hg.el @@ -45,7 +45,7 @@ (ert-deftest vc-hg-annotate-extract-revision-at-line-with-both () (with-temp-buffer - (save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:")) + (save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:")) (should (equal (vc-hg-annotate-extract-revision-at-line) (cons "218075" commit c71e1e86dff7e5a385107c358d25dce9027915c0 Author: Dmitry Gutov Date: Sun Jan 10 04:09:42 2016 +0300 Use short date for 'hg annotate', and output the author * lisp/vc/vc-hg.el (vc-hg-annotate-command): Change '-d' to '-dq'. (Bug#21805) (vc-hg-annotate-switches): Default to "-u" "--follow". (vc-hg-annotate-re): Update to recognize the short date format and the optional username. (vc-hg-annotate-time) (vc-hg-annotate-extract-revision-at-line): Update accordingly. * test/automated/vc-hg.el: New file. diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 8a0a9f9..85e2376 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -131,7 +131,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "23.1" :group 'vc-hg) -(defcustom vc-hg-annotate-switches nil +(defcustom vc-hg-annotate-switches '("-u" "--follow") "String or list of strings specifying switches for hg annotate under VC. If nil, use the value of `vc-annotate-switches'. If t, use no switches." @@ -380,36 +380,44 @@ If LIMIT is non-nil, show no more than this many entries." (defun vc-hg-annotate-command (file buffer &optional revision) "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER. Optional arg REVISION is a revision to annotate from." - (apply #'vc-hg-command buffer 0 file "annotate" "-d" "-n" "--follow" + (apply #'vc-hg-command buffer 0 file "annotate" "-dq" "-n" (append (vc-switches 'hg 'annotate) (if revision (list (concat "-r" revision)))))) (declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) -;; The format for one line output by "hg annotate -d -n" looks like this: -;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS -;; i.e: VERSION_NUMBER DATE: CONTENTS -;; If the user has set the "--follow" option, the output looks like: -;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS -;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS +;; One line printed by "hg annotate -dq -n -u --follow" looks like this: +;; b56girard 114590 2012-03-13 CLOBBER: Lorem ipsum dolor sit +;; i.e. AUTHOR REVISION DATE FILENAME: CONTENTS +;; The user can omit options "-u" and/or "--follow". Then it'll look like: +;; 114590 2012-03-13 CLOBBER: +;; or +;; b56girard 114590 2012-03-13: (defconst vc-hg-annotate-re - "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\([^:\n]+\\(?::\\(?:[^: \n][^:\n]*\\)?\\)*\\): \\)\\)") + (concat + "^\\(?: *[^ ]+ +\\)?\\([0-9]+\\) " ;User and revision. + "\\([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]\\)" ;Date. + "\\( [^:]+\\)?:")) ;Filename, (defun vc-hg-annotate-time () (when (looking-at vc-hg-annotate-re) (goto-char (match-end 0)) (vc-annotate-convert-time - (date-to-time (match-string-no-properties 2))))) + (let ((str (match-string-no-properties 2))) + (encode-time 0 0 0 + (string-to-number (substring str 6 8)) + (string-to-number (substring str 4 6)) + (string-to-number (substring str 0 4))))))) (defun vc-hg-annotate-extract-revision-at-line () (save-excursion (beginning-of-line) (when (looking-at vc-hg-annotate-re) (if (match-beginning 3) - (match-string-no-properties 1) - (cons (match-string-no-properties 1) - (expand-file-name (match-string-no-properties 4) - (vc-hg-root default-directory))))))) + (cons (match-string-no-properties 1) + (expand-file-name (substring (match-string-no-properties 3) 1) + (vc-hg-root default-directory))) + (match-string-no-properties 1))))) ;;; Tag system diff --git a/test/automated/vc-hg.el b/test/automated/vc-hg.el new file mode 100644 index 0000000..6a746ce --- /dev/null +++ b/test/automated/vc-hg.el @@ -0,0 +1,60 @@ +;;; vc-hg.el --- tests for vc/vc-hg.el + +;; Copyright (C) 2016 Free Software Foundation, Inc. + +;; Author: Dmitry Gutov +;; Maintainer: emacs-devel@gnu.org + +;; 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 'vc-hg) +(require 'vc-annotate) + +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-filename () + ;; with filename + (with-temp-buffer + (save-excursion (insert "215 2007-06-20 CONTENTS:")) + (should (equal (vc-hg-annotate-extract-revision-at-line) + (cons + "215" + (expand-file-name "test/automated/CONTENTS" + source-directory)))))) + +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-user () + (with-temp-buffer + (save-excursion (insert " gerv 107217 2012-09-17:")) + (should (equal (vc-hg-annotate-extract-revision-at-line) + "107217")))) + +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-both () + (with-temp-buffer + (save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:")) + (should (equal (vc-hg-annotate-extract-revision-at-line) + (cons + "218075" + (expand-file-name "test/automated/CLOBBER" + source-directory)))))) + +(ert-deftest vc-hg-annotate-time () + (with-temp-buffer + (save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:")) + (should (floatp (vc-hg-annotate-time))))) + +;;; vc-hg.el ends here commit f50027be1ac5861dcda22cda64df69bf93e4ee70 Author: Paul Eggert Date: Sat Jan 9 16:15:01 2016 -0800 Spelling fix diff --git a/lisp/apropos.el b/lisp/apropos.el index f165685..3c1a413 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -677,7 +677,7 @@ the output includes key-bindings of commands." (`require (push (cdr x) requires)) (`provide (push (cdr x) provides)) (`t nil) ; Skip "was an autoload" entries. - ;; FIXME: Print information about each indivial method: both + ;; FIXME: Print information about each individual method: both ;; its docstring and specializers (bug#21422). (`cl-defmethod (push (cadr x) provides)) (_ (push (or (cdr-safe x) x) symbols)))) commit c7dff677ca31312931b9b46188f076e2204e026b Author: Eli Zaretskii Date: Sat Jan 9 22:05:41 2016 +0200 ; * etc/NEWS: Fix the Xref entries that got separated. diff --git a/etc/NEWS b/etc/NEWS index 3ad2fb3..4e32e48 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -961,6 +961,20 @@ As a result of this, the following commands are now obsolete: `find-tag-other-window', `find-tag-other-frame', `find-tag-regexp', `tags-apropos', and `tags-loop-continue'. ++++ +*** New variables + +`find-tag-marker-ring-length' is now an obsolete alias for +`xref-marker-ring-length'. `find-tag-marker-ring' is now an obsolete +alias for a private variable. `xref-push-marker-stack' and +`xref-pop-marker-stack' should be used instead to manipulate the stack +of searches for definitions. + +--- +*** `xref-find-definitions' and `describe-function' now display +information about mode local overrides (defined by cedet/mode-local.el +`define-overloadable-function' `define-mode-local-overrides'). + The framework's Lisp API is still experimental and can change in major, backward-incompatible ways. @@ -973,18 +987,6 @@ with projects. The main commands included in it are The Lisp API of this package is still experimental. -*** New variables - -`find-tag-marker-ring-length' is now an obsolete alias for -`xref-marker-ring-length'. `find-tag-marker-ring' is now an obsolete -alias for a private variable. `xref-push-marker-stack' and -`xref-pop-marker-stack' should be used to mutate it instead. - ---- -*** `xref-find-definitions' and `describe-function' now display -information about mode local overrides (defined by cedet/mode-local.el -`define-overloadable-function' `define-mode-local-overrides'). - ** EUDC EUDC's LDAP backend has been improved. commit cc140bcec665163790a8a15845f16dca39525425 Author: Eli Zaretskii Date: Sat Jan 9 21:45:33 2016 +0200 Document user-level functions in project.el * lisp/progmodes/project.el (project-find-file) (project-or-external-find-file): Add doc strings. diff --git a/etc/NEWS b/etc/NEWS index 407d13b..3ad2fb3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -964,13 +964,14 @@ As a result of this, the following commands are now obsolete: The framework's Lisp API is still experimental and can change in major, backward-incompatible ways. +--- ** New package Project The new package Project provides generic infrastructure for dealing with projects. The main commands included in it are `project-find-file' and `project-find-regexp'. -Like Xref, the project API is still experimental. +The Lisp API of this package is still experimental. *** New variables diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 5070bb0..fe28ed7 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -313,6 +313,10 @@ pattern to search for." ;;;###autoload (defun project-find-file () + "Visit a file in the current project's roots. + +This is like `find-file', but it limits the file-name completion +candidates to the files within the current project roots." (interactive) (let* ((pr (project-current t)) (dirs (project-roots pr))) @@ -320,6 +324,10 @@ pattern to search for." ;;;###autoload (defun project-or-external-find-file () + "Visit a file in the current project's roots or external roots. + +This is like `find-file', but it limits the file-name completion +candidates to the files within the current project roots and external roots." (interactive) (let* ((pr (project-current t)) (dirs (append commit f8208b69192359a97735d461f05060f6579df0f2 Author: Eli Zaretskii Date: Sat Jan 9 21:12:46 2016 +0200 Document the user-level features of the Xref package * doc/emacs/maintaining.texi (Maintaining): Add a list of described features. (Xref): New section, made out of thoroughly rewritten "Tags" section. (Find Identifiers, Looking Up Identifiers, Xref Commands) (Identifier Search, List Identifiers): New subsections, incorporating the old tags commands and the new xref commands. (Tags Tables, Tag Syntax, Create Tags Table, Etags Regexps): Section and subsections demoted to a lower level. * doc/emacs/search.texi (Search): * doc/emacs/windows.texi (Pop Up Window): * doc/emacs/frames.texi (Creating Frames): * doc/emacs/programs.texi (Imenu, Symbol Completion): * doc/emacs/building.texi (Grep Searching): * doc/emacs/dired.texi (Operating on Files): * doc/emacs/glossary.texi (Glossary): All references to tags changed. diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index 3a12795..3fa89d9 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -360,8 +360,8 @@ that specifies how to run @command{grep}. Use the same arguments you would give @command{grep} when running it normally: a @command{grep}-style regexp (usually in single-quotes to quote the shell's special characters) followed by file names, which may use wildcards. If you -specify a prefix argument for @kbd{M-x grep}, it finds the tag -(@pxref{Tags}) in the buffer around point, and puts that into the +specify a prefix argument for @kbd{M-x grep}, it finds the identifier +(@pxref{Xref}) in the buffer around point, and puts that into the default @command{grep} command. Your command need not simply run @command{grep}; you can use any shell diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index f3211b5..855e653 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -785,8 +785,8 @@ Search all the specified files for the regular expression @var{regexp} (@code{dired-do-search}). This command is a variant of @code{tags-search}. The search stops at -the first match it finds; use @kbd{M-,} to resume the search and find -the next match. @xref{Tags Search}. +the first match it finds; use @kbd{M-x tags-loop-continue} to resume +the search and find the next match. @xref{Identifier Search}. @kindex Q @r{(Dired)} @findex dired-do-query-replace-regexp @@ -797,8 +797,8 @@ replacing matches for @var{regexp} with the string @var{to} (@code{dired-do-query-replace-regexp}). This command is a variant of @code{tags-query-replace}. If you exit the -query replace loop, you can use @kbd{M-,} to resume the scan and replace -more matches. @xref{Tags Search}. +query replace loop, you can use @kbd{M-x tags-loop-continue} to resume +the scan and replace more matches. @xref{Identifier Search}. @end table @node Shell Commands in Dired diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 53b689f..5ef9385 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -788,8 +788,8 @@ Maintaining Large Programs * Version Control:: Using version control systems. * Change Log:: Maintaining a change history for your program. -* Tags:: Go directly to any function in your program in one - command. Tags remembers which file it is in. +* Xref:: Find definitions and references of any function, + method, struct, macro, @dots{} in your program. * EDE:: An integrated development environment for Emacs. @ifnottex * Emerge:: A convenient way of merging two versions of a program. @@ -861,15 +861,25 @@ Change Logs * Change Log Commands:: Commands for editing change log files. * Format of ChangeLog:: What the change log file looks like. +Xref + +* Find Identifiers:: Commands to find where an identifier is defined + or referenced, to list identifiers, etc. +* Tags Tables:: Tags table records which file defines a symbol. +* Select Tags Table:: How to visit a specific tags table. + +Find Identifiers + +* Looking Up Identifiers:: Commands to find the definition of a specific tag. +* Xref Commands:: Commands in the @file{*xref*} buffer. +* Identifier Search:: Searching and replacing identifiers. +* List Identifiers:: Listing identifiers and completing on them. + Tags Tables * Tag Syntax:: Tag syntax for various types of code and text files. * Create Tags Table:: Creating a tags table with @command{etags}. * Etags Regexps:: Create arbitrary tags using regular expressions. -* Select Tags Table:: How to visit a tags table. -* Find Tag:: Commands to find the definition of a specific tag. -* Tags Search:: Using a tags table for searching and replacing. -* List Tags:: Using tags for completion, and listing them. @ifnottex Merging Files with Emerge diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index a048997..5fbe0fc 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -416,9 +416,9 @@ Start composing a mail message in another frame. This runs @code{compose-mail-other-frame}. It is the other-frame variant of @kbd{C-x m}. @xref{Sending Mail}. @item C-x 5 . -Find a tag in the current tag table in another frame. This runs -@code{find-tag-other-frame}, the multiple-frame variant of @kbd{M-.}. -@xref{Tags}. +Find the definition of an identifier in another frame. This runs +@code{xref-find-definitions-other-frame}, the multiple-frame variant +of @kbd{M-.}. @xref{Xref}. @item C-x 5 r @var{filename} @key{RET} @kindex C-x 5 r @findex find-file-read-only-other-frame diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index 4b9832f..bce97da 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi @@ -1329,7 +1329,7 @@ indentation or completion. @anchor{Glossary---Tags Table} @item Tags Table A tags table is a file that serves as an index to the function -definitions in one or more other files. @xref{Tags}. +definitions in one or more other files. @xref{Tags Tables}. @item Termscript File A termscript file contains a record of all characters sent by Emacs to diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 7b72e66..8842b8e 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -5,17 +5,42 @@ @node Maintaining @chapter Maintaining Large Programs - This chapter describes Emacs features for maintaining large -programs. If you are maintaining a large Lisp program, then in -addition to the features described here, you may find -the Emacs Lisp Regression Testing (ERT) library useful -(@pxref{Top,,ERT,ert, Emacs Lisp Regression Testing}). + This chapter describes Emacs features for maintaining medium- to +large-size programs and packages. These features include: + +@itemize @minus +@item +Unified interface to Support for Version Control Systems +(@acronym{VCS}) that record the history of changes to source files. + +@item +A specialized mode for maintaining @file{ChangeLog} files that provide +a chronological log of program changes. + +@item +@acronym{Xref}, a set of commands for displaying definitions of +symbols (a.k.a.@: ``identifiers'') and their references. + +@item +@acronym{EDE}, the Emacs's own IDE. + +@ifnottex +@item +A mode for merging changes to program sources made on separate +branches of development. +@end ifnottex +@end itemize + +If you are maintaining a large Lisp program, then in addition to the +features described here, you may find the Emacs Lisp Regression +Testing (@acronym{ERT}) library useful (@pxref{Top,,ERT,ert, Emacs +Lisp Regression Testing}). @menu * Version Control:: Using version control systems. * Change Log:: Maintaining a change history for your program. -* Tags:: Go directly to any function in your program in one - command. Tags remembers which file it is in. +* Xref:: Find definitions and references of any function, + method, struct, macro, @dots{} in your program. * EDE:: An integrated development environment for Emacs. @ifnottex * Emerge:: A convenient way of merging two versions of a program. @@ -1660,16 +1685,370 @@ permitted provided the copyright notice and this notice are preserved. @noindent Of course, you should substitute the proper years and copyright holder. -@node Tags -@section Tags Tables -@cindex tags and tag tables +@node Xref +@section Find Identifier Definitions and References +@cindex xref + + An @dfn{identifier} is a syntactic elements of the program: a +function, a subroutine, a method, a class, a data type, a macro, etc. +In a programming language, each identifier is a symbol in the +language's syntax. Many program development tools provide +capabilities to extract references to identifiers from source files, +record them on specialized data bases, and then use those data bases +to quickly find where each identifier was defined and referenced. + +Emacs provides a unified user interface to these tools, called +@samp{xref}. The tools supported by @samp{xref} include: + +@enumerate a +@item +Some major modes provide built-in means for looking up the language +symbols. For example, Emacs Lisp symbols can be identified by +searching the package load history, maintained by the Emacs Lisp +interpreter, and by consulting the built-in documentation strings; the +Emacs Lisp mode uses these facilities to find definitions of symbols. + +@item +Etags, the command for tagging identifier definitions which is part of +the Emacs distribution. @xref{Create Tags Table}. + +@item +@acronym{GNU} GLOBAL, the source code tagging system, which provides +the @command{gtags} command and associated utilities. @xref{Command +Line, gtags, , global, GNU GLOBAL source code tag system}. + +@item +Cscope (@uref{http://cscope.sourceforge.net/}, a tool for browsing +source code. + +@item +@acronym{GNU} IDUtils, a package for generating databases of +identifier references and querying those databases. @xref{Top,,, +idutils, ID database utilities}. + +@item +Grep, the venerable program that searches files for lines matching +patterns. @xref{Invoking,,, grep, GNU Grep Manual}. +@end enumerate + +@noindent +Additional tools could be supported as they become available, or as +user extensions. Each such tool is used as a @dfn{backend} by +commands described in this section. Each command detects which +backends are available for the current major mode, and uses the most +capable of the available backends, with Grep generally serving as the +fall-back backend. + +@cindex tag +The commands described here are useful for finding references in major +modes other than those defined to support programming languages. For +example, chapters, sections, appendices, etc. of a text or a @TeX{} +document can be treated as identifiers as well. In this chapter, we +collectively refer to a reference that specifies the name of the file +where the corresponding subunit is defined, and the position of the +subunit's definition in that file, as a @dfn{tag}. We refer to the +backends used by @code{xref} as @dfn{tagging backends}. + +@menu +* Find Identifiers:: Commands to find where an identifier is defined + or referenced, to list identifiers, etc. +* Tags Tables:: Tags table records which file defines a symbol. +* Select Tags Table:: How to visit a specific tags table. +@end menu + +@node Find Identifiers +@subsection Find Identifiers + + This subsection describes the commands that use the tagging backends +in order to find definitions of identifiers, references to +identifiers, and perform various queries about identifiers. With most +backends, these definitions and references were recorded as tags in +the database created and maintained by the backend. + +@menu +* Looking Up Identifiers:: Commands to find the definition of a specific tag. +* Xref Commands:: Commands in the @file{*xref*} buffer. +* Identifier Search:: Searching and replacing identifiers. +* List Identifiers:: Listing identifiers and completing on them. +@end menu + +@node Looking Up Identifiers +@subsubsection Looking Up Identifiers +@cindex find definition of symbols +@cindex identifier, finding definition of +@cindex find references to symbols + + The most important thing that @code{xref} enables you to do is to find +the definition of a specific identifier. + +@table @kbd +@item M-.@: +Find definitions of an identifier (@code{xref-find-definitions}). +@item C-M-. @var{pattern} @key{RET} +Find all identifiers whose name matches @var{pattern} +(@code{xref-find-apropos}). +@item C-x 4 .@: @key{RET} +Find definitions of identifier, but display it in another window +(@code{xref-find-definitions-other-window}). +@item C-x 5 .@: @key{RET} +Find definition of identifier, and display it in a new frame +(@code{xref-find-definitions-other-frame}). +@item M-, +Pop back to where you previously invoked @kbd{M-.} and friends +(@code{xref-pop-marker-stack}). +@end table + +@kindex M-. +@findex xref-find-definitions + @kbd{M-.}@: (@code{xref-find-definitions}) shows the definitions of +the identifier at point. With a prefix argument, or if there's no +valid identifier at point, it prompts for the identifier. If the +identifier has only one definition, the command jumps to it. If the +identifier has more than one possible definition (e.g., in an +object-oriented language, or if there's a function and a variable by +the same name), the command shows the candidate definitions in a +@file{*xref*} buffer, together with the files in which these +definitions are found. Selecting one of these candidates by typing +@kbd{@key{RET}} or clicking @kbd{Mouse-2} will pop a buffer showing +the corresponding definition. + + When entering the identifier argument to @kbd{M-.}, the usual +minibuffer completion commands can be used (@pxref{Completion}), with +the known identifier names as completion candidates. - A @dfn{tag} is a reference to a subunit in a program or in a -document. In source code, tags reference syntactic elements of the -program: functions, subroutines, data types, macros, etc. In a -document, tags reference chapters, sections, appendices, etc. Each -tag specifies the name of the file where the corresponding subunit is -defined, and the position of the subunit's definition in that file. +@kindex C-x 4 . +@findex xref-find-definitions-other-window +@kindex C-x 5 . +@findex xref-find-definitions-other-frame + Like most commands that can switch buffers, +@code{xref-find-definitions} has a variant that displays the new +buffer in another window, and one that makes a new frame for it. The +former is @w{@kbd{C-x 4 .}} +(@code{xref-find-definitions-other-window}), and the latter is +@w{@kbd{C-x 5 .}} (@code{xref-find-definitions-other-frame}). + +@findex xref-find-apropos +@kindex C-M-. + The command @kbd{C-M-.} (@code{xref-find-apropos}) finds the +definitions of one or more identifiers that match a specified regular +expression. It is just like @kbd{M-.} except that it does regexp +matching of identifiers instead of symbol name matching. + + When any of the above commands finds more than one definition, it +presents the @file{*xref*} buffer showing the definition candidates. +In that buffer, you have several specialized commands, described in +@ref{Xref Commands}. + +@kindex M-, +@findex xref-pop-marker-stack +@vindex xref-marker-ring-length + To go back to places @emph{from where} you found the definition, +use @kbd{M-,} (@code{xref-pop-marker-stack}). It jumps back to the +point of the last invocation of @kbd{M-.}. Thus you can find and +examine the definition of something with @kbd{M-.} and then return to +where you were with @kbd{M-,}. @kbd{M-,} allows you to retrace your +steps to a depth determined by the variable +@code{xref-marker-ring-length}, which defaults to 16. + +@node Xref Commands +@subsubsection Commands Available in the @file{*xref*} Buffer +@cindex commands in @file{*xref*} buffers +@cindex XREF mode + + The following commands are provided in the @file{*xref*} buffer by +the special XREF mode: + +@table @kbd +@item @key{RET} +@itemx Mouse-2 +Display the reference on the current line and bury the @file{*xref*} +buffer. +@item n +@itemx . +@findex xref-next-line +Move to the next reference and display it in the other window +(@code{xref-next-line}). +@item p +@itemx , +@findex xref-prev-line +Move to the previous reference and display it in the other window +(@code{xref-prev-line}). +@item C-o +@findex xref-show-location-at-point +Display the reference on the current line in the other window +(@code{xref-show-location-at-point}). +@findex xref-query-replace +@item r @var{pattern} @key{RET} @var{replacement} @key{RET} +Perform interactive query-replace on references that match +@var{pattern} (@code{xref-query-replace}), replacing the match with +@var{replacement}. @xref{Identifier Search}. +@findex xref-quit +@item q +Quit the window showing the @file{*xref*} buffer (@code{xref-quit}). +@end table + +In addition, the usual navigation commands, such as the arrow keys, +@kbd{C-n}, and @kbd{C-p} are available for moving around the buffer +without displaying the references. + +@node Identifier Search +@subsubsection Searching and Replacing with Identifiers +@cindex search and replace in multiple files +@cindex multiple-file search and replace + + The commands in this section visit and search all the files listed +in the @code{xref} backend's database, one by one. For these +commands, the database serves only to specify a sequence of files to +search. These commands scan all the databases starting with the first +one (if any) that describes the current file, proceed from there to +the end of the list, and then scan from the beginning of the list +until they have covered all the databases in the list. + +@table @kbd +@item M-? +Find all the references for the identifier at point. +@item M-x xref-query-replace @key{RET} @var{regexp} @key{RET} @var{replacement} @key{RET} +Interactively replace @var{regexp} with @var{replacement} in the names +of all the identifiers shown in the @file{*xref*} buffer. +@item M-x tags-search @key{RET} @var{regexp} @key{RET} +Search for @var{regexp} through the files in the selected tags +table. +@item M-x tags-query-replace @key{RET} @var{regexp} @key{RET} @var{replacement} @key{RET} +Perform a @code{query-replace-regexp} on each file in the selected tags table. +@item M-x tags-loop-continue +Restart one of the last 2 commands above, from the current location of point. +@end table + +@kindex M-? +@findex xref-find-references + @kbd{M-?} finds all the references for the identifier at point. If +there's no valid identifier at point, or when invoked with a prefix +argument, the command prompts for the identifier, with completion. It +then presents a @file{*xref*} buffer with all the references to the +identifier, showing the file name and the line where the identifier is +referenced. The XREF mode commands are available in this buffer, see +@ref{Xref Commands}. + +@findex xref-query-replace + @kbd{M-x xref-query-replace} reads a regexp to match identifier +names and a string to replace with, just like ordinary @kbd{M-x +query-replace-regexp}. It then performs the specified replacement in +the names of the matching identifiers in all the places in all the +files where these identifiers are referenced. This is useful when you +rename your identifiers as part of refactoring. This command should +be invoked in the @file{*xref*} buffer generated by @code{M-?}. + +@findex tags-search + @kbd{M-x tags-search} reads a regexp using the minibuffer, then +searches for matches in all the files in the selected tags table, one +file at a time. It displays the name of the file being searched so +you can follow its progress. As soon as it finds an occurrence, +@code{tags-search} returns. This command works only with the etags +backend, and requires tags tables to be available (@pxref{Tags +Tables}). + +@findex tags-loop-continue + Having found one match, you probably want to find all the rest. +Type @kbd{M-x tags-loop-continue}) to resume the @code{tags-search}, +finding one more match. This searches the rest of the current buffer, +followed by the remaining files of the tags table. + +@findex tags-query-replace + @kbd{M-x tags-query-replace} performs a single +@code{query-replace-regexp} through all the files in the tags table. It +reads a regexp to search for and a string to replace with, just like +ordinary @kbd{M-x query-replace-regexp}. It searches much like @kbd{M-x +tags-search}, but repeatedly, processing matches according to your +input. @xref{Query Replace}, for more information on query replace. +This command works only with the etags backend. + +@vindex tags-case-fold-search +@cindex case-sensitivity and tags search + You can control the case-sensitivity of tags search commands by +customizing the value of the variable @code{tags-case-fold-search}. The +default is to use the same setting as the value of +@code{case-fold-search} (@pxref{Lax Search}). + + It is possible to get through all the files in the tags table with a +single invocation of @kbd{M-x tags-query-replace}. But often it is +useful to exit temporarily, which you can do with any input event that +has no special query replace meaning. You can resume the query +replace subsequently by typing @kbd{M-x tags-loop-continue}; this +command resumes the last tags search or replace command that you did. +For instance, to skip the rest of the current file, you can type +@kbd{M-> M-x tags-loop-continue}. + + The commands in this section carry out much broader searches than +the @code{xref-find-definitions} family. The +@code{xref-find-definitions} commands search only for definitions of +identifiers that match your string or regexp. The commands +@code{tags-search} and @code{tags-query-replace} find every occurrence +of the regexp, as ordinary search commands and replace commands do in +the current buffer. + + As an alternative to @code{tags-search}, you can run @command{grep} +as a subprocess and have Emacs show you the matching lines one by one. +@xref{Grep Searching}. + +@node List Identifiers +@subsubsection Identifier Inquiries + +@table @kbd +@item C-M-i +@itemx M-@key{TAB} +Perform completion on the text around point, using the @code{xref} +backend if one is available (@code{completion-at-point}). +@item M-x list-tags @key{RET} @var{file} @key{RET} +Display a list of the tags defined in the program file @var{file}. +@item M-x xref-find-apropos @key{RET} @var{regexp} @key{RET} +Display a list of all known identifiers matching @var{regexp}. +@end table + +@cindex completion (symbol names) + In most programming language modes, you can type @kbd{C-M-i} or +@kbd{M-@key{TAB}} (@code{completion-at-point}) to complete the symbol +at point. If there is an @code{xref} backend available, this command +can use it to generate completion candidates more intelligently. +@xref{Symbol Completion}. + +@findex list-tags + @kbd{M-x list-tags} reads the name of one of the files covered by +the selected tags table, and displays a list of tags defined in that +file. Do not include a directory as part of the file name unless the +file name recorded in the tags table includes a directory. This +command works only with the etags backend, and requires a tags table +for the project to be available. @xref{Tags Tables}. + +@c Sadly, the new-and-improved Xref feature doesn't provide anything +@c close to the described below features of the now-obsoleted +@c tags-apropos. I'm leaving this here to encourage enhancements to +@c xref.el. +@ignore +@findex tags-apropos +@vindex tags-apropos-verbose +@vindex tags-tag-face +@vindex tags-apropos-additional-actions + @kbd{M-x tags-apropos} is like @code{apropos} for tags +(@pxref{Apropos}). It displays a list of tags in the selected tags +table whose entries match @var{regexp}. If the variable +@code{tags-apropos-verbose} is non-@code{nil}, it displays the names +of the tags files together with the tag names. You can customize the +appearance of the output by setting the variable @code{tags-tag-face} +to a face. You can display additional output by customizing the +variable @code{tags-apropos-additional-actions}; see its documentation +for details. +@end ignore + +@findex next-file + @kbd{M-x next-file} visits files covered by the selected tags table. +The first time it is called, it visits the first file covered by the +table. Each subsequent call visits the next covered file, unless a +prefix argument is supplied, in which case it returns to the first +file. This command works only with the etags backend. + +@node Tags Tables +@subsection Tags Tables +@cindex tags and tag tables A @dfn{tags table} records the tags extracted by scanning the source code of a certain program or a certain document. Tags extracted from @@ -1685,12 +2064,14 @@ source files. on a document or the source code file. The @samp{etags} program writes the tags to a @dfn{tags table file}, or @dfn{tags file} in short. The conventional name for a tags file is @file{TAGS}@. -@xref{Create Tags Table}. +@xref{Create Tags Table}. (It is also possible to create a tags table +by using one of the commands from other packages that can produce such +tables in the same format.) - Emacs provides many commands for searching and replacing using the -information recorded in tags tables. For instance, the @kbd{M-.} -(@code{find-tag}) jumps to the location of a specified function -definition in its source file. @xref{Find Tag}. + Emacs uses the tags tables via the @code{etags} package as one of +the supported backends for @code{xref}. Because tags tables are +produced by the @command{etags} command that is part of an Emacs +distribution, we describe tags tables in more detail here. @cindex C++ class browser, tags @cindex tags, C++ @@ -1706,14 +2087,10 @@ use tags, separate from the @command{etags} facility. * Tag Syntax:: Tag syntax for various types of code and text files. * Create Tags Table:: Creating a tags table with @command{etags}. * Etags Regexps:: Create arbitrary tags using regular expressions. -* Select Tags Table:: How to visit a tags table. -* Find Tag:: Commands to find the definition of a specific tag. -* Tags Search:: Using a tags table for searching and replacing. -* List Tags:: Using tags for completion, and listing them. @end menu @node Tag Syntax -@subsection Source File Tag Syntax +@subsubsection Source File Tag Syntax Here is how tag syntax is defined for the most popular languages: @@ -1883,13 +2260,17 @@ line. @item In Python code, @code{def} or @code{class} at the beginning of a line generate a tag. + +@item +In Ruby code, @code{def} or @code{class} or @code{module} at the +beginning of a line generate a tag. @end itemize You can also generate tags based on regexp matching (@pxref{Etags Regexps}) to handle other formats and languages. @node Create Tags Table -@subsection Creating Tags Tables +@subsubsection Creating Tags Tables @cindex @command{etags} program The @command{etags} program is used to create a tags table file. It knows @@ -1946,7 +2327,7 @@ source files, and the tags file will still refer correctly to the source files. If the tags file is @file{-} or is in the @file{/dev} directory, however, the file names are made relative to the current working directory. This is useful, for -example, when writing the tags to @file{/dev/stdout}. +example, when writing the tags to the standard output. When using a relative file name, it should not be a symbolic link pointing to a tags file in a different directory, because this would @@ -1992,7 +2373,7 @@ options, it outputs detailed information about how tags are generated for @var{lang}. @node Etags Regexps -@subsection Etags Regexps +@subsubsection Etags Regexps The @samp{--regex} option to @command{etags} allows tags to be recognized by regular expression matching. You can intermix this @@ -2151,7 +2532,7 @@ etags --language=none \ @subsection Selecting a Tags Table @findex visit-tags-table - Emacs has at any time one @dfn{selected} tags table. All the + Emacs has at any time at most one @dfn{selected} tags table. All the commands for working with tags tables use the selected one. To select a tags table, type @kbd{M-x visit-tags-table}, which reads the tags table file name as an argument, with @file{TAGS} in the default @@ -2192,212 +2573,6 @@ table mentions that file, as explained above. Do not set both @code{tags-file-name} and @code{tags-table-list}. -@node Find Tag -@subsection Finding a Tag - - The most important thing that a tags table enables you to do is to find -the definition of a specific tag. - -@table @kbd -@item M-.@: @var{tag} @key{RET} -Find first definition of @var{tag} (@code{find-tag}). -@item C-u M-. -Find next alternate definition of last tag specified. -@item C-u - M-. -Go back to previous tag found. -@item C-M-. @var{pattern} @key{RET} -Find a tag whose name matches @var{pattern} (@code{find-tag-regexp}). -@item C-u C-M-. -Find the next tag whose name matches the last pattern used. -@item C-x 4 .@: @var{tag} @key{RET} -Find first definition of @var{tag}, but display it in another window -(@code{find-tag-other-window}). -@item C-x 5 .@: @var{tag} @key{RET} -Find first definition of @var{tag}, and create a new frame to select the -buffer (@code{find-tag-other-frame}). -@item M-* -Pop back to where you previously invoked @kbd{M-.} and friends. -@end table - -@kindex M-. -@findex find-tag - @kbd{M-.}@: (@code{find-tag}) prompts for a tag name and jumps to -its source definition. It works by searching through the tags table -for that tag's file and approximate character position, visiting that -file, and searching for the tag definition at ever-increasing -distances away from the recorded approximate position. - - When entering the tag argument to @kbd{M-.}, the usual minibuffer -completion commands can be used (@pxref{Completion}), with the tag -names in the selected tags table as completion candidates. If you -specify an empty argument, the balanced expression in the buffer -before or around point is the default argument. @xref{Expressions}. - - You don't need to give @kbd{M-.} the full name of the tag; a part -will do. @kbd{M-.} finds tags which contain that argument as a -substring. However, it prefers an exact match to a substring match. -To find other tags that match the same substring, give @code{find-tag} -a numeric argument, as in @kbd{C-u M-.} or @kbd{M-0 M-.}; this does -not read a tag name, but continues searching the tags table's text for -another tag containing the same substring last used. - -@kindex C-x 4 . -@findex find-tag-other-window -@kindex C-x 5 . -@findex find-tag-other-frame - Like most commands that can switch buffers, @code{find-tag} has a -variant that displays the new buffer in another window, and one that -makes a new frame for it. The former is @w{@kbd{C-x 4 .}} -(@code{find-tag-other-window}), and the latter is @w{@kbd{C-x 5 .}} -(@code{find-tag-other-frame}). - - To move back to previous tag definitions, use @kbd{C-u - M-.}; more -generally, @kbd{M-.} with a negative numeric argument. Similarly, -@w{@kbd{C-x 4 .}} with a negative argument finds the previous tag -location in another window. - -@kindex M-* -@findex pop-tag-mark -@vindex find-tag-marker-ring-length - As well as going back to places you've found tags recently, you can -go back to places @emph{from where} you found them, using @kbd{M-*} -(@code{pop-tag-mark}). Thus you can find and examine the definition -of something with @kbd{M-.} and then return to where you were with -@kbd{M-*}. - - Both @kbd{C-u - M-.} and @kbd{M-*} allow you to retrace your steps to -a depth determined by the variable @code{find-tag-marker-ring-length}. - -@findex find-tag-regexp -@kindex C-M-. - The command @kbd{C-M-.} (@code{find-tag-regexp}) visits the tags that -match a specified regular expression. It is just like @kbd{M-.} except -that it does regexp matching instead of substring matching. - -@node Tags Search -@subsection Searching and Replacing with Tags Tables -@cindex search and replace in multiple files -@cindex multiple-file search and replace - - The commands in this section visit and search all the files listed -in the selected tags table, one by one. For these commands, the tags -table serves only to specify a sequence of files to search. These -commands scan the list of tags tables starting with the first tags -table (if any) that describes the current file, proceed from there to -the end of the list, and then scan from the beginning of the list -until they have covered all the tables in the list. - -@table @kbd -@item M-x tags-search @key{RET} @var{regexp} @key{RET} -Search for @var{regexp} through the files in the selected tags -table. -@item M-x tags-query-replace @key{RET} @var{regexp} @key{RET} @var{replacement} @key{RET} -Perform a @code{query-replace-regexp} on each file in the selected tags table. -@item M-, -Restart one of the commands above, from the current location of point -(@code{tags-loop-continue}). -@end table - -@findex tags-search - @kbd{M-x tags-search} reads a regexp using the minibuffer, then -searches for matches in all the files in the selected tags table, one -file at a time. It displays the name of the file being searched so you -can follow its progress. As soon as it finds an occurrence, -@code{tags-search} returns. - -@kindex M-, -@findex tags-loop-continue - Having found one match, you probably want to find all the rest. -Type @kbd{M-,} (@code{tags-loop-continue}) to resume the -@code{tags-search}, finding one more match. This searches the rest of -the current buffer, followed by the remaining files of the tags table. - -@findex tags-query-replace - @kbd{M-x tags-query-replace} performs a single -@code{query-replace-regexp} through all the files in the tags table. It -reads a regexp to search for and a string to replace with, just like -ordinary @kbd{M-x query-replace-regexp}. It searches much like @kbd{M-x -tags-search}, but repeatedly, processing matches according to your -input. @xref{Query Replace}, for more information on query replace. - -@vindex tags-case-fold-search -@cindex case-sensitivity and tags search - You can control the case-sensitivity of tags search commands by -customizing the value of the variable @code{tags-case-fold-search}. The -default is to use the same setting as the value of -@code{case-fold-search} (@pxref{Lax Search}). - - It is possible to get through all the files in the tags table with a -single invocation of @kbd{M-x tags-query-replace}. But often it is -useful to exit temporarily, which you can do with any input event that -has no special query replace meaning. You can resume the query -replace subsequently by typing @kbd{M-,}; this command resumes the -last tags search or replace command that you did. For instance, to -skip the rest of the current file, you can type @kbd{M-> M-,}. - - The commands in this section carry out much broader searches than the -@code{find-tag} family. The @code{find-tag} commands search only for -definitions of tags that match your substring or regexp. The commands -@code{tags-search} and @code{tags-query-replace} find every occurrence -of the regexp, as ordinary search commands and replace commands do in -the current buffer. - - These commands create buffers only temporarily for the files that they -have to search (those which are not already visited in Emacs buffers). -Buffers in which no match is found are quickly killed; the others -continue to exist. - - As an alternative to @code{tags-search}, you can run @command{grep} -as a subprocess and have Emacs show you the matching lines one by one. -@xref{Grep Searching}. - -@node List Tags -@subsection Tags Table Inquiries - -@table @kbd -@item C-M-i -@itemx M-@key{TAB} -Perform completion on the text around point, using the selected tags -table if one is loaded (@code{completion-at-point}). -@item M-x list-tags @key{RET} @var{file} @key{RET} -Display a list of the tags defined in the program file @var{file}. -@item M-x tags-apropos @key{RET} @var{regexp} @key{RET} -Display a list of all tags matching @var{regexp}. -@end table - -@cindex completion (symbol names) - In most programming language modes, you can type @kbd{C-M-i} or -@kbd{M-@key{TAB}} (@code{completion-at-point}) to complete the symbol -at point. If there is a selected tags table, this command can use it -to generate completion candidates. @xref{Symbol Completion}. - -@findex list-tags - @kbd{M-x list-tags} reads the name of one of the files covered by -the selected tags table, and displays a list of tags defined in that -file. Do not include a directory as part of the file name unless the -file name recorded in the tags table includes a directory. - -@findex tags-apropos -@vindex tags-apropos-verbose -@vindex tags-tag-face -@vindex tags-apropos-additional-actions - @kbd{M-x tags-apropos} is like @code{apropos} for tags -(@pxref{Apropos}). It displays a list of tags in the selected tags -table whose entries match @var{regexp}. If the variable -@code{tags-apropos-verbose} is non-@code{nil}, it displays the names -of the tags files together with the tag names. You can customize the -appearance of the output by setting the variable @code{tags-tag-face} -to a face. You can display additional output by customizing the -variable @code{tags-apropos-additional-actions}; see its documentation -for details. - -@findex next-file - @kbd{M-x next-file} visits files covered by the selected tags table. -The first time it is called, it visits the first file covered by the -table. Each subsequent call visits the next covered file, unless a -prefix argument is supplied, in which case it returns to the first -file. - @node EDE @section Emacs Development Environment @cindex EDE (Emacs Development Environment) diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 97c74a9..e4bd85c 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -271,7 +271,7 @@ bindings for that purpose. The Imenu facility offers a way to find the major definitions in a file by name. It is also useful in text formatter major modes, where it treats each chapter, section, etc., as a definition. -(@xref{Tags}, for a more powerful feature that handles multiple files +(@xref{Xref}, for a more powerful feature that handles multiple files together.) @findex imenu @@ -1358,7 +1358,7 @@ the @kbd{M-@key{TAB}} key is usually reserved by the window manager for switching graphical windows, so you should type @kbd{C-M-i} or @kbd{@key{ESC} @key{TAB}} instead. -@cindex tags-based completion +@cindex xref-based completion @findex completion-at-point @cindex Lisp symbol completion @cindex completion (Lisp symbols) @@ -1368,7 +1368,7 @@ which generates its completion list in a flexible way. If Semantic mode is enabled, it tries to use the Semantic parser data for completion (@pxref{Semantic}). If Semantic mode is not enabled or fails at performing completion, it tries to complete using the -selected tags table (@pxref{Tags}). If in Emacs Lisp mode, it +available @code{xref} backend (@pxref{Xref}). If in Emacs Lisp mode, it performs completion using the function, variable, or property names defined in the current Emacs session. diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index cc516ec..bef74e3 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -12,10 +12,10 @@ a string. Emacs also has commands to replace occurrences of a string with a different string. There are also commands that do the same thing, but search for patterns instead of fixed strings. - You can also search multiple files under the control of a tags table -(@pxref{Tags Search}) or through the Dired @kbd{A} command -(@pxref{Operating on Files}), or ask the @code{grep} program to do it -(@pxref{Grep Searching}). + You can also search multiple files under the control of an +@code{xref} backend (@pxref{Identifier Search}) or through the Dired +@kbd{A} command (@pxref{Operating on Files}), or ask the @code{grep} +program to do it (@pxref{Grep Searching}). @menu * Incremental Search:: Search happens as you type the string. diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index cd7d08d..f99234b 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -231,8 +231,9 @@ Mail}), but in another window (@code{compose-mail-other-window}). @findex find-tag-other-window @item C-x 4 . -Find a tag in the current tags table, similar to @kbd{M-.} -(@pxref{Tags}), but in another window (@code{find-tag-other-window}). +Find the definition of an identifier, similar to @kbd{M-.} +(@pxref{Xref}), but in another window +(@code{xref-find-definitions-other-window}). @item C-x 4 r @var{filename} @key{RET} Visit file @var{filename} read-only, and select its buffer in another window (@code{find-file-read-only-other-window}). @xref{Visiting}. diff --git a/etc/NEWS b/etc/NEWS index 0b45087..407d13b 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -938,6 +938,7 @@ New options `tildify-space-string', `tildify-pattern', and `tildify-ignored-environments-alist' variables (as well as a few helper functions) obsolete. ++++ ** New package Xref replaces Etags's front-end and UI The new package Xref provides a generic framework and new commands to @@ -960,7 +961,7 @@ As a result of this, the following commands are now obsolete: `find-tag-other-window', `find-tag-other-frame', `find-tag-regexp', `tags-apropos', and `tags-loop-continue'. -The framework's API is still experimental and can change in major, +The framework's Lisp API is still experimental and can change in major, backward-incompatible ways. ** New package Project commit b131fb85580f3379d028bbb60dddd138dcbe3c98 Author: Stefan Monnier Date: Sat Jan 9 12:50:10 2016 -0500 * loading.texi: Add `define-type' entry for load-history * doc/lispref/loading.texi (Where Defined): Remove incorrect cl-defmethod description, and add missing define-type entry. diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 2893a6d..cb5c701 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -968,11 +968,8 @@ The feature @var{feature} was provided. @item (cl-defmethod @var{method} @var{specializers}) The named @var{method} was defined by using @code{cl-defmethod}, with @var{specializers} as its specializers. -@item (cl-defmethod @var{gfun} t @dots{}) -A generic function @var{gfun} was defined by using -@code{cl-defgeneric}. The number of @code{t} members of the list -following @var{gfun} reflects the number of the generic arguments in -the @var{args} form of the corresponding @code{cl-defgeneric} call. +@item (define-type . @var{type}) +The type @var{type} was defined. @end table The value of @code{load-history} may have one element whose @sc{car} is commit db3c2a8daaa2a3b887e1b0c5b0aba6f7c0eed752 Author: Eli Zaretskii Date: Sat Jan 9 19:06:52 2016 +0200 Improve doc strings and prompts in xref.el * lisp/progmodes/xref.el (xref-backend-functions) (xref-find-definitions): Doc fixes. (xref-query-replace): Doc fix. Improve prompts for arguments. diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 5970011..fe39122 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -208,7 +208,7 @@ LENGTH is the match length, in characters." (defvar xref-backend-functions nil "Special hook to find the xref backend for the current context. -Each functions on this hook is called in turn with no arguments +Each function on this hook is called in turn with no arguments, and should return either nil to mean that it is not applicable, or an xref backend, which is a value to be used to dispatch the generic functions.") @@ -502,10 +502,14 @@ WINDOW controls how the buffer is displayed: (xref--pop-to-location xref window))) (defun xref-query-replace (from to) - "Perform interactive replacement in all current matches." + "Perform interactive replacement of FROM with TO in all displayed xrefs. + +This command interactively replaces FROM with TO in the names of the +references displayed in the current *xref* buffer." (interactive - (list (read-regexp "Query replace regexp in matches" ".*") - (read-regexp "Replace with: "))) + (let ((fr (read-regexp "Xref query-replace (regexp)" ".*"))) + (list fr + (read-regexp (format "Xref query-replace (regexp) %s with: " fr))))) (let (pairs item) (unwind-protect (progn @@ -762,12 +766,10 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)." With prefix argument or when there's no identifier at point, prompt for it. -If the backend has sufficient information to determine a unique -definition for IDENTIFIER, it returns only that definition. If -there are multiple possible definitions, it returns all of them. - -If the backend returns one definition, jump to it; otherwise, -display the list in a buffer." +If sufficient information is available to determine a unique +definition for IDENTIFIER, display it in the selected window. +Otherwise, display the list of the possible definitions in a +buffer where the user can select from the list." (interactive (list (xref--read-identifier "Find definitions of: "))) (xref--find-definitions identifier nil)) commit f6117ef754d9b02433dadaf61e72df0d7391e40a Author: Alan Mackenzie Date: Sat Jan 9 15:18:29 2016 +0000 Allow the use of `font-lock-extend-region-multiline' in CC Mode. * lisp/progmodes/cc-mode.el (c-font-lock-init): Remove `font-lock-extend-regions-wholelines' from `font-lock-extend-region-functions' rather than setting the latter to nil. diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 6440659..738870b 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1336,12 +1336,13 @@ This function is called from `c-common-init', once per mode initialization." . c-mark-function))) ;; Prevent `font-lock-default-fontify-region' extending the region it will - ;; fontify to whole lines by removing `font-lock-extend-region-whole-lines' - ;; (and, coincidentally, `font-lock-extend-region-multiline' (which we do - ;; not need)) from `font-lock-extend-region-functions'. (Emacs only). This - ;; fixes Emacs bug #19669. + ;; fontify to whole lines by removing `font-lock-extend-region-wholelines' + ;; from `font-lock-extend-region-functions'. (Emacs only). This fixes + ;; Emacs bug #19669. (when (boundp 'font-lock-extend-region-functions) - (setq font-lock-extend-region-functions nil)) + (setq font-lock-extend-region-functions + (delq 'font-lock-extend-region-wholelines + font-lock-extend-region-functions))) (make-local-variable 'font-lock-fontify-region-function) (setq font-lock-fontify-region-function 'c-font-lock-fontify-region) commit 90fd798aacbf92a330cf43d2670479499daf3fb1 Author: Michael Albinus Date: Sat Jan 9 13:55:02 2016 +0100 Fix coding system for Tramp on OS X. * lisp/net/tramp-compat.el: Require ucs-normalize. * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell): Set coding system to `utf-8-hfs' for Mac OS X. * test/automated/tramp-tests.el (tramp-test29-vc-registered): Flush directory properties when needed. (tramp--test-utf8): Include Chinese file name, again. diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index c6de183..44923ae 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -56,6 +56,8 @@ (require 'custom) (require 'format-spec) (require 'shell) + ;; Introduced in Emacs 23.2. + (require 'ucs-normalize nil 'noerror) (require 'trampver) (require 'tramp-loaddefs) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ca0707f..1357db0 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4214,10 +4214,8 @@ process to set up. VEC specifies the connection." (cons 'undecided 'undecided))) cs-decode cs-encode) (when (symbolp cs) (setq cs (cons cs cs))) - (setq cs-decode (car cs)) - (setq cs-encode (cdr cs)) - (unless cs-decode (setq cs-decode 'undecided)) - (unless cs-encode (setq cs-encode 'undecided)) + (setq cs-decode (or (car cs) 'undecided) + cs-encode (or (cdr cs) 'undecided)) (setq cs-encode (tramp-compat-coding-system-change-eol-conversion cs-encode @@ -4229,7 +4227,13 @@ process to set up. VEC specifies the connection." (when (search-forward "\r" nil t) (setq cs-decode (tramp-compat-coding-system-change-eol-conversion cs-decode 'dos))) - (tramp-compat-funcall + ;; Special setting for Mac OS X. + (when (and (string-match + "^Darwin" (tramp-get-connection-property vec "uname" "")) + (memq 'utf-8-hfs (coding-system-list))) + (setq cs-decode 'utf-8-hfs + cs-encode 'utf-8-hfs)) + (tramp-compat-funcall 'set-buffer-process-coding-system cs-decode cs-encode) (tramp-message vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)) diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 73a7294..c956f9c 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1658,6 +1658,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (vc-register nil (list (car vc-handled-backends) (list (file-name-nondirectory tmp-name2)))))) + ;; vc-git uses an own process sentinel, Tramp's sentinel + ;; for flushing the cache isn't used. + (with-parsed-tramp-file-name tmp-name1 nil + (tramp-flush-directory-property v localname)) (should (vc-registered (file-name-nondirectory tmp-name2))))) ;; Cleanup. @@ -2044,8 +2048,7 @@ Use the `ls' command." (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ") (unless (or (tramp--test-hpux-p) (tramp--test-darwin-p)) "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت") - (unless (tramp--test-darwin-p) - "银河系漫游指南系列") + "银河系漫游指南系列" "Автостопом по гала́ктике"))) (ert-deftest tramp-test32-utf8 () commit e985a0e9eed9542716c4c03e0e9a1a973de97a7a Author: Eli Zaretskii Date: Sat Jan 9 12:09:13 2016 +0200 ; * etc/NEWS: Mark the 'check-expensive' entry not to be documented. diff --git a/etc/NEWS b/etc/NEWS index 6cac809..0b45087 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -96,6 +96,7 @@ so if you want to use it, you can always take a copy from an older Emacs. Various resolutions are available as etc/images/icons/hicolor/*/apps/emacs.png. The old Emacs logo icons are available as `emacs23.png' in the same location. +--- ** New make target `check-expensive' to run additional tests. This includes all tests which run via "make check", plus additional tests which take more time to perform. commit 9dfcbf0262305eb3dfd394fb67891ef2c05fcd7f Author: Eli Zaretskii Date: Sat Jan 9 10:55:35 2016 +0200 Update 'load-history' docs * doc/lispref/loading.texi (Where Defined): Update the list of forms in 'load-history' by adding the forms created for the 'cl-generic' generics. (Bug#21422) diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 0a01162..2893a6d 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -965,6 +965,14 @@ The face @var{face} was defined. The feature @var{feature} was required. @item (provide . @var{feature}) The feature @var{feature} was provided. +@item (cl-defmethod @var{method} @var{specializers}) +The named @var{method} was defined by using @code{cl-defmethod}, with +@var{specializers} as its specializers. +@item (cl-defmethod @var{gfun} t @dots{}) +A generic function @var{gfun} was defined by using +@code{cl-defgeneric}. The number of @code{t} members of the list +following @var{gfun} reflects the number of the generic arguments in +the @var{args} form of the corresponding @code{cl-defgeneric} call. @end table The value of @code{load-history} may have one element whose @sc{car} is commit 207e191f1b8042afe16f6c61440dacc79c7782b5 Author: Paul Eggert Date: Fri Jan 8 14:53:10 2016 -0800 Fix (error ...) error Problem reported by Glenn Morris in: http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00561.html * lisp/vc/add-log.el (change-log-goto-source): Fix typos introduced in my Aug 28 change, where I got confused by the two meanings of (error ...). diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index a5fe956..45e8633 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -481,9 +481,10 @@ try to visit the file for the change under `point' instead." (apply 'change-log-goto-source-1 (append change-log-find-head change-log-find-tail)) (error - "Cannot find more matches for tag `%s' in file `%s'" - (car change-log-find-head) - (nth 2 change-log-find-head)))) + (format-message + "Cannot find more matches for tag `%s' in file `%s'" + (car change-log-find-head) + (nth 2 change-log-find-head))))) (save-excursion (let* ((at (point)) (tag-at (change-log-search-tag-name)) @@ -515,8 +516,9 @@ try to visit the file for the change under `point' instead." (condition-case nil (setq change-log-find-tail (apply 'change-log-goto-source-1 change-log-find-head)) - (error "Cannot find matches for tag `%s' in file `%s'" - tag file)))))))) + (error + (format-message "Cannot find matches for tag `%s' in file `%s'" + tag file))))))))) (defun change-log-next-error (&optional argp reset) "Move to the Nth (default 1) next match in a ChangeLog buffer. commit 457738ffba806a638ca3597741ecd103241790be Author: Alan Mackenzie Date: Fri Jan 8 22:42:47 2016 +0000 Correctly analyze brace arguments in templated C++ function declarations. * lisp/progmodes/cc-defs.el (c-go-list-forward, c-go-list-backward): add POS and LIMIT parameters, like the other c-go-list-* functions have. * lisp/progmodes/cc-engine.el (c-restore-<>-properties): Check backwards for a ?\( rather than a ?<. (c-looking-at-inexpr-block): Handle names followed by template specifiers. diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 77e949c..000995c 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -654,23 +654,35 @@ right side of it." ;; Wrappers for common scan-lists cases, mainly because it's almost ;; impossible to get a feel for how that function works. -(defmacro c-go-list-forward () - "Move backward across one balanced group of parentheses. - -Return POINT when we succeed, NIL when we fail. In the latter case, leave -point unmoved." - `(c-safe (let ((endpos (scan-lists (point) 1 0))) - (goto-char endpos) - endpos))) - -(defmacro c-go-list-backward () - "Move backward across one balanced group of parentheses. - -Return POINT when we succeed, NIL when we fail. In the latter case, leave -point unmoved." - `(c-safe (let ((endpos (scan-lists (point) -1 0))) - (goto-char endpos) - endpos))) +(defmacro c-go-list-forward (&optional pos limit) + "Move forward across one balanced group of parentheses starting at POS or +point. Return POINT when we succeed, NIL when we fail. In the latter case, +leave point unmoved. + +A LIMIT for the search may be given. The start position is assumed to be +before it." + (let ((res `(c-safe (goto-char (scan-lists ,(or pos `(point)) 1 0)) (point)))) + (if limit + `(save-restriction + (if ,limit + (narrow-to-region (point-min) ,limit)) + ,res) + res))) + +(defmacro c-go-list-backward (&optional pos limit) + "Move backward across one balanced group of parentheses starting at POS or +point. Return POINT when we succeed, NIL when we fail. In the latter case, +leave point unmoved. + +A LIMIT for the search may be given. The start position is assumed to be +after it." + (let ((res `(c-safe (goto-char (scan-lists ,(or pos `(point)) -1 0)) (point)))) + (if limit + `(save-restriction + (if ,limit + (narrow-to-region ,limit (point-max))) + ,res) + res))) (defmacro c-up-list-forward (&optional pos limit) "Return the first position after the list sexp containing POS, diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 3301d41..98699df 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -5688,8 +5688,8 @@ comment at the start of cc-engine.el for more info." (c-backward-token-2) (setq c-restricted-<>-arglists (and (not (looking-at c-opt-<>-sexp-key)) - (progn (c-backward-syntactic-ws) ; to < or , - (and (memq (char-before) '(?< ?,)) + (progn (c-backward-syntactic-ws) ; to ( or , + (and (memq (char-before) '(?\( ?,)) ; what about -arglist nil) @@ -9106,6 +9106,11 @@ comment at the start of cc-engine.el for more info." (goto-char containing-sexp) (if (or (save-excursion (c-backward-syntactic-ws lim) + (while (and (eq (char-before) ?>) + (c-get-char-property (1- (point)) + 'syntax-table) + (c-go-list-backward nil lim)) + (c-backward-syntactic-ws lim)) (and (> (point) (or lim (point-min))) (c-on-identifier))) (and c-special-brace-lists commit d57724a879ce60f0567bf323b884f917f4e94937 Author: Glenn Morris Date: Fri Jan 8 16:31:56 2016 -0500 * lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare. diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index c2b7cf5..30320b0 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -633,6 +633,9 @@ SYMBOL is a function that can be overridden." ;; LIST ALL LOADED OVERRIDES FOR SYMBOL HERE ))) +;; We are called from describe-function in help-fns.el, where this is defined. +(defvar describe-function-orig-buffer) + (defun describe-mode-local-overload (symbol) "For `help-fns-describe-function-functions'; add overloads for SYMBOL." (when (get symbol 'mode-local-overload) commit 2a9532d592757dd24e8ac1b4c52d268d0e316464 Author: Glenn Morris Date: Fri Jan 8 16:28:09 2016 -0500 * lisp/ffap.el (ffap-latex-mode): Avoid free variable. diff --git a/lisp/ffap.el b/lisp/ffap.el index 543b3b2..36727b3 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -974,14 +974,14 @@ out of NAME." (push (cons "" (cdr (assoc (match-string 0) ; i.e. "(TeX-current-macro)" preferred-suffix-rules))) guess-rules)) - (setq kpsewhich-args (mapcar (lambda (rule) - (concat (car rule) name (cdr rule))) - guess-rules)) (with-temp-buffer (let ((process-environment (buffer-local-value 'process-environment curbuf)) (exec-path (buffer-local-value 'exec-path curbuf))) - (apply #'call-process "kpsewhich" nil t nil kpsewhich-args)) + (apply #'call-process "kpsewhich" nil t nil + (mapcar (lambda (rule) + (concat (car rule) name (cdr rule))) + guess-rules))) (when (< (point-min) (point-max)) (buffer-substring (goto-char (point-min)) (point-at-eol)))))))) commit 1a6b0846b5fbf08aa4288ae9e47c59cfca30459f Author: Mark Oteiza Date: Fri Jan 8 12:19:09 2016 -0500 * lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`. diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index 941f98e..8ed0bb3 100644 --- a/lisp/play/dunnet.el +++ b/lisp/play/dunnet.el @@ -1203,7 +1203,7 @@ for a moment, then straighten yourself up. (interactive) (forward-line (- 0 (- (window-height) 2 ))) (set-window-start (selected-window) (point)) - (end-of-buffer)) + (goto-char (point-max))) ;;; Insert something into the buffer, followed by newline. commit 8be046f453b3f74eaf41154f28b85d45d2cc3844 Author: Alan Mackenzie Date: Fri Jan 8 14:41:58 2016 +0000 Respect fontification region calculated by major mode. Fixes bug #22316. * lisp/font-lock.el (font-lock-extend-jit-lock-region-after-change): when a fontification region has been calculated by a function on font-lock-extend-after-change-region-function use this region rather than changing the end position to somewhere else. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 4a92069..3c1f01d 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1302,15 +1302,18 @@ This function does 2 things: (point-min)))) (when (< end (point-max)) (setq end - (if (get-text-property end 'font-lock-multiline) - (or (text-property-any end (point-max) - 'font-lock-multiline nil) - (point-max)) + (cond + ((get-text-property end 'font-lock-multiline) + (or (text-property-any end (point-max) + 'font-lock-multiline nil) + (point-max))) + ;; If `end' has been set by the function above, don't corrupt it. + (font-lock-extend-after-change-region-function end) ;; Rounding up to a whole number of lines should include the ;; line right after `end'. Typical case: the first char of ;; the line was deleted. Or a \n was inserted in the middle ;; of a line. - (1+ end)))) + (t (1+ end))))) ;; Finally, pre-enlarge the region to a whole number of lines, to try ;; and anticipate what font-lock-default-fontify-region will do, so as to ;; avoid double-redisplay. commit 4b37cba3d55abf6788768c6017019d1039aa6c2e Author: Eli Zaretskii Date: Fri Jan 8 14:06:13 2016 +0200 Improve documentation of Delete Selection mode * lisp/delsel.el (delete-selection-mode) (delete-selection-helper): Update and expand the doc strings. (Bug#22296) * doc/emacs/mark.texi (Using Region): Document the behavior of delete commands in Delete Selection mode. (Bug#22296) * doc/lispref/markers.texi (The Mark): Document how to add the support for Delete Selection mode to Lisp programs. (Bug#22296) diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 28b4e3d..98980d5 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -288,7 +288,9 @@ instead signal an error if the mark is inactive. active---for example, typing @kbd{a} inserts the character @samp{a}, then deactivates the mark. If you enable Delete Selection mode, a minor mode, then inserting text while the mark is active causes the -text in the region to be deleted first. To toggle Delete Selection +text in the region to be deleted first. Also, commands that normally +delete just one character, such as @kbd{C-d} or @kbd{@key{DEL}}, will +delete the entire region instead. To toggle Delete Selection mode on or off, type @kbd{M-x delete-selection-mode}. @node Mark Ring diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index d440855..bf18543 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -659,6 +659,24 @@ more marks than this are pushed onto the @code{mark-ring}, @c There is also global-mark-ring-max, but this chapter explicitly @c does not talk about the global mark. +@cindex @code{delete-selection}, symbol property +@findex delete-selection-helper +@findex delete-selection-pre-hook +When Delete Selection mode (@pxref{Using Region, Delete Selection, , +emacs, The GNU Emacs Manual}) is enabled, commands that operate on the +active region (a.k.a.@: ``selection'') behave slightly differently. +This works by adding the function @code{delete-selection-pre-hook} to +the @code{pre-command-hook} (@pxref{Command Overview}). That function +calls @code{delete-selection-helper} to delete the selection as +appropriate for the command. If you want to adapt a command to Delete +Selection mode, put the @code{delete-selection} property on the +function's symbol (@pxref{Symbol Plists}); commands that don't have +this property on their symbol won't delete the selection. This +property can have one of several values to tailor the behavior to what +the command is supposed to do; see the doc strings of +@code{delete-selection-pre-hook} and @code{delete-selection-helper} +for the details. + @node The Region @section The Region @c The index entry must be just "region" to make it the first hit diff --git a/lisp/delsel.el b/lisp/delsel.el index 46eea97..6a819eb 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -37,16 +37,26 @@ ;; the values: ;; `yank' ;; For commands which do a yank; ensures the region about to be -;; deleted isn't yanked. +;; deleted isn't immediately yanked back, which would make the +;; command a no-op. ;; `supersede' ;; Delete the active region and ignore the current command, -;; i.e. the command will just delete the region. +;; i.e. the command will just delete the region. This is for +;; commands that normally delete small amounts of text, like +;; a single character -- they will instead delete the whole +;; active region. +;; `kill' +;; `kill-region' is used on the selection, rather than +;; `delete-region'. (Text selected with the mouse will typically +;; be yankable anyhow.) ;; t ;; The normal case: delete the active region prior to executing ;; the command which will insert replacement text. -;; +;; FUNCTION ;; For commands which need to dynamically determine this behavior. -;; The function should return one of the above values or nil. +;; FUNCTION should take no argument and return one of the above +;; values, or nil. In the latter case, FUNCTION should itself +;; do with the active region whatever is appropriate." ;;; Code: @@ -66,7 +76,11 @@ enable the mode if ARG is omitted or nil. When Delete Selection mode is enabled, typed text replaces the selection if the selection is active. Otherwise, typed text is just inserted at -point regardless of any selection." +point regardless of any selection. Also, commands that normally delete +just one character will delete the entire selection instead. + +See `delete-selection-helper' and `delete-selection-pre-hook' for +information on adapting behavior of commands in Delete Selection mode." :global t :group 'editing-basics (if (not delete-selection-mode) (remove-hook 'pre-command-hook 'delete-selection-pre-hook) @@ -147,10 +161,14 @@ With ARG, repeat that many times. `C-u' means until end of buffer." "Delete selection according to TYPE: `yank' For commands which do a yank; ensures the region about to be - deleted isn't yanked. + deleted isn't immediately yanked back, which would make the + command a no-op. `supersede' Delete the active region and ignore the current command, - i.e. the command will just delete the region. + i.e. the command will just delete the region. This is for + commands that normally delete small amounts of text, like + a single character -- they will instead delete the whole + active region. `kill' `kill-region' is used on the selection, rather than `delete-region'. (Text selected with the mouse will typically @@ -160,7 +178,9 @@ With ARG, repeat that many times. `C-u' means until end of buffer." the command which will insert replacement text. FUNCTION For commands which need to dynamically determine this behavior. - FUNCTION should take no argument and return one of the above values or nil." + FUNCTION should take no argument and return one of the above + values, or nil. In the latter case, FUNCTION should itself + do with the active region whatever is appropriate." (condition-case data (cond ((eq type 'kill) ;Deprecated, backward compatibility. (delete-active-region t) commit a034dd384c995f09ecf4ec145cfc614a217b4e4e Author: Dmitry Gutov Date: Fri Jan 8 14:32:27 2016 +0300 Fix two project-find-file issues * lisp/progmodes/project.el (project--value-in-dir): Temporarily set enable-local-variables to :all. (project-find-file, project-or-external-find-file): All autoloads. (project--find-file-in): Require xref. diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index cfe7fc3..5070bb0 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -258,7 +258,8 @@ DIRS must contain directory names." (defun project--value-in-dir (var dir) (with-temp-buffer (setq default-directory dir) - (hack-dir-local-variables-non-file-buffer) + (let ((enable-local-variables :all)) + (hack-dir-local-variables-non-file-buffer)) (symbol-value var))) (declare-function grep-read-files "grep") @@ -310,12 +311,14 @@ pattern to search for." (user-error "No matches for: %s" regexp)) (xref--show-xrefs xrefs nil))) +;;;###autoload (defun project-find-file () (interactive) (let* ((pr (project-current t)) (dirs (project-roots pr))) (project--find-file-in dirs pr))) +;;;###autoload (defun project-or-external-find-file () (interactive) (let* ((pr (project-current t)) @@ -326,6 +329,7 @@ pattern to search for." ;; FIXME: Uniquely abbreviate the roots? (defun project--find-file-in (dirs project) + (require 'xref) (let* ((all-files (cl-mapcan (lambda (dir) commit 30abf295e8add1afa3963de7bf4bae9aa2c71434 Author: Eli Zaretskii Date: Fri Jan 8 12:40:14 2016 +0200 Clarify doc string of 'dired-current-directory' * lisp/dired.el (dired-current-directory): Doc fix: clarify that the return value might not end in a slash when called with the optional argument non-nil. (Bug#6273) diff --git a/lisp/dired.el b/lisp/dired.el index 5b5b6f0..e023da2 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2806,7 +2806,9 @@ It runs the hook `dired-initial-position-hook'." (defun dired-current-directory (&optional localp) "Return the name of the subdirectory to which this line belongs. This returns a string with trailing slash, like `default-directory'. -Optional argument means return a file name relative to `default-directory'." +Optional argument means return a file name relative to `default-directory', +in which case the value could be an empty string if `default-directory' +is the directory where the file on this line resides." (let ((here (point)) (alist (or dired-subdir-alist ;; probably because called in a non-dired buffer commit e990bb270e574eb6d329056e28be9340d9a042ef Author: Eli Zaretskii Date: Fri Jan 8 12:12:53 2016 +0200 Use the face of preceding text for displaying the ellipsis * src/xdisp.c (setup_for_ellipsis): Use the face of the preceding text in it->saved_face_id for displaying the ellipsis, and ignore the face, if any, of the invisible text. (Bug#22320) diff --git a/src/xdisp.c b/src/xdisp.c index 87a92fc..d730a0b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4583,14 +4583,15 @@ setup_for_ellipsis (struct it *it, int len) it->current.dpvec_index = 0; it->dpvec_face_id = -1; - /* Reset the current face ID to default if the last visible - character and the first invisible character have different faces. - IT->saved_face_id was set in handle_stop to the face of the - preceding character, and will be different from IT->face_id only - if the invisible text skipped in handle_invisible_prop has some - non-default face. IT's face is restored in set_iterator_to_next. */ - if (it->saved_face_id < 0 || it->saved_face_id != it->face_id) - it->saved_face_id = it->face_id = DEFAULT_FACE_ID; + /* Use IT->saved_face_id for the ellipsis, so that it has the same + face as the preceding text. IT->saved_face_id was set in + handle_stop to the face of the preceding character, and will be + different from IT->face_id only if the invisible text skipped in + handle_invisible_prop has some non-default face on its first + character. We thus ignore the face of the invisible text when we + display the ellipsis. IT's face is restored in set_iterator_to_next. */ + if (it->saved_face_id >= 0) + it->face_id = it->saved_face_id; /* If the ellipsis represents buffer text, it means we advanced in the buffer, so we should no longer ignore overlay strings. */ commit 5810ac3a105a13224b84c848ccf5fd2ac9bbb712 Author: Michael Albinus Date: Fri Jan 8 10:09:37 2016 +0100 Suppress Chinese file name test for OSX in tramp-tests.el * test/automated/tramp-tests.el (tramp--test-utf8): Remove instrumentation. Suppress Chinese file name test for OSX. diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index b664204..73a7294 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -2037,7 +2037,6 @@ Use the `ls' command." (defun tramp--test-utf8 () "Perform the test in `tramp-test32-utf8*'." - (tramp--instrument-test-case 10 (let ((coding-system-for-read 'utf-8) (coding-system-for-write 'utf-8) (file-name-coding-system 'utf-8)) @@ -2045,8 +2044,9 @@ Use the `ls' command." (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ") (unless (or (tramp--test-hpux-p) (tramp--test-darwin-p)) "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت") - "银河系漫游指南系列" - "Автостопом по гала́ктике")))) + (unless (tramp--test-darwin-p) + "银河系漫游指南系列") + "Автостопом по гала́ктике"))) (ert-deftest tramp-test32-utf8 () "Check UTF8 encoding in file names and file contents." commit eeb710a1bb4375ad334af4981cb691f6efdaf0a0 Author: Glenn Morris Date: Thu Jan 7 20:37:17 2016 -0500 ; * lisp/startup.el: Sentences end with two spaces. diff --git a/lisp/startup.el b/lisp/startup.el index 97a6a0b..15a79f6 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -77,7 +77,7 @@ once you are familiar with the contents of the startup screen." (defvar startup-screen-inhibit-startup-screen nil) ;; The mechanism used to ensure that only end users can disable this -;; message is not complex. Clearly, it is possible for a determined +;; message is not complex. Clearly, it is possible for a determined ;; system administrator to inhibit this message anyway, but at least ;; they will do so with knowledge of why the Emacs developers think ;; this is a bad idea. @@ -86,7 +86,7 @@ once you are familiar with the contents of the startup screen." The startup message is in the echo area as it provides information about GNU Emacs and the GNU system in general, which we want all -users to see. As this is the least intrusive startup message, +users to see. As this is the least intrusive startup message, this variable gets specialized treatment to prevent the message from being disabled site-wide by systems administrators, while still allowing individual users to do so. commit 428b3de2bfeaa445ca096a5cfabacda8253e8f0e Author: Glenn Morris Date: Thu Jan 7 20:16:31 2016 -0500 * admin/admin.el (set-version): Also handle the NEWS file. diff --git a/admin/admin.el b/admin/admin.el index 7923f0b..fe807ff 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -96,13 +96,74 @@ Root must be the root of an Emacs source tree." (submatch (1+ (in "0-9.")))))) ;; Major version only. (when (string-match "\\([0-9]\\{2,\\}\\)" version) - (setq version (match-string 1 version)) - (set-version-in-file root "src/msdos.c" version - (rx (and "Vwindow_system_version" (1+ not-newline) - ?\( (submatch (1+ (in "0-9"))) ?\)))) - (set-version-in-file root "etc/refcards/ru-refcard.tex" version - "\\\\newcommand{\\\\versionemacs}\\[0\\]\ -{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")) + (let ((newmajor (match-string 1 version))) + (set-version-in-file root "src/msdos.c" newmajor + (rx (and "Vwindow_system_version" (1+ not-newline) + ?\( (submatch (1+ (in "0-9"))) ?\)))) + (set-version-in-file root "etc/refcards/ru-refcard.tex" newmajor + "\\\\newcommand{\\\\versionemacs}\\[0\\]\ +{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs"))) + (let* ((oldversion + (with-temp-buffer + (insert-file-contents (expand-file-name "README" root)) + (if (re-search-forward "version \\([0-9.]*\\)" nil t) + (version-to-list (match-string 1))))) + (oldmajor (if oldversion (car oldversion))) + (newversion (version-to-list version)) + (newmajor (car newversion)) + (newshort (format "%s.%s" newmajor + (+ (cadr newversion) + (if (eq 2 (length newversion)) 0 1)))) + (majorbump (and oldversion (not (equal oldmajor newmajor)))) + (minorbump (and oldversion (not majorbump) + (not (equal (cadr oldversion) (cadr newversion))))) + (newsfile (expand-file-name "etc/NEWS" root)) + (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) + (when (and majorbump + (not (file-exists-p oldnewsfile))) + (rename-file newsfile oldnewsfile) + (find-file oldnewsfile) ; to prompt you to commit it + (copy-file oldnewsfile newsfile) + (with-temp-buffer + (insert-file-contents newsfile) + (re-search-forward "is about changes in Emacs version \\([0-9]+\\)") + (replace-match (number-to-string newmajor) nil nil nil 1) + (re-search-forward "^See files \\(NEWS\\)") + (replace-match (format "NEWS.%s, NEWS" oldmajor) nil nil nil 1) + (let ((start (line-beginning-position))) + (search-forward "in older Emacs versions") + (or (equal start (line-beginning-position)) + (fill-region start (line-beginning-position 2)))) + (re-search-forward "^ $") + (forward-line -1) + (let ((start (point))) + (goto-char (point-max)) + (re-search-backward "^ $" nil nil 2) + (delete-region start (line-beginning-position 0))) + (write-region nil nil newsfile))) + (when (or majorbump minorbump) + (find-file newsfile) + (goto-char (point-min)) + (if (re-search-forward (format "^\\* .*in Emacs %s" newshort) nil t) + (progn + (kill-buffer) + (message "No need to update etc/NEWS")) + (goto-char (point-min)) + (re-search-forward "^ $") + (forward-line -1) + (dolist (s '("Installation Changes" "Startup Changes" "Changes" + "Editing Changes" + "Changes in Specialized Modes and Packages" + "New Modes and Packages" + "Incompatible Lisp Changes" + "Lisp Changes")) + (insert (format "\n \n* %s in Emacs %s\n" s newshort))) + (insert (format "\n \n* Changes in Emacs %s on \ +Non-Free Operating Systems\n" newshort))) + ;; Because we skip "bump version" commits when merging between branches. + ;; Probably doesn't matter in practice, because NEWS changes + ;; will only happen on master anyway. + (message "Commit any NEWS changes separately"))) (message "Setting version numbers...done")) ;; Note this makes some assumptions about form of short copyright. commit 648de81b0b3be18e317d66c3bc09091038a06e96 Author: Dmitry Gutov Date: Fri Jan 8 02:54:50 2016 +0300 ; Add NEWS entry for project.el diff --git a/etc/NEWS b/etc/NEWS index 2347012..6cac809 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -962,6 +962,14 @@ As a result of this, the following commands are now obsolete: The framework's API is still experimental and can change in major, backward-incompatible ways. +** New package Project + +The new package Project provides generic infrastructure for dealing +with projects. The main commands included in it are +`project-find-file' and `project-find-regexp'. + +Like Xref, the project API is still experimental. + *** New variables `find-tag-marker-ring-length' is now an obsolete alias for diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 2e3222f..cfe7fc3 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -27,6 +27,11 @@ ;; current project, without having to know which package handles ;; detection of that project type, parsing its config files, etc. ;; +;; NOTE: The project API is still experimental and can change in major, +;; backward-incompatible ways. Everyone is encouraged to try it, and +;; report to us any problems or use cases we hadn't anticipated, by +;; sending an email to emacs-devel, or `M-x report-emacs-bug'. +;; ;; Infrastructure: ;; ;; Function `project-current', to determine the current project commit 671862f6b3089c3a503c1b6936a821ad54429359 Author: Dmitry Gutov Date: Fri Jan 8 02:26:55 2016 +0300 apropos-library: Skip obvious duplicates; don't error on generics * lisp/apropos.el (apropos-library): Skip "was an autoload" entries, to avoid obvious duplicates. For each cl-defmethod entry, take just its function symbol (bug#21422). diff --git a/lisp/apropos.el b/lisp/apropos.el index 36a729a..f165685 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -676,6 +676,10 @@ the output includes key-bindings of commands." ;; (autoload (push (cdr x) autoloads)) (`require (push (cdr x) requires)) (`provide (push (cdr x) provides)) + (`t nil) ; Skip "was an autoload" entries. + ;; FIXME: Print information about each indivial method: both + ;; its docstring and specializers (bug#21422). + (`cl-defmethod (push (cadr x) provides)) (_ (push (or (cdr-safe x) x) symbols)))) (let ((apropos-pattern "")) ;Dummy binding for apropos-symbols-internal. (apropos-symbols-internal commit 51668a535e318edb64b52c69126f2e70c3ebcdec Author: Dmitry Gutov Date: Fri Jan 8 00:19:32 2016 +0300 ; Grammar fix diff --git a/lisp/startup.el b/lisp/startup.el index aaa6883..97a6a0b 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -76,7 +76,7 @@ once you are familiar with the contents of the startup screen." (defvar startup-screen-inhibit-startup-screen nil) -;; The mechanism uses to ensure that only end users can disable this +;; The mechanism used to ensure that only end users can disable this ;; message is not complex. Clearly, it is possible for a determined ;; system administrator to inhibit this message anyway, but at least ;; they will do so with knowledge of why the Emacs developers think @@ -84,7 +84,7 @@ once you are familiar with the contents of the startup screen." (defcustom inhibit-startup-echo-area-message nil "Non-nil inhibits the initial startup echo area message. -The startup message in the echo area as it provides information +The startup message is in the echo area as it provides information about GNU Emacs and the GNU system in general, which we want all users to see. As this is the least intrusive startup message, this variable gets specialized treatment to prevent the message commit ed41d117a434abd28df4585663c2311c87160d1c Author: Dmitry Gutov Date: Thu Jan 7 20:14:40 2016 +0300 Add project-find-file and project-or-external-find-file * lisp/minibuffer.el (completion-category-defaults): Add `project-file' category. * lisp/progmodes/project.el (project-find-file) (project-or-external-find-file): New commands. (project--find-file-in): New private function. * lisp/progmodes/xref.el (xref-collect-matches): Use `expand-file-name' on DIR, to expand the tildes. (xref--find-ignores-arguments): Extract from `xref--rgrep-command'. diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 1251a4e..ecac0ae 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -831,7 +831,8 @@ styles for specific categories, such as files, buffers, etc." (defvar completion-category-defaults '((buffer (styles . (basic substring))) - (unicode-name (styles . (basic substring)))) + (unicode-name (styles . (basic substring))) + (project-file (styles . (basic substring)))) "Default settings for specific completion categories. Each entry has the shape (CATEGORY . ALIST) where ALIST is an association list that can specify properties such as: diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index d771587..2e3222f 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -45,10 +45,12 @@ ;;; TODO: -;; * Commands `project-find-file' and `project-or-external-find-file'. -;; Currently blocked on adding a new completion style that would let -;; the user enter just the base file name (or a part of it), and get -;; it expanded to the absolute file name. +;; * Reliably cache the list of files in the project, probably using +;; filenotify.el (if supported) to invalidate. And avoiding caching +;; if it's not available (manual cache invalidation is not nice). +;; +;; * Allow the backend to override the file-listing logic? Maybe also +;; to delegate file name completion to an external tool. ;; ;; * Build tool related functionality. Start with a `project-build' ;; command, which should provide completions on tasks to run, and @@ -258,6 +260,7 @@ DIRS must contain directory names." (declare-function xref-collect-matches "xref") (declare-function xref--show-xrefs "xref") (declare-function xref-backend-identifier-at-point "xref") +(declare-function xref--find-ignores-arguments "xref") ;;;###autoload (defun project-find-regexp (regexp) @@ -302,5 +305,42 @@ pattern to search for." (user-error "No matches for: %s" regexp)) (xref--show-xrefs xrefs nil))) +(defun project-find-file () + (interactive) + (let* ((pr (project-current t)) + (dirs (project-roots pr))) + (project--find-file-in dirs pr))) + +(defun project-or-external-find-file () + (interactive) + (let* ((pr (project-current t)) + (dirs (append + (project-roots pr) + (project-external-roots pr)))) + (project--find-file-in dirs pr))) + +;; FIXME: Uniquely abbreviate the roots? +(defun project--find-file-in (dirs project) + (let* ((all-files + (cl-mapcan + (lambda (dir) + (let ((command + (format "%s %s %s -type f -print0" + find-program + dir + (xref--find-ignores-arguments + (project-ignores project dir) + (expand-file-name dir))))) + (split-string (shell-command-to-string command) "\0" t))) + dirs)) + (table (lambda (string pred action) + (cond + ((eq action 'metadata) + '(metadata . ((category . project-file)))) + (t + (complete-with-action action all-files string pred)))))) + (find-file + (completing-read "Find file: " table nil t)))) + (provide 'project) ;;; project.el ends here diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index ae5ec61..5970011 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -876,7 +876,9 @@ IGNORES is a list of glob patterns." grep-find-template t t)) (grep-highlight-matches nil) (command (xref--rgrep-command (xref--regexp-to-extended regexp) - files dir ignores)) + files + (expand-file-name dir) + ignores)) (orig-buffers (buffer-list)) (buf (get-buffer-create " *xref-grep*")) (grep-re (caar grep-regexp-alist)) @@ -912,23 +914,28 @@ IGNORES is a list of glob patterns." " " (shell-quote-argument ")")) dir - (concat - (shell-quote-argument "(") - " -path " - (mapconcat - (lambda (ignore) - (when (string-match-p "/\\'" ignore) - (setq ignore (concat ignore "*"))) - (if (string-match "\\`\\./" ignore) - (setq ignore (replace-match dir t t ignore)) - (unless (string-prefix-p "*" ignore) - (setq ignore (concat "*/" ignore)))) - (shell-quote-argument ignore)) - ignores - " -o -path ") - " " - (shell-quote-argument ")") - " -prune -o "))) + (xref--find-ignores-arguments ignores dir))) + +(defun xref--find-ignores-arguments (ignores dir) + ;; `shell-quote-argument' quotes the tilde as well. + (cl-assert (not (string-match-p "\\`~" dir))) + (concat + (shell-quote-argument "(") + " -path " + (mapconcat + (lambda (ignore) + (when (string-match-p "/\\'" ignore) + (setq ignore (concat ignore "*"))) + (if (string-match "\\`\\./" ignore) + (setq ignore (replace-match dir t t ignore)) + (unless (string-prefix-p "*" ignore) + (setq ignore (concat "*/" ignore)))) + (shell-quote-argument ignore)) + ignores + " -o -path ") + " " + (shell-quote-argument ")") + " -prune -o ")) (defun xref--regexp-to-extended (str) (replace-regexp-in-string commit 056da45d2c9a82c3ad8f0c2d3e16bb4864aa7838 Author: Eli Zaretskii Date: Thu Jan 7 18:45:42 2016 +0200 ; Improve commentary in 'setup_for_ellipsis' * src/xdisp.c (setup_for_ellipsis): Improve commentary for when we reset the ellipsis face to the default face. diff --git a/src/xdisp.c b/src/xdisp.c index ee748bd..87a92fc 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4583,9 +4583,12 @@ setup_for_ellipsis (struct it *it, int len) it->current.dpvec_index = 0; it->dpvec_face_id = -1; - /* Remember the current face id in case glyphs specify faces. - IT's face is restored in set_iterator_to_next. - saved_face_id was set to preceding char's face in handle_stop. */ + /* Reset the current face ID to default if the last visible + character and the first invisible character have different faces. + IT->saved_face_id was set in handle_stop to the face of the + preceding character, and will be different from IT->face_id only + if the invisible text skipped in handle_invisible_prop has some + non-default face. IT's face is restored in set_iterator_to_next. */ if (it->saved_face_id < 0 || it->saved_face_id != it->face_id) it->saved_face_id = it->face_id = DEFAULT_FACE_ID; commit 269d0088a89806f527180aba6fe23860ae916623 Author: Phillip Lord Date: Thu Jan 7 11:39:03 2016 +0000 ; Improve docstring for `inhibit-startup-echo-area-message' Both the docstring and comments now indicate why this variable has specialised treatment. diff --git a/lisp/startup.el b/lisp/startup.el index 61f6db7..aaa6883 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -76,13 +76,24 @@ once you are familiar with the contents of the startup screen." (defvar startup-screen-inhibit-startup-screen nil) -;; FIXME? Why does this get such weirdly extreme treatment, when the -;; more important inhibit-startup-screen does not. +;; The mechanism uses to ensure that only end users can disable this +;; message is not complex. Clearly, it is possible for a determined +;; system administrator to inhibit this message anyway, but at least +;; they will do so with knowledge of why the Emacs developers think +;; this is a bad idea. (defcustom inhibit-startup-echo-area-message nil "Non-nil inhibits the initial startup echo area message. -Setting this variable takes effect -only if you do it with the customization buffer -or if your init file contains a line of this form: + +The startup message in the echo area as it provides information +about GNU Emacs and the GNU system in general, which we want all +users to see. As this is the least intrusive startup message, +this variable gets specialized treatment to prevent the message +from being disabled site-wide by systems administrators, while +still allowing individual users to do so. + +Setting this variable takes effect only if you do it with the +customization buffer or if your init file contains a line of this +form: (setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\") If your init file is byte-compiled, use the following form instead: commit 07442debd1e037094700d1e5092ad72cdbb7d10d Author: Glenn Morris Date: Wed Jan 6 23:22:04 2016 -0800 ; * etc/NEWS: Backport edit made on wrong branch. diff --git a/etc/NEWS b/etc/NEWS index 1d8a70a..2347012 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1534,57 +1534,56 @@ For consistency with the usual Emacs spelling, the Lisp variable `hfy-optimisations' has been renamed to `hfy-optimizations'. The old name should still work, as an obsolescent alias. - -* Changes in Frames and Windows Code in Emacs 25.1 +** Changes in Frame- and Window- Handling +++ -** Emacs can now draw horizontal scroll bars on some platforms that +*** Emacs can now draw horizontal scroll bars on some platforms that provide toolkit scroll bars, namely Gtk+, Lucid, Motif and Windows. Horizontal scroll bars are turned off by default. -*** New function `horizontal-scroll-bars-available-p' telling whether +**** New function `horizontal-scroll-bars-available-p' telling whether horizontal scroll bars are available on the underlying system. -*** New mode `horizontal-scroll-bar-mode' to toggle horizontal scroll +**** New mode `horizontal-scroll-bar-mode' to toggle horizontal scroll bars on all existing and future frames. -*** New function `toggle-horizontal-scroll-bar' to toggle horizontal +**** New function `toggle-horizontal-scroll-bar' to toggle horizontal scroll bars on the selected frame. -*** New frame parameters `horizontal-scroll-bars' and +**** New frame parameters `horizontal-scroll-bars' and `scroll-bar-height' to set horizontal scroll bars and their height for individual frames and in `default-frame-alist'. -*** New functions `frame-scroll-bar-height' and +**** New functions `frame-scroll-bar-height' and `window-scroll-bar-height' return the height of horizontal scroll bars on a specific frame or window. -*** `set-window-scroll-bars' now accepts five parameters where the last +**** `set-window-scroll-bars' now accepts five parameters where the last two specify height and type of the window's horizontal scroll bar. -*** `window-scroll-bars' now returns type and sizes of horizontal scroll +**** `window-scroll-bars' now returns type and sizes of horizontal scroll bars too. -*** New buffer-local variables `horizontal-scroll-bar' and +**** New buffer-local variables `horizontal-scroll-bar' and `scroll-bar-height'. +++ -** New functions `frame-geometry' and `frame-edges' give access to a +*** New functions `frame-geometry' and `frame-edges' give access to a frame's geometry. +++ -** New functions `mouse-absolute-pixel-position' and +*** New functions `mouse-absolute-pixel-position' and `set-mouse-absolute-pixel-position' get/set screen coordinates of the mouse cursor. +++ -** The function `window-edges' now accepts three additional arguments to +*** The function `window-edges' now accepts three additional arguments to retrieve body, absolute and pixel edges of the window. +++ -** The functions `window-inside-edges', `window-inside-pixel-edges' and +*** The functions `window-inside-edges', `window-inside-pixel-edges' and `window-inside-absolute-pixel-edges' have been renamed to respectively `window-body-edges', `window-body-pixel-edges' and `window-absolute-body-pixel-edges'. The old names are kept as aliases. +++ -** New function `window-absolute-pixel-position' to get the screen +*** New function `window-absolute-pixel-position' to get the screen coordinates of a visible buffer position. +++ -** The height of a frame's menu and tool bar are no longer counted in the +*** The height of a frame's menu and tool bar are no longer counted in the frame's text height. This means that the text height stands only for the height of the frame's root window plus that of the echo area (if present). This was already the behavior for frames with external tool @@ -1592,33 +1591,33 @@ and menu bars (like in the Gtk builds) but has now been extended to all builds. +++ -** Frames now do not necessarily preserve the number of columns or lines +*** Frames now do not necessarily preserve the number of columns or lines they display when setting default font, menu bar, fringe width, or scroll bars. In particular, maximized and fullscreen frames are conceptually never resized if such settings change. For fullheight and fullwidth frames, the behavior may depend on the toolkit used. -*** New option `frame-inhibit-implied-resize' if non-nil, means that +**** New option `frame-inhibit-implied-resize' if non-nil, means that setting default font, menu bar, fringe width, or scroll bars of a specific frame does not resize that frame in order to preserve the number of columns or lines it displays. +++ -** New function `window-preserve-size' allows to preserve the size of +*** New function `window-preserve-size' allows to preserve the size of windows without "fixing" it. It's supported by `fit-window-to-buffer', `temp-buffer-resize-mode' and `display-buffer'. +++ -** New `display-buffer' action function `display-buffer-use-some-frame'. +*** New `display-buffer' action function `display-buffer-use-some-frame'. This displays the buffer in an existing frame other than the current frame, and allows the caller to specify a frame predicate to exclude frames. +++ -** New minor mode `window-divider-mode' and options +*** New minor mode `window-divider-mode' and options `window-divider-default-places', `window-divider-default-bottom-width' and `window-divider-default-right-width'. -** Tearoff menus and detachable toolbars for Gtk+ has been removed. +** Tearoff menus and detachable toolbars for Gtk+ have been removed. Those features have been deprecated in Gtk+ for a long time. ** Etags commit ce4a052415b70030ee591af3cb5bed0fb79ef3aa Author: Leo Liu Date: Thu Jan 7 11:00:52 2016 +0800 Add defvar-local to lisp-imenu-generic-expression * lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add defvar-local. diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 574ecef..cb8abde 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -131,9 +131,10 @@ t)) "\\s-+\\(" lisp-mode-symbol-regexp "\\)")) 2) - ;; For `defvar', we ignore (defvar FOO) constructs. + ;; For `defvar'/`defvar-local', we ignore (defvar FOO) constructs. (list (purecopy "Variables") - (purecopy (concat "^\\s-*(defvar\\s-+\\(" lisp-mode-symbol-regexp "\\)" + (purecopy (concat "^\\s-*(defvar\\(?:-local\\)?\\s-+\\(" + lisp-mode-symbol-regexp "\\)" "[[:space:]\n]+[^)]")) 1) (list (purecopy "Types") commit a0121bc7112f3d6ab76a67ba84cd80301cdc3581 Author: Leo Liu Date: Thu Jan 7 09:48:00 2016 +0800 Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Don't declare (indent 1). diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 5543e92..f29f64f 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -152,12 +152,11 @@ For example, you could write ...BODY CODE...)" (declare (doc-string 2) (debug (&define name string-or-null-p - [&optional [¬ keywordp] sexp - &optional [¬ keywordp] sexp - &optional [¬ keywordp] sexp] - [&rest [keywordp sexp]] - def-body)) - (indent 1)) + [&optional [¬ keywordp] sexp + &optional [¬ keywordp] sexp + &optional [¬ keywordp] sexp] + [&rest [keywordp sexp]] + def-body))) ;; Allow skipping the first three args. (cond commit 76fe2d526e7d4257f8c8855084bf172065aea2d1 Author: Glenn Morris Date: Wed Jan 6 20:36:46 2016 -0500 * lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix. diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index eed7265..e688d6b 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -682,8 +682,9 @@ Return FILE if there was no autoload cookie in it, else nil." (defun autoload-find-destination (file load-name) "Find the destination point of the current buffer's autoloads. FILE is the file name of the current buffer. +LOAD-NAME is the name as it appears in the output. Returns a buffer whose point is placed at the requested location. -Returns nil if the file's autoloads are uptodate, otherwise +Returns nil if the file's autoloads are up-to-date, otherwise removes any prior now out-of-date autoload entries." (catch 'up-to-date (let* ((buf (current-buffer)) commit 1ae088fba76c9021a0d9744e303b7e7a2386a6e6 Author: Glenn Morris Date: Wed Jan 6 19:56:47 2016 -0500 * lisp/emacs-lisp/autoload.el (autoload-find-destination): Avoid specifying the length of a time object (it has not been "2" for some time). diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index f21f8d6..eed7265 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -716,7 +716,7 @@ removes any prior now out-of-date autoload entries." ;; last-time is the time-stamp (specifying ;; the last time we looked at the file) and ;; the file hasn't been changed since. - (and (listp last-time) (= (length last-time) 2) + (and (listp last-time) (not (time-less-p last-time file-time))) ;; last-time is an MD5 checksum instead. (and (stringp last-time) commit b6b47af82f6c7d960388ec46dd8ab371c2e34de4 Author: Andreas Schwab Date: Wed Jan 6 20:50:02 2016 +0100 Properly encode/decode base64Binary data in SOAP * lisp/net/soap-client.el (soap-encode-xs-basic-type): Encode base64Binary value as utf-8. (soap-decode-xs-basic-type): Decode base64Binary value as utf-8. diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index f8cdaa9..7402464 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -538,7 +538,7 @@ This is a specialization of `soap-encode-value' for (base64Binary (unless (stringp value) (error "Not a string value for base64Binary")) - (base64-encode-string value)) + (base64-encode-string (encode-coding-string value 'utf-8))) (otherwise (error "Don't know how to encode %s for type %s" @@ -682,7 +682,7 @@ This is a specialization of `soap-decode-type' for decimal byte float double duration) (string-to-number (car contents))) (boolean (string= (downcase (car contents)) "true")) - (base64Binary (base64-decode-string (car contents))) + (base64Binary (decode-coding-string (base64-decode-string (car contents)) 'utf-8)) (anyType (soap-decode-any-type node)) (Array (soap-decode-array node)))))) commit c63246628461f748d66a8a07ba008de2e00fd33a Author: Eli Zaretskii Date: Wed Jan 6 20:25:45 2016 +0200 Obey coding-system-for-write when writing stdout/stderr in batch * src/print.c (printchar_to_stream): * src/xdisp.c (message_to_stderr): If coding-system-for-write has a non-nil value, use it to encode output in preference to locale-coding-system. See the discussions in http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00048.html for the details. * doc/lispref/os.texi (Terminal Output): Document how to send non-ASCII text via 'send-string-to-terminal'. (Batch Mode): Document how text written to standard streams is encoded. Fix inaccuracy regarding which output streams are used by output functions in batch mode. diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 969c1d6..7206cd4 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -2085,6 +2085,8 @@ than optimal. To fix the problem, set @code{baud-rate}. @defun send-string-to-terminal string &optional terminal This function sends @var{string} to @var{terminal} without alteration. Control characters in @var{string} have terminal-dependent effects. +(If you need to display non-ASCII text on the terminal, encode it +using one of the functions described in @ref{Explicit Encoding}.) This function operates only on text terminals. @var{terminal} may be a terminal object, a frame, or @code{nil} for the selected frame's terminal. In batch mode, @var{string} is sent to @code{stdout} when @@ -2252,13 +2254,21 @@ loads the library named @var{file}, or @samp{-f @var{function}}, which calls @var{function} with no arguments, or @samp{--eval @var{form}}. Any Lisp program output that would normally go to the echo area, -either using @code{message}, or using @code{prin1}, etc., with @code{t} -as the stream, goes instead to Emacs's standard error descriptor when -in batch mode. Similarly, input that would normally come from the -minibuffer is read from the standard input descriptor. -Thus, Emacs behaves much like a noninteractive -application program. (The echo area output that Emacs itself normally -generates, such as command echoing, is suppressed entirely.) +either using @code{message}, or using @code{prin1}, etc., with +@code{t} as the stream, goes instead to Emacs's standard descriptors +when in batch mode: @code{message} writes to the standard error +descriptor, while @code{prin1} and other print functions write to the +standard output. Similarly, input that would normally come from the +minibuffer is read from the standard input descriptor. Thus, Emacs +behaves much like a noninteractive application program. (The echo +area output that Emacs itself normally generates, such as command +echoing, is suppressed entirely.) + +Non-ASCII text written to the standard output or error descriptors is +by default encoded using @code{locale-coding-system} (@pxref{Locales}) +if it is non-@code{nil}; this can be overridden by binding +@code{coding-system-for-write} to a coding system of you choice +(@pxref{Explicit Encoding}). @defvar noninteractive This variable is non-@code{nil} when Emacs is running in batch mode. diff --git a/src/print.c b/src/print.c index 9756750..269d8f2 100644 --- a/src/print.c +++ b/src/print.c @@ -200,6 +200,13 @@ printchar_to_stream (unsigned int ch, FILE *stream) { Lisp_Object dv IF_LINT (= Qnil); ptrdiff_t i = 0, n = 1; + Lisp_Object coding_system = Vlocale_coding_system; + bool encode_p = false; + + if (!NILP (Vcoding_system_for_write)) + coding_system = Vcoding_system_for_write; + if (!NILP (coding_system)) + encode_p = true; if (CHAR_VALID_P (ch) && DISP_TABLE_P (Vstandard_display_table)) { @@ -228,8 +235,11 @@ printchar_to_stream (unsigned int ch, FILE *stream) unsigned char mbstr[MAX_MULTIBYTE_LENGTH]; int len = CHAR_STRING (ch, mbstr); Lisp_Object encoded_ch = - ENCODE_SYSTEM (make_multibyte_string ((char *) mbstr, 1, len)); + make_multibyte_string ((char *) mbstr, 1, len); + if (encode_p) + encoded_ch = code_convert_string_norecord (encoded_ch, + coding_system, true); fwrite (SSDATA (encoded_ch), 1, SBYTES (encoded_ch), stream); #ifdef WINDOWSNT if (print_output_debug_flag && stream == stderr) diff --git a/src/xdisp.c b/src/xdisp.c index b18bfd0..ee748bd 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -10206,7 +10206,16 @@ message_to_stderr (Lisp_Object m) } if (STRINGP (m)) { - Lisp_Object s = ENCODE_SYSTEM (m); + Lisp_Object coding_system = Vlocale_coding_system; + Lisp_Object s; + + if (!NILP (Vcoding_system_for_write)) + coding_system = Vcoding_system_for_write; + if (!NILP (coding_system)) + s = code_convert_string_norecord (m, coding_system, true); + else + s = m; + fwrite (SDATA (s), SBYTES (s), 1, stderr); } if (!cursor_in_echo_area) commit 2f32cb547feb0864eae9345b50a1119decca28c0 Author: Xue Fuqiao Date: Wed Jan 6 17:17:24 2016 +0800 * doc/misc/efaq.texi (Packages that do not come with Emacs): Update the URI of MELPA and marmalade-repo. Reported by CHENG Gao in https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html. diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index bbd9354..5008db3 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -3308,10 +3308,10 @@ available, and then Emacs can automatically download and install the packages that you select. @xref{Packages,,, emacs, The GNU Emacs Manual}. There are other, non-GNU, Emacs Lisp package servers, including: -@uref{http://melpa.milkbox.net, MELPA}; and -@uref{http://marmalade-repo.org, Marmalade}. To use additional -package servers, customize the @code{package-archives} variable. -Be aware that installing a package can run arbitrary code, so only add +@uref{http://melpa.org/, MELPA}; and +@uref{https://marmalade-repo.org/, Marmalade}. To use additional +package servers, customize the @code{package-archives} variable. Be +aware that installing a package can run arbitrary code, so only add sources that you trust. The @uref{https://lists.gnu.org/mailman/listinfo/gnu-emacs-sources, commit d2937aa050b6d860b63d880ab3880547e6255486 Author: Maksim Golubev Date: Tue Jan 5 19:17:55 2016 -0500 * lisp/progmodes/opascal.el (opascal-mode-syntax-table): Fix backslash. (Bug#22224) Copyright-paperwork-exempt: yes diff --git a/lisp/progmodes/opascal.el b/lisp/progmodes/opascal.el index 72c09fe..6a02280 100644 --- a/lisp/progmodes/opascal.el +++ b/lisp/progmodes/opascal.el @@ -257,6 +257,7 @@ routine.") (defvar opascal-mode-syntax-table (let ((st (make-syntax-table))) + (modify-syntax-entry ?\\ "." st) ; bug#22224 ;; Strings. (modify-syntax-entry ?\" "\"" st) (modify-syntax-entry ?\' "\"" st) commit 5330c255b581270dae5a1a1420e9395f92ce2156 Author: Federico Beffa Date: Tue Jan 5 18:59:19 2016 -0500 * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit): Make it actually work. (Bug#22265) Copyright-paperwork-exempt: yes diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el index 6efc0b1..214f381 100644 --- a/lisp/progmodes/xscheme.el +++ b/lisp/progmodes/xscheme.el @@ -1174,9 +1174,10 @@ the remaining input.") (defun xscheme-prompt-for-expression-exit () (interactive) - (if (eq (xscheme-region-expression-p (point-min) (point-max)) 'one) + (if (eq (xscheme-region-expression-p (minibuffer-prompt-end) (point-max)) + 'one) (exit-minibuffer) - (error "input must be a single, complete expression"))) + (error "Input must be a single, complete expression"))) (defun xscheme-region-expression-p (start end) (save-excursion commit 73809908c6520208df274dfbdf10e2fa87dc2064 Author: Alan Mackenzie Date: Tue Jan 5 21:16:37 2016 +0000 Remove function wrongly on AWK Mode value of context fontification hook. * lisp/progmodes/cc-langs.el (c-before-context-fontification-functions): swap order of entries so that awk's entry isn't superseded by the default. * lisp/progmodes/cc-mode.el (c-before-context-fl-expand-region): Correct to handle nil value of c-before-context-fontification-functions. diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index d7972b4..08d84fb 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -531,8 +531,8 @@ When the mode is initialized, these functions are called with parameters \(point-min), \(point-max) and .") (c-lang-defconst c-before-context-fontification-functions - awk nil - t 'c-context-expand-fl-region) + t 'c-context-expand-fl-region + awk nil) ;; For documentation see the following c-lang-defvar of the same name. ;; The value here may be a list of functions or a single function. (c-lang-defvar c-before-context-fontification-functions diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index e5be0b5..6440659 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1252,7 +1252,8 @@ Note that the style variables are always made local to the buffer." (save-restriction (widen) (save-excursion - (let ((new-beg beg) (new-end end) new-region) + (let ((new-beg beg) (new-end end) + (new-region (cons beg end))) (mapc (lambda (fn) (setq new-region (funcall fn new-beg new-end)) (setq new-beg (car new-region) new-end (cdr new-region))) commit d400753a0d1c4080c6c2addf6d0be4660e076c75 Author: Paul Eggert Date: Tue Jan 5 09:17:58 2016 -0800 * src/buffer.c: Stick with ASCII in doc string. diff --git a/src/buffer.c b/src/buffer.c index 29f38d1..3f93716 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6204,7 +6204,7 @@ all windows or just the selected window. Lisp programs may give this variable certain special values: -- The symbol ‘lambda’ enables Transient Mark mode temporarily. +- The symbol `lambda' enables Transient Mark mode temporarily. The mode is disabled again after any subsequent action that would normally deactivate the mark (e.g. buffer modification). commit 221240c9254957a1f2df1e9a1687e757d0b5d59b Author: Paul Eggert Date: Tue Jan 5 09:01:21 2016 -0800 Reword transient-mark-mode doc string * src/buffer.c (syms_of_buffer): Reword doc string to avoid confusion. The value 'lambda (literally) can be interpreted as (quote lambda), which is not intended here; we want just the lambda symbol. diff --git a/src/buffer.c b/src/buffer.c index 493312b..29f38d1 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6204,11 +6204,11 @@ all windows or just the selected window. Lisp programs may give this variable certain special values: -- A value of \\='lambda (literally) enables Transient Mark mode temporarily. - It is disabled again after any subsequent action that would +- The symbol ‘lambda’ enables Transient Mark mode temporarily. + The mode is disabled again after any subsequent action that would normally deactivate the mark (e.g. buffer modification). -- A value of (only . OLDVAL) enables Transient Mark mode +- The pair (only . OLDVAL) enables Transient Mark mode temporarily. After any subsequent point motion command that is not shift-translated, or any other action that would normally deactivate the mark (e.g. buffer modification), the value of commit 977d3eabe3c1a6eb3577f36117409d76c5ffc0b7 Author: Eli Zaretskii Date: Tue Jan 5 17:49:50 2016 +0200 Update doc string of 'selective-display' * src/buffer.c (syms_of_buffer) : Say that using it with the value of 't' is obsolete. (Bug#1092) diff --git a/src/buffer.c b/src/buffer.c index 51c36de..493312b 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5803,11 +5803,14 @@ you probably should set this to -2 in that buffer. */); DEFVAR_PER_BUFFER ("selective-display", &BVAR (current_buffer, selective_display), Qnil, doc: /* Non-nil enables selective display. + An integer N as value means display only lines that start with less than N columns of space. + A value of t means that the character ^M makes itself and all the rest of the line invisible; also, when saving the buffer -in a file, save the ^M as a newline. */); +in a file, save the ^M as a newline. This usage is obsolete; use +overlays or text properties instead. */); DEFVAR_PER_BUFFER ("selective-display-ellipses", &BVAR (current_buffer, selective_display_ellipses), commit 229c3fa541398f6087147b7dc180b0b602c731dd Author: Alan Mackenzie Date: Tue Jan 5 10:30:55 2016 +0000 Make C++ buffers writeable when writing their initial text properties. This is a correction to yesterday's CC Mode patch. * lisp/progmodes/cc-engine.el (c-before-change-check-<>-operators): Put c-save-buffer-state around the function rather than a mere `let'. diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 2a35a64..3301d41 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -5596,9 +5596,10 @@ comment at the start of cc-engine.el for more info." ;; FIXME!!! This routine ignores the possibility of macros entirely. ;; 2010-01-29. (save-excursion - (let ((beg-lit-limits (progn (goto-char beg) (c-literal-limits))) - (end-lit-limits (progn (goto-char end) (c-literal-limits))) - new-beg new-end beg-limit end-limit) + (c-save-buffer-state + ((beg-lit-limits (progn (goto-char beg) (c-literal-limits))) + (end-lit-limits (progn (goto-char end) (c-literal-limits))) + new-beg new-end beg-limit end-limit) ;; Locate the earliest < after the barrier before the changed region, ;; which isn't already marked as a paren. (goto-char (if beg-lit-limits (car beg-lit-limits) beg)) commit f5c762c8785523a2d38088aa48452bffa4da69d6 Author: Michael Albinus Date: Tue Jan 5 09:47:41 2016 +0100 Additional changes for "make check-expensive" * CONTRIBUTE : Encourage use of ":tags '(:expensive-test)". Explain make target `check-expensive'. * etc/NEWS: Mention new make target `check-expensive'. * test/automated/Makefile.in (check-doit): New target. (check, check-expensive): Use it. diff --git a/CONTRIBUTE b/CONTRIBUTE index 9061007..9c53fe2 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -251,12 +251,20 @@ Emacs uses ERT, Emacs Lisp Regression Testing, for testing. See (info "(ert)") or https://www.gnu.org/software/emacs/manual/html_node/ert/ for more information on writing and running tests. +If your test lasts longer than some few seconds, mark it in its +`ert-deftest' definition with ":tags '(:expensive-test)". + To run tests on the entire Emacs tree, run "make check" from the top-level directory. Most tests are in the directory "test/automated". From the "test/automated" directory, run "make " to run the tests for .el(c). See "test/automated/Makefile" for more information. +Tests which are tagged ":expensive-test" are enabled additionally, if +you run "make check-expensive" from the top-level directory. "make +" as mentioned above incorporates expensive tests for +.el(c). + ** Understanding Emacs Internals. The best way to understand Emacs Internals is to read the code, diff --git a/etc/NEWS b/etc/NEWS index d31d1a0..1d8a70a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -96,6 +96,10 @@ so if you want to use it, you can always take a copy from an older Emacs. Various resolutions are available as etc/images/icons/hicolor/*/apps/emacs.png. The old Emacs logo icons are available as `emacs23.png' in the same location. +** New make target `check-expensive' to run additional tests. +This includes all tests which run via "make check", plus additional +tests which take more time to perform. + * Startup Changes in Emacs 25.1 diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in index 43e3905..48920ef 100644 --- a/test/automated/Makefile.in +++ b/test/automated/Makefile.in @@ -87,9 +87,9 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@ ## to change this; bug#17848 - if that gets done, this can be simplified). ## ## Beware: it approximates 'no-byte-compile', so watch out for false-positives! -SELECTOR_DEFAULT=(not (tag :expensive-test)) +SELECTOR_DEFAULT=(quote (not (tag :expensive-test))) SELECTOR_EXPENSIVE=nil -SELECTOR=${SELECTOR_DEFAULT} +SELECTOR= %.log: ${srcdir}/%.el @if grep '^;.*no-byte-compile: t' $< > /dev/null; then \ loadfile=$<; \ @@ -100,7 +100,7 @@ SELECTOR=${SELECTOR_DEFAULT} echo Testing $$loadfile; \ stat=OK ; \ $(emacs) -l ert -l $$loadfile \ - --eval "(ert-run-tests-batch-and-exit '${SELECTOR})" ${WRITE_LOG} + --eval "(ert-run-tests-batch-and-exit ${SELECTOR})" ${WRITE_LOG} ELFILES = $(sort $(wildcard ${srcdir}/*.el)) LOGFILES = $(patsubst %.el,%.log,$(notdir ${ELFILES})) @@ -121,16 +121,20 @@ endef $(foreach test,${TESTS},$(eval $(call test_template,${test}))) - -## Re-run all the tests every time. +## Rerun default tests. check: - -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done - @${MAKE} check-maybe + @${MAKE} check-doit SELECTOR="${SELECTOR_DEFAULT}" ## Rerun also expensive tests. .PHONY: check-expensive check-expensive: - @${MAKE} check SELECTOR=${SELECTOR_EXPENSIVE} + @${MAKE} check-doit SELECTOR="${SELECTOR_EXPENSIVE}" + +## Re-run all the tests every time. +.PHONY: check-doit +check-doit: + -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done + @${MAKE} check-maybe ## Only re-run tests whose .log is older than the test. .PHONY: check-maybe commit 1729cf3eb5a37affcac185bea66b203f9ff0fa8e Author: Xue Fuqiao Date: Tue Jan 5 10:28:25 2016 +0800 ; * admin/MAINTAINERS: Remove myself. ; Lack of time. diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index dc6c0d2..859046a 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -218,9 +218,6 @@ Nicolas Petton lisp/emacs-lisp/subr-x.el lisp/arc-mode.el -Xue Fuqiao - doc/lispref/* - Tassilo Horn lisp/doc-view.el commit 33219d385bbb271e2812fef615c81df1983e61d9 Author: Alan Mackenzie Date: Mon Jan 4 22:29:33 2016 +0000 Apply text properties for <, > in new after-change function (C++ Java Modes). These are category/syntax-table properties to give < and > paren syntax. Also apply certain `c-type' text properties to the insides of <..> constructs to ensure that identifiers contained by them get fontified. This patch fixes bug #681. * lisp/progmodes/cc-cmds.el (c-electric-lt-gt): Reformulate due to new after-change action. * lisp/progmodes/cc-engine.el (c-before-change-check-<>-operators): Expand change region to include s which might not be already marked as parens, rather than just when paren text properties are removed. (c-restore-<>-properties): New after-change function, which applies text properties marking < and > with paren syntax. * lisp/progmodes/cc-fonts.el (c-font-lock-declarations): Ensure `c-type' properties are applied to the interiors of <...> constructs, to ensure fontification of identifiers there. * lisp/progmodes/cc-langs.el (c-before-font-lock-functions): Add c-restore-<>-properties to this list for C++ and Java. * lisp/progmodes/cc-mode.el (c-common-init): When invoking c-before-font-lock-functions, exclude c-restore-<>-properties from the functions invoked. (c-before-change): Initialize c-new-BEG/END here (rather than c-after-change) to allow modification by before-change functions. (c-after-change): Amend c-new-END here, rather than initializing it and c-new-BEG. diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index a46f048..6761de1 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1121,35 +1121,15 @@ numeric argument is supplied, or the point is inside a literal." (looking-at "<<")) (>= (match-end 0) final-pos))) - ;; It's a >. Either a C++ >> operator. ...... - (or (and (c-major-mode-is 'c++-mode) + ;; It's a >. Either a template/generic terminator ... + (or (c-get-char-property (1- final-pos) 'syntax-table) + ;; or a C++ >> operator. + (and (c-major-mode-is 'c++-mode) (progn (goto-char (1- final-pos)) (c-beginning-of-current-token) (looking-at ">>")) - (>= (match-end 0) final-pos)) - ;; ...., or search back for a < which isn't already marked as an - ;; opening template delimiter. - (save-restriction - (widen) - ;; Narrow to avoid `c-forward-<>-arglist' below searching past - ;; our position. - (narrow-to-region (point-min) final-pos) - (goto-char final-pos) - (while - (and - (progn - (c-syntactic-skip-backward "^<;}" nil t) - (eq (char-before) ?<)) - (progn - (backward-char) - (looking-at "\\s(")))) - (and (eq (char-after) ?<) - (not (looking-at "\\s(")) - (progn (c-backward-syntactic-ws) - (c-simple-skip-symbol-backward)) - (or (looking-at c-opt-<>-sexp-key) - (not (looking-at c-keywords-regexp))))))))) + (>= (match-end 0) final-pos)))))) (goto-char final-pos) (when found-delim @@ -1157,11 +1137,9 @@ numeric argument is supplied, or the point is inside a literal." (when (and (eq (char-before) ?>) (not executing-kbd-macro) blink-paren-function) - ;; Currently (2014-10-19), the syntax-table text properties on < and > - ;; are only applied in code called during Emacs redisplay. We thus - ;; explicitly cause a redisplay so that these properties have been - ;; applied when `blink-paren-function' gets called. - (sit-for 0) + ;; From now (2016-01-01), the syntax-table text properties on < and > + ;; are applied in an after-change function, not during redisplay. Hence + ;; we no longer need to call (sit-for 0) for blink paren to work. (funcall blink-paren-function))))) (defun c-electric-paren (arg) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 617c94a..2a35a64 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -5577,8 +5577,9 @@ comment at the start of cc-engine.el for more info." (defun c-before-change-check-<>-operators (beg end) ;; Unmark certain pairs of "< .... >" which are currently marked as - ;; template/generic delimiters. (This marking is via syntax-table - ;; text properties). + ;; template/generic delimiters. (This marking is via syntax-table text + ;; properties), and expand the (c-new-BEG c-new-END) region to include all + ;; unmarked < and > operators within the certain bounds (see below). ;; ;; These pairs are those which are in the current "statement" (i.e., ;; the region between the {, }, or ; before BEG and the one after @@ -5597,38 +5598,40 @@ comment at the start of cc-engine.el for more info." (save-excursion (let ((beg-lit-limits (progn (goto-char beg) (c-literal-limits))) (end-lit-limits (progn (goto-char end) (c-literal-limits))) - new-beg new-end need-new-beg need-new-end) - ;; Locate the barrier before the changed region + new-beg new-end beg-limit end-limit) + ;; Locate the earliest < after the barrier before the changed region, + ;; which isn't already marked as a paren. (goto-char (if beg-lit-limits (car beg-lit-limits) beg)) - (c-syntactic-skip-backward "^;{}" (c-determine-limit 512)) - (setq new-beg (point)) + (setq beg-limit (c-determine-limit 512)) ;; 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))) + ;; pair. Firstly, the ones with the < before beg and > after beg.... + (while (progn (c-syntactic-skip-backward "^;{}<" beg-limit) + (eq (char-before) ?<)) + (c-backward-token-2) + (when (eq (char-after) ?<) + (c-clear-<-pair-props-if-match-after beg))) + (c-forward-syntactic-ws) + (setq new-beg (point)) - ;; Locate the barrier after END. + ;; ...Then the ones with < before end and > after end. (goto-char (if end-lit-limits (cdr end-lit-limits) end)) - (c-syntactic-re-search-forward "[;{}]" (c-determine-+ve-limit 512) 'end) + (setq end-limit (c-determine-+ve-limit 512)) + (while (and (c-syntactic-re-search-forward "[;{}>]" end-limit 'end) + (eq (char-before) ?>)) + (c-end-of-current-token) + (when (eq (char-before) ?>) + (c-clear->-pair-props-if-match-before end (1- (point))))) + (c-backward-syntactic-ws) (setq new-end (point)) - ;; Remove syntax-table properties from the remaining pertinent <...> - ;; pairs, those with a > after end and < before 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))) - ;; Extend the fontification region, if needed. - (when need-new-beg - (goto-char new-beg) - (c-forward-syntactic-ws) - (and (< (point) c-new-BEG) (setq c-new-BEG (point)))) - - (when need-new-end - (and (> new-end c-new-END) (setq c-new-END new-end)))))) + (and new-beg + (< new-beg c-new-BEG) + (setq c-new-BEG new-beg)) + (and new-end + (> new-end c-new-END) + (setq c-new-END new-end))))) (defun c-after-change-check-<>-operators (beg end) ;; This is called from `after-change-functions' when @@ -5668,7 +5671,28 @@ comment at the start of cc-engine.el for more info." (c-clear-<>-pair-props) (forward-char))))))) - +(defun c-restore-<>-properties (_beg _end _old-len) + ;; This function is called as an after-change function. It restores the + ;; category/syntax-table properties on template/generic <..> pairs between + ;; c-new-BEG and c-new-END. It may do hidden buffer changes. + (c-save-buffer-state ((c-parse-and-markup-<>-arglists t) + c-restricted-<>-arglists lit-limits) + (goto-char c-new-BEG) + (if (setq lit-limits (c-literal-limits)) + (goto-char (cdr lit-limits))) + (while (and (< (point) c-new-END) + (c-syntactic-re-search-forward "<" c-new-END 'bound)) + (backward-char) + (save-excursion + (c-backward-token-2) + (setq c-restricted-<>-arglists + (and (not (looking-at c-opt-<>-sexp-key)) + (progn (c-backward-syntactic-ws) ; to < or , + (and (memq (char-before) '(?< ?,)) + (not (eq (c-get-char-property (point) 'c-type) + 'c-decl-arg-start))))))) + (or (c-forward-<>-arglist nil) + (forward-char))))) ;; Handling of small scale constructs like types and names. diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index c2b2d72..f74e5cb 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1205,6 +1205,9 @@ casts and declarations are fontified. Used on level 2 and higher." ;; Same as `max-type-decl-*', but used when we're before ;; `token-pos'. (max-type-decl-end-before-token 0) + ;; End of <..> construct which has had c-<>-arg-sep c-type + ;; properties set within it. + (max-<>-end 0) ;; Set according to the context to direct the heuristics for ;; recognizing C++ templates. c-restricted-<>-arglists @@ -1347,6 +1350,28 @@ casts and declarations are fontified. Used on level 2 and higher." (setq decl-or-cast (c-forward-decl-or-cast-1 match-pos context last-cast-end)) + ;; Ensure that c-<>-arg-sep c-type properties are in place on the + ;; commas separating the arguments inside template/generic <..>s. + (when (and (eq (char-before match-pos) ?<) + (> match-pos max-<>-end)) + (save-excursion + (goto-char match-pos) + (c-backward-token-2) + (if (and + (eq (char-after) ?<) + (let ((c-restricted-<>-arglists + (save-excursion + (c-backward-token-2) + (and + (not (looking-at c-opt-<>-sexp-key)) + (progn (c-backward-syntactic-ws) + (memq (char-before) '(?\( ?,))) + (not (eq (c-get-char-property (1- (point)) + 'c-type) + 'c-decl-arg-start)))))) + (c-forward-<>-arglist nil))) + (setq max-<>-end (point))))) + (cond ((eq decl-or-cast 'cast) ;; Save the position after the previous cast so we can feed diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 8ae7527..d7972b4 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -499,8 +499,13 @@ parameters \(point-min) and \(point-max).") ;; For documentation see the following c-lang-defvar of the same name. ;; The value here may be a list of functions or a single function. t 'c-change-expand-fl-region - (c c++ objc) '(c-neutralize-syntax-in-and-mark-CPP - c-change-expand-fl-region) + (c objc) '(c-neutralize-syntax-in-and-mark-CPP + c-change-expand-fl-region) + c++ '(c-neutralize-syntax-in-and-mark-CPP + c-restore-<>-properties + c-change-expand-fl-region) + java '(c-restore-<>-properties + c-change-expand-fl-region) awk 'c-awk-extend-and-syntax-tablify-region) (c-lang-defvar c-before-font-lock-functions (let ((fs (c-lang-const c-before-font-lock-functions))) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 7f71700..e5be0b5 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -631,8 +631,11 @@ that requires a literal mode spec at compile time." (font-lock-mode 1))) ;; Buffer local variables defining the region to be fontified by a font lock -;; after-change function. They are set in c-after-change to -;; after-change-functions' BEG and END, and may be modified by functions in +;; after-change function. They are initialized in c-before-change to +;; before-change-functions' BEG and END. `c-new-END' is amended in +;; c-after-change with after-change-functions' BEG, END, and OLD-LEN. These +;; variables may be modified by any before/after-change function, in +;; particular by functions in `c-get-state-before-change-functions' and ;; `c-before-font-lock-functions'. (defvar c-new-BEG 0) (make-variable-buffer-local 'c-new-BEG) @@ -671,8 +674,9 @@ compatible with old code; callers should always specify it." (funcall fn (point-min) (point-max))) c-get-state-before-change-functions) (mapc (lambda (fn) - (funcall fn (point-min) (point-max) - (- (point-max) (point-min)))) + (if (not (eq fn 'c-restore-<>-properties)) + (funcall fn (point-min) (point-max) + (- (point-max) (point-min))))) c-before-font-lock-functions)))) (set (make-local-variable 'outline-regexp) "[^#\n\^M]") @@ -1032,6 +1036,8 @@ Note that the style variables are always made local to the buffer." c-just-done-before-change) ; guard against a spurious second ; invocation of before-change-functions. (setq c-just-done-before-change t) + ;; (c-new-BEG c-new-END) will be the region to fontify. + (setq c-new-BEG beg c-new-END end) (setq c-maybe-stale-found-type nil) (save-restriction (save-match-data @@ -1126,7 +1132,8 @@ Note that the style variables are always made local to the buffer." ;; (c-new-BEG c-new-END) will be the region to fontify. It may become ;; larger than (beg end). - (setq c-new-BEG beg c-new-END end) + ;; (setq c-new-BEG beg c-new-END end) + (setq c-new-END (- (+ c-new-END (- end beg)) old-len)) (unless (c-called-from-text-property-change-p) (setq c-just-done-before-change nil) commit 31a97acf43b7eb95f3ddc6ceca1682b35a5b1945 Merge: 4e62197 9fb185a Author: Michael Albinus Date: Mon Jan 4 23:28:23 2016 +0100 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 commit 4e62197a64e6386e24b328c40d6020412ea3031d Author: Michael Albinus Date: Mon Jan 4 23:28:07 2016 +0100 Introduce check-expensive tests. * Makefile.in (check-expensive): * test/automated/Makefile.in (check-expensive): New target. * test/automated/auto-revert-tests.el (auto-revert-test01-auto-revert-several-files): * test/automated/file-notify-tests.el (file-notify--deftest-remote): * test/automated/tramp-tests.el (tramp-test26-process-file) (tramp-test27-start-file-process, tramp-test28-shell-command) (tramp-test29-vc-registered) (tramp-test31-special-characters-with-stat) (tramp-test31-special-characters-with-perl) (tramp-test31-special-characters-with-ls) (tramp-test32-utf8-with-stat, tramp-test32-utf8-with-perl) (tramp-test32-utf8-with-ls, tramp-test33-asynchronous-requests) (tramp-test35-unload): Tag the tests as :expensive-test. diff --git a/Makefile.in b/Makefile.in index c6a7bda..b792e7c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -921,12 +921,12 @@ extraclean: $(extraclean_dirs:=_extraclean) TAGS tags: lib lib-src src $(MAKE) -C src tags -check: all +check check-expensive: all @if test ! -d test/automated; then \ echo "You do not seem to have the test/ directory."; \ echo "Maybe you are using a release tarfile, rather than a repository checkout."; \ else \ - $(MAKE) -C test/automated check; \ + $(MAKE) -C test/automated $@; \ fi dist: @@ -943,7 +943,7 @@ $(DOCS): $(MAKE) -C doc/$(subst -, ,$@) .PHONY: $(DOCS) docs pdf ps -.PHONY: info dvi dist check html info-real info-dir check-info +.PHONY: info dvi dist check check-expensive html info-real info-dir check-info ## TODO add etc/refcards. docs: $(DOCS) diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in index b36e7f9..43e3905 100644 --- a/test/automated/Makefile.in +++ b/test/automated/Makefile.in @@ -87,6 +87,9 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@ ## to change this; bug#17848 - if that gets done, this can be simplified). ## ## Beware: it approximates 'no-byte-compile', so watch out for false-positives! +SELECTOR_DEFAULT=(not (tag :expensive-test)) +SELECTOR_EXPENSIVE=nil +SELECTOR=${SELECTOR_DEFAULT} %.log: ${srcdir}/%.el @if grep '^;.*no-byte-compile: t' $< > /dev/null; then \ loadfile=$<; \ @@ -97,7 +100,7 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@ echo Testing $$loadfile; \ stat=OK ; \ $(emacs) -l ert -l $$loadfile \ - -f ert-run-tests-batch-and-exit ${WRITE_LOG} + --eval "(ert-run-tests-batch-and-exit '${SELECTOR})" ${WRITE_LOG} ELFILES = $(sort $(wildcard ${srcdir}/*.el)) LOGFILES = $(patsubst %.el,%.log,$(notdir ${ELFILES})) @@ -124,6 +127,11 @@ check: -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done @${MAKE} check-maybe +## Rerun also expensive tests. +.PHONY: check-expensive +check-expensive: + @${MAKE} check SELECTOR=${SELECTOR_EXPENSIVE} + ## Only re-run tests whose .log is older than the test. .PHONY: check-maybe check-maybe: ${LOGFILES} diff --git a/test/automated/auto-revert-tests.el b/test/automated/auto-revert-tests.el index 2d67465..a6f8cb2 100644 --- a/test/automated/auto-revert-tests.el +++ b/test/automated/auto-revert-tests.el @@ -94,6 +94,7 @@ ;; This is inspired by Bug#21841. (ert-deftest auto-revert-test01-auto-revert-several-files () "Check autorevert for several files at once." + :tags '(:expensive-test) (skip-unless (executable-find "cp")) (let* ((cp (executable-find "cp")) diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el index 5479eb1..7bf7b0b 100644 --- a/test/automated/file-notify-tests.el +++ b/test/automated/file-notify-tests.el @@ -138,6 +138,7 @@ being the result.") (declare (indent 1)) `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () ,docstring + :tags '(:expensive-test) (let* ((temporary-file-directory file-notify-test-remote-temporary-file-directory) (ert-test (ert-get-test ',test))) diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index f072584..b664204 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1394,6 +1394,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ert-deftest tramp-test26-process-file () "Check `process-file'." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (not @@ -1440,6 +1441,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ert-deftest tramp-test27-start-file-process () "Check `start-file-process'." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (not @@ -1509,6 +1511,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ert-deftest tramp-test28-shell-command () "Check `shell-command'." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (not @@ -1596,6 +1599,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ert-deftest tramp-test29-vc-registered () "Check `vc-registered'." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -1971,6 +1975,7 @@ Several special characters do not work properly there." (ert-deftest tramp-test31-special-characters-with-stat () "Check special characters in file names. Use the `stat' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -1989,6 +1994,7 @@ Use the `stat' command." (ert-deftest tramp-test31-special-characters-with-perl () "Check special characters in file names. Use the `perl' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2010,6 +2016,7 @@ Use the `perl' command." (ert-deftest tramp-test31-special-characters-with-ls () "Check special characters in file names. Use the `ls' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2050,6 +2057,7 @@ Use the `ls' command." (ert-deftest tramp-test32-utf8-with-stat () "Check UTF8 encoding in file names and file contents. Use the `stat' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2068,6 +2076,7 @@ Use the `stat' command." (ert-deftest tramp-test32-utf8-with-perl () "Check UTF8 encoding in file names and file contents. Use the `perl' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2089,6 +2098,7 @@ Use the `perl' command." (ert-deftest tramp-test32-utf8-with-ls () "Check UTF8 encoding in file names and file contents. Use the `ls' command." + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2114,6 +2124,7 @@ Such requests could arrive from timers, process filters and process sentinels. They shall not disturb each other." ;; Mark as failed until bug has been fixed. :expected-result :failed + :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (eq @@ -2225,6 +2236,7 @@ process sentinels. They shall not disturb each other." Since it unloads Tramp, it shall be the last test to run." ;; Mark as failed until all symbols are unbound. :expected-result (if (featurep 'tramp) :failed :passed) + :tags '(:expensive-test) (when (featurep 'tramp) (unload-feature 'tramp 'force) ;; No Tramp feature must be left. commit 9fb185aff7b1f36c30bd157ec446d9bad104d1ee Author: Lars Magne Ingebrigtsen Date: Mon Jan 4 23:03:16 2016 +0100 shr-tag-video bug fix * shr.el (shr-tag-video): Protect against the `poster' being empty. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 979b0ca..0703171 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1361,7 +1361,7 @@ The preference is a float determined from `shr-prefer-media-type'." (start (point))) (unless url (setq url (car (shr--extract-best-source dom)))) - (if image + (if (> (length image) 0) (shr-tag-img nil image) (shr-insert " [video] ")) (shr-urlify start (shr-expand-url url)))) commit 6300655ec9286f3a259ee60536819a0056be4810 Author: Michael Albinus Date: Mon Jan 4 19:25:39 2016 +0100 Minor fixes in tramp-tests.el * test/automated/tramp-tests.el (tramp-test26-process-file): Move point properly. (tramp-test29-vc-registered): Work with relative file names. diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 5938ada..f072584 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1424,6 +1424,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (should-not (get-buffer-window (current-buffer) t)) ;; Second run. The output must be appended. + (goto-char (point-max)) (should (zerop (process-file "ls" nil t t fnnd))) ;; `ls' could produce colorized output. (goto-char (point-min)) @@ -1652,8 +1653,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (error (vc-register nil (list (car vc-handled-backends) - (list (file-name-nondirectory tmp-name2))))))) - (should (vc-registered tmp-name2))) + (list (file-name-nondirectory tmp-name2)))))) + (should (vc-registered (file-name-nondirectory tmp-name2))))) ;; Cleanup. (ignore-errors (delete-directory tmp-name1 'recursive))))) commit 50575b1bdd7fcb4d1bf525fb5ca635fe7ab7d8c6 Author: Eli Zaretskii Date: Mon Jan 4 19:08:37 2016 +0200 Ensure redisplay when 'truncate-lines' is set * lisp/frame.el (redisplay--variables): Add 'truncate-lines'. (Bug#22303) diff --git a/lisp/frame.el b/lisp/frame.el index 04dd4ab..09738d1 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -2239,6 +2239,7 @@ See also `toggle-frame-maximized'." overline-margin line-prefix wrap-prefix + truncate-lines bidi-paragraph-direction bidi-display-reordering)) commit 0d9e80d79dccf3f0811c630d91be0d170d56ee0c Author: Eli Zaretskii Date: Mon Jan 4 18:58:20 2016 +0200 Fix a doc string of 'transient-mark-mode' * src/buffer.c (syms_of_buffer) : Prevent "lambda" in doc string from becoming a link to lambda expressions. diff --git a/src/buffer.c b/src/buffer.c index c07b2dc..51c36de 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6201,7 +6201,7 @@ all windows or just the selected window. Lisp programs may give this variable certain special values: -- A value of `lambda' enables Transient Mark mode temporarily. +- A value of \\='lambda (literally) enables Transient Mark mode temporarily. It is disabled again after any subsequent action that would normally deactivate the mark (e.g. buffer modification). commit 0000ae508258b25a56aa9525646d316ec684b5a6 Author: Eli Zaretskii Date: Mon Jan 4 18:25:21 2016 +0200 MS-Windows followup to latest gnulib update * nt/gnulib.mk (EXTRA_DIST): Add ignore-value.h. diff --git a/nt/gnulib.mk b/nt/gnulib.mk index 7c9cc19..6884bf9 100644 --- a/nt/gnulib.mk +++ b/nt/gnulib.mk @@ -453,6 +453,13 @@ EXTRA_libgnu_a_SOURCES += group-member.c ## end gnulib module group-member +## begin gnulib module ignore-value + + +EXTRA_DIST += ignore-value.h + +## end gnulib module ignore-value + ## begin gnulib module intprops commit 4bc5e0222ba7407378b8623b95903176ae14b2e5 Author: Paul Eggert Date: Sun Jan 3 23:51:44 2016 -0800 Spelling fix diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 26471b0..ae5ec61 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -21,7 +21,7 @@ ;; NOTE: The xref API is still experimental and can change in major, ;; backward-incompatible ways. Everyone is encouraged to try it, and -;; report to us any problems or use cases we hadn't anticiated, by +;; report to us any problems or use cases we hadn't anticipated, by ;; sending an email to emacs-devel, or `M-x report-emacs-bug'. ;; ;; This file provides a somewhat generic infrastructure for cross commit f1093f7a7ccc8e56a7cbb932d1df53cc844f92b5 Author: Jens Lechtenboerger Date: Mon Jan 4 01:56:11 2016 +0100 Do secure signed Bcc handling * lisp/gnus/message.el (message-send): Do secure signed Bcc handling (bug#18718). diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 7be2ff9..51dcc1a 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4227,6 +4227,8 @@ Instead, just auto-save the buffer and then bury it." (if message-return-action (apply (car message-return-action) (cdr message-return-action)))) +(autoload 'mml-secure-bcc-is-safe "mml-sec") + (defun message-send (&optional arg) "Send the message in the current buffer. If `message-interactive' is non-nil, wait for success indication or @@ -4241,6 +4243,7 @@ It should typically alter the sending method in some way or other." (let ((inhibit-read-only t)) (put-text-property (point-min) (point-max) 'read-only nil)) (message-fix-before-sending) + (mml-secure-bcc-is-safe) (run-hooks 'message-send-hook) (when message-confirm-send (or (y-or-n-p "Send message? ") commit e79b06e6def82fab56a153085bff8223876d5908 Author: Paul Eggert Date: Sun Jan 3 15:00:49 2016 -0800 Avoid stdio in SIGINT handler * admin/merge-gnulib (GNULIB_MODULES): Add ignore-value. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/ignore-value.h: New file, from gnulib. * src/keyboard.c: Include it. (write_stdout, read_stdin): New functions. (handle_interrupt): Use them instead of printf and getchar, and avoid fflush when handling signals. diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 363bb23..40b5b78 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -32,7 +32,7 @@ GNULIB_MODULES=' dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog - intprops largefile lstat + ignore-value intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat sig2str socklen stat-time stdalign stddef stdio diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 97ed5b1..b920cbb 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=flexmember --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=setenv --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --avoid=unsetenv --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat sig2str socklen stat-time stdalign stddef stdio stpcpy strftime strtoimax strtoumax symlink sys_stat sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub unsetenv update-copyright utimens vla warnings +# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=flexmember --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=setenv --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --avoid=unsetenv --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog ignore-value intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat sig2str socklen stat-time stdalign stddef stdio stpcpy strftime strtoimax strtoumax symlink sys_stat sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub unsetenv update-copyright utimens vla warnings MOSTLYCLEANFILES += core *.stackdump @@ -567,6 +567,13 @@ EXTRA_libgnu_a_SOURCES += group-member.c ## end gnulib module group-member +## begin gnulib module ignore-value + + +EXTRA_DIST += ignore-value.h + +## end gnulib module ignore-value + ## begin gnulib module intprops diff --git a/lib/ignore-value.h b/lib/ignore-value.h new file mode 100644 index 0000000..6713d96 --- /dev/null +++ b/lib/ignore-value.h @@ -0,0 +1,50 @@ +/* ignore a function return without a compiler warning. -*- coding: utf-8 -*- + + Copyright (C) 2008-2016 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Jim Meyering, Eric Blake and Pádraig Brady. */ + +/* Use "ignore_value" to avoid a warning when using a function declared with + gcc's warn_unused_result attribute, but for which you really do want to + ignore the result. Traditionally, people have used a "(void)" cast to + indicate that a function's return value is deliberately unused. However, + if the function is declared with __attribute__((warn_unused_result)), + gcc issues a warning even with the cast. + + Caution: most of the time, you really should heed gcc's warning, and + check the return value. However, in those exceptional cases in which + you're sure you know what you're doing, use this function. + + For the record, here's one of the ignorable warnings: + "copy.c:233: warning: ignoring return value of 'fchown', + declared with attribute warn_unused_result". */ + +#ifndef _GL_IGNORE_VALUE_H +#define _GL_IGNORE_VALUE_H + +/* Normally casting an expression to void discards its value, but GCC + versions 3.4 and newer have __attribute__ ((__warn_unused_result__)) + which may cause unwanted diagnostics in that case. Use __typeof__ + and __extension__ to work around the problem, if the workaround is + known to be needed. */ +#if 3 < __GNUC__ + (4 <= __GNUC_MINOR__) +# define ignore_value(x) \ + (__extension__ ({ __typeof__ (x) __x = (x); (void) __x; })) +#else +# define ignore_value(x) ((void) (x)) +#endif + +#endif diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 69920a8..27ca70a 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -91,6 +91,7 @@ AC_DEFUN([gl_EARLY], # Code from module gettimeofday: # Code from module gitlog-to-changelog: # Code from module group-member: + # Code from module ignore-value: # Code from module include_next: # Code from module intprops: # Code from module inttypes-incomplete: @@ -905,6 +906,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/gettimeofday.c lib/gl_openssl.h lib/group-member.c + lib/ignore-value.h lib/intprops.h lib/inttypes.in.h lib/lstat.c diff --git a/src/keyboard.c b/src/keyboard.c index fcafd0b..6bdfc1a 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -64,6 +64,8 @@ along with GNU Emacs. If not, see . */ #include #include +#include + #ifdef HAVE_WINDOW_SYSTEM #include TERM_HEADER #endif /* HAVE_WINDOW_SYSTEM */ @@ -10206,6 +10208,21 @@ deliver_interrupt_signal (int sig) deliver_process_signal (sig, handle_interrupt_signal); } +/* Output MSG directly to standard output, without buffering. Ignore + failures. This is safe in a signal handler. */ +static void +write_stdout (char const *msg) +{ + ignore_value (write (STDOUT_FILENO, msg, strlen (msg))); +} + +/* Read a byte from stdin, without buffering. Safe in signal handlers. */ +static int +read_stdin (void) +{ + char c; + return read (STDIN_FILENO, &c, 1) == 1 ? c : EOF; +} /* If Emacs is stuck because `inhibit-quit' is true, then keep track of the number of times C-g has been requested. If C-g is pressed @@ -10242,9 +10259,9 @@ handle_interrupt (bool in_signal_handler) sigemptyset (&blocked); sigaddset (&blocked, SIGINT); pthread_sigmask (SIG_BLOCK, &blocked, 0); + fflush (stdout); } - fflush (stdout); reset_all_sys_modes (); #ifdef SIGTSTP @@ -10260,8 +10277,9 @@ handle_interrupt (bool in_signal_handler) /* Perhaps should really fork an inferior shell? But that would not provide any way to get back to the original shell, ever. */ - printf ("No support for stopping a process on this operating system;\n"); - printf ("you can continue or abort.\n"); + write_stdout ("No support for stopping a process" + " on this operating system;\n" + "you can continue or abort.\n"); #endif /* not SIGTSTP */ #ifdef MSDOS /* We must remain inside the screen area when the internal terminal @@ -10272,46 +10290,49 @@ handle_interrupt (bool in_signal_handler) the code used for auto-saving doesn't cope with the mark bit. */ if (!gc_in_progress) { - printf ("Auto-save? (y or n) "); - fflush (stdout); - if (((c = getchar ()) & ~040) == 'Y') + write_stdout ("Auto-save? (y or n) "); + c = read_stdin (); + if ((c & 040) == 'Y') { Fdo_auto_save (Qt, Qnil); #ifdef MSDOS - printf ("\r\nAuto-save done"); -#else /* not MSDOS */ - printf ("Auto-save done\n"); -#endif /* not MSDOS */ + write_stdout ("\r\nAuto-save done"); +#else + write_stdout ("Auto-save done\n"); +#endif } - while (c != '\n') c = getchar (); + while (c != '\n') + c = read_stdin (); } else { /* During GC, it must be safe to reenable quitting again. */ Vinhibit_quit = Qnil; + write_stdout + ( #ifdef MSDOS - printf ("\r\n"); -#endif /* not MSDOS */ - printf ("Garbage collection in progress; cannot auto-save now\r\n"); - printf ("but will instead do a real quit after garbage collection ends\r\n"); - fflush (stdout); + "\r\n" +#endif + "Garbage collection in progress; cannot auto-save now\r\n" + "but will instead do a real quit" + " after garbage collection ends\r\n"); } #ifdef MSDOS - printf ("\r\nAbort? (y or n) "); -#else /* not MSDOS */ - printf ("Abort (and dump core)? (y or n) "); -#endif /* not MSDOS */ - fflush (stdout); - if (((c = getchar ()) & ~040) == 'Y') + write_stdout ("\r\nAbort? (y or n) "); +#else + write_stdout ("Abort (and dump core)? (y or n) "); +#endif + c = read_stdin (); + if ((c & ~040) == 'Y') emacs_abort (); - while (c != '\n') c = getchar (); + while (c != '\n') + c = read_stdin (); #ifdef MSDOS - printf ("\r\nContinuing...\r\n"); + write_stdout ("\r\nContinuing...\r\n"); #else /* not MSDOS */ - printf ("Continuing...\n"); + write_stdout ("Continuing...\n"); #endif /* not MSDOS */ - fflush (stdout); init_all_sys_modes (); } else commit 861022ff5f7b8d6ab53c726e009208eadf4ecd41 Author: Paul Eggert Date: Sun Jan 3 14:47:05 2016 -0800 * doc/misc/texinfo.tex: Revert unwanted copyright change. diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 0ad0e85..f140bba 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -5,7 +5,10 @@ % \def\texinfoversion{2015-12-20.12} % -% Copyright 1985-1986, 1988, 1990-2016 Free Software Foundation, Inc. +% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, +% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 +% Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as commit 46e47a5c57365398a7e9ae085ffcc044a080078e Author: Glenn Morris Date: Sun Jan 3 11:32:57 2016 -0800 ; * etc/refcards/ru-refcard.tex (cyear): Update via M-x set-copyright. diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index e27a3d2..273a79c 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -22,7 +22,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{25} % version of Emacs this is for -\newcommand{\cyear}[0]{2015} % copyright year +\newcommand{\cyear}[0]{2016} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. commit 71ea138bad3a6bc51106b4ff2f570296069ee4b1 Author: Artur Malabarba Date: Sun Jan 3 16:58:35 2016 +0000 * lisp/align.el (align): Simplify a lambda diff --git a/lisp/align.el b/lisp/align.el index da8e51c..7e439f3 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -893,11 +893,10 @@ on the format of these lists." (or exclude-rules align-mode-exclude-rules-list align-exclude-rules-list) - (function - (lambda (b e mode) - (when (and mode (listp mode)) - (setq sec-first (min sec-first b) - sec-last (max sec-last e)))))) + (lambda (b e mode) + (when (consp mode) + (setq sec-first (min sec-first b) + sec-last (max sec-last e))))) (if (< sec-first sec-last) (align-region sec-first sec-last 'entire (or rules align-mode-rules-list align-rules-list) commit 5618a507ad2ef7d84ae0dd643f87aab41e3f24f0 Author: Artur Malabarba Date: Sun Jan 3 16:57:12 2016 +0000 * lisp/align.el (align): Fix arg order in call to `align-region' diff --git a/lisp/align.el b/lisp/align.el index a7a98c2..da8e51c 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -888,10 +888,11 @@ on the format of these lists." (let ((sec-first end) (sec-last beg)) (align-region beg end - (or exclude-rules - align-mode-exclude-rules-list - align-exclude-rules-list) nil separator + nil ; rules + (or exclude-rules + align-mode-exclude-rules-list + align-exclude-rules-list) (function (lambda (b e mode) (when (and mode (listp mode)) commit 1f680dbc860164a7e16b624ca23c21ac58af31c2 Author: Eli Zaretskii Date: Sun Jan 3 17:22:06 2016 +0200 Fix compilation next-error in buffers with selective-display * lisp/progmodes/compile.el (compilation-beginning-of-line): New function. (compilation-internal-error-properties) (compilation-next-error-function, compilation-set-window): Use it. (Bug#1092) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index e5609b8..b7ab408 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1125,6 +1125,16 @@ POS and RES.") (compilation-internal-error-properties file line end-line col end-col type fmt))) +(defun compilation-beginning-of-line (&optional n) + "Like `beginning-of-line', but accounts for lines hidden by `selective-display'." + (if (or (not (eq selective-display t)) + (null n) + (= n 1)) + (beginning-of-line n) + (re-search-forward "[\n\r]" nil 'end (1- n)) + (if (< n 0) + (beginning-of-line)))) + (defun compilation-move-to-column (col screen) "Go to column COL on the current line. If SCREEN is non-nil, columns are screen columns, otherwise, they are @@ -1183,13 +1193,15 @@ FMTS is a list of format specs for transforming the file name. (goto-char (marker-position marker)) ;; Set end-marker if appropriate and go to line. (if (not (or end-col end-line)) - (beginning-of-line (- line marker-line -1)) - (beginning-of-line (- (or end-line line) marker-line -1)) + (compilation-beginning-of-line (- line marker-line -1)) + (compilation-beginning-of-line (- (or end-line line) + marker-line -1)) (if (or (null end-col) (< end-col 0)) (end-of-line) (compilation-move-to-column end-col screen-columns)) (setq end-marker (point-marker)) - (when end-line (beginning-of-line (- line end-line -1)))) + (when end-line + (compilation-beginning-of-line (- line end-line -1)))) (if col (compilation-move-to-column col screen-columns) (forward-to-indentation 0)) @@ -2469,7 +2481,7 @@ This is the value of `next-error-function' in Compilation buffers." ;; Treat file's found lines in forward order, 1 by 1. (dolist (line (reverse (cddr (compilation--loc->file-struct loc)))) (when (car line) ; else this is a filename w/o a line# - (beginning-of-line (- (car line) last -1)) + (compilation-beginning-of-line (- (car line) last -1)) (setq last (car line))) ;; Treat line's found columns and store/update a marker for each. (dolist (col (cdr line)) @@ -2541,7 +2553,7 @@ displays at the top of the window; there is no arrow." (if (integerp compilation-context-lines) (set-window-start w (save-excursion (goto-char mk) - (beginning-of-line + (compilation-beginning-of-line (- 1 compilation-context-lines)) (point))) ;; If there is no left fringe. commit d20a9488dde5fa7440465e3c7b068ff744389b0b Author: Lars Magne Ingebrigtsen Date: Sun Jan 3 12:19:13 2016 +0100 * nsm.el (nsm-check-protocol): Fix typo in the message. diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index dadf0b9..ebdeecc 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -216,7 +216,7 @@ unencrypted." (not (nsm-query host port status :signature-sha1 - "The certificate used to verify the connectio to %s:%s uses the SHA1 algorithm (%s), which is believed to be unsafe." + "The certificate used to verify the connection to %s:%s uses the SHA1 algorithm (%s), which is believed to be unsafe." host port signature-algorithm))) (delete-process process) nil) commit 1da116f8ec3f22738961a1997b71db63c2fdac08 Author: Lars Magne Ingebrigtsen Date: Sun Jan 3 10:41:51 2016 +0100 Add SHA1 warnings for high network security settings * nsm.el (nsm-check-protocol): When using high security, warn about SHA1 certificates, which are now believed to be open to spoofing. diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 31f2b32..dadf0b9 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -183,7 +183,9 @@ unencrypted." (defun nsm-check-protocol (process host port status settings) (let ((prime-bits (plist-get status :diffie-hellman-prime-bits)) - (encryption (format "%s-%s-%s" + (signature-algorithm + (plist-get (plist-get status :certificate) :signature-algorithm)) + (encryption (format "%s-%s-%s" (plist-get status :key-exchange) (plist-get status :cipher) (plist-get status :mac))) @@ -209,6 +211,15 @@ unencrypted." host port encryption))) (delete-process process) nil) + ((and (string-match "\\bSHA1\\b" signature-algorithm) + (not (memq :signature-sha1 (plist-get settings :conditions))) + (not + (nsm-query + host port status :signature-sha1 + "The certificate used to verify the connectio to %s:%s uses the SHA1 algorithm (%s), which is believed to be unsafe." + host port signature-algorithm))) + (delete-process process) + nil) ((and protocol (string-match "SSL" protocol) (not (memq :ssl (plist-get settings :conditions))) commit e48bacd9d1389e55d0ee1b5f8a55558477646400 Author: Xue Fuqiao Date: Sun Jan 3 09:12:56 2016 +0800 ; * etc/NEWS: Typo fix. diff --git a/etc/NEWS b/etc/NEWS index e9b0fb5..d31d1a0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1305,8 +1305,8 @@ files (recursively) under a directory. +++ ** New variable `inhibit-message', when bound to non-nil, inhibits -`message' and related functions from displaying messages the Echo -Area. The output is still logged to the *Messages* buffer. +`message' and related functions from displaying messages in the echo +area. The output is still logged to the *Messages* buffer. +++ ** A new text property `inhibit-read-only' can be used in read-only commit 5213ded9aab68d83c306aa2f4880c8a1abd3608c Author: Jens Lechtenboerger Date: Sun Jan 3 01:10:34 2016 +0000 Refactor mml-smime.el, mml1991.el, mml2015.el (Maybe this is the last merge from Gnus git to Emacs git) Cf. discussion on ding mailing list, messages in . Common code from the three files mml-smime.el, mml1991.el, and mml2015.el is moved to mml-sec.el. Auxiliary functions are added to gnus-util.el. The code is supported by test cases with necessary test keys. Documentation in message.texi is updated. * doc/misc/message.texi (Security, Using S/MIME): Update for refactoring mml-smime.el, mml1991.el, mml2015.el. (Using OpenPGP): Rename from "Using PGP/MIME"; update contents. (Passphrase caching, Encrypt-to-self, Bcc Warning): New sections. * lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff): New functions. * lisp/gnus/mml-sec.el: Require gnus-util and epg. (epa--select-keys): Autoload. (mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix. (mml-secure-openpgp-signers): New user option; make mml1991-signers and mml2015-signers obsolete aliases to it. (mml-secure-smime-signers): New user option; make mml-smime-signers an obsolete alias to it. (mml-secure-openpgp-encrypt-to-self): New user option; make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete aliases to it. (mml-secure-smime-encrypt-to-self): New user option; make mml-smime-encrypt-to-self an obsolete alias to it. (mml-secure-openpgp-sign-with-sender): New user option; make mml2015-sign-with-sender an obsolete alias to it. (mml-secure-smime-sign-with-sender): New user option; make mml-smime-sign-with-sender an obsolete alias to it. (mml-secure-openpgp-always-trust): New user option; make mml2015-always-trust an obsolete alias to it. (mml-secure-fail-when-key-problem, mml-secure-key-preferences): New user options. (mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup) (mml-secure-cust-record-keys, mml-secure-cust-remove-keys) (mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list) (mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval) (mml-secure-passphrase-callback, mml-secure-check-user-id) (mml-secure-secret-key-exists-p, mml-secure-check-sub-key) (mml-secure-find-usable-keys, mml-secure-select-preferred-keys) (mml-secure-fingerprint, mml-secure-filter-keys) (mml-secure-normalize-cust-name, mml-secure-select-keys) (mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers) (mml-secure-self-recipients, mml-secure-recipients) (mml-secure-epg-encrypt, mml-secure-epg-sign): New functions. * lisp/gnus/mml-smime.el: Require epg; refactor declaration and autoloading of epg functions. (mml-smime-use): Doc fix. (mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry): Obsolete. (mml-smime-get-dns-cert, mml-smime-get-ldap-cert): Use format instead of gnus-format-message. (mml-smime-epg-secret-key-id-list): Remove variable. (mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key) (mml-smime-epg-find-usable-secret-key): Remove functions. (mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor. * lisp/gnus/mml1991.el (mml1991-cache-passphrase) (mml1991-passphrase-cache-expiry): Obsolete. (mml1991-epg-secret-key-id-list): Remove variable. (mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key) (mml1991-epg-find-usable-secret-key): Remove functions. (mml1991-epg-sign, mml1991-epg-encrypt): Refactor. * lisp/gnus/mml2015.el (mml2015-cache-passphrase) (mml2015-passphrase-cache-expiry): Obsolete. (mml2015-epg-secret-key-id-list): Remove variable. (mml2015-epg-passphrase-callback, mml2015-epg-check-user-id) (mml2015-epg-check-sub-key, mml2015-epg-find-usable-key) (mml2015-epg-find-usable-secret-key): Remove functions. (mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign) (mml2015-epg-encrypt): Refactor. diff --git a/doc/misc/message.texi b/doc/misc/message.texi index dbc7759..761fb77 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -938,16 +938,82 @@ Libidn} installed in order to use this functionality. @cindex encrypt @cindex secure -Using the @acronym{MML} language, Message is able to create digitally -signed and digitally encrypted messages. Message (or rather -@acronym{MML}) currently support @acronym{PGP} (RFC 1991), -@acronym{PGP/MIME} (RFC 2015/3156) and @acronym{S/MIME}. +By default, e-mails are transmitted without any protection around the +Internet, which implies that they can be read and changed by lots of +different parties. In particular, they are analyzed under bulk +surveillance, which violates basic human rights. To defend those +rights, digital self-defense is necessary (in addition to legal +changes), and encryption and digital signatures are powerful +techniques for self-defense. In essence, encryption ensures that +only the intended recipient will be able to read a message, while +digital signatures make sure that modifications to messages can be +detected by the recipient. + +Nowadays, there are two major incompatible e-mail encryption +standards, namely @acronym{OpenPGP} and @acronym{S/MIME}. Both of +these standards are implemented by the @uref{https://www.gnupg.org/, +GNU Privacy Guard (GnuPG)}, which needs to be installed as external +software in addition to GNU Emacs. Before you can start to encrypt, +decrypt, and sign messages, you need to create a so-called key-pair, +which consists of a private key and a public key. Your @emph{public} key +(also known as @emph{certificate}, in particular with @acronym{S/MIME}), is +used by others (a) to encrypt messages intended for you and (b) to verify +digital signatures created by you. In contrast, you use your @emph{private} +key (a) to decrypt messages and (b) to sign messages. (You may want to +think of your public key as an open safe that you offer to others such +that they can deposit messages and lock the door, while your private +key corresponds to the opening combination for the safe.) + +Thus, you need to perform the following steps for e-mail encryption, +typically outside Emacs. See, for example, the +@uref{https://www.gnupg.org/gph/en/manual.html, The GNU Privacy +Handbook} for details covering the standard @acronym{OpenPGP} with +@acronym{GnuPG}. +@enumerate +@item +Install GnuPG. +@item +Create a key-pair for your own e-mail address. +@item +Distribute your public key, e.g., via upload to key servers. +@item +Import the public keys for the recipients to which you want to send +encrypted e-mails. +@end enumerate + +Whether to use the standard @acronym{OpenPGP} or @acronym{S/MIME} is +beyond the scope of this documentation. Actually, you can use one +standard for one set of recipients and the other standard for +different recipients (depending their preferences or capabilities). + +In case you are not familiar with all those acronyms: The standard +@acronym{OpenPGP} is also called @acronym{PGP} (Pretty Good Privacy). +The command line tools offered by @acronym{GnuPG} for +@acronym{OpenPGP} are called @command{gpg} and @command{gpg2}, while +the one for @acronym{S/MIME} is called @command{gpgsm}. An +alternative, but discouraged, tool for @acronym{S/MIME} is +@command{openssl}. To make matters worse, e-mail messages can be +formed in two different ways with @acronym{OpenPGP}, namely +@acronym{PGP} (RFC 1991/4880) and @acronym{PGP/MIME} (RFC 2015/3156). + +The good news, however, is the following: In GNU Emacs, Message +supports all those variants, comes with reasonable defaults that can +be customized according to your needs, and invokes the proper command +line tools behind the scenes for encryption, decryption, as well as +creation and verification of digital signatures. + +Message uses the @acronym{MML} language for the creation of signed +and/or encrypted messages as explained in the following. + @menu * Signing and encryption:: Signing and encrypting commands. * Using S/MIME:: Using S/MIME -* Using PGP/MIME:: Using PGP/MIME +* Using OpenPGP:: Using OpenPGP +* Passphrase caching:: How to cache passphrases * PGP Compatibility:: Compatibility with older implementations +* Encrypt-to-self:: Reading your own encrypted messages +* Bcc Warning:: Do not use encryption with Bcc headers @end menu @node Signing and encryption @@ -1041,11 +1107,45 @@ programs are required to make things work, and some small general hints. @node Using S/MIME @subsection Using S/MIME -@emph{Note!} This section assume you have a basic familiarity with -modern cryptography, @acronym{S/MIME}, various PKCS standards, OpenSSL and -so on. +@acronym{S/MIME} requires an external implementation, such as +@uref{https://www.gnupg.org/, GNU Privacy Guard} or +@uref{https://www.openssl.org/, OpenSSL}. The default Emacs interface +to the S/MIME implementation is EasyPG (@pxref{Top,,EasyPG Assistant +User's Manual, epa, EasyPG Assistant User's Manual}), which has been +included in Emacs since version 23 and which relies on the command +line tool @command{gpgsm} provided by @acronym{GnuPG}. That tool +implements certificate management, including certificate revocation +and expiry, while such tasks need to be performed manually, if OpenSSL +is used. + +The choice between EasyPG and OpenSSL is controlled by the variable +@code{mml-smime-use}, which needs to be set to the value @code{epg} +for EasyPG. Depending on your version of Emacs that value may be the +default; if not, you can either customize that variable or place the +following line in your @file{.emacs} file (that line needs to be +placed above other code related to message/gnus/encryption): + +@lisp +(require 'epg) +@end lisp + +Moreover, you may want to customize the variables +@code{mml-default-encrypt-method} and +@code{mml-default-sign-method} to the string @code{"smime"}. + +That's all if you want to use S/MIME with EasyPG, and that's the +recommended way of using S/MIME with Message. + +If you think about using OpenSSL instead of EasyPG, please read the +BUGS section in the manual for the @command{smime} command coming with +OpenSSL first. If you still want to use OpenSSL, the following +applies. + +@emph{Note!} The remainder of this section assumes you have a basic +familiarity with modern cryptography, @acronym{S/MIME}, various PKCS +standards, OpenSSL and so on. -The @acronym{S/MIME} support in Message (and @acronym{MML}) require +The @acronym{S/MIME} support in Message (and @acronym{MML}) can use OpenSSL@. OpenSSL performs the actual @acronym{S/MIME} sign/encrypt operations. OpenSSL can be found at @uref{http://www.openssl.org/}. OpenSSL 0.9.6 and later should work. Version 0.9.5a cannot extract mail @@ -1101,26 +1201,44 @@ you use unencrypted keys (e.g., if they are on a secure storage, or if you are on a secure single user machine) simply press @code{RET} at the passphrase prompt. -@node Using PGP/MIME -@subsection Using PGP/MIME +@node Using OpenPGP +@subsection Using OpenPGP -@acronym{PGP/MIME} requires an external OpenPGP implementation, such -as @uref{http://www.gnupg.org/, GNU Privacy Guard}. Pre-OpenPGP +Use of OpenPGP requires an external software, such +as @uref{https://www.gnupg.org/, GNU Privacy Guard}. Pre-OpenPGP implementations such as PGP 2.x and PGP 5.x are also supported. The default Emacs interface to the PGP implementation is EasyPG (@pxref{Top,,EasyPG Assistant User's Manual, epa, EasyPG Assistant User's Manual}), but PGG (@pxref{Top, ,PGG, pgg, PGG Manual}) and Mailcrypt are also supported. @xref{PGP Compatibility}. +As stated earlier, messages encrypted with OpenPGP can be formatted +according to two different standards, namely @acronym{PGP} or +@acronym{PGP/MIME}. The variables +@code{mml-default-encrypt-method} and +@code{mml-default-sign-method} determine which variant to prefer, +@acronym{PGP/MIME} by default. + +@node Passphrase caching +@subsection Passphrase caching + @cindex gpg-agent -Message internally calls GnuPG (the @command{gpg} command) to perform +Message with EasyPG internally calls GnuPG (the @command{gpg} or +@command{gpgsm} command) to perform data encryption, and in certain cases (decrypting or signing for -example), @command{gpg} requires user's passphrase. Currently the -recommended way to supply your passphrase to @command{gpg} is to use the +example), @command{gpg}/@command{gpgsm} requires user's passphrase. +Currently the recommended way to supply your passphrase is to use the @command{gpg-agent} program. -To use @command{gpg-agent} in Emacs, you need to run the following -command from the shell before starting Emacs. +In particular, the @command{gpg-agent} program supports passphrase +caching so that you do not need to enter your passphrase for every +decryption/sign operation. @xref{Agent Options, , , gnupg, Using the +GNU Privacy Guard}. + +How to use @command{gpg-agent} in Emacs depends on your version of +GnuPG. With GnuPG version 2.1, @command{gpg-agent} is started +automatically if necessary. With older versions you may need to run +the following command from the shell before starting Emacs. @example eval `gpg-agent --daemon` @@ -1135,11 +1253,10 @@ GNU Privacy Guard}. Once your @command{gpg-agent} is set up, it will ask you for a passphrase as needed for @command{gpg}. Under the X Window System, you will see a new passphrase input dialog appear. The dialog is -provided by PIN Entry (the @command{pinentry} command), and as of -version 0.7.2, @command{pinentry} cannot cooperate with Emacs on a -single tty. So, if you are using a text console, you may need to put -a passphrase into gpg-agent's cache beforehand. The following command -does the trick. +provided by PIN Entry (the @command{pinentry} command), reasonably +recent versions of which can also cooperate with Emacs on a text +console. If that does not work, you may need to put a passphrase into +gpg-agent's cache beforehand. The following command does the trick. @example gpg --use-agent --sign < /dev/null > /dev/null @@ -1181,6 +1298,38 @@ message that can be understood by PGP version 2. (Refer to @uref{http://www.gnupg.org/gph/en/pgp2x.html} for more information about the problem.) +@node Encrypt-to-self +@subsection Encrypt-to-self + +By default, messages are encrypted to all recipients (@code{To}, +@code{Cc}, @code{Bcc} headers). Thus, you will not be able to decrypt +your own messages. To make sure that messages are also encrypted to +your own key(s), several alternative solutions exist: +@enumerate +@item +Use the @code{encrypt-to} option in the file @file{gpg.conf} (for +OpenPGP) or @file{gpgsm.conf} (for @acronym{S/MIME} with EasyPG). +@xref{Invoking GPG, , , gnupg, Using the GNU Privacy Guard}, or +@xref{Invoking GPGSM, , , gnupg, Using the GNU Privacy Guard}. +@item +Include your own e-mail address (for which you created a key-pair) +among the recipients. +@item +Customize the variable @code{mml-secure-openpgp-encrypt-to-self} (for +OpenPGP) or @code{mml-secure-smime-encrypt-to-self} (for +@acronym{S/MIME} with EasyPG). +@end enumerate + +@node Bcc Warning +@subsection Bcc Warning + +The @code{Bcc} header is meant to hide recipients of messages. +However, when encrypted messages are used, the e-mail addresses of all +@code{Bcc}-headers are given away to all recipients without +warning, which is a bug, see +@uref{https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718}. + + @node Various Commands @section Various Commands diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 82a267c..31645fc 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1996,6 +1996,31 @@ to case differences." (defun gnus-timer--function (timer) (elt timer 5))) +(defun gnus-test-list (list predicate) + "To each element of LIST apply PREDICATE. +Return nil if LIST is no list or is empty or some test returns nil; +otherwise, return t." + (when (and list (listp list)) + (let ((result (mapcar predicate list))) + (not (memq nil result))))) + +(defun gnus-subsetp (list1 list2) + "Return t if LIST1 is a subset of LIST2. +Similar to `subsetp' but use member for element test so that this works for +lists of strings." + (when (and (listp list1) (listp list2)) + (if list1 + (and (member (car list1) list2) + (gnus-subsetp (cdr list1) list2)) + t))) + +(defun gnus-setdiff (list1 list2) + "Return member-based set difference of LIST1 and LIST2." + (when (and list1 (listp list1) (listp list2)) + (if (member (car list1) list2) + (gnus-setdiff (cdr list1) list2) + (cons (car list1) (gnus-setdiff (cdr list1) list2))))) + (provide 'gnus-util) ;;; gnus-util.el ends here diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el index e4c9095..0a5f472 100644 --- a/lisp/gnus/mml-sec.el +++ b/lisp/gnus/mml-sec.el @@ -25,7 +25,9 @@ (eval-when-compile (require 'cl)) -(autoload 'gnus-subsetp "gnus-util") +(require 'gnus-util) +(require 'epg) + (autoload 'mail-strip-quoted-names "mail-utils") (autoload 'mml2015-sign "mml2015") (autoload 'mml2015-encrypt "mml2015") @@ -40,6 +42,7 @@ (autoload 'mml-smime-encrypt-query "mml-smime") (autoload 'mml-smime-verify "mml-smime") (autoload 'mml-smime-verify-test "mml-smime") +(autoload 'epa--select-keys "epa") (defvar mml-sign-alist '(("smime" mml-smime-sign-buffer mml-smime-sign-query) @@ -91,7 +94,7 @@ signs and encrypt the message in one step. Note that the output generated by using a `combined' mode is NOT understood by all PGP implementations, in particular PGP version -2 does not support it! See Info node `(message)Security' for +2 does not support it! See Info node `(message) Security' for details." :version "22.1" :group 'message @@ -111,7 +114,9 @@ details." (if (boundp 'password-cache) password-cache t) - "If t, cache passphrase." + "If t, cache OpenPGP or S/MIME passphrases inside Emacs. +Passphrase caching in Emacs is NOT recommended. Use gpg-agent instead. +See Info node `(message) Security'." :group 'message :type 'boolean) @@ -125,6 +130,21 @@ Whether the passphrase is cached at all is controlled by :group 'message :type 'integer) +(defcustom mml-secure-safe-bcc-list nil + "List of e-mail addresses that are safe to use in Bcc headers. +EasyPG encrypts e-mails to Bcc addresses, and the encrypted e-mail +by default identifies the used encryption keys, giving away the +Bcc'ed identities. Clearly, this contradicts the original goal of +*blind* copies. +For an academic paper explaining the problem, see URL +`http://crypto.stanford.edu/portia/papers/bb-bcc.pdf'. +Use this variable to specify e-mail addresses whose owners do not +mind if they are identifiable as recipients. This may be useful if +you use Bcc headers to encrypt e-mails to yourself." + :version "25.1" + :group 'message + :type '(repeat string)) + ;;; Configuration/helper functions (defun mml-signencrypt-style (method &optional style) @@ -275,6 +295,36 @@ Use METHOD if given. Else use `mml-secure-method' or (interactive) (mml-secure-part "smime")) +(defun mml-secure-is-encrypted-p () + "Check whether secure encrypt tag is present." + (save-excursion + (goto-char (point-min)) + (re-search-forward + (concat "^" (regexp-quote mail-header-separator) "\n" + "<#secure[^>]+encrypt") + nil t))) + +(defun mml-secure-bcc-is-safe () + "Check whether usage of Bcc is safe (or absent). +Bcc usage is safe in two cases: first, if the current message does +not contain an MML secure encrypt tag; +second, if the Bcc addresses are a subset of `mml-secure-safe-bcc-list'. +In all other cases, ask the user whether Bcc usage is safe. +Raise error if user answers no. +Note that this function does not produce a meaningful return value: +either an error is raised or not." + (when (mml-secure-is-encrypted-p) + (let ((bcc (mail-strip-quoted-names (message-fetch-field "bcc")))) + (when bcc + (let ((bcc-list (mapcar #'cadr + (mail-extract-address-components bcc t)))) + (unless (gnus-subsetp bcc-list mml-secure-safe-bcc-list) + (unless (yes-or-no-p "Message for encryption contains Bcc header.\ + This may give away all Bcc'ed identities to all recipients.\ + Are you sure that this is safe?\ + (Customize `mml-secure-safe-bcc-list' to avoid this warning.) ") + (error "Aborted")))))))) + ;; defuns that add the proper <#secure ...> tag to the top of the message body (defun mml-secure-message (method &optional modesym) (let ((mode (prin1-to-string modesym)) @@ -380,6 +430,529 @@ If called with a prefix argument, only encrypt (do NOT sign)." (interactive "P") (mml-secure-message "pgpauto" (if dontsign 'encrypt 'signencrypt))) +;;; Common functionality for mml1991.el, mml2015.el, mml-smime.el + +(define-obsolete-variable-alias 'mml1991-signers 'mml-secure-openpgp-signers) +(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers) +(defcustom mml-secure-openpgp-signers nil + "A list of your own key ID(s) which will be used to sign OpenPGP messages. +If set, it is added to the setting of `mml-secure-openpgp-sign-with-sender'." + :group 'mime-security + :type '(repeat (string :tag "Key ID"))) + +(define-obsolete-variable-alias 'mml-smime-signers 'mml-secure-smime-signers) +(defcustom mml-secure-smime-signers nil + "A list of your own key ID(s) which will be used to sign S/MIME messages. +If set, it is added to the setting of `mml-secure-smime-sign-with-sender'." + :group 'mime-security + :type '(repeat (string :tag "Key ID"))) + +(define-obsolete-variable-alias + 'mml1991-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self) +(define-obsolete-variable-alias + 'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self) +(defcustom mml-secure-openpgp-encrypt-to-self nil + "List of own key ID(s) or t; determines additional recipients with OpenPGP. +If t, also encrypt to key for message sender; if list, encrypt to those keys. +With this variable, you can ensure that you can decrypt your own messages. +Alternatives to this variable include Bcc'ing the message to yourself or +using the encrypt-to or hidden-encrypt-to option in gpg.conf (see man gpg(1)). +Note that this variable and the encrypt-to option give away your identity +for *every* encryption without warning, which is not what you want if you are +using, e.g., remailers. +Also, use of Bcc gives away your identity for *every* encryption without +warning, which is a bug, see: +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718" + :group 'mime-security + :type '(choice (const :tag "None" nil) + (const :tag "From address" t) + (repeat (string :tag "Key ID")))) + +(define-obsolete-variable-alias + 'mml-smime-encrypt-to-self 'mml-secure-smime-encrypt-to-self) +(defcustom mml-secure-smime-encrypt-to-self nil + "List of own key ID(s) or t; determines additional recipients with S/MIME. +If t, also encrypt to key for message sender; if list, encrypt to those keys. +With this variable, you can ensure that you can decrypt your own messages. +Alternatives to this variable include Bcc'ing the message to yourself or +using the encrypt-to option in gpgsm.conf (see man gpgsm(1)). +Note that this variable and the encrypt-to option give away your identity +for *every* encryption without warning, which is not what you want if you are +using, e.g., remailers. +Also, use of Bcc gives away your identity for *every* encryption without +warning, which is a bug, see: +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718" + :group 'mime-security + :type '(choice (const :tag "None" nil) + (const :tag "From address" t) + (repeat (string :tag "Key ID")))) + +(define-obsolete-variable-alias + 'mml2015-sign-with-sender 'mml-secure-openpgp-sign-with-sender) +;mml1991-sign-with-sender did never exist. +(defcustom mml-secure-openpgp-sign-with-sender nil + "If t, use message sender to find an OpenPGP key to sign with." + :group 'mime-security + :type 'boolean) + +(define-obsolete-variable-alias + 'mml-smime-sign-with-sender 'mml-secure-smime-sign-with-sender) +(defcustom mml-secure-smime-sign-with-sender nil + "If t, use message sender to find an S/MIME key to sign with." + :group 'mime-security + :type 'boolean) + +(define-obsolete-variable-alias + 'mml2015-always-trust 'mml-secure-openpgp-always-trust) +;mml1991-always-trust did never exist. +(defcustom mml-secure-openpgp-always-trust t + "If t, skip key validation of GnuPG on encryption." + :group 'mime-security + :type 'boolean) + +(defcustom mml-secure-fail-when-key-problem nil + "If t, raise an error if some key is missing or several keys exist. +Otherwise, ask the user." + :group 'mime-security + :type 'boolean) + +(defcustom mml-secure-key-preferences + '((OpenPGP (sign) (encrypt)) (CMS (sign) (encrypt))) + "Protocol- and usage-specific fingerprints of preferred keys. +This variable is only relevant if a recipient owns multiple key pairs (for +encryption) or you own multiple key pairs (for signing). In such cases, +you will be asked which key(s) should be used, and your choice can be +customized in this variable." + :group 'mime-security + :type '(alist :key-type (symbol :tag "Protocol") :value-type + (alist :key-type (symbol :tag "Usage") :value-type + (alist :key-type (string :tag "Name") :value-type + (repeat (string :tag "Fingerprint")))))) + +(defun mml-secure-cust-usage-lookup (context usage) + "Return preferences for CONTEXT and USAGE." + (let* ((protocol (epg-context-protocol context)) + (protocol-prefs (cdr (assoc protocol mml-secure-key-preferences)))) + (assoc usage protocol-prefs))) + +(defun mml-secure-cust-fpr-lookup (context usage name) + "Return fingerprints of preferred keys for CONTEXT, USAGE, and NAME." + (let* ((usage-prefs (mml-secure-cust-usage-lookup context usage)) + (fprs (assoc name (cdr usage-prefs)))) + (when fprs + (cdr fprs)))) + +(defun mml-secure-cust-record-keys (context usage name keys &optional save) + "For CONTEXT, USAGE, and NAME record fingerprint(s) of KEYS. +If optional SAVE is not nil, save customized fingerprints. +Return keys." + (assert keys) + (let* ((usage-prefs (mml-secure-cust-usage-lookup context usage)) + (curr-fprs (cdr (assoc name (cdr usage-prefs)))) + (key-fprs (mapcar 'mml-secure-fingerprint keys)) + (new-fprs (gnus-union curr-fprs key-fprs :test 'equal))) + (if curr-fprs + (setcdr (assoc name (cdr usage-prefs)) new-fprs) + (setcdr usage-prefs (cons (cons name new-fprs) (cdr usage-prefs)))) + (when save + (customize-save-variable + 'mml-secure-key-preferences mml-secure-key-preferences)) + keys)) + +(defun mml-secure-cust-remove-keys (context usage name) + "Remove keys for CONTEXT, USAGE, and NAME. +Return t if a customization for NAME was present (and has been removed)." + (let* ((usage-prefs (mml-secure-cust-usage-lookup context usage)) + (current (assoc name usage-prefs))) + (when current + (setcdr usage-prefs (remove current (cdr usage-prefs))) + t))) + +(defvar mml-secure-secret-key-id-list nil) + +(defun mml-secure-add-secret-key-id (key-id) + "Record KEY-ID in list of secret keys." + (add-to-list 'mml-secure-secret-key-id-list key-id)) + +(defun mml-secure-clear-secret-key-id-list () + "Remove passwords from cache and clear list of secret keys." + ;; Loosely based on code inside mml2015-epg-encrypt, + ;; mml2015-epg-clear-decrypt, and mml2015-epg-decrypt + (dolist (key-id mml-secure-secret-key-id-list nil) + (password-cache-remove key-id)) + (setq mml-secure-secret-key-id-list nil)) + +(defvar mml1991-cache-passphrase) +(defvar mml1991-passphrase-cache-expiry) + +(defun mml-secure-cache-passphrase-p (protocol) + "Return t if OpenPGP or S/MIME passphrases should be cached for PROTOCOL. +Passphrase caching in Emacs is NOT recommended. Use gpg-agent instead." + (or (and (eq 'OpenPGP protocol) + (or mml-secure-cache-passphrase + (and (boundp 'mml2015-cache-passphrase) + mml2015-cache-passphrase) + (and (boundp 'mml1991-cache-passphrase) + mml1991-cache-passphrase))) + (and (eq 'CMS protocol) + (or mml-secure-cache-passphrase + (and (boundp 'mml-smime-cache-passphrase) + mml-smime-cache-passphrase))))) + +(defun mml-secure-cache-expiry-interval (protocol) + "Return time in seconds to cache passphrases for PROTOCOL. +Passphrase caching in Emacs is NOT recommended. Use gpg-agent instead." + (or (and (eq 'OpenPGP protocol) + (or (and (boundp 'mml2015-passphrase-cache-expiry) + mml2015-passphrase-cache-expiry) + (and (boundp 'mml1991-passphrase-cache-expiry) + mml1991-passphrase-cache-expiry) + mml-secure-passphrase-cache-expiry)) + (and (eq 'CMS protocol) + (or (and (boundp 'mml-smime-passphrase-cache-expiry) + mml-smime-passphrase-cache-expiry) + mml-secure-passphrase-cache-expiry)))) + +(defun mml-secure-passphrase-callback (context key-id standard) + "Ask for passphrase in CONTEXT for KEY-ID for STANDARD. +The passphrase is read and cached." + ;; Based on mml2015-epg-passphrase-callback. + (if (eq key-id 'SYM) + (epg-passphrase-callback-function context key-id nil) + (let* ((password-cache-key-id + (if (eq key-id 'PIN) + "PIN" + key-id)) + (entry (assoc key-id epg-user-id-alist)) + (passphrase + (password-read + (if (eq key-id 'PIN) + "Passphrase for PIN: " + (if entry + (format "Passphrase for %s %s: " key-id (cdr entry)) + (format "Passphrase for %s: " key-id))) + ;; TODO: With mml-smime.el, password-cache-key-id is not passed + ;; as argument to password-read. + ;; Is that on purpose? If so, the following needs to be placed + ;; inside an if statement. + password-cache-key-id))) + (when passphrase + (let ((password-cache-expiry (mml-secure-cache-expiry-interval + (epg-context-protocol context)))) + (password-cache-add password-cache-key-id passphrase)) + (mml-secure-add-secret-key-id password-cache-key-id) + (copy-sequence passphrase))))) + +(defun mml-secure-check-user-id (key recipient) + "Check whether KEY has a non-revoked, non-expired UID for RECIPIENT." + ;; Based on mml2015-epg-check-user-id. + (let ((uids (epg-key-user-id-list key))) + (catch 'break + (dolist (uid uids nil) + (if (and (stringp (epg-user-id-string uid)) + (equal (car (mail-header-parse-address + (epg-user-id-string uid))) + (car (mail-header-parse-address + recipient))) + (not (memq (epg-user-id-validity uid) + '(revoked expired)))) + (throw 'break t)))))) + +(defun mml-secure-secret-key-exists-p (context subkey) + "Return t if keyring for CONTEXT contains secret key for public SUBKEY." + (let* ((fpr (epg-sub-key-fingerprint subkey)) + (candidates (epg-list-keys context fpr 'secret)) + (candno (length candidates))) + ;; If two or more subkeys with the same fingerprint exist, something is + ;; terribly wrong. + (when (>= candno 2) + (error "Found %d secret keys with same fingerprint %s" candno fpr)) + (= 1 candno))) + +(defun mml-secure-check-sub-key (context key usage &optional fingerprint) + "Check whether in CONTEXT the public KEY has a usable subkey for USAGE. +This is the case if KEY is not disabled, and there is a subkey for +USAGE that is neither revoked nor expired. Additionally, if optional +FINGERPRINT is present and if it is not the primary key's fingerprint, then +the returned subkey must have that FINGERPRINT. FINGERPRINT must consist of +hexadecimal digits only (no leading \"0x\" allowed). +If USAGE is not `encrypt', then additionally an appropriate secret key must +be present in the keyring." + ;; Based on mml2015-epg-check-sub-key, extended by + ;; - check for secret keys if usage is not 'encrypt and + ;; - check for new argument FINGERPRINT. + (let* ((subkeys (epg-key-sub-key-list key)) + (primary (car subkeys)) + (fpr (epg-sub-key-fingerprint primary))) + ;; The primary key will be marked as disabled, when the entire + ;; key is disabled (see 12 Field, Format of colon listings, in + ;; gnupg/doc/DETAILS) + (unless (memq 'disabled (epg-sub-key-capability primary)) + (catch 'break + (dolist (subkey subkeys nil) + (if (and (memq usage (epg-sub-key-capability subkey)) + (not (memq (epg-sub-key-validity subkey) + '(revoked expired))) + (or (eq 'encrypt usage) ; Encryption works with public key. + ;; In contrast, signing requires secret key. + (mml-secure-secret-key-exists-p context subkey)) + (or (not fingerprint) + (gnus-string-match-p (concat fingerprint "$") fpr) + (gnus-string-match-p (concat fingerprint "$") + (epg-sub-key-fingerprint subkey)))) + (throw 'break t))))))) + +(defun mml-secure-find-usable-keys (context name usage &optional justone) + "In CONTEXT return a list of keys for NAME and USAGE. +If USAGE is `encrypt' public keys are returned, otherwise secret ones. +Only non-revoked and non-expired keys are returned whose primary key is +not disabled. +NAME can be an e-mail address or a key ID. +If NAME just consists of hexadecimal digits (possibly prefixed by \"0x\"), it +is treated as key ID for which at most one key must exist in the keyring. +Otherwise, NAME is treated as user ID, for which no keys are returned if it +is expired or revoked. +If optional JUSTONE is not nil, return the first key instead of a list." + (let* ((keys (epg-list-keys context name)) + (iskeyid (string-match "\\(0x\\)?\\([0-9a-fA-F]\\{8,\\}\\)" name)) + (fingerprint (match-string 2 name)) + result) + (when (and iskeyid (>= (length keys) 2)) + (error + "Name %s (for %s) looks like a key ID but multiple keys found" + name usage)) + (catch 'break + (dolist (key keys result) + (if (and (or iskeyid + (mml-secure-check-user-id key name)) + (mml-secure-check-sub-key context key usage fingerprint)) + (if justone + (throw 'break key) + (push key result))))))) + +(defun mml-secure-select-preferred-keys (context names usage) + "Return list of preferred keys in CONTEXT for NAMES and USAGE. +This inspects the keyrings to find keys for each name in NAMES. If several +keys are found for a name, `mml-secure-select-keys' is used to look for +customized preferences or have the user select preferable ones. +When `mml-secure-fail-when-key-problem' is t, fail with an error in +case of missing, outdated, or multiple keys." + ;; Loosely based on code appearing inside mml2015-epg-sign and + ;; mml2015-epg-encrypt. + (apply + #'nconc + (mapcar + (lambda (name) + (let* ((keys (mml-secure-find-usable-keys context name usage)) + (keyno (length keys))) + (cond ((= 0 keyno) + (when (or mml-secure-fail-when-key-problem + (not (y-or-n-p + (format "No %s key for %s; skip it? " + usage name)))) + (error "No %s key for %s" usage name))) + ((= 1 keyno) keys) + (t (mml-secure-select-keys context name keys usage))))) + names))) + +(defun mml-secure-fingerprint (key) + "Return fingerprint for public KEY." + (epg-sub-key-fingerprint (car (epg-key-sub-key-list key)))) + +(defun mml-secure-filter-keys (keys fprs) + "Filter KEYS to subset with fingerprints in FPRS." + (when keys + (if (member (mml-secure-fingerprint (car keys)) fprs) + (cons (car keys) (mml-secure-filter-keys (cdr keys) fprs)) + (mml-secure-filter-keys (cdr keys) fprs)))) + +(defun mml-secure-normalize-cust-name (name) + "Normalize NAME to be used for customization. +Currently, remove ankle brackets." + (if (string-match "^<\\(.*\\)>$" name) + (match-string 1 name) + name)) + +(defun mml-secure-select-keys (context name keys usage) + "In CONTEXT for NAME select among KEYS for USAGE. +KEYS should be a list with multiple entries. +NAME is normalized first as customized keys are inspected. +When `mml-secure-fail-when-key-problem' is t, fail with an error in case of +outdated or multiple keys." + (let* ((nname (mml-secure-normalize-cust-name name)) + (fprs (mml-secure-cust-fpr-lookup context usage nname)) + (usable-fprs (mapcar 'mml-secure-fingerprint keys))) + (if fprs + (if (gnus-subsetp fprs usable-fprs) + (mml-secure-filter-keys keys fprs) + (mml-secure-cust-remove-keys context usage nname) + (let ((diff (gnus-setdiff fprs usable-fprs))) + (if mml-secure-fail-when-key-problem + (error "Customization of %s keys for %s outdated" usage nname) + (mml-secure-select-keys-1 + context nname keys usage (format "\ +Customized keys + (%s) +for %s not available any more. +Select anew. " + diff nname))))) + (if mml-secure-fail-when-key-problem + (error "Multiple %s keys for %s" usage nname) + (mml-secure-select-keys-1 + context nname keys usage (format "\ +Multiple %s keys for: + %s +Select preferred one(s). " + usage nname)))))) + +(defun mml-secure-select-keys-1 (context name keys usage message) + "In CONTEXT for NAME let user select among KEYS for USAGE, showing MESSAGE. +Return selected keys." + (let* ((selected (epa--select-keys message keys)) + (selno (length selected)) + ;; TODO: y-or-n-p does not always resize the echo area but may + ;; truncate the message. Why? The following does not help. + ;; yes-or-no-p shows full message, though. + (message-truncate-lines nil)) + (if selected + (if (y-or-n-p + (format "%d %s key(s) selected. Store for %s? " + selno usage name)) + (mml-secure-cust-record-keys context usage name selected 'save) + selected) + (unless (y-or-n-p + (format "No %s key for %s; skip it? " usage name)) + (error "No %s key for %s" usage name))))) + +(defun mml-secure-signer-names (protocol sender) + "Determine signer names for PROTOCOL and message from SENDER. +Returned names may be e-mail addresses or key IDs and are determined based +on `mml-secure-openpgp-signers' and `mml-secure-openpgp-sign-with-sender' with +OpenPGP or `mml-secure-smime-signers' and `mml-secure-smime-sign-with-sender' +with S/MIME." + (if (eq 'OpenPGP protocol) + (append mml-secure-openpgp-signers + (if (and mml-secure-openpgp-sign-with-sender sender) + (list (concat "<" sender ">")))) + (append mml-secure-smime-signers + (if (and mml-secure-smime-sign-with-sender sender) + (list (concat "<" sender ">")))))) + +(defun mml-secure-signers (context signer-names) + "Determine signing keys in CONTEXT from SIGNER-NAMES. +If `mm-sign-option' is `guided', the user is asked to choose. +Otherwise, `mml-secure-select-preferred-keys' is used." + ;; Based on code appearing inside mml2015-epg-sign and + ;; mml2015-epg-encrypt. + (if (eq mm-sign-option 'guided) + (epa-select-keys context "\ +Select keys for signing. +If no one is selected, default secret key is used. " + signer-names t) + (mml-secure-select-preferred-keys context signer-names 'sign))) + +(defun mml-secure-self-recipients (protocol sender) + "Determine additional recipients based on encrypt-to-self variables. +PROTOCOL specifies OpenPGP or S/MIME for a message from SENDER." + (let ((encrypt-to-self + (if (eq 'OpenPGP protocol) + mml-secure-openpgp-encrypt-to-self + mml-secure-smime-encrypt-to-self))) + (when encrypt-to-self + (if (listp encrypt-to-self) + encrypt-to-self + (list sender))))) + +(defun mml-secure-recipients (protocol context config sender) + "Determine encryption recipients. +PROTOCOL specifies OpenPGP or S/MIME with matching CONTEXT and CONFIG +for a message from SENDER." + ;; Based on code appearing inside mml2015-epg-encrypt. + (let ((recipients + (apply #'nconc + (mapcar + (lambda (recipient) + (or (epg-expand-group config recipient) + (list (concat "<" recipient ">")))) + (split-string + (or (message-options-get 'message-recipients) + (message-options-set 'message-recipients + (read-string "Recipients: "))) + "[ \f\t\n\r\v,]+"))))) + (nconc recipients (mml-secure-self-recipients protocol sender)) + (if (eq mm-encrypt-option 'guided) + (setq recipients + (epa-select-keys context "\ +Select recipients for encryption. +If no one is selected, symmetric encryption will be performed. " + recipients)) + (setq recipients + (mml-secure-select-preferred-keys context recipients 'encrypt)) + (unless recipients + (error "No recipient specified"))) + recipients)) + +(defun mml-secure-epg-encrypt (protocol cont &optional sign) + ;; Based on code appearing inside mml2015-epg-encrypt. + (let* ((context (epg-make-context protocol)) + (config (epg-configuration)) + (sender (message-options-get 'message-sender)) + (recipients (mml-secure-recipients protocol context config sender)) + (signer-names (mml-secure-signer-names protocol sender)) + cipher signers) + (when sign + (setq signers (mml-secure-signers context signer-names)) + (epg-context-set-signers context signers)) + (when (eq 'OpenPGP protocol) + (epg-context-set-armor context t) + (epg-context-set-textmode context t)) + (when (mml-secure-cache-passphrase-p protocol) + (epg-context-set-passphrase-callback + context + (cons 'mml-secure-passphrase-callback protocol))) + (condition-case error + (setq cipher + (if (eq 'OpenPGP protocol) + (epg-encrypt-string context (buffer-string) recipients sign + mml-secure-openpgp-always-trust) + (epg-encrypt-string context (buffer-string) recipients)) + mml-secure-secret-key-id-list nil) + (error + (mml-secure-clear-secret-key-id-list) + (signal (car error) (cdr error)))) + cipher)) + +(defun mml-secure-epg-sign (protocol mode) + ;; Based on code appearing inside mml2015-epg-sign. + (let* ((context (epg-make-context protocol)) + (sender (message-options-get 'message-sender)) + (signer-names (mml-secure-signer-names protocol sender)) + (signers (mml-secure-signers context signer-names)) + signature micalg) + (when (eq 'OpenPGP protocol) + (epg-context-set-armor context t) + (epg-context-set-textmode context t)) + (epg-context-set-signers context signers) + (when (mml-secure-cache-passphrase-p protocol) + (epg-context-set-passphrase-callback + context + (cons 'mml-secure-passphrase-callback protocol))) + (condition-case error + (setq signature + (if (eq 'OpenPGP protocol) + (epg-sign-string context (buffer-string) mode) + (epg-sign-string context + (mm-replace-in-string (buffer-string) + "\n" "\r\n") t)) + mml-secure-secret-key-id-list nil) + (error + (mml-secure-clear-secret-key-id-list) + (signal (car error) (cdr error)))) + (if (epg-context-result-for context 'sign) + (setq micalg (epg-new-signature-digest-algorithm + (car (epg-context-result-for context 'sign))))) + (cons signature micalg))) + (provide 'mml-sec) ;;; mml-sec.el ends here diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index b19c9e8..a40595e 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -32,9 +32,17 @@ (autoload 'message-narrow-to-headers "message") (autoload 'message-fetch-field "message") +;; Prefer epg over openssl if it is available as epg uses GnuPG's gpgsm, +;; which features full-fledged certificate management, while openssl requires +;; major manual efforts for certificate revocation and expiry and has bugs +;; as documented under man smime(1). +(ignore-errors (require 'epg)) + (defcustom mml-smime-use (if (featurep 'epg) 'epg 'openssl) - "Whether to use OpenSSL or EPG to decrypt S/MIME messages. -Defaults to EPG if it's loaded." + "Whether to use OpenSSL or EasyPG (EPG) to handle S/MIME messages. +Defaults to EPG if it's available. +If you think about using OpenSSL, please read the BUGS section in the manual +for the `smime' command coming with OpenSSL first. EasyPG is recommended." :group 'mime-security :type '(choice (const :tag "EPG" epg) (const :tag "OpenSSL" openssl))) @@ -57,6 +65,9 @@ Defaults to EPG if it's loaded." "If t, cache passphrase." :group 'mime-security :type 'boolean) +(make-obsolete-variable 'mml-smime-cache-passphrase + 'mml-secure-cache-passphrase + "25.1") (defcustom mml-smime-passphrase-cache-expiry mml-secure-passphrase-cache-expiry "How many seconds the passphrase is cached. @@ -64,6 +75,9 @@ Whether the passphrase is cached at all is controlled by `mml-smime-cache-passphrase'." :group 'mime-security :type 'integer) +(make-obsolete-variable 'mml-smime-passphrase-cache-expiry + 'mml-secure-passphrase-cache-expiry + "25.1") (defcustom mml-smime-signers nil "A list of your own key ID which will be used to sign a message." @@ -202,7 +216,7 @@ Whether the passphrase is cached at all is controlled by ""))))) (if (setq cert (smime-cert-by-dns who)) (setq result (list 'certfile (buffer-name cert))) - (setq bad (gnus-format-message "`%s' not found. " who)))) + (setq bad (format "`%s' not found. " who)))) (quit)) result)) @@ -221,7 +235,7 @@ Whether the passphrase is cached at all is controlled by ""))))) (if (setq cert (smime-cert-by-ldap who)) (setq result (list 'certfile (buffer-name cert))) - (setq bad (gnus-format-message "`%s' not found. " who)))) + (setq bad (format "`%s' not found. " who)))) (quit)) result)) @@ -317,82 +331,28 @@ Whether the passphrase is cached at all is controlled by (defvar inhibit-redisplay) (defvar password-cache-expiry) -(autoload 'epg-make-context "epg") -(autoload 'epg-passphrase-callback-function "epg") -(declare-function epg-context-set-signers "epg" (context signers)) -(declare-function epg-context-result-for "epg" (context name)) -(declare-function epg-new-signature-digest-algorithm "epg" (cl-x) t) -(declare-function epg-verify-result-to-string "epg" (verify-result)) -(declare-function epg-list-keys "epg" (context &optional name mode)) -(declare-function epg-verify-string "epg" - (context signature &optional signed-text)) -(declare-function epg-sign-string "epg" (context plain &optional mode)) -(declare-function epg-encrypt-string "epg" - (context plain recipients &optional sign always-trust)) -(declare-function epg-context-set-passphrase-callback "epg" - (context passphrase-callback)) -(declare-function epg-sub-key-fingerprint "epg" (cl-x) t) -(declare-function epg-configuration "epg-config" ()) -(declare-function epg-expand-group "epg-config" (config group)) -(declare-function epa-select-keys "epa" - (context prompt &optional names secret)) - -(defvar mml-smime-epg-secret-key-id-list nil) - -(defun mml-smime-epg-passphrase-callback (context key-id ignore) - (if (eq key-id 'SYM) - (epg-passphrase-callback-function context key-id nil) - (let* (entry - (passphrase - (password-read - (if (eq key-id 'PIN) - "Passphrase for PIN: " - (if (setq entry (assoc key-id epg-user-id-alist)) - (format "Passphrase for %s %s: " key-id (cdr entry)) - (format "Passphrase for %s: " key-id))) - (if (eq key-id 'PIN) - "PIN" - key-id)))) - (when passphrase - (let ((password-cache-expiry mml-smime-passphrase-cache-expiry)) - (password-cache-add key-id passphrase)) - (setq mml-smime-epg-secret-key-id-list - (cons key-id mml-smime-epg-secret-key-id-list)) - (copy-sequence passphrase))))) - -(declare-function epg-key-sub-key-list "epg" (key) t) -(declare-function epg-sub-key-capability "epg" (sub-key) t) -(declare-function epg-sub-key-validity "epg" (sub-key) t) - -(defun mml-smime-epg-find-usable-key (keys usage) - (catch 'found - (while keys - (let ((pointer (epg-key-sub-key-list (car keys)))) - (while pointer - (if (and (memq usage (epg-sub-key-capability (car pointer))) - (not (memq (epg-sub-key-validity (car pointer)) - '(revoked expired)))) - (throw 'found (car keys))) - (setq pointer (cdr pointer)))) - (setq keys (cdr keys))))) - -;; XXX: since gpg --list-secret-keys does not return validity of each -;; key, `mml-smime-epg-find-usable-key' defined above is not enough for -;; secret keys. The function `mml-smime-epg-find-usable-secret-key' -;; below looks at appropriate public keys to check usability. -(defun mml-smime-epg-find-usable-secret-key (context name usage) - (let ((secret-keys (epg-list-keys context name t)) - secret-key) - (while (and (not secret-key) secret-keys) - (if (mml-smime-epg-find-usable-key - (epg-list-keys context (epg-sub-key-fingerprint - (car (epg-key-sub-key-list - (car secret-keys))))) - usage) - (setq secret-key (car secret-keys) - secret-keys nil) - (setq secret-keys (cdr secret-keys)))) - secret-key)) +(eval-when-compile + (autoload 'epg-make-context "epg") + (autoload 'epg-context-set-armor "epg") + (autoload 'epg-context-set-signers "epg") + (autoload 'epg-context-result-for "epg") + (autoload 'epg-new-signature-digest-algorithm "epg") + (autoload 'epg-verify-result-to-string "epg") + (autoload 'epg-list-keys "epg") + (autoload 'epg-decrypt-string "epg") + (autoload 'epg-verify-string "epg") + (autoload 'epg-sign-string "epg") + (autoload 'epg-encrypt-string "epg") + (autoload 'epg-passphrase-callback-function "epg") + (autoload 'epg-context-set-passphrase-callback "epg") + (autoload 'epg-sub-key-fingerprint "epg") + (autoload 'epg-configuration "epg-config") + (autoload 'epg-expand-group "epg-config") + (autoload 'epa-select-keys "epa")) + +(declare-function epg-key-sub-key-list "ext:epg" (key)) +(declare-function epg-sub-key-capability "ext:epg" (sub-key)) +(declare-function epg-sub-key-validity "ext:epg" (sub-key)) (autoload 'mml-compute-boundary "mml") @@ -401,146 +361,37 @@ Whether the passphrase is cached at all is controlled by (declare-function message-options-set "message" (symbol value)) (defun mml-smime-epg-sign (cont) - (let* ((inhibit-redisplay t) - (context (epg-make-context 'CMS)) - (boundary (mml-compute-boundary cont)) - (sender (message-options-get 'message-sender)) - (signer-names (or mml-smime-signers - (if (and mml-smime-sign-with-sender sender) - (list (concat "<" sender ">"))))) - signer-key - (signers - (or (message-options-get 'mml-smime-epg-signers) - (message-options-set - 'mml-smime-epg-signers - (if (eq mm-sign-option 'guided) - (epa-select-keys context "\ -Select keys for signing. -If no one is selected, default secret key is used. " - signer-names - t) - (if (or sender mml-smime-signers) - (delq nil - (mapcar - (lambda (signer) - (setq signer-key - (mml-smime-epg-find-usable-secret-key - context signer 'sign)) - (unless (or signer-key - (y-or-n-p - (format - "No secret key for %s; skip it? " - signer))) - (error "No secret key for %s" signer)) - signer-key) - signer-names))))))) - signature micalg) - (epg-context-set-signers context signers) - (if mml-smime-cache-passphrase - (epg-context-set-passphrase-callback - context - #'mml-smime-epg-passphrase-callback)) - (condition-case error - (setq signature (epg-sign-string context - (mm-replace-in-string (buffer-string) - "\n" "\r\n") - t) - mml-smime-epg-secret-key-id-list nil) - (error - (while mml-smime-epg-secret-key-id-list - (password-cache-remove (car mml-smime-epg-secret-key-id-list)) - (setq mml-smime-epg-secret-key-id-list - (cdr mml-smime-epg-secret-key-id-list))) - (signal (car error) (cdr error)))) - (if (epg-context-result-for context 'sign) - (setq micalg (epg-new-signature-digest-algorithm - (car (epg-context-result-for context 'sign))))) + (let ((inhibit-redisplay t) + (boundary (mml-compute-boundary cont))) (goto-char (point-min)) - (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" - boundary)) - (if micalg - (insert (format "\tmicalg=%s; " - (downcase - (cdr (assq micalg - epg-digest-algorithm-alist)))))) - (insert "protocol=\"application/pkcs7-signature\"\n") - (insert (format "\n--%s\n" boundary)) - (goto-char (point-max)) - (insert (format "\n--%s\n" boundary)) - (insert "Content-Type: application/pkcs7-signature; name=smime.p7s + (let* ((pair (mml-secure-epg-sign 'CMS cont)) + (signature (car pair)) + (micalg (cdr pair))) + (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" + boundary)) + (if micalg + (insert (format "\tmicalg=%s; " + (downcase + (cdr (assq micalg + epg-digest-algorithm-alist)))))) + (insert "protocol=\"application/pkcs7-signature\"\n") + (insert (format "\n--%s\n" boundary)) + (goto-char (point-max)) + (insert (format "\n--%s\n" boundary)) + (insert "Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=smime.p7s ") - (insert (base64-encode-string signature) "\n") - (goto-char (point-max)) - (insert (format "--%s--\n" boundary)) - (goto-char (point-max)))) + (insert (base64-encode-string signature) "\n") + (goto-char (point-max)) + (insert (format "--%s--\n" boundary)) + (goto-char (point-max))))) (defun mml-smime-epg-encrypt (cont) (let* ((inhibit-redisplay t) - (context (epg-make-context 'CMS)) - (config (epg-configuration)) - (recipients (message-options-get 'mml-smime-epg-recipients)) - cipher signers - (sender (message-options-get 'message-sender)) - (signer-names (or mml-smime-signers - (if (and mml-smime-sign-with-sender sender) - (list (concat "<" sender ">"))))) (boundary (mml-compute-boundary cont)) - recipient-key) - (unless recipients - (setq recipients - (apply #'nconc - (mapcar - (lambda (recipient) - (or (epg-expand-group config recipient) - (list recipient))) - (split-string - (or (message-options-get 'message-recipients) - (message-options-set 'message-recipients - (read-string "Recipients: "))) - "[ \f\t\n\r\v,]+")))) - (when mml-smime-encrypt-to-self - (unless signer-names - (error "Neither message sender nor mml-smime-signers are set")) - (setq recipients (nconc recipients signer-names))) - (if (eq mm-encrypt-option 'guided) - (setq recipients - (epa-select-keys context "\ -Select recipients for encryption. -If no one is selected, symmetric encryption will be performed. " - recipients)) - (setq recipients - (mapcar - (lambda (recipient) - (setq recipient-key (mml-smime-epg-find-usable-key - (epg-list-keys context recipient) - 'encrypt)) - (unless (or recipient-key - (y-or-n-p - (format "No public key for %s; skip it? " - recipient))) - (error "No public key for %s" recipient)) - recipient-key) - recipients)) - (unless recipients - (error "No recipient specified"))) - (message-options-set 'mml-smime-epg-recipients recipients)) - (if mml-smime-cache-passphrase - (epg-context-set-passphrase-callback - context - #'mml-smime-epg-passphrase-callback)) - (condition-case error - (setq cipher - (epg-encrypt-string context (buffer-string) recipients) - mml-smime-epg-secret-key-id-list nil) - (error - (while mml-smime-epg-secret-key-id-list - (password-cache-remove (car mml-smime-epg-secret-key-id-list)) - (setq mml-smime-epg-secret-key-id-list - (cdr mml-smime-epg-secret-key-id-list))) - (signal (car error) (cdr error)))) + (cipher (mml-secure-epg-encrypt 'CMS cont))) (delete-region (point-min) (point-max)) (goto-char (point-min)) (insert "\ diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 6469636..bb5c940 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el @@ -63,11 +63,17 @@ (defvar mml1991-cache-passphrase mml-secure-cache-passphrase "If t, cache passphrase.") +(make-obsolete-variable 'mml1991-cache-passphrase + 'mml-secure-cache-passphrase + "25.1") (defvar mml1991-passphrase-cache-expiry mml-secure-passphrase-cache-expiry "How many seconds the passphrase is cached. Whether the passphrase is cached at all is controlled by `mml1991-cache-passphrase'.") +(make-obsolete-variable 'mml1991-passphrase-cache-expiry + 'mml-secure-passphrase-cache-expiry + "25.1") (defvar mml1991-signers nil "A list of your own key ID which will be used to sign a message.") @@ -75,6 +81,7 @@ Whether the passphrase is cached at all is controlled by (defvar mml1991-encrypt-to-self nil "If t, add your own key ID to recipient list when encryption.") + ;;; mailcrypt wrapper (autoload 'mc-sign-generic "mc-toplev") @@ -255,91 +262,9 @@ Whether the passphrase is cached at all is controlled by (autoload 'epg-configuration "epg-config") (autoload 'epg-expand-group "epg-config") -(defvar mml1991-epg-secret-key-id-list nil) - -(defun mml1991-epg-passphrase-callback (context key-id ignore) - (if (eq key-id 'SYM) - (epg-passphrase-callback-function context key-id nil) - (let* ((entry (assoc key-id epg-user-id-alist)) - (passphrase - (password-read - (format "GnuPG passphrase for %s: " - (if entry - (cdr entry) - key-id)) - (if (eq key-id 'PIN) - "PIN" - key-id)))) - (when passphrase - (let ((password-cache-expiry mml1991-passphrase-cache-expiry)) - (password-cache-add key-id passphrase)) - (setq mml1991-epg-secret-key-id-list - (cons key-id mml1991-epg-secret-key-id-list)) - (copy-sequence passphrase))))) - -(defun mml1991-epg-find-usable-key (keys usage) - (catch 'found - (while keys - (let ((pointer (epg-key-sub-key-list (car keys)))) - ;; The primary key will be marked as disabled, when the entire - ;; key is disabled (see 12 Field, Format of colon listings, in - ;; gnupg/doc/DETAILS) - (unless (memq 'disabled (epg-sub-key-capability (car pointer))) - (while pointer - (if (and (memq usage (epg-sub-key-capability (car pointer))) - (not (memq (epg-sub-key-validity (car pointer)) - '(revoked expired)))) - (throw 'found (car keys))) - (setq pointer (cdr pointer))))) - (setq keys (cdr keys))))) - -;; XXX: since gpg --list-secret-keys does not return validity of each -;; key, `mml1991-epg-find-usable-key' defined above is not enough for -;; secret keys. The function `mml1991-epg-find-usable-secret-key' -;; below looks at appropriate public keys to check usability. -(defun mml1991-epg-find-usable-secret-key (context name usage) - (let ((secret-keys (epg-list-keys context name t)) - secret-key) - (while (and (not secret-key) secret-keys) - (if (mml1991-epg-find-usable-key - (epg-list-keys context (epg-sub-key-fingerprint - (car (epg-key-sub-key-list - (car secret-keys))))) - usage) - (setq secret-key (car secret-keys) - secret-keys nil) - (setq secret-keys (cdr secret-keys)))) - secret-key)) - (defun mml1991-epg-sign (cont) - (let ((context (epg-make-context)) - headers cte signer-key signers signature) - (if (eq mm-sign-option 'guided) - (setq signers (epa-select-keys context "Select keys for signing. -If no one is selected, default secret key is used. " - mml1991-signers t)) - (if mml1991-signers - (setq signers (delq nil - (mapcar - (lambda (name) - (setq signer-key - (mml1991-epg-find-usable-secret-key - context name 'sign)) - (unless (or signer-key - (y-or-n-p - (format - "No secret key for %s; skip it? " - name))) - (error "No secret key for %s" name)) - signer-key) - mml1991-signers))))) - (epg-context-set-armor context t) - (epg-context-set-textmode context t) - (epg-context-set-signers context signers) - (if mml1991-cache-passphrase - (epg-context-set-passphrase-callback - context - #'mml1991-epg-passphrase-callback)) + (let ((inhibit-redisplay t) + headers cte) ;; Don't sign headers. (goto-char (point-min)) (when (re-search-forward "^$" nil t) @@ -352,28 +277,21 @@ If no one is selected, default secret key is used. " (when cte (setq cte (intern (downcase cte))) (mm-decode-content-transfer-encoding cte))) - (condition-case error - (setq signature (epg-sign-string context (buffer-string) 'clear) - mml1991-epg-secret-key-id-list nil) - (error - (while mml1991-epg-secret-key-id-list - (password-cache-remove (car mml1991-epg-secret-key-id-list)) - (setq mml1991-epg-secret-key-id-list - (cdr mml1991-epg-secret-key-id-list))) - (signal (car error) (cdr error)))) - (delete-region (point-min) (point-max)) - (mm-with-unibyte-current-buffer - (insert signature) - (goto-char (point-min)) - (while (re-search-forward "\r+$" nil t) - (replace-match "" t t)) - (when cte - (mm-encode-content-transfer-encoding cte)) - (goto-char (point-min)) - (when headers - (insert headers)) - (insert "\n")) - t)) + (let* ((pair (mml-secure-epg-sign 'OpenPGP 'clear)) + (signature (car pair))) + (delete-region (point-min) (point-max)) + (mm-with-unibyte-current-buffer + (insert signature) + (goto-char (point-min)) + (while (re-search-forward "\r+$" nil t) + (replace-match "" t t)) + (when cte + (mm-encode-content-transfer-encoding cte)) + (goto-char (point-min)) + (when headers + (insert headers)) + (insert "\n")) + t))) (defun mml1991-epg-encrypt (cont &optional sign) (goto-char (point-min)) @@ -386,78 +304,7 @@ If no one is selected, default secret key is used. " (delete-region (point-min) (point)) (when cte (mm-decode-content-transfer-encoding (intern (downcase cte)))))) - (let ((context (epg-make-context)) - (recipients - (if (message-options-get 'message-recipients) - (split-string - (message-options-get 'message-recipients) - "[ \f\t\n\r\v,]+"))) - recipient-key signer-key cipher signers config) - (when mml1991-encrypt-to-self - (unless mml1991-signers - (error "mml1991-signers is not set")) - (setq recipients (nconc recipients mml1991-signers))) - ;; We should remove this check if epg-0.0.6 is released. - (if (and (condition-case nil - (require 'epg-config) - (error)) - (functionp #'epg-expand-group)) - (setq config (epg-configuration) - recipients - (apply #'nconc - (mapcar (lambda (recipient) - (or (epg-expand-group config recipient) - (list recipient))) - recipients)))) - (if (eq mm-encrypt-option 'guided) - (setq recipients - (epa-select-keys context "Select recipients for encryption. -If no one is selected, symmetric encryption will be performed. " - recipients)) - (setq recipients - (delq nil (mapcar - (lambda (name) - (setq recipient-key (mml1991-epg-find-usable-key - (epg-list-keys context name) - 'encrypt)) - (unless (or recipient-key - (y-or-n-p - (format "No public key for %s; skip it? " - name))) - (error "No public key for %s" name)) - recipient-key) - recipients))) - (unless recipients - (error "No recipient specified"))) - (when sign - (if (eq mm-sign-option 'guided) - (setq signers (epa-select-keys context "Select keys for signing. -If no one is selected, default secret key is used. " - mml1991-signers t)) - (if mml1991-signers - (setq signers (delq nil - (mapcar - (lambda (name) - (mml1991-epg-find-usable-secret-key - context name 'sign)) - mml1991-signers))))) - (epg-context-set-signers context signers)) - (epg-context-set-armor context t) - (epg-context-set-textmode context t) - (if mml1991-cache-passphrase - (epg-context-set-passphrase-callback - context - #'mml1991-epg-passphrase-callback)) - (condition-case error - (setq cipher - (epg-encrypt-string context (buffer-string) recipients sign) - mml1991-epg-secret-key-id-list nil) - (error - (while mml1991-epg-secret-key-id-list - (password-cache-remove (car mml1991-epg-secret-key-id-list)) - (setq mml1991-epg-secret-key-id-list - (cdr mml1991-epg-secret-key-id-list))) - (signal (car error) (cdr error)))) + (let ((cipher (mml-secure-epg-encrypt 'OpenPGP cont sign))) (delete-region (point-min) (point-max)) (insert "\n" cipher)) t) diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 10ba126..e2e9977 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -111,6 +111,9 @@ Valid packages include `epg', `pgg' and `mailcrypt'.") "If t, cache passphrase." :group 'mime-security :type 'boolean) +(make-obsolete-variable 'mml2015-cache-passphrase + 'mml-secure-cache-passphrase + "25.1") (defcustom mml2015-passphrase-cache-expiry mml-secure-passphrase-cache-expiry "How many seconds the passphrase is cached. @@ -118,6 +121,9 @@ Whether the passphrase is cached at all is controlled by `mml2015-cache-passphrase'." :group 'mime-security :type 'integer) +(make-obsolete-variable 'mml2015-passphrase-cache-expiry + 'mml-secure-passphrase-cache-expiry + "25.1") (defcustom mml2015-signers nil "A list of your own key ID(s) which will be used to sign a message. @@ -774,99 +780,6 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." (autoload 'epg-expand-group "epg-config") (autoload 'epa-select-keys "epa") -(defvar mml2015-epg-secret-key-id-list nil) - -(defun mml2015-epg-passphrase-callback (context key-id ignore) - (if (eq key-id 'SYM) - (epg-passphrase-callback-function context key-id nil) - (let* ((password-cache-key-id - (if (eq key-id 'PIN) - "PIN" - key-id)) - entry - (passphrase - (password-read - (if (eq key-id 'PIN) - "Passphrase for PIN: " - (if (setq entry (assoc key-id epg-user-id-alist)) - (format "Passphrase for %s %s: " key-id (cdr entry)) - (format "Passphrase for %s: " key-id))) - password-cache-key-id))) - (when passphrase - (let ((password-cache-expiry mml2015-passphrase-cache-expiry)) - (password-cache-add password-cache-key-id passphrase)) - (setq mml2015-epg-secret-key-id-list - (cons password-cache-key-id mml2015-epg-secret-key-id-list)) - (copy-sequence passphrase))))) - -(defun mml2015-epg-check-user-id (key recipient) - (let ((pointer (epg-key-user-id-list key)) - result) - (while pointer - (if (and (equal (car (mail-header-parse-address - (epg-user-id-string (car pointer)))) - (car (mail-header-parse-address - recipient))) - (not (memq (epg-user-id-validity (car pointer)) - '(revoked expired)))) - (setq result t - pointer nil) - (setq pointer (cdr pointer)))) - result)) - -(defun mml2015-epg-check-sub-key (key usage) - (let ((pointer (epg-key-sub-key-list key)) - result) - ;; The primary key will be marked as disabled, when the entire - ;; key is disabled (see 12 Field, Format of colon listings, in - ;; gnupg/doc/DETAILS) - (unless (memq 'disabled (epg-sub-key-capability (car pointer))) - (while pointer - (if (and (memq usage (epg-sub-key-capability (car pointer))) - (not (memq (epg-sub-key-validity (car pointer)) - '(revoked expired)))) - (setq result t - pointer nil) - (setq pointer (cdr pointer))))) - result)) - -(defun mml2015-epg-find-usable-key (context name usage - &optional name-is-key-id) - (let ((keys (epg-list-keys context name)) - key) - (while keys - (if (and (or name-is-key-id - ;; Non email user-id can be supplied through - ;; mml2015-signers if mml2015-encrypt-to-self is set. - ;; Treat it as valid, as it is user's intention. - (not (string-match "\\`<" name)) - (mml2015-epg-check-user-id (car keys) name)) - (mml2015-epg-check-sub-key (car keys) usage)) - (setq key (car keys) - keys nil) - (setq keys (cdr keys)))) - key)) - -;; XXX: since gpg --list-secret-keys does not return validity of each -;; key, `mml2015-epg-find-usable-key' defined above is not enough for -;; secret keys. The function `mml2015-epg-find-usable-secret-key' -;; below looks at appropriate public keys to check usability. -(defun mml2015-epg-find-usable-secret-key (context name usage) - (let ((secret-keys (epg-list-keys context name t)) - secret-key) - (while (and (not secret-key) secret-keys) - (if (mml2015-epg-find-usable-key - context - (epg-sub-key-fingerprint - (car (epg-key-sub-key-list - (car secret-keys)))) - usage - t) - (setq secret-key (car secret-keys) - secret-keys nil) - (setq secret-keys (cdr secret-keys)))) - secret-key)) - (autoload 'gnus-create-image "gnus-ems") (defun mml2015-epg-key-image (key-id) @@ -921,18 +834,15 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." mm-security-handle 'gnus-info "Corrupted") (throw 'error handle)) (setq context (epg-make-context)) - (if mml2015-cache-passphrase + (if (or mml2015-cache-passphrase mml-secure-cache-passphrase) (epg-context-set-passphrase-callback context - #'mml2015-epg-passphrase-callback)) + (cons 'mml-secure-passphrase-callback 'OpenPGP))) (condition-case error (setq plain (epg-decrypt-string context (mm-get-part child)) - mml2015-epg-secret-key-id-list nil) + mml-secure-secret-key-id-list nil) (error - (while mml2015-epg-secret-key-id-list - (password-cache-remove (car mml2015-epg-secret-key-id-list)) - (setq mml2015-epg-secret-key-id-list - (cdr mml2015-epg-secret-key-id-list))) + (mml-secure-clear-secret-key-id-list) (mm-set-handle-multipart-parameter mm-security-handle 'gnus-info "Failed") (if (eq (car error) 'quit) @@ -968,18 +878,15 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." (let ((inhibit-redisplay t) (context (epg-make-context)) plain) - (if mml2015-cache-passphrase + (if (or mml2015-cache-passphrase mml-secure-cache-passphrase) (epg-context-set-passphrase-callback context - #'mml2015-epg-passphrase-callback)) + (cons 'mml-secure-passphrase-callback 'OpenPGP))) (condition-case error (setq plain (epg-decrypt-string context (buffer-string)) - mml2015-epg-secret-key-id-list nil) + mml-secure-secret-key-id-list nil) (error - (while mml2015-epg-secret-key-id-list - (password-cache-remove (car mml2015-epg-secret-key-id-list)) - (setq mml2015-epg-secret-key-id-list - (cdr mml2015-epg-secret-key-id-list))) + (mml-secure-clear-secret-key-id-list) (mm-set-handle-multipart-parameter mm-security-handle 'gnus-info "Failed") (if (eq (car error) 'quit) @@ -1065,176 +972,37 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." (mml2015-extract-cleartext-signature)))) (defun mml2015-epg-sign (cont) - (let* ((inhibit-redisplay t) - (context (epg-make-context)) - (boundary (mml-compute-boundary cont)) - (sender (message-options-get 'message-sender)) - (signer-names (or mml2015-signers - (if (and mml2015-sign-with-sender sender) - (list (concat "<" sender ">"))))) - signer-key - (signers - (or (message-options-get 'mml2015-epg-signers) - (message-options-set - 'mml2015-epg-signers - (if (eq mm-sign-option 'guided) - (epa-select-keys context "\ -Select keys for signing. -If no one is selected, default secret key is used. " - signer-names - t) - (if (or sender mml2015-signers) - (delq nil - (mapcar - (lambda (signer) - (setq signer-key - (mml2015-epg-find-usable-secret-key - context signer 'sign)) - (unless (or signer-key - (y-or-n-p - (format - "No secret key for %s; skip it? " - signer))) - (error "No secret key for %s" signer)) - signer-key) - signer-names))))))) - signature micalg) - (epg-context-set-armor context t) - (epg-context-set-textmode context t) - (epg-context-set-signers context signers) - (if mml2015-cache-passphrase - (epg-context-set-passphrase-callback - context - #'mml2015-epg-passphrase-callback)) + (let ((inhibit-redisplay t) + (boundary (mml-compute-boundary cont))) ;; Signed data must end with a newline (RFC 3156, 5). (goto-char (point-max)) (unless (bolp) (insert "\n")) - (condition-case error - (setq signature (epg-sign-string context (buffer-string) t) - mml2015-epg-secret-key-id-list nil) - (error - (while mml2015-epg-secret-key-id-list - (password-cache-remove (car mml2015-epg-secret-key-id-list)) - (setq mml2015-epg-secret-key-id-list - (cdr mml2015-epg-secret-key-id-list))) - (signal (car error) (cdr error)))) - (if (epg-context-result-for context 'sign) - (setq micalg (epg-new-signature-digest-algorithm - (car (epg-context-result-for context 'sign))))) - (goto-char (point-min)) - (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" - boundary)) - (if micalg - (insert (format "\tmicalg=pgp-%s; " - (downcase - (cdr (assq micalg - epg-digest-algorithm-alist)))))) - (insert "protocol=\"application/pgp-signature\"\n") - (insert (format "\n--%s\n" boundary)) - (goto-char (point-max)) - (insert (format "\n--%s\n" boundary)) - (insert "Content-Type: application/pgp-signature; name=\"signature.asc\"\n\n") - (insert signature) - (goto-char (point-max)) - (insert (format "--%s--\n" boundary)) - (goto-char (point-max)))) + (let* ((pair (mml-secure-epg-sign 'OpenPGP t)) + (signature (car pair)) + (micalg (cdr pair))) + (goto-char (point-min)) + (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" + boundary)) + (if micalg + (insert (format "\tmicalg=pgp-%s; " + (downcase + (cdr (assq micalg + epg-digest-algorithm-alist)))))) + (insert "protocol=\"application/pgp-signature\"\n") + (insert (format "\n--%s\n" boundary)) + (goto-char (point-max)) + (insert (format "\n--%s\n" boundary)) + (insert "Content-Type: application/pgp-signature; name=\"signature.asc\"\n\n") + (insert signature) + (goto-char (point-max)) + (insert (format "--%s--\n" boundary)) + (goto-char (point-max))))) (defun mml2015-epg-encrypt (cont &optional sign) (let* ((inhibit-redisplay t) - (context (epg-make-context)) (boundary (mml-compute-boundary cont)) - (config (epg-configuration)) - (recipients (message-options-get 'mml2015-epg-recipients)) - cipher - (sender (message-options-get 'message-sender)) - (signer-names (or mml2015-signers - (if (and mml2015-sign-with-sender sender) - (list (concat "<" sender ">"))))) - signers - recipient-key signer-key) - (unless recipients - (setq recipients - (apply #'nconc - (mapcar - (lambda (recipient) - (or (epg-expand-group config recipient) - (list (concat "<" recipient ">")))) - (split-string - (or (message-options-get 'message-recipients) - (message-options-set 'message-recipients - (read-string "Recipients: "))) - "[ \f\t\n\r\v,]+")))) - (when mml2015-encrypt-to-self - (unless signer-names - (error "Neither message sender nor mml2015-signers are set")) - (setq recipients (nconc recipients signer-names))) - (if (eq mm-encrypt-option 'guided) - (setq recipients - (epa-select-keys context "\ -Select recipients for encryption. -If no one is selected, symmetric encryption will be performed. " - recipients)) - (setq recipients - (delq nil - (mapcar - (lambda (recipient) - (setq recipient-key (mml2015-epg-find-usable-key - context recipient 'encrypt)) - (unless (or recipient-key - (y-or-n-p - (format "No public key for %s; skip it? " - recipient))) - (error "No public key for %s" recipient)) - recipient-key) - recipients))) - (unless recipients - (error "No recipient specified"))) - (message-options-set 'mml2015-epg-recipients recipients)) - (when sign - (setq signers - (or (message-options-get 'mml2015-epg-signers) - (message-options-set - 'mml2015-epg-signers - (if (eq mm-sign-option 'guided) - (epa-select-keys context "\ -Select keys for signing. -If no one is selected, default secret key is used. " - signer-names - t) - (if (or sender mml2015-signers) - (delq nil - (mapcar - (lambda (signer) - (setq signer-key - (mml2015-epg-find-usable-secret-key - context signer 'sign)) - (unless (or signer-key - (y-or-n-p - (format - "No secret key for %s; skip it? " - signer))) - (error "No secret key for %s" signer)) - signer-key) - signer-names))))))) - (epg-context-set-signers context signers)) - (epg-context-set-armor context t) - (epg-context-set-textmode context t) - (if mml2015-cache-passphrase - (epg-context-set-passphrase-callback - context - #'mml2015-epg-passphrase-callback)) - (condition-case error - (setq cipher - (epg-encrypt-string context (buffer-string) recipients sign - mml2015-always-trust) - mml2015-epg-secret-key-id-list nil) - (error - (while mml2015-epg-secret-key-id-list - (password-cache-remove (car mml2015-epg-secret-key-id-list)) - (setq mml2015-epg-secret-key-id-list - (cdr mml2015-epg-secret-key-id-list))) - (signal (car error) (cdr error)))) + (cipher (mml-secure-epg-encrypt 'OpenPGP cont sign))) (delete-region (point-min) (point-max)) (goto-char (point-min)) (insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n" commit 43662a240b682de94299e797452ba56d01a04883 Author: Dmitry Gutov Date: Sun Jan 3 02:03:29 2016 +0200 ; Clarify that xref is still experimental diff --git a/etc/NEWS b/etc/NEWS index c97edf2..e9b0fb5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -955,6 +955,9 @@ As a result of this, the following commands are now obsolete: `find-tag-other-window', `find-tag-other-frame', `find-tag-regexp', `tags-apropos', and `tags-loop-continue'. +The framework's API is still experimental and can change in major, +backward-incompatible ways. + *** New variables `find-tag-marker-ring-length' is now an obsolete alias for diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index fe0af0c..26471b0 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -19,6 +19,11 @@ ;;; Commentary: +;; NOTE: The xref API is still experimental and can change in major, +;; backward-incompatible ways. Everyone is encouraged to try it, and +;; report to us any problems or use cases we hadn't anticiated, by +;; sending an email to emacs-devel, or `M-x report-emacs-bug'. +;; ;; This file provides a somewhat generic infrastructure for cross ;; referencing commands, in particular "find-definition". ;; commit 0a6e6caf65237e034135dd50979fe06feb426d5b Author: Glenn Morris Date: Sat Jan 2 10:33:17 2016 -0800 ; * admin/release-process: Remove some obsolete records. diff --git a/admin/release-process b/admin/release-process index d0b55ba..5a95fa2 100644 --- a/admin/release-process +++ b/admin/release-process @@ -212,26 +212,26 @@ names of the people who have checked it. SECTION READERS ---------------------------------- -TUTORIAL cyd -TUTORIAL.bg ogi -TUTORIAL.cn xfq +TUTORIAL +TUTORIAL.bg +TUTORIAL.cn TUTORIAL.cs -TUTORIAL.de wl +TUTORIAL.de TUTORIAL.eo TUTORIAL.es TUTORIAL.fr -TUTORIAL.he eliz +TUTORIAL.he TUTORIAL.it TUTORIAL.ja TUTORIAL.ko -TUTORIAL.nl Pieter Schoenmakers +TUTORIAL.nl TUTORIAL.pl TUTORIAL.pt_BR TUTORIAL.ro -TUTORIAL.ru Alex Ott +TUTORIAL.ru TUTORIAL.sk -TUTORIAL.sl Primoz PETERLIN -TUTORIAL.sv Mats Lidell +TUTORIAL.sl +TUTORIAL.sv TUTORIAL.th TUTORIAL.zh @@ -325,7 +325,7 @@ markers.texi minibuf.texi modes.texi nonascii.texi -numbers.texi Paul Eggert (24.4) +numbers.texi objects.texi os.texi package.texi commit c2e9e3dd33810b3a0e1dff1374c1112eaed351c5 Author: Glenn Morris Date: Sat Jan 2 10:16:03 2016 -0800 * lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function): Explicitly ignore case. (Bug#22262) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 82e81b2..bd08d3f 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -496,12 +496,12 @@ This is used to fontify fixed-format Fortran comments." ;; worth the trouble (about 0.5% of slow down). (eval ;I hate `eval', but it's hard to avoid it here. `(syntax-propertize-rules - ("^[cd\\*]" (0 "<")) + ("^[CcDd\\*]" (0 "<")) ;; We mark all chars after line-length as "comment-start", rather than ;; just the first one. This is so that a closing ' that's past the ;; line-length will indeed be ignored (and will result in a string that ;; leaks into subsequent lines). - ((format "^[^cd\\*\t\n].\\{%d\\}\\(.+\\)" (1- line-length)) + ((format "^[^CcDd\\*\t\n].\\{%d\\}\\(.+\\)" (1- line-length)) (1 "<"))))) (defvar fortran-font-lock-keywords fortran-font-lock-keywords-1 commit 8637f3d0fa8d2f7325313abd66edb072b1a69db7 Author: Stefan Monnier Date: Sat Jan 2 13:03:42 2016 -0500 (semantic-symref-derive-find-filepatterns): Return a list * lisp/cedet/semantic/symref/grep.el (semantic-symref-derive-find-filepatterns): Return a list. (semantic-symref-perform-search): Quote the result here once and for all. diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index 54b5383..3b544d9 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -53,6 +53,8 @@ and those hits returned.") See find -name man page for format.") (defun semantic-symref-derive-find-filepatterns (&optional mode) + ;; FIXME: This should be moved to grep.el, where it could be used + ;; for "C-u M-x grep" as well. "Derive a list of file patterns for the current buffer. Looks first in `semantic-symref-filepattern-alist'. If it is not there, it then looks in `auto-mode-alist', and attempts to derive something @@ -64,28 +66,20 @@ Optional argument MODE specifies the `major-mode' to test." (when (not pat) ;; No hit, try auto-mode-alist. (dolist (X auto-mode-alist) - (when (eq (cdr X) mode) - ;; Only take in simple patterns, so try to convert this one. - (let ((Xp - (cond ((string-match "\\\\\\.\\([^\\'>]+\\)\\\\'" (car X)) - (concat "*." (match-string 1 (car X)))) - (t nil)))) - (when Xp - (setq pat (cons Xp pat)))) - ))) + (when (and (eq (cdr X) mode) + ;; Only take in simple patterns, so try to convert this one. + (string-match "\\\\\\.\\([^\\'>]+\\)\\\\'" (car X))) + (push (concat "*." (match-string 1 (car X))) pat)))) ;; Convert the list into some find-flags. - (cond ((= (length pat) 1) - (concat "-name " (shell-quote-argument (car pat)))) - ((consp pat) - (concat (shell-quote-argument "(") " " - (mapconcat (lambda (s) - (concat "-name " (shell-quote-argument s))) - pat - " -o ") - " " (shell-quote-argument ")"))) - (t - (error "Customize `semantic-symref-filepattern-alist' for %s" major-mode)) - ))) + (if (null pat) + (error "Customize `semantic-symref-filepattern-alist' for %S" + major-mode) + (let ((args `("-name" ,(car pat)))) + (if (null (cdr args)) + args + `("(" ,@args + ,@(apply #'nconc (mapcar (lambda (s) `("-o" "-name" ,s)) pat)) + ")")))))) (defvar grepflags) (defvar greppattern) @@ -147,7 +141,8 @@ This shell should support pipe redirect syntax." ;; Find the root of the project, and do a find-grep... (let* (;; Find the file patterns to use. (rootdir (semantic-symref-calculate-rootdir)) - (filepattern (semantic-symref-derive-find-filepatterns)) + (filepatterns (semantic-symref-derive-find-filepatterns)) + (filepattern (mapconcat #'shell-quote-argument filepatterns " ")) ;; Grep based flags. (grepflags (cond ((eq (oref tool :resulttype) 'file) "-l ") commit 0a7ad071efdd6fe9cc2f5f18bb5648f0062ec60b Author: Eli Zaretskii Date: Sat Jan 2 18:05:44 2016 +0200 ; Re-arrange xref-related entries in NEWS. diff --git a/etc/NEWS b/etc/NEWS index fdfd4f0..c97edf2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -933,20 +933,30 @@ New options `tildify-space-string', `tildify-pattern', and `tildify-ignored-environments-alist' variables (as well as a few helper functions) obsolete. -** xref -The new package provides generic framework and new commands to find -and move to definitions, as well as pop back to the original location. - -*** New key bindings -`xref-find-definitions' replaces `find-tag' and provides an interface -to pick one destination among several. Hence, `tags-loop-continue' is -unbound. `xref-pop-marker-stack' replaces `pop-tag-mark', but uses an -easier binding, which is now unoccupied (`M-,'). +** New package Xref replaces Etags's front-end and UI + +The new package Xref provides a generic framework and new commands to +find and move to definitions of functions, macros, data structures +etc., as well as go back to the location where you were before moving +to a definition. It supersedes and obsoletes many Etags commands, +while still using the etags.el code that reads the TAGS tables as one +of its back-ends. + +The command `xref-find-definitions' replaces `find-tag' and provides +an interface to pick one definition among several. +`tags-loop-continue' is now unbound. `xref-pop-marker-stack' replaces +`pop-tag-mark', but has a keybinding (`M-,'), unlike `pop-tag-mark'. + `xref-find-definitions-other-window' replaces `find-tag-other-window'. `xref-find-definitions-other-frame' replaces `find-tag-other-frame'. `xref-find-apropos' replaces `find-tag-regexp'. +As a result of this, the following commands are now obsolete: +`find-tag-other-window', `find-tag-other-frame', `find-tag-regexp', +`tags-apropos', and `tags-loop-continue'. + *** New variables + `find-tag-marker-ring-length' is now an obsolete alias for `xref-marker-ring-length'. `find-tag-marker-ring' is now an obsolete alias for a private variable. `xref-push-marker-stack' and @@ -957,11 +967,6 @@ alias for a private variable. `xref-push-marker-stack' and information about mode local overrides (defined by cedet/mode-local.el `define-overloadable-function' `define-mode-local-overrides'). -** etags -As a result of the above, these commands are now obsolete: -`find-tag-other-window', `find-tag-other-frame', `find-tag-regexp', -`tags-apropos' and `tags-loop-continue'. - ** EUDC EUDC's LDAP backend has been improved. commit fe903ef7cf1b1efdeede7128fb75f464eb72bdda Author: Eli Zaretskii Date: Sat Jan 2 17:24:48 2016 +0200 Fix xref-find-references on MS-Windows * lisp/cedet/semantic/symref/grep.el (semantic-symref-derive-find-filepatterns): Use 'shell-quote-argument' instead of manually quoting in a way that only works with Posix shells. (Bug#22289) diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index 52c8d3b..54b5383 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -75,14 +75,14 @@ Optional argument MODE specifies the `major-mode' to test." ))) ;; Convert the list into some find-flags. (cond ((= (length pat) 1) - (concat "-name \"" (car pat) "\"")) + (concat "-name " (shell-quote-argument (car pat)))) ((consp pat) - (concat "\\( " + (concat (shell-quote-argument "(") " " (mapconcat (lambda (s) - (concat "-name \"" s "\"")) + (concat "-name " (shell-quote-argument s))) pat " -o ") - " \\)")) + " " (shell-quote-argument ")"))) (t (error "Customize `semantic-symref-filepattern-alist' for %s" major-mode)) ))) commit 55a28d8a1b1981d8469b39c68488f1848e8601b2 Author: Anders Lindgren Date: Sat Jan 2 15:54:01 2016 +0100 ; Fixed visual bell artifact problem on NextStep. * src/nsterm.m (EmacsBell): Add feature to remove visual bell unconditionally. (hide_bell): New function. (ns_copy_bits): Hide visible bell before scrolling the frame content. diff --git a/src/nsterm.m b/src/nsterm.m index 0510f8e..b270e0e 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1150,9 +1150,11 @@ ns_clip_to_row (struct window *w, struct glyph_row *row, { // Number of currently active bell:s. unsigned int nestCount; + bool isAttached; } - (void)show:(NSView *)view; - (void)hide; +- (void)remove; @end @implementation EmacsBell @@ -1162,6 +1164,7 @@ ns_clip_to_row (struct window *w, struct glyph_row *row, if ((self = [super init])) { nestCount = 0; + isAttached = false; self.image = [NSImage imageNamed:NSImageNameCaution]; } return self; @@ -1183,6 +1186,7 @@ ns_clip_to_row (struct window *w, struct glyph_row *row, [self setFrameOrigin:pos]; [self setFrameSize:self.image.size]; + isAttached = true; [[[view window] contentView] addSubview:self positioned:NSWindowAbove relativeTo:nil]; @@ -1199,17 +1203,31 @@ ns_clip_to_row (struct window *w, struct glyph_row *row, // Note: Trace output from this method isn't shown, reason unknown. // NSTRACE ("[EmacsBell hide]"); - --nestCount; + if (nestCount > 0) + --nestCount; // Remove the image once the last bell became inactive. if (nestCount == 0) { + [self remove]; + } +} + + +-(void)remove +{ + if (isAttached) + { [self removeFromSuperview]; + isAttached = false; } } @end + +static EmacsBell * bell_view = nil; + static void ns_ring_bell (struct frame *f) /* -------------------------------------------------------------------------- @@ -1222,7 +1240,6 @@ ns_ring_bell (struct frame *f) struct frame *frame = SELECTED_FRAME (); NSView *view; - static EmacsBell * bell_view = nil; if (bell_view == nil) { bell_view = [[EmacsBell alloc] init]; @@ -1246,6 +1263,18 @@ ns_ring_bell (struct frame *f) } +static void hide_bell () +/* -------------------------------------------------------------------------- + Ensure the bell is hidden. + -------------------------------------------------------------------------- */ +{ + if (bell_view != nil) + { + [bell_view remove]; + } +} + + /* ========================================================================== Frame / window manager related functions @@ -2328,6 +2357,8 @@ ns_copy_bits (struct frame *f, NSRect src, NSRect dest) { if (FRAME_NS_VIEW (f)) { + hide_bell(); // Ensure the bell image isn't scrolled. + ns_focus (f, &dest, 1); [FRAME_NS_VIEW (f) scrollRect: src by: NSMakeSize (dest.origin.x - src.origin.x, commit d064034c1c805ba263de26efe7ca42acecbe8899 Author: Eli Zaretskii Date: Sat Jan 2 14:48:38 2016 +0200 Document new features of tildify-mode * lisp/textmodes/tildify.el (tildify-foreach-ignore-environments) (tildify-mode): Spelling fixes in doc strings. * etc/NEWS: Reformat the tildify-mode entry. diff --git a/etc/NEWS b/etc/NEWS index 1880e6d..fdfd4f0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -925,8 +925,10 @@ By default, 32 consecutive spaces or four consecutive TABs are considered to be too deep, but the new variable `whitespace-big-indent-regexp' can be customized to change that. -** tildify: `tildify-space-string', `tildify-pattern', and -`tildify-foreach-region-function' variables added making +--- +** New options in `tildify-mode'. +New options `tildify-space-string', `tildify-pattern', and +`tildify-foreach-region-function' variables make `tildify-string-alist', `tildify-pattern-alist', and `tildify-ignored-environments-alist' variables (as well as a few helper functions) obsolete. diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index b11569c..eb799c0 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -282,7 +282,7 @@ corresponding text part and can be either: CALLBACK is a function accepting two arguments -- REG-BEG and REG-END -- that will be called for portions of the buffer outside of the environments defined by -PAIRS regexes. +PAIRS regexps. The function will return as soon as CALLBACK returns nil or point goes past END. CALLBACK may be called on portions of the buffer outside of [BEG END); in fact @@ -479,7 +479,7 @@ which is assumed to be a space character, should be replaced with a hard space." ;;;###autoload (define-minor-mode tildify-mode - "Adds electric behaviour to space character. + "Adds electric behavior to space character. When space is inserted into a buffer in a position where hard space is required instead (determined by `tildify-space-pattern' and `tildify-space-predicates'), commit 964bea7da5283a6c1ca2d7c6ee8a9d07d4951e69 Author: Eli Zaretskii Date: Sat Jan 2 14:06:02 2016 +0200 Document new features of Whitespace mode * doc/emacs/display.texi (Useless Whitespace): Document 'whitespace-toggle-options' and the new 'big-indent' style. Document 'whitespace-big-indent-regexp'. Document the Global Whitespace mode. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 38e7a90..1b75a15 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1164,12 +1164,15 @@ indicate-empty-lines t)}. @cindex mode, Whitespace @findex whitespace-mode @vindex whitespace-style +@findex whitespace-toggle-options Whitespace mode is a buffer-local minor mode that lets you visualize many kinds of whitespace in the buffer, by either drawing the whitespace characters with a special face or displaying them as special glyphs. To toggle this mode, type @kbd{M-x whitespace-mode}. The kinds of whitespace visualized are determined -by the list variable @code{whitespace-style}. Here is a partial list +by the list variable @code{whitespace-style}. Individual elements in +that list can be toggled on or off in the current buffer by typing +@w{@kbd{M-x whitespace-toggle-options}}. Here is a partial list of possible elements (see the variable's documentation for the full list): @@ -1200,6 +1203,13 @@ Highlight newlines. @item empty Highlight empty lines. +@item big-indent +@vindex whitespace-big-indent-regexp +Highlight too-deep indentation. By default any sequence of at least 4 +consecutive TAB characters or 32 consecutive SPC characters is +highlighted. To change that, customize the regular expression +@code{whitespace-big-indent-regexp}. + @item space-mark Draw space and non-breaking characters with a special glyph. @@ -1210,6 +1220,12 @@ Draw tab characters with a special glyph. Draw newline characters with a special glyph. @end table +@findex global-whitespace-toggle-options +@findex global-whitespace-mode +Global Whitespace mode is a global minor mode that lets you visualize +whitespace in all buffers. To toggle individual features, use +@kbd{M-x global-whitespace-toggle-options}. + @node Selective Display @section Selective Display @cindex selective display diff --git a/etc/NEWS b/etc/NEWS index c20afaf..1880e6d 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -919,9 +919,11 @@ use PDF instead of DVI. `prettify-symbols-mode' in a tex-mode buffer, \alpha ... \omega, and many other math macros are displayed using unicode characters. -** whitespace-mode: new 'big-indent style highlighting too much indentation. -By default, 32 spaces and four TABs are considered to be too much but -`whitespace-big-indent-regexp' can be configured to change that. ++++ +** New `big-indent' style in `whitespace-mode' highlights deep indentation. +By default, 32 consecutive spaces or four consecutive TABs are +considered to be too deep, but the new variable +`whitespace-big-indent-regexp' can be customized to change that. ** tildify: `tildify-space-string', `tildify-pattern', and `tildify-foreach-region-function' variables added making commit cd68f47e4fddaa891a978b4ac55cbf323850dfd9 Author: Eli Zaretskii Date: Sat Jan 2 12:36:28 2016 +0200 Improve documentation of new Hide-IfDef features * etc/NEWS: Expand and reword Hide-IfDef section. diff --git a/etc/NEWS b/etc/NEWS index 25bd69e..c20afaf 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -877,16 +877,36 @@ fitting for use in money calculations --- *** Factorial works with non-integer inputs. -** HideIfDef mode now support full C/C++ expressions, argumented macro -expansions, interactive macro evaluation and automatic scanning of -#defined symbols. +** Hide-IfDef mode -*** New custom variable `hide-ifdef-header-regexp' to define C/C++ header file -name patterns. Default case-insensitive .h, .hh, .hpp, .hxx, and .h++. +--- +*** Hide-IfDef mode now support full C/C++ expressions in macros, +macro argument expansion, interactive macro evaluation and automatic +scanning of #define'd symbols. + +--- +*** New command `hif-evaluate-macro', bound to `C-c @ e', displays the +result of evaluating a macro. + +--- +*** New command `hif-clear-all-ifdef-define', bound to `C-c @ C', clears +all defined symbols in `hide-ifdef-env'. + +--- +*** New custom variable `hide-ifdef-header-regexp' to define C/C++ header +file name patterns. Defaults to files whose extension is one of `.h', +`.hh', `.hpp', `.hxx', or `.h++', matched case-insensitively. + +--- *** New custom variable `hide-ifdef-expand-reinclusion-protection' to prevent -reinclusion protected header files from being fully hidden. +reinclusion protected (a.k.a. "idempotent") header files from being hidden. +(This could happen when an idempotent header file is visited again, +when its guard symbol is already defined.) Defaults to `t'. + +--- *** New custom variable `hide-ifdef-exclude-define-regexp' to define symbol -name patterns (e.g. all "FOR_DOXYGEN_ONLY_*") to be excluded. +name patterns (e.g. all "FOR_DOXYGEN_ONLY_*") to be ignored when +looking for macro definitions. By default, no symbols are ignored. ** TeX mode commit 723b8bf19de21c0a2c25dc91df5ab22a3a9e2717 Author: Leo Liu Date: Sat Jan 2 15:48:44 2016 +0800 Fix regression in font-locking cl-assert and cl-check-type * lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Fix el-errs-re. diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 4bb1466..574ecef 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -383,7 +383,8 @@ This will generate compile-time constants from BINDINGS." ((eq type 'type) font-lock-type-face) ((or (not (match-string 2)) ;; Normal defun. (and (match-string 2) ;; Setf function. - (match-string 4))) font-lock-function-name-face))) + (match-string 4))) + font-lock-function-name-face))) nil t))) "Subdued level highlighting for Lisp modes.") @@ -403,7 +404,7 @@ This will generate compile-time constants from BINDINGS." (2 font-lock-constant-face nil t)) ;; Erroneous structures. (,(concat "(" el-errs-re "\\_>") - (1 font-lock-warning-face)) + (1 font-lock-warning-face prepend)) ;; Words inside \\[] tend to be for `substitute-command-keys'. (,(concat "\\\\\\\\\\[\\(" lisp-mode-symbol-regexp "\\)\\]") (1 font-lock-constant-face prepend)) commit 372d00a981942a5da868a33372eb29d5806f2ab3 Author: Glenn Morris Date: Fri Jan 1 07:23:33 2016 -0500 ; Auto-commit of loaddefs files. diff --git a/lisp/dired.el b/lisp/dired.el index dd32363..5b5b6f0 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3903,7 +3903,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "dired-aux" "dired-aux.el" "29842a53d6651f8f535ec8e02d20d7cc") +;;;### (autoloads nil "dired-aux" "dired-aux.el" "7b7e39be8bcaf5f35b2735c3f5635f40") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@ -4416,7 +4416,7 @@ instead. ;;;*** -;;;### (autoloads nil "dired-x" "dired-x.el" "06f532e2e812fa1cb10ade31249e9700") +;;;### (autoloads nil "dired-x" "dired-x.el" "26ec84bf71edaf13ce45aeab60b7f31f") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index e0294cd..631e4a4 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -1101,7 +1101,7 @@ method invocation orders of the involved classes." (list eieio--generic-subclass-generalizer)) -;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "52d481d50642de76b077ba0bafdd2cd4") +;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "6aca3c1b5f751a01331761da45fc4f5c") ;;; Generated autoloads from eieio-compat.el (autoload 'eieio--defalias "eieio-compat" "\ diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index a1b4a72..772ebd9 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -973,7 +973,7 @@ variable PRINT-FUNCTION. Optional argument NOESCAPE is passed to ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "eieio-custom" "eieio-custom.el" "916f54b818479a77a02f3ecccda84a11") +;;;### (autoloads nil "eieio-custom" "eieio-custom.el" "e8d466f8eee341f3da967c2931b28043") ;;; Generated autoloads from eieio-custom.el (autoload 'customize-object "eieio-custom" "\ @@ -984,7 +984,7 @@ Optional argument GROUP is the sub-group of slots to display. ;;;*** -;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "d00419c898056fadf2f8e491f864aa1e") +;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "5bd32f1033d0e2eee7c32c0ad28330fc") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index d4a6244..178f3a0 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -2412,7 +2412,7 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'." (load file 'NOERROR nil nil) )) -;;;### (autoloads nil "hfy-cmap" "hfy-cmap.el" "1fb78b15b18622256262c7246b2a3520") +;;;### (autoloads nil "hfy-cmap" "hfy-cmap.el" "e644ddae915ddb98c9b2f16ffa5a74b2") ;;; Generated autoloads from hfy-cmap.el (autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\ diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 90a4194..9d23e64 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -2614,7 +2614,7 @@ will be inserted before the group at point." ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "ibuf-ext" "ibuf-ext.el" "65ef908165926cf48da6f43fd01ef50b") +;;;### (autoloads nil "ibuf-ext" "ibuf-ext.el" "9521139d5f2ba7c870e3101fd73bb3ce") ;;; Generated autoloads from ibuf-ext.el (autoload 'ibuffer-auto-mode "ibuf-ext" "\ diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 3d1f6d2..311b698 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -3,7 +3,7 @@ ;;; Code: -;;;### (autoloads nil "5x5" "play/5x5.el" (22086 11930 122062 731000)) +;;;### (autoloads nil "5x5" "play/5x5.el" (22150 28228 674072 702000)) ;;; 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" (22086 11930 -;;;;;; 138062 731000)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (22150 28228 +;;;;;; 750072 702000)) ;;; 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" (22086 11930 -;;;;;; 138062 731000)) +;;;### (autoloads nil "ada-stmt" "progmodes/ada-stmt.el" (22150 28228 +;;;;;; 750072 702000)) ;;; 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" (22086 11930 -;;;;;; 138062 731000)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (22150 28228 +;;;;;; 754072 702000)) ;;; 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" (22086 11930 366062 -;;;;;; 731000)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (22150 28229 246072 +;;;;;; 702000)) ;;; 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" (22092 27717 -;;;;;; 604268 464000)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (22150 28227 +;;;;;; 338072 702000)) ;;; 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" (22086 11929 490062 731000)) +;;;### (autoloads nil "align" "align.el" (22150 28226 938072 702000)) ;;; 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" (22086 11929 494062 731000)) +;;;### (autoloads nil "allout" "allout.el" (22150 28226 942072 702000)) ;;; 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" (22086 -;;;;;; 11929 490062 731000)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (22150 +;;;;;; 28226 938072 702000)) ;;; 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" (22092 27717 960268 -;;;;;; 464000)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (22150 28228 350072 +;;;;;; 702000)) ;;; 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" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "animate" "play/animate.el" (22150 28228 674072 +;;;;;; 702000)) ;;; 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" (22086 11929 494062 -;;;;;; 731000)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (22150 28226 942072 +;;;;;; 702000)) ;;; 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" (22086 -;;;;;; 11930 138062 731000)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (22150 +;;;;;; 28228 754072 702000)) ;;; 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" (22086 11929 526062 -;;;;;; 731000)) +;;;### (autoloads nil "appt" "calendar/appt.el" (22150 28227 46072 +;;;;;; 702000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1037,8 +1037,8 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (22099 26170 362017 -;;;;;; 16000)) +;;;### (autoloads nil "apropos" "apropos.el" (22150 28226 942072 +;;;;;; 702000)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1153,8 +1153,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads nil "arc-mode" "arc-mode.el" (22086 11929 494062 -;;;;;; 731000)) +;;;### (autoloads nil "arc-mode" "arc-mode.el" (22150 28226 946072 +;;;;;; 702000)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1174,7 +1174,7 @@ archive. ;;;*** -;;;### (autoloads nil "array" "array.el" (22086 11929 494062 731000)) +;;;### (autoloads nil "array" "array.el" (22150 28226 946072 702000)) ;;; Generated autoloads from array.el (autoload 'array-mode "array" "\ @@ -1245,8 +1245,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads nil "artist" "textmodes/artist.el" (22086 11930 -;;;;;; 310062 731000)) +;;;### (autoloads nil "artist" "textmodes/artist.el" (22150 28229 +;;;;;; 86072 702000)) ;;; Generated autoloads from textmodes/artist.el (push (purecopy '(artist 1 2 6)) package--builtin-versions) @@ -1452,8 +1452,8 @@ Keymap summary ;;;*** -;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (22086 11930 -;;;;;; 142062 731000)) +;;;### (autoloads nil "asm-mode" "progmodes/asm-mode.el" (22150 28228 +;;;;;; 758072 702000)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1480,8 +1480,8 @@ Special commands: ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (22086 -;;;;;; 11929 774062 731000)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (22150 +;;;;;; 28227 658072 702000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1493,8 +1493,8 @@ let-binding.") ;;;*** -;;;### (autoloads nil "autoarg" "autoarg.el" (22086 11929 494062 -;;;;;; 731000)) +;;;### (autoloads nil "autoarg" "autoarg.el" (22150 28226 946072 +;;;;;; 702000)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1554,8 +1554,8 @@ This is similar to `autoarg-mode' but rebinds the keypad keys ;;;*** -;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (22086 11930 -;;;;;; 142062 731000)) +;;;### (autoloads nil "autoconf" "progmodes/autoconf.el" (22150 28228 +;;;;;; 758072 702000)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1565,8 +1565,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (22086 11929 494062 -;;;;;; 731000)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (22150 28226 946072 +;;;;;; 702000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1604,8 +1604,8 @@ insert a template for the file depending on the mode of the buffer. ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (22086 -;;;;;; 11929 634062 731000)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (22150 +;;;;;; 28227 338072 702000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1656,8 +1656,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (22089 51528 204929 -;;;;;; 316000)) +;;;### (autoloads nil "autorevert" "autorevert.el" (22150 28226 946072 +;;;;;; 702000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1745,7 +1745,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (22086 11929 498062 731000)) +;;;### (autoloads nil "avoid" "avoid.el" (22150 28226 946072 702000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1783,8 +1783,8 @@ definition of \"random distance\".) ;;;*** -;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (22086 11930 -;;;;;; 142062 731000)) +;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (22150 28228 +;;;;;; 758072 702000)) ;;; Generated autoloads from progmodes/bat-mode.el (add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode)) @@ -1802,8 +1802,8 @@ Run script using `bat-run' and `bat-run-args'. ;;;*** -;;;### (autoloads nil "battery" "battery.el" (22086 11929 498062 -;;;;;; 731000)) +;;;### (autoloads nil "battery" "battery.el" (22150 28226 946072 +;;;;;; 702000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1838,8 +1838,8 @@ seconds. ;;;*** -;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (22086 -;;;;;; 11929 638062 731000)) +;;;### (autoloads nil "benchmark" "emacs-lisp/benchmark.el" (22150 +;;;;;; 28227 338072 702000)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload 'benchmark-run "benchmark" "\ @@ -1875,8 +1875,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (22092 27718 -;;;;;; 508268 464000)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (22150 28229 +;;;;;; 94072 702000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1968,7 +1968,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'. ;;;*** ;;;### (autoloads nil "bibtex-style" "textmodes/bibtex-style.el" -;;;;;; (22086 11930 310062 731000)) +;;;;;; (22150 28229 86072 702000)) ;;; Generated autoloads from textmodes/bibtex-style.el (autoload 'bibtex-style-mode "bibtex-style" "\ @@ -1978,8 +1978,8 @@ Major mode for editing BibTeX style files. ;;;*** -;;;### (autoloads nil "binhex" "mail/binhex.el" (22086 11929 930062 -;;;;;; 731000)) +;;;### (autoloads nil "binhex" "mail/binhex.el" (22150 28228 226072 +;;;;;; 702000)) ;;; Generated autoloads from mail/binhex.el (defconst binhex-begin-line "^:...............................................................$" "\ @@ -2003,8 +2003,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads nil "blackbox" "play/blackbox.el" (22086 11930 -;;;;;; 122062 731000)) +;;;### (autoloads nil "blackbox" "play/blackbox.el" (22150 28228 +;;;;;; 674072 702000)) ;;; Generated autoloads from play/blackbox.el (autoload 'blackbox "blackbox" "\ @@ -2123,8 +2123,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (22086 11929 498062 -;;;;;; 731000)) +;;;### (autoloads nil "bookmark" "bookmark.el" (22150 28226 950072 +;;;;;; 702000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2348,8 +2348,8 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;*** -;;;### (autoloads nil "browse-url" "net/browse-url.el" (22086 11929 -;;;;;; 990062 731000)) +;;;### (autoloads nil "browse-url" "net/browse-url.el" (22150 28228 +;;;;;; 350072 702000)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2395,12 +2395,17 @@ Ask a WWW browser to display the current region. (autoload 'browse-url "browse-url" "\ Ask a WWW browser to load URL. Prompt for a URL, defaulting to the URL at or before point. -The variable `browse-url-browser-function' says which browser to use. -If the URL is a mailto: URL, consult `browse-url-mailto-function' +Invokes a suitable browser function which does the actual job. +The variable `browse-url-browser-function' says which browser function to +use. If the URL is a mailto: URL, consult `browse-url-mailto-function' first, if that exists. -Passes any ARGS to the browser function. -The default is to pass `browse-url-new-window-flag'. +The additional ARGS are passed to the browser function. See the doc +strings of the actual functions, starting with `browse-url-browser-function', +for information about the significance of ARGS (most of the functions +ignore it). +If ARGS are omitted, the default is to pass `browse-url-new-window-flag' +as ARGS. \(fn URL &rest ARGS)" t nil) @@ -2490,6 +2495,7 @@ Ask the Chromium WWW browser to load URL. Default to the URL around or before point. The strings in variable `browse-url-chromium-arguments' are also passed to Chromium. +The optional argument NEW-WINDOW is not used. \(fn URL &optional NEW-WINDOW)" t nil) @@ -2624,6 +2630,7 @@ URL defaults to the URL around or before point. This runs the text browser specified by `browse-url-text-browser'. in an Xterm window using the Xterm program named by `browse-url-xterm-program' with possible additional arguments `browse-url-xterm-args'. +The optional argument NEW-WINDOW is not used. \(fn URL &optional NEW-WINDOW)" t nil) @@ -2672,6 +2679,7 @@ don't offer a form of remote control. (autoload 'browse-url-kde "browse-url" "\ Ask the KDE WWW browser to load URL. Default to the URL around or before point. +The optional argument NEW-WINDOW is not used. \(fn URL &optional NEW-WINDOW)" t nil) @@ -2689,7 +2697,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (22086 11929 498062 731000)) +;;;### (autoloads nil "bs" "bs.el" (22150 28226 950072 702000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2730,8 +2738,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (22150 28228 674072 +;;;;;; 702000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2753,7 +2761,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (22086 11930 142062 731000)) +;;;;;; (22150 28228 758072 702000)) ;;; 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))))) @@ -2773,8 +2781,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (22108 -;;;;;; 15942 526032 987000)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (22150 +;;;;;; 28227 358072 702000)) ;;; 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) @@ -2894,8 +2902,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (22086 -;;;;;; 11929 526062 731000)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (22150 +;;;;;; 28227 46072 702000)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2904,8 +2912,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (22086 11929 -;;;;;; 526062 731000)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (22150 28227 +;;;;;; 50072 702000)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2916,8 +2924,8 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (22086 -;;;;;; 11929 526062 731000)) +;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (22150 +;;;;;; 28227 50072 702000)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2929,7 +2937,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (22086 11929 522062 731000)) +;;;### (autoloads nil "calc" "calc/calc.el" (22150 28227 26072 702000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -3015,8 +3023,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (22086 11929 -;;;;;; 518062 731000)) +;;;### (autoloads nil "calc-undo" "calc/calc-undo.el" (22150 28227 +;;;;;; 22072 702000)) ;;; Generated autoloads from calc/calc-undo.el (autoload 'calc-undo "calc-undo" "\ @@ -3026,8 +3034,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (22092 27717 520268 -;;;;;; 464000)) +;;;### (autoloads nil "calculator" "calculator.el" (22150 28227 46072 +;;;;;; 702000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -3038,8 +3046,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (22092 27717 -;;;;;; 540268 464000)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (22150 28227 +;;;;;; 62072 702000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3082,8 +3090,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "canlock" "gnus/canlock.el" (22086 11929 774062 -;;;;;; 731000)) +;;;### (autoloads nil "canlock" "gnus/canlock.el" (22150 28227 658072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/canlock.el (autoload 'canlock-insert-header "canlock" "\ @@ -3100,8 +3108,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (22108 -;;;;;; 15942 570032 987000)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (22150 +;;;;;; 28228 786072 702000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3111,8 +3119,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (22086 11930 -;;;;;; 150062 731000)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (22150 28228 +;;;;;; 790072 702000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3210,8 +3218,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (22101 42694 -;;;;;; 157526 804000)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (22150 28228 +;;;;;; 798072 702000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3369,8 +3377,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (22086 -;;;;;; 11930 154062 731000)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (22150 +;;;;;; 28228 798072 702000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3421,8 +3429,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (22086 11930 -;;;;;; 154062 731000)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (22150 28228 +;;;;;; 802072 702000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3430,8 +3438,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (22086 11929 874062 -;;;;;; 731000)) +;;;### (autoloads nil "ccl" "international/ccl.el" (22150 28228 106072 +;;;;;; 702000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3724,8 +3732,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (22102 63557 -;;;;;; 288509 103000)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (22150 28227 +;;;;;; 358072 702000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3744,15 +3752,15 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cedet" "cedet/cedet.el" (22086 11929 542062 -;;;;;; 731000)) +;;;### (autoloads nil "cedet" "cedet/cedet.el" (22150 28227 146072 +;;;;;; 702000)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (22086 11930 -;;;;;; 154062 731000)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (22150 28228 +;;;;;; 802072 702000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 4)) package--builtin-versions) @@ -3781,8 +3789,8 @@ Choose `cfengine2-mode' or `cfengine3-mode' by buffer contents. ;;;*** -;;;### (autoloads nil "character-fold" "character-fold.el" (22109 -;;;;;; 36809 195889 179000)) +;;;### (autoloads nil "character-fold" "character-fold.el" (22150 +;;;;;; 28227 274072 702000)) ;;; Generated autoloads from character-fold.el (autoload 'character-fold-to-regexp "character-fold" "\ @@ -3801,15 +3809,15 @@ from which to start. ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (22092 27717 -;;;;;; 628268 464000)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (22150 28227 +;;;;;; 358072 702000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (22086 11929 650062 731000)) +;;;;;; (22150 28227 358072 702000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3826,8 +3834,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (22104 -;;;;;; 18893 193441 487000)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (22150 +;;;;;; 28227 362072 702000)) ;;; 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) @@ -4037,8 +4045,8 @@ Find package keywords that aren't in `finder-known-keywords'. ;;;*** -;;;### (autoloads nil "china-util" "language/china-util.el" (22086 -;;;;;; 11929 890062 731000)) +;;;### (autoloads nil "china-util" "language/china-util.el" (22150 +;;;;;; 28228 162072 702000)) ;;; Generated autoloads from language/china-util.el (autoload 'decode-hz-region "china-util" "\ @@ -4075,8 +4083,8 @@ Encode the text in the current buffer to HZ. ;;;*** -;;;### (autoloads nil "chistory" "chistory.el" (22086 11929 582062 -;;;;;; 731000)) +;;;### (autoloads nil "chistory" "chistory.el" (22150 28227 274072 +;;;;;; 702000)) ;;; Generated autoloads from chistory.el (autoload 'repeat-matching-complex-command "chistory" "\ @@ -4115,8 +4123,8 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (22086 -;;;;;; 11929 654062 731000)) +;;;### (autoloads nil "cl-indent" "emacs-lisp/cl-indent.el" (22150 +;;;;;; 28227 366072 702000)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4199,8 +4207,8 @@ instead. ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (22086 11929 -;;;;;; 654062 731000)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (22150 28227 +;;;;;; 366072 702000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) @@ -4218,8 +4226,8 @@ a future Emacs interpreter will be able to use it.") ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (22086 11930 -;;;;;; 158062 731000)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (22150 28228 +;;;;;; 802072 702000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4239,8 +4247,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (22086 11929 582062 -;;;;;; 731000)) +;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (22150 28227 274072 +;;;;;; 702000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4260,7 +4268,7 @@ is run). ;;;*** -;;;### (autoloads nil "color" "color.el" (22086 11929 582062 731000)) +;;;### (autoloads nil "color" "color.el" (22150 28227 274072 702000)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4279,7 +4287,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (22086 11929 586062 731000)) +;;;### (autoloads nil "comint" "comint.el" (22150 28227 278072 702000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4380,8 +4388,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads nil "compare-w" "vc/compare-w.el" (22086 11930 -;;;;;; 370062 731000)) +;;;### (autoloads nil "compare-w" "vc/compare-w.el" (22150 28229 +;;;;;; 250072 702000)) ;;; Generated autoloads from vc/compare-w.el (autoload 'compare-windows "compare-w" "\ @@ -4417,8 +4425,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (22099 26170 -;;;;;; 422017 16000)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (22150 28228 +;;;;;; 802072 702000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4599,8 +4607,8 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** -;;;### (autoloads nil "completion" "completion.el" (22086 11929 586062 -;;;;;; 731000)) +;;;### (autoloads nil "completion" "completion.el" (22150 28227 286072 +;;;;;; 702000)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4622,8 +4630,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (22086 -;;;;;; 11930 314062 731000)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (22150 +;;;;;; 28229 94072 702000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4778,8 +4786,8 @@ For details see `conf-mode'. Example: ;;;*** -;;;### (autoloads nil "cookie1" "play/cookie1.el" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "cookie1" "play/cookie1.el" (22150 28228 674072 +;;;;;; 702000)) ;;; Generated autoloads from play/cookie1.el (autoload 'cookie "cookie1" "\ @@ -4807,8 +4815,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (22086 -;;;;;; 11929 662062 731000)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (22150 +;;;;;; 28227 374072 702000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4846,8 +4854,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (22086 -;;;;;; 11930 162062 731000)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (22150 +;;;;;; 28228 806072 702000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -5045,8 +5053,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (22092 27718 148268 -;;;;;; 464000)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (22150 28228 806072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -5064,8 +5072,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (22086 11929 662062 -;;;;;; 731000)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (22150 28227 374072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -5091,8 +5099,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (22086 11930 -;;;;;; 314062 731000)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (22150 28229 +;;;;;; 94072 702000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5108,8 +5116,8 @@ Major mode to edit \"Sassy CSS\" files. ;;;*** -;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (22086 11929 -;;;;;; 690062 731000)) +;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (22150 28227 +;;;;;; 458072 702000)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5154,8 +5162,8 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;*** -;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (22087 9807 -;;;;;; 178279 951000)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (22150 28227 +;;;;;; 462072 702000)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -5167,7 +5175,7 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** ;;;### (autoloads nil "cursor-sensor" "emacs-lisp/cursor-sensor.el" -;;;;;; (22086 11929 662062 731000)) +;;;;;; (22150 28227 374072 702000)) ;;; Generated autoloads from emacs-lisp/cursor-sensor.el (autoload 'cursor-intangible-mode "cursor-sensor" "\ @@ -5187,8 +5195,8 @@ entering the area covered by the text-property property or leaving it. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (22086 11929 590062 -;;;;;; 731000)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (22150 28227 290072 +;;;;;; 702000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5507,8 +5515,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (22086 11929 590062 -;;;;;; 731000)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (22150 28227 290072 +;;;;;; 702000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5541,8 +5549,8 @@ omitted, a buffer named *Custom Themes* is used. ;;;*** -;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (22086 11930 -;;;;;; 370062 731000)) +;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (22150 28229 +;;;;;; 250072 702000)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5552,8 +5560,8 @@ Mode used for cvs status output. ;;;*** -;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (22089 51528 280929 -;;;;;; 316000)) +;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (22150 28228 810072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) @@ -5597,8 +5605,8 @@ See `cwarn-mode' for more information on Cwarn mode. ;;;*** -;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (22086 -;;;;;; 11929 890062 731000)) +;;;### (autoloads nil "cyril-util" "language/cyril-util.el" (22150 +;;;;;; 28228 162072 702000)) ;;; Generated autoloads from language/cyril-util.el (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\ @@ -5626,8 +5634,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (22086 11929 590062 -;;;;;; 731000)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (22150 28227 290072 +;;;;;; 702000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5673,8 +5681,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (22086 11929 -;;;;;; 542062 731000)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (22150 28227 +;;;;;; 146072 702000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5684,7 +5692,7 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads nil "dbus" "net/dbus.el" (22086 11929 990062 731000)) +;;;### (autoloads nil "dbus" "net/dbus.el" (22150 28228 354072 702000)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5697,8 +5705,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (22086 11930 -;;;;;; 162062 731000)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (22150 28228 +;;;;;; 810072 702000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5824,8 +5832,8 @@ There is some minimal font-lock support (see vars ;;;*** -;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (22086 11929 -;;;;;; 662062 731000)) +;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (22150 28227 +;;;;;; 378072 702000)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -5868,8 +5876,8 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** -;;;### (autoloads nil "decipher" "play/decipher.el" (22086 11930 -;;;;;; 126062 731000)) +;;;### (autoloads nil "decipher" "play/decipher.el" (22150 28228 +;;;;;; 674072 702000)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5897,8 +5905,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (22086 11929 590062 -;;;;;; 731000)) +;;;### (autoloads nil "delim-col" "delim-col.el" (22150 28227 290072 +;;;;;; 702000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5923,7 +5931,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (22086 11929 594062 731000)) +;;;### (autoloads nil "delsel" "delsel.el" (22150 28227 290072 702000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5951,8 +5959,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (22086 11929 -;;;;;; 666062 731000)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (22150 28227 +;;;;;; 398072 702000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -6020,8 +6028,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (22086 11929 594062 -;;;;;; 731000)) +;;;### (autoloads nil "descr-text" "descr-text.el" (22150 28227 290072 +;;;;;; 702000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -6070,8 +6078,8 @@ This function is meant to be used as a value of ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (22092 27717 592268 -;;;;;; 464000)) +;;;### (autoloads nil "desktop" "desktop.el" (22150 28227 294072 +;;;;;; 702000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6280,8 +6288,8 @@ Revert to the last loaded desktop. ;;;*** -;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (22086 11929 -;;;;;; 774062 731000)) +;;;### (autoloads nil "deuglify" "gnus/deuglify.el" (22150 28227 +;;;;;; 658072 702000)) ;;; Generated autoloads from gnus/deuglify.el (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\ @@ -6313,8 +6321,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (22092 -;;;;;; 27717 544268 464000)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (22150 +;;;;;; 28227 74072 702000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6356,7 +6364,7 @@ Major mode for editing the diary file. ;;;*** -;;;### (autoloads nil "diff" "vc/diff.el" (22086 11930 370062 731000)) +;;;### (autoloads nil "diff" "vc/diff.el" (22150 28229 254072 702000)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-u") "\ @@ -6404,8 +6412,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (22087 9807 430279 -;;;;;; 951000)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (22150 28229 +;;;;;; 250072 702000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6437,7 +6445,7 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "dig" "net/dig.el" (22086 11929 990062 731000)) +;;;### (autoloads nil "dig" "net/dig.el" (22150 28228 354072 702000)) ;;; Generated autoloads from net/dig.el (autoload 'dig "dig" "\ @@ -6448,7 +6456,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (22086 11929 598062 731000)) +;;;### (autoloads nil "dired" "dired.el" (22150 28227 310072 702000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6574,8 +6582,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (22086 11929 598062 -;;;;;; 731000)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (22150 28227 310072 +;;;;;; 702000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6605,8 +6613,8 @@ from `default-directory'. ;;;*** -;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (22086 11929 -;;;;;; 666062 731000)) +;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (22150 28227 +;;;;;; 398072 702000)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6620,8 +6628,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (22086 11929 598062 -;;;;;; 731000)) +;;;### (autoloads nil "disp-table" "disp-table.el" (22150 28227 310072 +;;;;;; 702000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6742,8 +6750,8 @@ in `.emacs'. ;;;*** -;;;### (autoloads nil "dissociate" "play/dissociate.el" (22086 11930 -;;;;;; 126062 731000)) +;;;### (autoloads nil "dissociate" "play/dissociate.el" (22150 28228 +;;;;;; 674072 702000)) ;;; Generated autoloads from play/dissociate.el (autoload 'dissociated-press "dissociate" "\ @@ -6759,7 +6767,7 @@ Default is 2. ;;;*** -;;;### (autoloads nil "dnd" "dnd.el" (22086 11929 598062 731000)) +;;;### (autoloads nil "dnd" "dnd.el" (22150 28227 314072 702000)) ;;; 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)) "\ @@ -6779,8 +6787,8 @@ if some action was made, or nil if the URL is ignored.") ;;;*** -;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (22086 11930 -;;;;;; 314062 731000)) +;;;### (autoloads nil "dns-mode" "textmodes/dns-mode.el" (22150 28229 +;;;;;; 98072 702000)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload 'dns-mode "dns-mode" "\ @@ -6803,8 +6811,8 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads nil "doc-view" "doc-view.el" (22086 11929 598062 -;;;;;; 731000)) +;;;### (autoloads nil "doc-view" "doc-view.el" (22150 28227 314072 +;;;;;; 702000)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6850,8 +6858,8 @@ See the command `doc-view-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "doctor" "play/doctor.el" (22086 11930 126062 -;;;;;; 731000)) +;;;### (autoloads nil "doctor" "play/doctor.el" (22150 28228 678072 +;;;;;; 702000)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -6861,7 +6869,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (22086 11929 602062 731000)) +;;;### (autoloads nil "double" "double.el" (22150 28227 318072 702000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6877,8 +6885,8 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (22093 48588 576393 -;;;;;; 539000)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (22150 28228 678072 +;;;;;; 702000)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 2)) package--builtin-versions) @@ -6889,8 +6897,8 @@ Switch to *dungeon* buffer and start game. ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (22092 -;;;;;; 27717 632268 464000)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (22150 +;;;;;; 28227 398072 702000)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -7034,8 +7042,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (22086 -;;;;;; 11929 666062 731000)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (22150 +;;;;;; 28227 398072 702000)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7173,8 +7181,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (22086 11930 -;;;;;; 166062 731000)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (22150 28228 +;;;;;; 814072 702000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7439,8 +7447,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (22086 11930 -;;;;;; 170062 731000)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (22150 28228 +;;;;;; 814072 702000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7588,8 +7596,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (22086 11929 602062 -;;;;;; 731000)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (22150 28227 318072 +;;;;;; 702000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7621,8 +7629,8 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** -;;;### (autoloads nil "echistory" "echistory.el" (22086 11929 602062 -;;;;;; 731000)) +;;;### (autoloads nil "echistory" "echistory.el" (22150 28227 318072 +;;;;;; 702000)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7633,8 +7641,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (22086 11929 -;;;;;; 774062 731000)) +;;;### (autoloads nil "ecomplete" "gnus/ecomplete.el" (22150 28227 +;;;;;; 658072 702000)) ;;; Generated autoloads from gnus/ecomplete.el (autoload 'ecomplete-setup "ecomplete" "\ @@ -7644,7 +7652,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (22092 27717 556268 464000)) +;;;### (autoloads nil "ede" "cedet/ede.el" (22150 28227 202072 702000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7670,8 +7678,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (22086 11929 -;;;;;; 670062 731000)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (22150 28227 +;;;;;; 406072 702000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7735,7 +7743,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (22086 11930 378062 731000)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (22150 28229 274072 702000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -8007,8 +8015,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (22086 11930 -;;;;;; 370062 731000)) +;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (22150 28229 +;;;;;; 254072 702000)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -8018,8 +8026,8 @@ With optional NODE, goes to that node. ;;;*** -;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (22086 11930 -;;;;;; 374062 731000)) +;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (22150 28229 +;;;;;; 262072 702000)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -8031,8 +8039,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (22086 11930 -;;;;;; 374062 731000)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (22150 28229 +;;;;;; 270072 702000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -8051,8 +8059,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (22086 11929 602062 -;;;;;; 731000)) +;;;### (autoloads nil "edmacro" "edmacro.el" (22150 28227 318072 +;;;;;; 702000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -8101,8 +8109,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (22086 11929 694062 -;;;;;; 731000)) +;;;### (autoloads nil "edt" "emulation/edt.el" (22150 28227 462072 +;;;;;; 702000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -8119,7 +8127,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (22086 11929 602062 731000)) +;;;### (autoloads nil "ehelp" "ehelp.el" (22150 28227 318072 702000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8155,15 +8163,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (22086 11929 -;;;;;; 674062 731000)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (22150 28227 +;;;;;; 422072 702000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (22086 -;;;;;; 11929 670062 731000)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (22150 +;;;;;; 28227 418072 702000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8179,8 +8187,8 @@ It creates an autoload function for CNAME's constructor. ;;;*** -;;;### (autoloads nil "elec-pair" "elec-pair.el" (22086 11929 602062 -;;;;;; 731000)) +;;;### (autoloads nil "elec-pair" "elec-pair.el" (22150 28227 322072 +;;;;;; 702000)) ;;; Generated autoloads from elec-pair.el (defvar electric-pair-text-pairs '((34 . 34)) "\ @@ -8221,8 +8229,8 @@ Toggle `electric-pair-mode' only in this buffer. ;;;*** -;;;### (autoloads nil "elide-head" "elide-head.el" (22086 11929 602062 -;;;;;; 731000)) +;;;### (autoloads nil "elide-head" "elide-head.el" (22150 28227 322072 +;;;;;; 702000)) ;;; Generated autoloads from elide-head.el (autoload 'elide-head "elide-head" "\ @@ -8237,8 +8245,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (22086 11929 -;;;;;; 674062 731000)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (22150 28227 +;;;;;; 422072 702000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8273,8 +8281,8 @@ optional prefix argument REINIT is non-nil. ;;;*** -;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (22086 11929 674062 -;;;;;; 731000)) +;;;### (autoloads nil "elp" "emacs-lisp/elp.el" (22150 28227 422072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload 'elp-instrument-function "elp" "\ @@ -8308,8 +8316,8 @@ displayed. ;;;*** -;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (22086 11929 690062 -;;;;;; 731000)) +;;;### (autoloads nil "emacs-lock" "emacs-lock.el" (22150 28227 458072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lock.el (autoload 'emacs-lock-mode "emacs-lock" "\ @@ -8336,8 +8344,8 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (22086 11929 -;;;;;; 934062 731000)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (22150 28228 +;;;;;; 226072 702000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8411,8 +8419,8 @@ Emerge two RCS revisions of a file, with another revision as ancestor. ;;;*** -;;;### (autoloads nil "enriched" "textmodes/enriched.el" (22086 11930 -;;;;;; 314062 731000)) +;;;### (autoloads nil "enriched" "textmodes/enriched.el" (22150 28229 +;;;;;; 98072 702000)) ;;; Generated autoloads from textmodes/enriched.el (autoload 'enriched-mode "enriched" "\ @@ -8447,7 +8455,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (22086 11929 698062 731000)) +;;;### (autoloads nil "epa" "epa.el" (22150 28227 482072 702000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8635,8 +8643,8 @@ Insert selected KEYS after the point. ;;;*** -;;;### (autoloads nil "epa-dired" "epa-dired.el" (22086 11929 698062 -;;;;;; 731000)) +;;;### (autoloads nil "epa-dired" "epa-dired.el" (22150 28227 478072 +;;;;;; 702000)) ;;; Generated autoloads from epa-dired.el (autoload 'epa-dired-do-decrypt "epa-dired" "\ @@ -8661,8 +8669,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (22086 11929 698062 -;;;;;; 731000)) +;;;### (autoloads nil "epa-file" "epa-file.el" (22150 28227 482072 +;;;;;; 702000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8682,8 +8690,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-mail" "epa-mail.el" (22086 11929 698062 -;;;;;; 731000)) +;;;### (autoloads nil "epa-mail" "epa-mail.el" (22150 28227 482072 +;;;;;; 702000)) ;;; Generated autoloads from epa-mail.el (autoload 'epa-mail-mode "epa-mail" "\ @@ -8760,7 +8768,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (22092 27717 648268 464000)) +;;;### (autoloads nil "epg" "epg.el" (22150 28227 482072 702000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8771,8 +8779,8 @@ Return a context object. ;;;*** -;;;### (autoloads nil "epg-config" "epg-config.el" (22086 11929 698062 -;;;;;; 731000)) +;;;### (autoloads nil "epg-config" "epg-config.el" (22150 28227 482072 +;;;;;; 702000)) ;;; Generated autoloads from epg-config.el (autoload 'epg-configuration "epg-config" "\ @@ -8792,7 +8800,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (22093 48588 540393 539000)) +;;;### (autoloads nil "erc" "erc/erc.el" (22150 28227 526072 702000)) ;;; Generated autoloads from erc/erc.el (push (purecopy '(erc 5 3)) package--builtin-versions) @@ -8841,36 +8849,36 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (22086 -;;;;;; 11929 706062 731000)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (22150 +;;;;;; 28227 506072 702000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (22092 27717 -;;;;;; 652268 464000)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (22150 28227 +;;;;;; 506072 702000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (22086 11929 -;;;;;; 706062 731000)) +;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (22150 28227 +;;;;;; 510072 702000)) ;;; Generated autoloads from erc/erc-capab.el (autoload 'erc-capab-identify-mode "erc-capab" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (22086 11929 -;;;;;; 706062 731000)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (22150 28227 +;;;;;; 510072 702000)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (22086 11929 706062 -;;;;;; 731000)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (22150 28227 510072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8900,14 +8908,14 @@ that subcommand. ;;;*** ;;;### (autoloads nil "erc-desktop-notifications" "erc/erc-desktop-notifications.el" -;;;;;; (22086 11929 706062 731000)) +;;;;;; (22150 28227 510072 702000)) ;;; Generated autoloads from erc/erc-desktop-notifications.el (autoload 'erc-notifications-mode "erc-desktop-notifications" "" t) ;;;*** -;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (22086 -;;;;;; 11929 710062 731000)) +;;;### (autoloads nil "erc-ezbounce" "erc/erc-ezbounce.el" (22150 +;;;;;; 28227 510072 702000)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload 'erc-cmd-ezb "erc-ezbounce" "\ @@ -8969,8 +8977,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (22086 11929 710062 -;;;;;; 731000)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (22150 28227 510072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -8982,8 +8990,8 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'. ;;;*** -;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (22086 11929 -;;;;;; 710062 731000)) +;;;### (autoloads nil "erc-identd" "erc/erc-identd.el" (22150 28227 +;;;;;; 510072 702000)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -9004,8 +9012,8 @@ system. ;;;*** -;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (22086 11929 -;;;;;; 710062 731000)) +;;;### (autoloads nil "erc-imenu" "erc/erc-imenu.el" (22150 28227 +;;;;;; 514072 702000)) ;;; Generated autoloads from erc/erc-imenu.el (autoload 'erc-create-imenu-index "erc-imenu" "\ @@ -9015,22 +9023,22 @@ system. ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (22086 11929 710062 -;;;;;; 731000)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (22150 28227 514072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads nil "erc-list" "erc/erc-list.el" (22086 11929 710062 -;;;;;; 731000)) +;;;### (autoloads nil "erc-list" "erc/erc-list.el" (22150 28227 514072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-list.el (autoload 'erc-list-mode "erc-list") ;;;*** -;;;### (autoloads nil "erc-log" "erc/erc-log.el" (22086 11929 710062 -;;;;;; 731000)) +;;;### (autoloads nil "erc-log" "erc/erc-log.el" (22150 28227 514072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -9059,8 +9067,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (22092 27717 -;;;;;; 652268 464000)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (22150 28227 +;;;;;; 514072 702000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9106,15 +9114,15 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** -;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (22086 11929 710062 -;;;;;; 731000)) +;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (22150 28227 514072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-menu.el (autoload 'erc-menu-mode "erc-menu" nil t) ;;;*** -;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (22086 -;;;;;; 11929 710062 731000)) +;;;### (autoloads nil "erc-netsplit" "erc/erc-netsplit.el" (22150 +;;;;;; 28227 514072 702000)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9125,8 +9133,8 @@ Show who's gone. ;;;*** -;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (22086 -;;;;;; 11929 710062 731000)) +;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (22150 +;;;;;; 28227 518072 702000)) ;;; Generated autoloads from erc/erc-networks.el (autoload 'erc-determine-network "erc-networks" "\ @@ -9143,8 +9151,8 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** -;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (22086 11929 -;;;;;; 710062 731000)) +;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (22150 28227 +;;;;;; 518072 702000)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9162,36 +9170,36 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (22086 11929 710062 -;;;;;; 731000)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (22150 28227 518072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (22086 -;;;;;; 11929 710062 731000)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (22150 +;;;;;; 28227 518072 702000)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (22086 11929 -;;;;;; 710062 731000)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (22150 28227 +;;;;;; 518072 702000)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (22092 27717 652268 -;;;;;; 464000)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (22150 28227 518072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (22086 -;;;;;; 11929 710062 731000)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (22150 +;;;;;; 28227 518072 702000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9208,15 +9216,15 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (22086 11929 -;;;;;; 714062 731000)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (22150 28227 +;;;;;; 518072 702000)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (22086 -;;;;;; 11929 714062 731000)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (22150 +;;;;;; 28227 518072 702000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9227,22 +9235,22 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (22086 -;;;;;; 11929 714062 731000)) +;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (22150 +;;;;;; 28227 518072 702000)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (22086 11929 -;;;;;; 714062 731000)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (22150 28227 +;;;;;; 518072 702000)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (22092 27717 -;;;;;; 656268 464000)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (22150 28227 +;;;;;; 522072 702000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9267,8 +9275,8 @@ keybindings will not do anything useful. ;;;*** -;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (22086 -;;;;;; 11929 714062 731000)) +;;;### (autoloads nil "erc-truncate" "erc/erc-truncate.el" (22150 +;;;;;; 28227 522072 702000)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9287,8 +9295,8 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** -;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (22086 11929 714062 -;;;;;; 731000)) +;;;### (autoloads nil "erc-xdcc" "erc/erc-xdcc.el" (22150 28227 522072 +;;;;;; 702000)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload 'erc-xdcc-mode "erc-xdcc") @@ -9299,8 +9307,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (22092 27717 632268 -;;;;;; 464000)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (22150 28227 426072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9369,8 +9377,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** -;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (22086 11929 -;;;;;; 674062 731000)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (22150 28227 +;;;;;; 426072 702000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9382,8 +9390,8 @@ Kill all test buffers that are still live. ;;;*** -;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (22086 11929 -;;;;;; 722062 731000)) +;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (22150 28227 +;;;;;; 542072 702000)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9393,8 +9401,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads nil "eshell" "eshell/eshell.el" (22086 11929 722062 -;;;;;; 731000)) +;;;### (autoloads nil "eshell" "eshell/eshell.el" (22150 28227 542072 +;;;;;; 702000)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) @@ -9429,8 +9437,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (22105 39773 947886 -;;;;;; 896000)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (22150 28228 818072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9747,8 +9755,8 @@ for \\[find-tag] (which see). ;;;*** -;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (22086 -;;;;;; 11929 894062 731000)) +;;;### (autoloads nil "ethio-util" "language/ethio-util.el" (22150 +;;;;;; 28228 166072 702000)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9916,7 +9924,7 @@ With ARG, insert that many delimiters. ;;;*** -;;;### (autoloads nil "eudc" "net/eudc.el" (22099 965 90725 479000)) +;;;### (autoloads nil "eudc" "net/eudc.el" (22150 28228 354072 702000)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9970,8 +9978,8 @@ This does nothing except loading eudc by autoload side-effect. ;;;*** -;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (22086 11929 990062 -;;;;;; 731000)) +;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (22150 28228 354072 +;;;;;; 702000)) ;;; Generated autoloads from net/eudc-bob.el (autoload 'eudc-display-generic-binary "eudc-bob" "\ @@ -10006,8 +10014,8 @@ Display a button for the JPEG DATA. ;;;*** -;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (22099 965 -;;;;;; 74725 479000)) +;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (22150 28228 +;;;;;; 354072 702000)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -10023,8 +10031,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** -;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (22086 -;;;;;; 11929 990062 731000)) +;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (22150 +;;;;;; 28228 354072 702000)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -10034,8 +10042,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (22086 11929 674062 -;;;;;; 731000)) +;;;### (autoloads nil "ewoc" "emacs-lisp/ewoc.el" (22150 28227 430072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload 'ewoc-create "ewoc" "\ @@ -10061,7 +10069,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (22093 48588 548393 539000)) +;;;### (autoloads nil "eww" "net/eww.el" (22150 28228 358072 702000)) ;;; Generated autoloads from net/eww.el (defvar eww-suggest-uris '(eww-links-at-point url-get-url-at-point eww-current-url) "\ @@ -10108,8 +10116,8 @@ Display the bookmarks. ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (22086 -;;;;;; 11930 170062 731000)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (22150 +;;;;;; 28228 818072 702000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -10144,7 +10152,7 @@ file modes. ;;;*** -;;;### (autoloads nil "expand" "expand.el" (22086 11929 726062 731000)) +;;;### (autoloads nil "expand" "expand.el" (22150 28227 542072 702000)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -10193,8 +10201,8 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads nil "f90" "progmodes/f90.el" (22092 27718 152268 -;;;;;; 464000)) +;;;### (autoloads nil "f90" "progmodes/f90.el" (22150 28228 818072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10261,8 +10269,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (22086 11929 726062 -;;;;;; 731000)) +;;;### (autoloads nil "face-remap" "face-remap.el" (22150 28227 542072 +;;;;;; 702000)) ;;; Generated autoloads from face-remap.el (autoload 'face-remap-add-relative "face-remap" "\ @@ -10476,7 +10484,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (22086 11929 730062 731000)) +;;;### (autoloads nil "ffap" "ffap.el" (22150 28227 554072 702000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10539,8 +10547,8 @@ Evaluate the forms in variable `ffap-bindings'. ;;;*** -;;;### (autoloads nil "filecache" "filecache.el" (22086 11929 734062 -;;;;;; 731000)) +;;;### (autoloads nil "filecache" "filecache.el" (22150 28227 554072 +;;;;;; 702000)) ;;; Generated autoloads from filecache.el (autoload 'file-cache-add-directory "filecache" "\ @@ -10597,8 +10605,8 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads nil "filenotify" "filenotify.el" (22086 11929 734062 -;;;;;; 731000)) +;;;### (autoloads nil "filenotify" "filenotify.el" (22150 28227 554072 +;;;;;; 702000)) ;;; Generated autoloads from filenotify.el (autoload 'file-notify-handle-event "filenotify" "\ @@ -10613,8 +10621,8 @@ Otherwise, signal a `file-notify-error'. ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (22086 11929 734062 -;;;;;; 731000)) +;;;### (autoloads nil "files-x" "files-x.el" (22150 28227 554072 +;;;;;; 702000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10679,8 +10687,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (22092 27717 792268 -;;;;;; 464000)) +;;;### (autoloads nil "filesets" "filesets.el" (22150 28227 578072 +;;;;;; 702000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10691,8 +10699,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (22086 11929 746062 -;;;;;; 731000)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (22150 28227 578072 +;;;;;; 702000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10712,8 +10720,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (22086 11929 746062 -;;;;;; 731000)) +;;;### (autoloads nil "find-dired" "find-dired.el" (22150 28227 578072 +;;;;;; 702000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10753,8 +10761,8 @@ use in place of \"-ls\" as the final argument. ;;;*** -;;;### (autoloads nil "find-file" "find-file.el" (22092 27717 792268 -;;;;;; 464000)) +;;;### (autoloads nil "find-file" "find-file.el" (22150 28227 578072 +;;;;;; 702000)) ;;; 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)))) "\ @@ -10844,8 +10852,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (22086 -;;;;;; 11929 678062 731000)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (22150 +;;;;;; 28227 430072 702000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -11015,8 +11023,8 @@ Define some key bindings for the find-function family of functions. ;;;*** -;;;### (autoloads nil "find-lisp" "find-lisp.el" (22086 11929 746062 -;;;;;; 731000)) +;;;### (autoloads nil "find-lisp" "find-lisp.el" (22150 28227 578072 +;;;;;; 702000)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -11036,7 +11044,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (22086 11929 750062 731000)) +;;;### (autoloads nil "finder" "finder.el" (22150 28227 578072 702000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -11058,8 +11066,8 @@ Find packages matching a given keyword. ;;;*** -;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (22086 11929 750062 -;;;;;; 731000)) +;;;### (autoloads nil "flow-ctrl" "flow-ctrl.el" (22150 28227 578072 +;;;;;; 702000)) ;;; Generated autoloads from flow-ctrl.el (autoload 'enable-flow-control "flow-ctrl" "\ @@ -11080,8 +11088,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (22086 11929 -;;;;;; 774062 731000)) +;;;### (autoloads nil "flow-fill" "gnus/flow-fill.el" (22150 28227 +;;;;;; 658072 702000)) ;;; Generated autoloads from gnus/flow-fill.el (autoload 'fill-flowed-encode "flow-fill" "\ @@ -11096,8 +11104,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (22092 27718 -;;;;;; 156268 464000)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (22150 28228 +;;;;;; 818072 702000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -11127,8 +11135,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (22086 11930 -;;;;;; 314062 731000)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (22150 28229 +;;;;;; 102072 702000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11198,14 +11206,14 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "foldout" "foldout.el" (22086 11929 750062 -;;;;;; 731000)) +;;;### (autoloads nil "foldout" "foldout.el" (22150 28227 582072 +;;;;;; 702000)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "follow" "follow.el" (22096 24780 228094 47000)) +;;;### (autoloads nil "follow" "follow.el" (22150 28227 582072 702000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11299,8 +11307,8 @@ selected if the original window is the first one in the frame. ;;;*** -;;;### (autoloads nil "footnote" "mail/footnote.el" (22086 11929 -;;;;;; 934062 731000)) +;;;### (autoloads nil "footnote" "mail/footnote.el" (22150 28228 +;;;;;; 226072 702000)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) @@ -11319,7 +11327,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (22086 11929 754062 731000)) +;;;### (autoloads nil "forms" "forms.el" (22150 28227 586072 702000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11355,8 +11363,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (22092 27718 -;;;;;; 156268 464000)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (22150 28228 +;;;;;; 822072 702000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11433,8 +11441,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "fortune" "play/fortune.el" (22086 11930 126062 -;;;;;; 731000)) +;;;### (autoloads nil "fortune" "play/fortune.el" (22150 28228 678072 +;;;;;; 702000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11482,8 +11490,8 @@ and choose the directory as the fortune-file. ;;;*** -;;;### (autoloads nil "frameset" "frameset.el" (22086 11929 754062 -;;;;;; 731000)) +;;;### (autoloads nil "frameset" "frameset.el" (22150 28227 622072 +;;;;;; 702000)) ;;; Generated autoloads from frameset.el (defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\ @@ -11669,15 +11677,15 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (22086 11930 -;;;;;; 126062 731000)) +;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (22150 28228 +;;;;;; 678072 702000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (22092 27718 -;;;;;; 172268 464000)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (22150 28228 +;;;;;; 822072 702000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11754,8 +11762,8 @@ detailed description of this mode. ;;;*** -;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (22086 11929 -;;;;;; 678062 731000)) +;;;### (autoloads nil "generic" "emacs-lisp/generic.el" (22150 28227 +;;;;;; 430072 702000)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11835,8 +11843,8 @@ regular expression that can be used as an element of ;;;*** -;;;### (autoloads nil "glasses" "progmodes/glasses.el" (22086 11930 -;;;;;; 178062 731000)) +;;;### (autoloads nil "glasses" "progmodes/glasses.el" (22150 28228 +;;;;;; 822072 702000)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11850,8 +11858,8 @@ add virtual separators (like underscores) at places they belong to. ;;;*** -;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (22086 11929 -;;;;;; 778062 731000)) +;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (22150 28227 +;;;;;; 662072 702000)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11905,7 +11913,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (22086 11929 810062 731000)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (22150 28227 942072 702000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11955,8 +11963,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (22086 11929 -;;;;;; 778062 731000)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (22150 28227 +;;;;;; 666072 702000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -12046,8 +12054,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (22086 11929 -;;;;;; 782062 731000)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (22150 28227 +;;;;;; 674072 702000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -12057,8 +12065,8 @@ Make the current buffer look like a nice article. ;;;*** -;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (22086 -;;;;;; 11929 782062 731000)) +;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (22150 +;;;;;; 28227 674072 702000)) ;;; Generated autoloads from gnus/gnus-bookmark.el (autoload 'gnus-bookmark-set "gnus-bookmark" "\ @@ -12081,8 +12089,8 @@ deletion, or > if it is flagged for displaying. ;;;*** -;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (22086 11929 -;;;;;; 782062 731000)) +;;;### (autoloads nil "gnus-cache" "gnus/gnus-cache.el" (22150 28227 +;;;;;; 678072 702000)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload 'gnus-jog-cache "gnus-cache" "\ @@ -12123,8 +12131,8 @@ supported. ;;;*** -;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (22086 11929 -;;;;;; 786062 731000)) +;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (22150 28227 +;;;;;; 682072 702000)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -12159,8 +12167,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (22086 11929 -;;;;;; 786062 731000)) +;;;### (autoloads nil "gnus-diary" "gnus/gnus-diary.el" (22150 28227 +;;;;;; 686072 702000)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -12175,8 +12183,8 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** -;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (22086 11929 -;;;;;; 786062 731000)) +;;;### (autoloads nil "gnus-dired" "gnus/gnus-dired.el" (22150 28227 +;;;;;; 686072 702000)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -12186,8 +12194,8 @@ Convenience method to turn on gnus-dired-mode. ;;;*** -;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (22086 11929 -;;;;;; 786062 731000)) +;;;### (autoloads nil "gnus-draft" "gnus/gnus-draft.el" (22150 28227 +;;;;;; 686072 702000)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -12197,8 +12205,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (22086 11929 -;;;;;; 786062 731000)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (22150 28227 +;;;;;; 686072 702000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus--random-face-with-type "gnus-fun" "\ @@ -12263,8 +12271,8 @@ Insert a random Face header from `gnus-face-directory'. ;;;*** -;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (22086 -;;;;;; 11929 786062 731000)) +;;;### (autoloads nil "gnus-gravatar" "gnus/gnus-gravatar.el" (22150 +;;;;;; 28227 686072 702000)) ;;; Generated autoloads from gnus/gnus-gravatar.el (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\ @@ -12281,8 +12289,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (22086 11929 -;;;;;; 790062 731000)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (22150 28227 +;;;;;; 694072 702000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12299,8 +12307,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (22086 11929 -;;;;;; 790062 731000)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (22150 28227 +;;;;;; 694072 702000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12315,8 +12323,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (22086 11929 -;;;;;; 790062 731000)) +;;;### (autoloads nil "gnus-kill" "gnus/gnus-kill.el" (22150 28227 +;;;;;; 698072 702000)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias 'gnus-batch-kill 'gnus-batch-score) @@ -12329,8 +12337,8 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;*** -;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (22086 11929 790062 -;;;;;; 731000)) +;;;### (autoloads nil "gnus-ml" "gnus/gnus-ml.el" (22150 28227 698072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\ @@ -12353,8 +12361,8 @@ Minor mode for providing mailing-list commands. ;;;*** -;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (22092 27717 -;;;;;; 816268 464000)) +;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (22150 28227 +;;;;;; 698072 702000)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload 'gnus-group-split-setup "gnus-mlspl" "\ @@ -12454,8 +12462,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** -;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (22086 11929 -;;;;;; 794062 731000)) +;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (22150 28227 +;;;;;; 702072 702000)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload 'gnus-msg-mail "gnus-msg" "\ @@ -12482,7 +12490,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads nil "gnus-notifications" "gnus/gnus-notifications.el" -;;;;;; (22086 11929 794062 731000)) +;;;;;; (22150 28227 702072 702000)) ;;; Generated autoloads from gnus/gnus-notifications.el (autoload 'gnus-notifications "gnus-notifications" "\ @@ -12498,8 +12506,8 @@ This is typically a function to add in ;;;*** -;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (22086 11929 -;;;;;; 794062 731000)) +;;;### (autoloads nil "gnus-picon" "gnus/gnus-picon.el" (22150 28227 +;;;;;; 702072 702000)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload 'gnus-treat-from-picon "gnus-picon" "\ @@ -12522,8 +12530,8 @@ If picons are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (22086 11929 -;;;;;; 794062 731000)) +;;;### (autoloads nil "gnus-range" "gnus/gnus-range.el" (22150 28227 +;;;;;; 702072 702000)) ;;; Generated autoloads from gnus/gnus-range.el (autoload 'gnus-sorted-difference "gnus-range" "\ @@ -12590,8 +12598,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (22086 -;;;;;; 11929 794062 731000)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (22150 +;;;;;; 28227 702072 702000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12606,8 +12614,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (22086 11929 -;;;;;; 794062 731000)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (22150 28227 +;;;;;; 806072 702000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12634,8 +12642,8 @@ See the documentation for these variables and functions for details. ;;;*** -;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (22086 11929 -;;;;;; 798062 731000)) +;;;### (autoloads nil "gnus-spec" "gnus/gnus-spec.el" (22150 28227 +;;;;;; 806072 702000)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload 'gnus-update-format "gnus-spec" "\ @@ -12645,8 +12653,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (22086 11929 -;;;;;; 798062 731000)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (22150 28227 +;;;;;; 846072 702000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12656,8 +12664,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (22086 11929 -;;;;;; 802062 731000)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (22150 28227 +;;;;;; 858072 702000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12668,8 +12676,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (22086 11929 -;;;;;; 802062 731000)) +;;;### (autoloads nil "gnus-sync" "gnus/gnus-sync.el" (22150 28227 +;;;;;; 862072 702000)) ;;; Generated autoloads from gnus/gnus-sync.el (autoload 'gnus-sync-initialize "gnus-sync" "\ @@ -12684,8 +12692,8 @@ Install the sync hooks. ;;;*** -;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (22086 11929 -;;;;;; 806062 731000)) +;;;### (autoloads nil "gnus-win" "gnus/gnus-win.el" (22150 28227 +;;;;;; 938072 702000)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12695,8 +12703,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (22086 11929 994062 -;;;;;; 731000)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (22150 28228 358072 +;;;;;; 702000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12712,8 +12720,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (22086 11930 126062 -;;;;;; 731000)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (22150 28228 678072 +;;;;;; 702000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12739,8 +12747,8 @@ Use \\[describe-mode] for more info. ;;;*** -;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (22086 11929 -;;;;;; 994062 731000)) +;;;### (autoloads nil "goto-addr" "net/goto-addr.el" (22150 28228 +;;;;;; 358072 702000)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12781,8 +12789,8 @@ Like `goto-address-mode', but only for comments and strings. ;;;*** -;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (22086 11929 -;;;;;; 810062 731000)) +;;;### (autoloads nil "gravatar" "gnus/gravatar.el" (22150 28227 +;;;;;; 942072 702000)) ;;; Generated autoloads from gnus/gravatar.el (autoload 'gravatar-retrieve "gravatar" "\ @@ -12798,8 +12806,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;*** -;;;### (autoloads nil "grep" "progmodes/grep.el" (22086 11930 178062 -;;;;;; 731000)) +;;;### (autoloads nil "grep" "progmodes/grep.el" (22150 28228 826072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12966,7 +12974,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'. ;;;*** -;;;### (autoloads nil "gs" "gs.el" (22086 11929 854062 731000)) +;;;### (autoloads nil "gs" "gs.el" (22150 28228 26072 702000)) ;;; Generated autoloads from gs.el (autoload 'gs-load-image "gs" "\ @@ -12979,8 +12987,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (22092 27718 188268 -;;;;;; 464000)) +;;;### (autoloads nil "gud" "progmodes/gud.el" (22150 28228 826072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -13075,8 +13083,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (22099 26170 382017 -;;;;;; 16000)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (22150 28227 434072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -13178,8 +13186,8 @@ binding mode. ;;;*** -;;;### (autoloads nil "handwrite" "play/handwrite.el" (22086 11930 -;;;;;; 130062 731000)) +;;;### (autoloads nil "handwrite" "play/handwrite.el" (22150 28228 +;;;;;; 678072 702000)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -13224,8 +13232,8 @@ to be updated. ;;;*** -;;;### (autoloads nil "hashcash" "mail/hashcash.el" (22092 27717 -;;;;;; 880268 464000)) +;;;### (autoloads nil "hashcash" "mail/hashcash.el" (22150 28228 +;;;;;; 230072 702000)) ;;; Generated autoloads from mail/hashcash.el (autoload 'hashcash-insert-payment "hashcash" "\ @@ -13267,8 +13275,8 @@ Prefix arg sets default accept amount temporarily. ;;;*** -;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (22086 11929 854062 -;;;;;; 731000)) +;;;### (autoloads nil "help-at-pt" "help-at-pt.el" (22150 28228 26072 +;;;;;; 702000)) ;;; Generated autoloads from help-at-pt.el (autoload 'help-at-pt-string "help-at-pt" "\ @@ -13395,8 +13403,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (22101 42694 89526 -;;;;;; 804000)) +;;;### (autoloads nil "help-fns" "help-fns.el" (22150 28228 26072 +;;;;;; 702000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13483,8 +13491,8 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file. ;;;*** -;;;### (autoloads nil "help-macro" "help-macro.el" (22086 11929 854062 -;;;;;; 731000)) +;;;### (autoloads nil "help-macro" "help-macro.el" (22150 28228 26072 +;;;;;; 702000)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -13498,8 +13506,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (22086 11929 854062 -;;;;;; 731000)) +;;;### (autoloads nil "help-mode" "help-mode.el" (22150 28228 26072 +;;;;;; 702000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13600,8 +13608,8 @@ BOOKMARK is a bookmark name or a bookmark record. ;;;*** -;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (22086 11929 -;;;;;; 678062 731000)) +;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (22150 28227 +;;;;;; 434072 702000)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload 'Helper-describe-bindings "helper" "\ @@ -13616,7 +13624,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (22086 11929 858062 731000)) +;;;### (autoloads nil "hexl" "hexl.el" (22150 28228 26072 702000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13710,8 +13718,7 @@ This discards the buffer's undo information. ;;;*** -;;;### (autoloads nil "hi-lock" "hi-lock.el" (22092 27717 860268 -;;;;;; 464000)) +;;;### (autoloads nil "hi-lock" "hi-lock.el" (22150 28228 30072 702000)) ;;; Generated autoloads from hi-lock.el (autoload 'hi-lock-mode "hi-lock" "\ @@ -13878,8 +13885,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (22092 27718 -;;;;;; 188268 464000)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (22150 28228 +;;;;;; 826072 702000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13926,8 +13933,8 @@ Several variables affect how the hiding is done: ;;;*** -;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (22093 48588 -;;;;;; 580393 539000)) +;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (22150 28228 +;;;;;; 830072 702000)) ;;; 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))) "\ @@ -13989,8 +13996,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (22086 11929 858062 -;;;;;; 731000)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (22150 28228 30072 +;;;;;; 702000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -14121,8 +14128,8 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode. ;;;*** -;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (22086 11929 858062 -;;;;;; 731000)) +;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (22150 28228 30072 +;;;;;; 702000)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) @@ -14154,8 +14161,7 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** -;;;### (autoloads nil "hl-line" "hl-line.el" (22086 11929 858062 -;;;;;; 731000)) +;;;### (autoloads nil "hl-line" "hl-line.el" (22150 28228 30072 702000)) ;;; Generated autoloads from hl-line.el (autoload 'hl-line-mode "hl-line" "\ @@ -14204,8 +14210,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (22086 11929 -;;;;;; 534062 731000)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (22150 28227 +;;;;;; 78072 702000)) ;;; 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"))) "\ @@ -14315,8 +14321,8 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads nil "html2text" "gnus/html2text.el" (22086 11929 -;;;;;; 810062 731000)) +;;;### (autoloads nil "html2text" "gnus/html2text.el" (22150 28227 +;;;;;; 946072 702000)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -14326,8 +14332,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (22092 27717 -;;;;;; 864268 464000)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (22150 28228 +;;;;;; 34072 702000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14360,8 +14366,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'. ;;;*** -;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (22086 11929 862062 -;;;;;; 731000)) +;;;### (autoloads nil "ibuf-macs" "ibuf-macs.el" (22150 28228 50072 +;;;;;; 702000)) ;;; Generated autoloads from ibuf-macs.el (autoload 'define-ibuffer-column "ibuf-macs" "\ @@ -14463,8 +14469,7 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (22092 27717 868268 -;;;;;; 464000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (22150 28228 54072 702000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14503,8 +14508,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (22092 -;;;;;; 27717 556268 464000)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (22150 +;;;;;; 28227 78072 702000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14557,8 +14562,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (22086 11929 862062 -;;;;;; 731000)) +;;;### (autoloads nil "icomplete" "icomplete.el" (22150 28228 54072 +;;;;;; 702000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14597,8 +14602,8 @@ completions: ;;;*** -;;;### (autoloads nil "icon" "progmodes/icon.el" (22086 11930 186062 -;;;;;; 731000)) +;;;### (autoloads nil "icon" "progmodes/icon.el" (22150 28228 830072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -14638,8 +14643,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (22086 -;;;;;; 11930 194062 731000)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (22150 +;;;;;; 28228 850072 702000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14664,8 +14669,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (22092 27718 -;;;;;; 216268 464000)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (22150 28228 +;;;;;; 862072 702000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14794,7 +14799,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (22093 48588 548393 539000)) +;;;### (autoloads nil "ido" "ido.el" (22150 28228 82072 702000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -15056,7 +15061,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (22086 11929 866062 731000)) +;;;### (autoloads nil "ielm" "ielm.el" (22150 28228 82072 702000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -15068,7 +15073,7 @@ See `inferior-emacs-lisp-mode' for details. ;;;*** -;;;### (autoloads nil "iimage" "iimage.el" (22086 11929 866062 731000)) +;;;### (autoloads nil "iimage" "iimage.el" (22150 28228 82072 702000)) ;;; Generated autoloads from iimage.el (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") @@ -15084,7 +15089,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (22092 27717 872268 464000)) +;;;### (autoloads nil "image" "image.el" (22150 28228 86072 702000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15277,8 +15282,8 @@ If Emacs is compiled without ImageMagick support, this does nothing. ;;;*** -;;;### (autoloads nil "image-dired" "image-dired.el" (22092 27717 -;;;;;; 872268 464000)) +;;;### (autoloads nil "image-dired" "image-dired.el" (22150 28228 +;;;;;; 86072 702000)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) @@ -15415,8 +15420,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads nil "image-file" "image-file.el" (22086 11929 866062 -;;;;;; 731000)) +;;;### (autoloads nil "image-file" "image-file.el" (22150 28228 86072 +;;;;;; 702000)) ;;; 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")) "\ @@ -15478,8 +15483,8 @@ An image file is one whose name has an extension in ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (22091 6875 287217 -;;;;;; 891000)) +;;;### (autoloads nil "image-mode" "image-mode.el" (22150 28228 86072 +;;;;;; 702000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15526,7 +15531,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (22092 27717 872268 464000)) +;;;### (autoloads nil "imenu" "imenu.el" (22150 28228 90072 702000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15664,8 +15669,8 @@ for more information. ;;;*** -;;;### (autoloads nil "ind-util" "language/ind-util.el" (22086 11929 -;;;;;; 898062 731000)) +;;;### (autoloads nil "ind-util" "language/ind-util.el" (22150 28228 +;;;;;; 190072 702000)) ;;; Generated autoloads from language/ind-util.el (autoload 'indian-compose-region "ind-util" "\ @@ -15695,8 +15700,8 @@ Convert old Emacs Devanagari characters to UCS. ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (22086 11930 -;;;;;; 206062 731000)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (22150 28228 +;;;;;; 862072 702000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15714,7 +15719,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (22086 11929 874062 731000)) +;;;### (autoloads nil "info" "info.el" (22150 28228 98072 702000)) ;;; 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))))) "\ @@ -15926,8 +15931,8 @@ completion alternatives to currently visited manuals. ;;;*** -;;;### (autoloads nil "info-look" "info-look.el" (22086 11929 870062 -;;;;;; 731000)) +;;;### (autoloads nil "info-look" "info-look.el" (22150 28228 90072 +;;;;;; 702000)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15974,8 +15979,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (22086 11929 870062 -;;;;;; 731000)) +;;;### (autoloads nil "info-xref" "info-xref.el" (22150 28228 94072 +;;;;;; 702000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -16058,8 +16063,8 @@ the sources handy. ;;;*** -;;;### (autoloads nil "informat" "informat.el" (22086 11929 874062 -;;;;;; 731000)) +;;;### (autoloads nil "informat" "informat.el" (22150 28228 102072 +;;;;;; 702000)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -16104,8 +16109,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inline" "emacs-lisp/inline.el" (22086 11929 -;;;;;; 678062 731000)) +;;;### (autoloads nil "inline" "emacs-lisp/inline.el" (22150 28227 +;;;;;; 434072 702000)) ;;; Generated autoloads from emacs-lisp/inline.el (autoload 'define-inline "inline" "\ @@ -16119,8 +16124,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;*** -;;;### (autoloads nil "inversion" "cedet/inversion.el" (22086 11929 -;;;;;; 550062 731000)) +;;;### (autoloads nil "inversion" "cedet/inversion.el" (22150 28227 +;;;;;; 218072 702000)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) @@ -16132,8 +16137,8 @@ Only checks one based on which kind of Emacs is being run. ;;;*** -;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (22086 -;;;;;; 11929 874062 731000)) +;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (22150 +;;;;;; 28228 106072 702000)) ;;; Generated autoloads from international/isearch-x.el (autoload 'isearch-toggle-specified-input-method "isearch-x" "\ @@ -16153,8 +16158,8 @@ Toggle input method in interactive search. ;;;*** -;;;### (autoloads nil "isearchb" "isearchb.el" (22086 11929 886062 -;;;;;; 731000)) +;;;### (autoloads nil "isearchb" "isearchb.el" (22150 28228 154072 +;;;;;; 702000)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) @@ -16168,8 +16173,8 @@ accessed via isearchb. ;;;*** -;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (22086 -;;;;;; 11929 874062 731000)) +;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (22150 +;;;;;; 28228 106072 702000)) ;;; Generated autoloads from international/iso-cvt.el (autoload 'iso-spanish "iso-cvt" "\ @@ -16260,15 +16265,15 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (22086 11929 874062 731000)) +;;;;;; (22150 28228 106072 702000)) ;;; 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" (22086 11930 -;;;;;; 318062 731000)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (22150 28229 +;;;;;; 102072 702000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16299,7 +16304,7 @@ and added as a submenu of the \"Edit\" menu.") (if ispell-menu-map-needed (progn (define-key ispell-menu-map [ispell-region] `(menu-item ,(purecopy "Spell-Check Region") ispell-region :enable mark-active :help ,(purecopy "Spell-check text in marked region"))) (define-key ispell-menu-map [ispell-message] `(menu-item ,(purecopy "Spell-Check Message") ispell-message :visible (eq major-mode 'mail-mode) :help ,(purecopy "Skip headers and included message text"))) (define-key ispell-menu-map [ispell-buffer] `(menu-item ,(purecopy "Spell-Check Buffer") ispell-buffer :help ,(purecopy "Check spelling of selected buffer"))) (fset 'ispell-menu-map (symbol-value 'ispell-menu-map)))) -(defvar ispell-skip-region-alist `((ispell-words-keyword forward-line) (ispell-dictionary-keyword forward-line) (ispell-pdict-keyword forward-line) (ispell-parsing-keyword forward-line) (,(purecopy "^---*BEGIN PGP [A-Z ]*--*") \, (purecopy "^---*END PGP [A-Z ]*--*")) (,(purecopy "^begin [0-9][0-9][0-9] [^ ]+$") \, (purecopy "\nend\n")) (,(purecopy "^%!PS-Adobe-[123].0") \, (purecopy "\n%%EOF\n")) (,(purecopy "^---* \\(Start of \\)?[Ff]orwarded [Mm]essage") \, (purecopy "^---* End of [Ff]orwarded [Mm]essage")) (,(purecopy "\\(--+\\|_+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)"))) "\ +(defvar ispell-skip-region-alist `((ispell-words-keyword forward-line) (ispell-dictionary-keyword forward-line) (ispell-pdict-keyword forward-line) (ispell-parsing-keyword forward-line) (,(purecopy "^---*BEGIN PGP [A-Z ]*--*") \, (purecopy "^---*END PGP [A-Z ]*--*")) (,(purecopy "^begin [0-9][0-9][0-9] [^ ]+$") \, (purecopy "\nend\n")) (,(purecopy "^%!PS-Adobe-[123].0") \, (purecopy "\n%%EOF\n")) (,(purecopy "^---* \\(Start of \\)?[Ff]orwarded [Mm]essage") \, (purecopy "^---* End of [Ff]orwarded [Mm]essage"))) "\ Alist expressing beginning and end of regions not to spell check. The alist key must be a regular expression. Valid forms include: @@ -16501,8 +16506,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" (22086 -;;;;;; 11929 898062 731000)) +;;;### (autoloads nil "japan-util" "language/japan-util.el" (22150 +;;;;;; 28228 190072 702000)) ;;; Generated autoloads from language/japan-util.el (autoload 'setup-japanese-environment-internal "japan-util" "\ @@ -16579,8 +16584,8 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** -;;;### (autoloads nil "jka-compr" "jka-compr.el" (22086 11929 890062 -;;;;;; 731000)) +;;;### (autoloads nil "jka-compr" "jka-compr.el" (22150 28228 158072 +;;;;;; 702000)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16603,8 +16608,8 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (22109 36809 299889 -;;;;;; 179000)) +;;;### (autoloads nil "js" "progmodes/js.el" (22150 28228 866072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16631,14 +16636,14 @@ locally, like so: ;;;*** -;;;### (autoloads nil "json" "json.el" (22101 42694 105526 804000)) +;;;### (autoloads nil "json" "json.el" (22150 28228 158072 702000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "keypad" "emulation/keypad.el" (22092 27717 -;;;;;; 636268 464000)) +;;;### (autoloads nil "keypad" "emulation/keypad.el" (22150 28227 +;;;;;; 462072 702000)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16693,8 +16698,8 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** -;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (22086 -;;;;;; 11929 878062 731000)) +;;;### (autoloads nil "kinsoku" "international/kinsoku.el" (22150 +;;;;;; 28228 106072 702000)) ;;; Generated autoloads from international/kinsoku.el (autoload 'kinsoku "kinsoku" "\ @@ -16715,8 +16720,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (22086 11929 878062 -;;;;;; 731000)) +;;;### (autoloads nil "kkc" "international/kkc.el" (22150 28228 106072 +;;;;;; 702000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16738,7 +16743,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (22086 11929 890062 731000)) +;;;### (autoloads nil "kmacro" "kmacro.el" (22150 28228 162072 702000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16850,8 +16855,8 @@ If kbd macro currently being defined end it before activating it. ;;;*** -;;;### (autoloads nil "korea-util" "language/korea-util.el" (22086 -;;;;;; 11929 902062 731000)) +;;;### (autoloads nil "korea-util" "language/korea-util.el" (22150 +;;;;;; 28228 194072 702000)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\ @@ -16865,8 +16870,8 @@ The kind of Korean keyboard for Korean input method. ;;;*** -;;;### (autoloads nil "lao-util" "language/lao-util.el" (22086 11929 -;;;;;; 902062 731000)) +;;;### (autoloads nil "lao-util" "language/lao-util.el" (22150 28228 +;;;;;; 194072 702000)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16903,8 +16908,8 @@ Transcribe Romanized Lao string STR to Lao character string. ;;;*** -;;;### (autoloads nil "latexenc" "international/latexenc.el" (22086 -;;;;;; 11929 878062 731000)) +;;;### (autoloads nil "latexenc" "international/latexenc.el" (22150 +;;;;;; 28228 106072 702000)) ;;; 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))) "\ @@ -16936,7 +16941,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el" -;;;;;; (22086 11929 878062 731000)) +;;;;;; (22150 28228 110072 702000)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16977,8 +16982,8 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** -;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (22086 -;;;;;; 11930 210062 731000)) +;;;### (autoloads nil "ld-script" "progmodes/ld-script.el" (22150 +;;;;;; 28228 866072 702000)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16988,8 +16993,8 @@ A major mode to edit GNU ld script files ;;;*** -;;;### (autoloads nil "let-alist" "emacs-lisp/let-alist.el" (22092 -;;;;;; 27717 632268 464000)) +;;;### (autoloads nil "let-alist" "emacs-lisp/let-alist.el" (22150 +;;;;;; 28227 434072 702000)) ;;; Generated autoloads from emacs-lisp/let-alist.el (push (purecopy '(let-alist 1 0 4)) package--builtin-versions) @@ -17028,7 +17033,7 @@ displayed in the example above. ;;;*** -;;;### (autoloads nil "life" "play/life.el" (22086 11930 130062 731000)) +;;;### (autoloads nil "life" "play/life.el" (22150 28228 678072 702000)) ;;; Generated autoloads from play/life.el (autoload 'life "life" "\ @@ -17041,7 +17046,7 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads nil "linum" "linum.el" (22086 11929 930062 731000)) +;;;### (autoloads nil "linum" "linum.el" (22150 28228 210072 702000)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) @@ -17078,8 +17083,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (22086 11929 930062 -;;;;;; 731000)) +;;;### (autoloads nil "loadhist" "loadhist.el" (22150 28228 210072 +;;;;;; 702000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -17110,7 +17115,7 @@ something strange, such as redefining an Emacs function. ;;;*** -;;;### (autoloads nil "locate" "locate.el" (22086 11929 930062 731000)) +;;;### (autoloads nil "locate" "locate.el" (22150 28228 210072 702000)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -17162,8 +17167,8 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads nil "log-edit" "vc/log-edit.el" (22092 27718 544268 -;;;;;; 464000)) +;;;### (autoloads nil "log-edit" "vc/log-edit.el" (22150 28229 278072 +;;;;;; 702000)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -17194,8 +17199,8 @@ done. Otherwise, it uses the current buffer. ;;;*** -;;;### (autoloads nil "log-view" "vc/log-view.el" (22086 11930 378062 -;;;;;; 731000)) +;;;### (autoloads nil "log-view" "vc/log-view.el" (22150 28229 278072 +;;;;;; 702000)) ;;; Generated autoloads from vc/log-view.el (autoload 'log-view-mode "log-view" "\ @@ -17205,7 +17210,7 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (22086 11929 930062 731000)) +;;;### (autoloads nil "lpr" "lpr.el" (22150 28228 210072 702000)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17300,8 +17305,8 @@ for further customization of the printer command. ;;;*** -;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (22086 11929 930062 -;;;;;; 731000)) +;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (22150 28228 210072 +;;;;;; 702000)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -17312,8 +17317,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads nil "lunar" "calendar/lunar.el" (22086 11929 534062 -;;;;;; 731000)) +;;;### (autoloads nil "lunar" "calendar/lunar.el" (22150 28227 78072 +;;;;;; 702000)) ;;; Generated autoloads from calendar/lunar.el (autoload 'lunar-phases "lunar" "\ @@ -17325,8 +17330,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (22086 11930 -;;;;;; 210062 731000)) +;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (22150 28228 +;;;;;; 866072 702000)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload 'm4-mode "m4-mode" "\ @@ -17336,7 +17341,7 @@ A major mode to edit m4 macro files. ;;;*** -;;;### (autoloads nil "macros" "macros.el" (22086 11929 930062 731000)) +;;;### (autoloads nil "macros" "macros.el" (22150 28228 210072 702000)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -17425,8 +17430,8 @@ and then select the region of un-tablified names and use ;;;*** -;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (22086 11929 -;;;;;; 934062 731000)) +;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (22150 28228 +;;;;;; 230072 702000)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17456,8 +17461,8 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;*** -;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (22086 11929 -;;;;;; 934062 731000)) +;;;### (autoloads nil "mail-hist" "mail/mail-hist.el" (22150 28228 +;;;;;; 230072 702000)) ;;; Generated autoloads from mail/mail-hist.el (autoload 'mail-hist-define-keys "mail-hist" "\ @@ -17486,8 +17491,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (22086 11929 -;;;;;; 934062 731000)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (22150 28228 +;;;;;; 230072 702000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17561,8 +17566,8 @@ matches may be returned from the message body. ;;;*** -;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (22086 11929 -;;;;;; 938062 731000)) +;;;### (autoloads nil "mailabbrev" "mail/mailabbrev.el" (22150 28228 +;;;;;; 230072 702000)) ;;; Generated autoloads from mail/mailabbrev.el (defvar mail-abbrevs-mode nil "\ @@ -17611,8 +17616,8 @@ double-quotes. ;;;*** -;;;### (autoloads nil "mailalias" "mail/mailalias.el" (22086 11929 -;;;;;; 938062 731000)) +;;;### (autoloads nil "mailalias" "mail/mailalias.el" (22150 28228 +;;;;;; 230072 702000)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -17665,8 +17670,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any. ;;;*** -;;;### (autoloads nil "mailclient" "mail/mailclient.el" (22086 11929 -;;;;;; 938062 731000)) +;;;### (autoloads nil "mailclient" "mail/mailclient.el" (22150 28228 +;;;;;; 234072 702000)) ;;; Generated autoloads from mail/mailclient.el (autoload 'mailclient-send-it "mailclient" "\ @@ -17678,8 +17683,8 @@ The mail client is taken to be the handler of mailto URLs. ;;;*** -;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (22086 -;;;;;; 11930 210062 731000)) +;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (22150 +;;;;;; 28228 870072 702000)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17796,8 +17801,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads nil "makesum" "makesum.el" (22086 11929 954062 -;;;;;; 731000)) +;;;### (autoloads nil "makesum" "makesum.el" (22150 28228 258072 +;;;;;; 702000)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -17808,7 +17813,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads nil "man" "man.el" (22086 11929 954062 731000)) +;;;### (autoloads nil "man" "man.el" (22150 28228 262072 702000)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17864,14 +17869,14 @@ Default bookmark handler for Man buffers. ;;;*** -;;;### (autoloads nil "map" "emacs-lisp/map.el" (22086 11929 678062 -;;;;;; 731000)) +;;;### (autoloads nil "map" "emacs-lisp/map.el" (22150 28227 438072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/map.el (push (purecopy '(map 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "master" "master.el" (22086 11929 954062 731000)) +;;;### (autoloads nil "master" "master.el" (22150 28228 262072 702000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) @@ -17894,8 +17899,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads nil "mb-depth" "mb-depth.el" (22086 11929 958062 -;;;;;; 731000)) +;;;### (autoloads nil "mb-depth" "mb-depth.el" (22150 28228 262072 +;;;;;; 702000)) ;;; Generated autoloads from mb-depth.el (defvar minibuffer-depth-indicate-mode nil "\ @@ -17922,14 +17927,14 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "md4" "md4.el" (22086 11929 958062 731000)) +;;;### (autoloads nil "md4" "md4.el" (22150 28228 262072 702000)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (22092 27717 852268 -;;;;;; 464000)) +;;;### (autoloads nil "message" "gnus/message.el" (22150 28227 974072 +;;;;;; 702000)) ;;; 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) @@ -18094,8 +18099,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (22086 -;;;;;; 11930 210062 731000)) +;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (22150 +;;;;;; 28228 870072 702000)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) @@ -18111,8 +18116,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (22086 11929 -;;;;;; 938062 731000)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (22150 28228 +;;;;;; 234072 702000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -18155,8 +18160,8 @@ redisplayed as output is inserted. ;;;*** -;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (22086 11929 970062 -;;;;;; 731000)) +;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (22150 28228 294072 +;;;;;; 702000)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -18246,7 +18251,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (22092 27717 888268 464000)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (22150 28228 298072 702000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -18263,8 +18268,8 @@ Display version information about MH-E and the MH mail handling system. ;;;*** -;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (22086 11929 -;;;;;; 970062 731000)) +;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (22150 28228 +;;;;;; 302072 702000)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload 'mh-rmail "mh-folder" "\ @@ -18345,8 +18350,8 @@ perform the operation on all messages in that region. ;;;*** -;;;### (autoloads nil "midnight" "midnight.el" (22086 11929 978062 -;;;;;; 731000)) +;;;### (autoloads nil "midnight" "midnight.el" (22150 28228 322072 +;;;;;; 702000)) ;;; Generated autoloads from midnight.el (defvar midnight-mode nil "\ @@ -18386,8 +18391,8 @@ to its second argument TM. ;;;*** -;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (22086 11929 -;;;;;; 978062 731000)) +;;;### (autoloads nil "minibuf-eldef" "minibuf-eldef.el" (22150 28228 +;;;;;; 322072 702000)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18416,7 +18421,7 @@ is modified to remove the default indication. ;;;*** -;;;### (autoloads nil "misc" "misc.el" (22086 11929 982062 731000)) +;;;### (autoloads nil "misc" "misc.el" (22150 28228 326072 702000)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -18444,8 +18449,8 @@ The return value is always nil. ;;;*** -;;;### (autoloads nil "misearch" "misearch.el" (22086 11929 982062 -;;;;;; 731000)) +;;;### (autoloads nil "misearch" "misearch.el" (22150 28228 326072 +;;;;;; 702000)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18533,8 +18538,8 @@ whose file names match the specified wildcard. ;;;*** -;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (22086 -;;;;;; 11930 210062 731000)) +;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (22150 +;;;;;; 28228 874072 702000)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) @@ -18545,8 +18550,8 @@ Major mode for the mixal asm language. ;;;*** -;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (22086 11929 -;;;;;; 818062 731000)) +;;;### (autoloads nil "mm-encode" "gnus/mm-encode.el" (22150 28227 +;;;;;; 978072 702000)) ;;; Generated autoloads from gnus/mm-encode.el (autoload 'mm-default-file-encoding "mm-encode" "\ @@ -18556,8 +18561,8 @@ Return a default encoding for FILE. ;;;*** -;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (22086 11929 -;;;;;; 818062 731000)) +;;;### (autoloads nil "mm-extern" "gnus/mm-extern.el" (22150 28227 +;;;;;; 978072 702000)) ;;; Generated autoloads from gnus/mm-extern.el (autoload 'mm-extern-cache-contents "mm-extern" "\ @@ -18575,8 +18580,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (22086 11929 -;;;;;; 818062 731000)) +;;;### (autoloads nil "mm-partial" "gnus/mm-partial.el" (22150 28227 +;;;;;; 978072 702000)) ;;; Generated autoloads from gnus/mm-partial.el (autoload 'mm-inline-partial "mm-partial" "\ @@ -18589,8 +18594,8 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** -;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (22086 11929 818062 -;;;;;; 731000)) +;;;### (autoloads nil "mm-url" "gnus/mm-url.el" (22150 28227 978072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -18606,8 +18611,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (22086 11929 818062 -;;;;;; 731000)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (22150 28227 982072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18626,7 +18631,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** -;;;### (autoloads nil "mml" "gnus/mml.el" (22086 11929 822062 731000)) +;;;### (autoloads nil "mml" "gnus/mml.el" (22150 28227 986072 702000)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18651,8 +18656,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (22086 11929 822062 -;;;;;; 731000)) +;;;### (autoloads nil "mml1991" "gnus/mml1991.el" (22150 28227 986072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -18667,8 +18672,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (22086 11929 822062 -;;;;;; 731000)) +;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (22150 28227 990072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18708,8 +18713,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (22096 24780 -;;;;;; 204094 47000)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (22150 28227 +;;;;;; 222072 702000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) @@ -18750,8 +18755,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (22086 11930 130062 -;;;;;; 731000)) +;;;### (autoloads nil "morse" "play/morse.el" (22150 28228 682072 +;;;;;; 702000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18776,8 +18781,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text. ;;;*** -;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (22086 11929 982062 -;;;;;; 731000)) +;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (22150 28228 326072 +;;;;;; 702000)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -18824,7 +18829,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (22105 39773 859886 896000)) +;;;### (autoloads nil "mpc" "mpc.el" (22150 28228 326072 702000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18834,7 +18839,7 @@ Main entry point for MPC. ;;;*** -;;;### (autoloads nil "mpuz" "play/mpuz.el" (22086 11930 130062 731000)) +;;;### (autoloads nil "mpuz" "play/mpuz.el" (22150 28228 682072 702000)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18844,7 +18849,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (22086 11929 986062 731000)) +;;;### (autoloads nil "msb" "msb.el" (22150 28228 338072 702000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18869,8 +18874,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (22086 -;;;;;; 11929 882062 731000)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (22150 +;;;;;; 28228 114072 702000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -19002,8 +19007,8 @@ The default is 20. If LIMIT is negative, do not limit the listing. ;;;*** -;;;### (autoloads nil "mule-util" "international/mule-util.el" (22108 -;;;;;; 15942 546032 987000)) +;;;### (autoloads nil "mule-util" "international/mule-util.el" (22150 +;;;;;; 28228 114072 702000)) ;;; Generated autoloads from international/mule-util.el (defsubst string-to-list (string) "\ @@ -19162,8 +19167,8 @@ QUALITY can be: ;;;*** -;;;### (autoloads nil "net-utils" "net/net-utils.el" (22086 11929 -;;;;;; 998062 731000)) +;;;### (autoloads nil "net-utils" "net/net-utils.el" (22150 28228 +;;;;;; 378072 702000)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -19257,8 +19262,8 @@ Open a network connection to HOST on PORT. ;;;*** -;;;### (autoloads nil "netrc" "net/netrc.el" (22086 11929 998062 -;;;;;; 731000)) +;;;### (autoloads nil "netrc" "net/netrc.el" (22150 28228 378072 +;;;;;; 702000)) ;;; Generated autoloads from net/netrc.el (autoload 'netrc-credentials "netrc" "\ @@ -19270,8 +19275,8 @@ listed in the PORTS list. ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (22086 -;;;;;; 11929 998062 731000)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (22150 +;;;;;; 28228 378072 702000)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19367,8 +19372,8 @@ asynchronously, if possible. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (22092 -;;;;;; 27717 964268 464000)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (22150 +;;;;;; 28228 378072 702000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19390,7 +19395,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (22092 27717 980268 464000)) +;;;;;; (22150 28228 382072 702000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19400,8 +19405,8 @@ Start newsticker plainview. ;;;*** -;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (22086 -;;;;;; 11929 998062 731000)) +;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (22150 +;;;;;; 28228 382072 702000)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -19411,8 +19416,8 @@ Start reading news. You may want to bind this to a key. ;;;*** -;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (22086 -;;;;;; 11929 998062 731000)) +;;;### (autoloads nil "newst-ticker" "net/newst-ticker.el" (22150 +;;;;;; 28228 382072 702000)) ;;; Generated autoloads from net/newst-ticker.el (autoload 'newsticker-ticker-running-p "newst-ticker" "\ @@ -19432,8 +19437,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (22109 -;;;;;; 36809 263889 179000)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (22150 +;;;;;; 28228 382072 702000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19443,8 +19448,8 @@ Start newsticker treeview. ;;;*** -;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (22086 11929 822062 -;;;;;; 731000)) +;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (22150 28227 990072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19454,8 +19459,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (22086 11929 822062 -;;;;;; 731000)) +;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (22150 28227 990072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/nndoc.el (autoload 'nndoc-add-type "nndoc" "\ @@ -19469,8 +19474,8 @@ symbol in the alist. ;;;*** -;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (22086 11929 -;;;;;; 826062 731000)) +;;;### (autoloads nil "nnfolder" "gnus/nnfolder.el" (22150 28227 +;;;;;; 994072 702000)) ;;; Generated autoloads from gnus/nnfolder.el (autoload 'nnfolder-generate-active-file "nnfolder" "\ @@ -19481,7 +19486,7 @@ This command does not work if you use short group names. ;;;*** -;;;### (autoloads nil "nnml" "gnus/nnml.el" (22102 63557 304509 103000)) +;;;### (autoloads nil "nnml" "gnus/nnml.el" (22150 28228 2072 702000)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19491,7 +19496,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (22086 11930 22062 731000)) +;;;### (autoloads nil "novice" "novice.el" (22150 28228 446072 702000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19523,8 +19528,8 @@ future sessions. ;;;*** -;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (22086 -;;;;;; 11930 318062 731000)) +;;;### (autoloads nil "nroff-mode" "textmodes/nroff-mode.el" (22150 +;;;;;; 28229 102072 702000)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload 'nroff-mode "nroff-mode" "\ @@ -19538,14 +19543,14 @@ closing requests for requests that are used in matched pairs. ;;;*** -;;;### (autoloads nil "ntlm" "net/ntlm.el" (22086 11930 2062 731000)) +;;;### (autoloads nil "ntlm" "net/ntlm.el" (22150 28228 386072 702000)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 2 0 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (22086 11930 -;;;;;; 26062 731000)) +;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (22150 28228 +;;;;;; 450072 702000)) ;;; Generated autoloads from nxml/nxml-glyph.el (autoload 'nxml-glyph-display-string "nxml-glyph" "\ @@ -19557,8 +19562,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (22086 11930 -;;;;;; 26062 731000)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (22150 28228 +;;;;;; 450072 702000)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19618,8 +19623,8 @@ Many aspects this mode can be customized using ;;;*** -;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (22086 11930 -;;;;;; 26062 731000)) +;;;### (autoloads nil "nxml-uchnm" "nxml/nxml-uchnm.el" (22150 28228 +;;;;;; 454072 702000)) ;;; Generated autoloads from nxml/nxml-uchnm.el (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\ @@ -19631,8 +19636,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (22086 11930 -;;;;;; 214062 731000)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (22150 28228 +;;;;;; 874072 702000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19669,8 +19674,8 @@ startup file, `~/.emacs-octave'. ;;;*** -;;;### (autoloads nil "opascal" "progmodes/opascal.el" (22086 11930 -;;;;;; 214062 731000)) +;;;### (autoloads nil "opascal" "progmodes/opascal.el" (22150 28228 +;;;;;; 878072 702000)) ;;; Generated autoloads from progmodes/opascal.el (define-obsolete-function-alias 'delphi-mode 'opascal-mode "24.4") @@ -19705,7 +19710,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (22092 27718 88268 464000)) +;;;### (autoloads nil "org" "org/org.el" (22150 28228 642072 702000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19926,8 +19931,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (22092 27718 -;;;;;; 24268 464000)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (22150 28228 +;;;;;; 558072 702000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -20200,8 +20205,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (22086 11930 -;;;;;; 82062 731000)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (22150 28228 +;;;;;; 558072 702000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -20243,8 +20248,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-colview" "org/org-colview.el" (22086 11930 -;;;;;; 82062 731000)) +;;;### (autoloads nil "org-colview" "org/org-colview.el" (22150 28228 +;;;;;; 582072 702000)) ;;; Generated autoloads from org/org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -20307,8 +20312,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (22086 11930 -;;;;;; 82062 731000)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (22150 28228 +;;;;;; 582072 702000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -20318,8 +20323,8 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-macs" "org/org-macs.el" (22092 27718 44268 -;;;;;; 464000)) +;;;### (autoloads nil "org-macs" "org/org-macs.el" (22150 28228 602072 +;;;;;; 702000)) ;;; Generated autoloads from org/org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -20347,8 +20352,8 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (22086 11930 118062 -;;;;;; 731000)) +;;;### (autoloads nil "outline" "outline.el" (22150 28228 666072 +;;;;;; 702000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20391,10 +20396,10 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (22092 27717 -;;;;;; 636268 464000)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (22150 28227 +;;;;;; 450072 702000)) ;;; Generated autoloads from emacs-lisp/package.el -(push (purecopy '(package 1 0 1)) package--builtin-versions) +(push (purecopy '(package 1 1 0)) package--builtin-versions) (defvar package-enable-at-startup t "\ Whether to activate installed packages when Emacs starts. @@ -20507,7 +20512,7 @@ The list is displayed in a buffer named `*Packages*'. ;;;*** -;;;### (autoloads nil "paren" "paren.el" (22086 11930 122062 731000)) +;;;### (autoloads nil "paren" "paren.el" (22150 28228 666072 702000)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -20533,8 +20538,8 @@ matching parenthesis is highlighted in `show-paren-style' after ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (22086 -;;;;;; 11929 534062 731000)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (22150 +;;;;;; 28227 78072 702000)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -20547,8 +20552,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (22092 27718 -;;;;;; 228268 464000)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (22150 28228 +;;;;;; 890072 702000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20597,8 +20602,8 @@ See also the user variables `pascal-type-keywords', `pascal-start-keywords' and ;;;*** -;;;### (autoloads nil "password-cache" "password-cache.el" (22086 -;;;;;; 11930 122062 731000)) +;;;### (autoloads nil "password-cache" "password-cache.el" (22150 +;;;;;; 28228 666072 702000)) ;;; Generated autoloads from password-cache.el (defvar password-cache t "\ @@ -20619,8 +20624,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (22091 6875 247217 -;;;;;; 891000)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (22150 28227 +;;;;;; 454072 702000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20721,8 +20726,8 @@ to this macro. ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (22150 28228 666072 +;;;;;; 702000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20732,8 +20737,8 @@ Completion rules for the `cvs' command. ;;;*** -;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "pcmpl-gnu" "pcmpl-gnu.el" (22150 28228 666072 +;;;;;; 702000)) ;;; Generated autoloads from pcmpl-gnu.el (autoload 'pcomplete/gzip "pcmpl-gnu" "\ @@ -20760,8 +20765,8 @@ Completion for the GNU tar utility. ;;;*** -;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (22086 11930 -;;;;;; 122062 731000)) +;;;### (autoloads nil "pcmpl-linux" "pcmpl-linux.el" (22150 28228 +;;;;;; 670072 702000)) ;;; Generated autoloads from pcmpl-linux.el (autoload 'pcomplete/kill "pcmpl-linux" "\ @@ -20781,8 +20786,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "pcmpl-rpm" "pcmpl-rpm.el" (22150 28228 670072 +;;;;;; 702000)) ;;; Generated autoloads from pcmpl-rpm.el (autoload 'pcomplete/rpm "pcmpl-rpm" "\ @@ -20792,8 +20797,8 @@ Completion for the `rpm' command. ;;;*** -;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "pcmpl-unix" "pcmpl-unix.el" (22150 28228 670072 +;;;;;; 702000)) ;;; Generated autoloads from pcmpl-unix.el (autoload 'pcomplete/cd "pcmpl-unix" "\ @@ -20848,8 +20853,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (22150 28228 670072 +;;;;;; 702000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20873,8 +20878,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (22086 11930 122062 -;;;;;; 731000)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (22150 28228 674072 +;;;;;; 702000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20931,7 +20936,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (22092 27718 548268 464000)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (22150 28229 282072 702000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -21006,8 +21011,8 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (22086 11930 -;;;;;; 378062 731000)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (22150 28229 +;;;;;; 278072 702000)) ;;; 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)) "\ @@ -21015,8 +21020,8 @@ Global menu used by PCL-CVS.") ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (22086 -;;;;;; 11930 214062 731000)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (22150 +;;;;;; 28228 890072 702000)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -21077,8 +21082,8 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;*** -;;;### (autoloads nil "picture" "textmodes/picture.el" (22086 11930 -;;;;;; 318062 731000)) +;;;### (autoloads nil "picture" "textmodes/picture.el" (22150 28229 +;;;;;; 106072 702000)) ;;; Generated autoloads from textmodes/picture.el (autoload 'picture-mode "picture" "\ @@ -21158,8 +21163,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "pinentry" "net/pinentry.el" (22086 11930 2062 -;;;;;; 731000)) +;;;### (autoloads nil "pinentry" "net/pinentry.el" (22150 28228 386072 +;;;;;; 702000)) ;;; Generated autoloads from net/pinentry.el (push (purecopy '(pinentry 0 1)) package--builtin-versions) @@ -21176,8 +21181,8 @@ will not be shown. ;;;*** -;;;### (autoloads nil "plstore" "gnus/plstore.el" (22086 11929 842062 -;;;;;; 731000)) +;;;### (autoloads nil "plstore" "gnus/plstore.el" (22150 28228 10072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/plstore.el (autoload 'plstore-open "plstore" "\ @@ -21192,8 +21197,8 @@ Major mode for editing PLSTORE files. ;;;*** -;;;### (autoloads nil "po" "textmodes/po.el" (22086 11930 322062 -;;;;;; 731000)) +;;;### (autoloads nil "po" "textmodes/po.el" (22150 28229 106072 +;;;;;; 702000)) ;;; Generated autoloads from textmodes/po.el (autoload 'po-find-file-coding-system "po" "\ @@ -21204,7 +21209,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads nil "pong" "play/pong.el" (22086 11930 130062 731000)) +;;;### (autoloads nil "pong" "play/pong.el" (22150 28228 682072 702000)) ;;; Generated autoloads from play/pong.el (autoload 'pong "pong" "\ @@ -21220,7 +21225,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (22086 11929 846062 731000)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (22150 28228 14072 702000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -21231,8 +21236,8 @@ Use streaming commands. ;;;*** -;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (22086 11929 682062 -;;;;;; 731000)) +;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (22150 28227 454072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload 'pp-to-string "pp" "\ @@ -21282,8 +21287,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (22092 27718 128268 -;;;;;; 464000)) +;;;### (autoloads nil "printing" "printing.el" (22150 28228 698072 +;;;;;; 702000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21871,7 +21876,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (22092 27718 128268 464000)) +;;;### (autoloads nil "proced" "proced.el" (22150 28228 702072 702000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21889,8 +21894,8 @@ Proced buffers. ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (22086 11930 134062 -;;;;;; 731000)) +;;;### (autoloads nil "profiler" "profiler.el" (22150 28228 702072 +;;;;;; 702000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21918,8 +21923,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "project" "progmodes/project.el" (22088 30660 -;;;;;; 79412 927000)) +;;;### (autoloads nil "project" "progmodes/project.el" (22150 28228 +;;;;;; 890072 702000)) ;;; Generated autoloads from progmodes/project.el (autoload 'project-current "project" "\ @@ -21930,14 +21935,14 @@ the user for a different directory to look in. \(fn &optional MAYBE-PROMPT DIR)" nil nil) (autoload 'project-find-regexp "project" "\ -Find all matches for REGEXP in the current project. +Find all matches for REGEXP in the current project's roots. With \\[universal-argument] prefix, you can specify the directory to search in, and the file name pattern to search for. \(fn REGEXP)" t nil) -(autoload 'project-or-libraries-find-regexp "project" "\ -Find all matches for REGEXP in the current project or libraries. +(autoload 'project-or-external-find-regexp "project" "\ +Find all matches for REGEXP in the project roots or external roots. With \\[universal-argument] prefix, you can specify the file name pattern to search for. @@ -21945,8 +21950,8 @@ pattern to search for. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (22086 11930 -;;;;;; 218062 731000)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (22150 28228 +;;;;;; 894072 702000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21979,7 +21984,7 @@ With prefix argument ARG, restart the Prolog process if running before. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22092 27718 404268 464000)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22150 28228 986072 702000)) ;;; 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")) "\ @@ -21990,8 +21995,8 @@ The default value is (\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (22086 11930 -;;;;;; 218062 731000)) +;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (22150 28228 +;;;;;; 894072 702000)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) @@ -22037,8 +22042,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (22092 27718 412268 -;;;;;; 464000)) +;;;### (autoloads nil "ps-print" "ps-print.el" (22150 28228 990072 +;;;;;; 702000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -22235,8 +22240,8 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (22086 11929 550062 -;;;;;; 731000)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (22150 28227 222072 +;;;;;; 702000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) @@ -22254,8 +22259,8 @@ Optional argument FACE specifies the face to do the highlighting. ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (22092 27718 -;;;;;; 244268 464000)) +;;;### (autoloads nil "python" "progmodes/python.el" (22150 28228 +;;;;;; 906072 702000)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 25 1)) package--builtin-versions) @@ -22292,7 +22297,7 @@ Major mode for editing Python files. ;;;*** -;;;### (autoloads nil "qp" "gnus/qp.el" (22086 11929 846062 731000)) +;;;### (autoloads nil "qp" "gnus/qp.el" (22150 28228 14072 702000)) ;;; Generated autoloads from gnus/qp.el (autoload 'quoted-printable-decode-region "qp" "\ @@ -22311,8 +22316,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (22086 11929 -;;;;;; 882062 731000)) +;;;### (autoloads nil "quail" "international/quail.el" (22150 28228 +;;;;;; 122072 702000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22542,8 +22547,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (22086 -;;;;;; 11929 922062 731000)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (22150 +;;;;;; 28228 202072 702000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22556,7 +22561,7 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'. ;;;*** ;;;### (autoloads nil "quail/uni-input" "leim/quail/uni-input.el" -;;;;;; (22086 11929 930062 731000)) +;;;;;; (22150 28228 210072 702000)) ;;; Generated autoloads from leim/quail/uni-input.el (autoload 'ucs-input-activate "quail/uni-input" "\ @@ -22570,8 +22575,8 @@ While this input method is active, the variable ;;;*** -;;;### (autoloads nil "quickurl" "net/quickurl.el" (22086 11930 2062 -;;;;;; 731000)) +;;;### (autoloads nil "quickurl" "net/quickurl.el" (22150 28228 390072 +;;;;;; 702000)) ;;; 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" "\ @@ -22642,8 +22647,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (22092 27717 984268 -;;;;;; 464000)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (22150 28228 390072 +;;;;;; 702000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22681,8 +22686,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (22086 -;;;;;; 11929 682062 731000)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (22150 +;;;;;; 28227 454072 702000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22700,8 +22705,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (22086 11930 254062 -;;;;;; 731000)) +;;;### (autoloads nil "recentf" "recentf.el" (22150 28228 990072 +;;;;;; 702000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22727,7 +22732,7 @@ were operated on recently. ;;;*** -;;;### (autoloads nil "rect" "rect.el" (22087 9807 394279 951000)) +;;;### (autoloads nil "rect" "rect.el" (22150 28228 990072 702000)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22867,8 +22872,8 @@ Activates the region if needed. Only lasts until the region is deactivated. ;;;*** -;;;### (autoloads nil "refill" "textmodes/refill.el" (22086 11930 -;;;;;; 322062 731000)) +;;;### (autoloads nil "refill" "textmodes/refill.el" (22150 28229 +;;;;;; 106072 702000)) ;;; Generated autoloads from textmodes/refill.el (autoload 'refill-mode "refill" "\ @@ -22888,8 +22893,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (22086 11930 -;;;;;; 330062 731000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (22150 28229 +;;;;;; 130072 702000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'reftex-citation "reftex-cite" nil t) (autoload 'reftex-all-document-files "reftex-parse") @@ -22942,8 +22947,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (22092 -;;;;;; 27718 512268 464000)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (22150 +;;;;;; 28229 114072 702000)) ;;; 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)))) @@ -22952,8 +22957,8 @@ This enforces rescanning the buffer on next use. ;;;*** -;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (22086 -;;;;;; 11929 682062 731000)) +;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (22150 +;;;;;; 28227 454072 702000)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload 'regexp-opt "regexp-opt" "\ @@ -22982,15 +22987,15 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (22086 11929 682062 -;;;;;; 731000)) +;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (22150 28227 454072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (22086 11930 -;;;;;; 334062 731000)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (22150 28229 +;;;;;; 130072 702000)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) @@ -23044,7 +23049,7 @@ to turn the *scratch* buffer into your notes buffer. ;;;*** -;;;### (autoloads nil "repeat" "repeat.el" (22086 11930 258062 731000)) +;;;### (autoloads nil "repeat" "repeat.el" (22150 28228 994072 702000)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) @@ -23067,8 +23072,8 @@ recently executed command not bound to an input event\". ;;;*** -;;;### (autoloads nil "reporter" "mail/reporter.el" (22086 11929 -;;;;;; 938062 731000)) +;;;### (autoloads nil "reporter" "mail/reporter.el" (22150 28228 +;;;;;; 234072 702000)) ;;; Generated autoloads from mail/reporter.el (autoload 'reporter-submit-bug-report "reporter" "\ @@ -23099,8 +23104,8 @@ mail-sending package is used for editing and sending the message. ;;;*** -;;;### (autoloads nil "reposition" "reposition.el" (22086 11930 262062 -;;;;;; 731000)) +;;;### (autoloads nil "reposition" "reposition.el" (22150 28228 994072 +;;;;;; 702000)) ;;; Generated autoloads from reposition.el (autoload 'reposition-window "reposition" "\ @@ -23126,7 +23131,7 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads nil "reveal" "reveal.el" (22086 11930 262062 731000)) +;;;### (autoloads nil "reveal" "reveal.el" (22150 28228 994072 702000)) ;;; Generated autoloads from reveal.el (autoload 'reveal-mode "reveal" "\ @@ -23161,8 +23166,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (22086 11929 682062 -;;;;;; 731000)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (22150 28227 454072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -23177,8 +23182,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (22086 11930 6062 -;;;;;; 731000)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (22150 28228 394072 +;;;;;; 702000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -23222,8 +23227,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (22092 27717 884268 -;;;;;; 464000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (22150 28228 242072 +;;;;;; 702000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23420,8 +23425,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (22086 11929 -;;;;;; 942062 731000)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (22150 28228 +;;;;;; 246072 702000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23485,8 +23490,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (22086 11930 -;;;;;; 26062 731000)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (22150 28228 +;;;;;; 454072 702000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23497,8 +23502,8 @@ Return a pattern. ;;;*** -;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (22086 11930 -;;;;;; 30062 731000)) +;;;### (autoloads nil "rng-nxml" "nxml/rng-nxml.el" (22150 28228 +;;;;;; 458072 702000)) ;;; Generated autoloads from nxml/rng-nxml.el (autoload 'rng-nxml-mode-init "rng-nxml" "\ @@ -23510,8 +23515,8 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil. ;;;*** -;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (22086 11930 -;;;;;; 30062 731000)) +;;;### (autoloads nil "rng-valid" "nxml/rng-valid.el" (22150 28228 +;;;;;; 462072 702000)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -23541,8 +23546,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (22086 11930 30062 -;;;;;; 731000)) +;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (22150 28228 462072 +;;;;;; 702000)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23602,7 +23607,7 @@ Start using robin package NAME, which is a string. ;;;*** -;;;### (autoloads nil "rot13" "rot13.el" (22086 11930 266062 731000)) +;;;### (autoloads nil "rot13" "rot13.el" (22150 28228 994072 702000)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -23639,8 +23644,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (22086 11930 338062 -;;;;;; 731000)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (22150 28229 146072 +;;;;;; 702000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23670,8 +23675,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (22089 -;;;;;; 51528 360929 316000)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (22150 +;;;;;; 28228 910072 702000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23688,8 +23693,8 @@ Major mode for editing Ruby code. ;;;*** -;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (22086 11930 266062 -;;;;;; 731000)) +;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (22150 28228 994072 +;;;;;; 702000)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) @@ -23707,8 +23712,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (22086 11929 686062 -;;;;;; 731000)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (22150 28227 454072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -24019,15 +24024,15 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (22086 11930 -;;;;;; 6062 731000)) +;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (22150 28228 +;;;;;; 394072 702000)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (22086 11930 266062 -;;;;;; 731000)) +;;;### (autoloads nil "savehist" "savehist.el" (22150 28228 994072 +;;;;;; 702000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -24059,8 +24064,8 @@ histories, which is probably undesirable. ;;;*** -;;;### (autoloads nil "saveplace" "saveplace.el" (22086 11930 266062 -;;;;;; 731000)) +;;;### (autoloads nil "saveplace" "saveplace.el" (22150 28228 994072 +;;;;;; 702000)) ;;; Generated autoloads from saveplace.el (defvar save-place-mode nil "\ @@ -24081,8 +24086,8 @@ where it was when you previously visited the same file. ;;;*** -;;;### (autoloads nil "scheme" "progmodes/scheme.el" (22086 11930 -;;;;;; 222062 731000)) +;;;### (autoloads nil "scheme" "progmodes/scheme.el" (22150 28228 +;;;;;; 910072 702000)) ;;; Generated autoloads from progmodes/scheme.el (autoload 'scheme-mode "scheme" "\ @@ -24121,8 +24126,8 @@ that variable's value is a string. ;;;*** -;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (22086 11929 -;;;;;; 850062 731000)) +;;;### (autoloads nil "score-mode" "gnus/score-mode.el" (22150 28228 +;;;;;; 18072 702000)) ;;; Generated autoloads from gnus/score-mode.el (autoload 'gnus-score-mode "score-mode" "\ @@ -24135,8 +24140,8 @@ This mode is an extended emacs-lisp mode. ;;;*** -;;;### (autoloads nil "scroll-all" "scroll-all.el" (22089 51528 372929 -;;;;;; 316000)) +;;;### (autoloads nil "scroll-all" "scroll-all.el" (22150 28228 994072 +;;;;;; 702000)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -24161,8 +24166,8 @@ one window apply to all visible windows in the same frame. ;;;*** -;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (22086 11930 -;;;;;; 270062 731000)) +;;;### (autoloads nil "scroll-lock" "scroll-lock.el" (22150 28228 +;;;;;; 994072 702000)) ;;; Generated autoloads from scroll-lock.el (autoload 'scroll-lock-mode "scroll-lock" "\ @@ -24178,16 +24183,16 @@ vertically fixed relative to window boundaries during scrolling. ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (22086 11930 6062 -;;;;;; 731000)) +;;;### (autoloads nil "secrets" "net/secrets.el" (22150 28228 394072 +;;;;;; 702000)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) ;;;*** -;;;### (autoloads nil "semantic" "cedet/semantic.el" (22092 27717 -;;;;;; 568268 464000)) +;;;### (autoloads nil "semantic" "cedet/semantic.el" (22150 28227 +;;;;;; 222072 702000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) @@ -24245,7 +24250,7 @@ Semantic mode. ;;;*** ;;;### (autoloads nil "semantic/bovine/grammar" "cedet/semantic/bovine/grammar.el" -;;;;;; (22086 11929 554062 731000)) +;;;;;; (22150 28227 234072 702000)) ;;; Generated autoloads from cedet/semantic/bovine/grammar.el (autoload 'bovine-grammar-mode "semantic/bovine/grammar" "\ @@ -24256,7 +24261,7 @@ Major mode for editing Bovine grammars. ;;;*** ;;;### (autoloads nil "semantic/wisent/grammar" "cedet/semantic/wisent/grammar.el" -;;;;;; (22086 11929 578062 731000)) +;;;;;; (22150 28227 266072 702000)) ;;; Generated autoloads from cedet/semantic/wisent/grammar.el (autoload 'wisent-grammar-mode "semantic/wisent/grammar" "\ @@ -24266,8 +24271,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (22086 11929 -;;;;;; 946062 731000)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (22150 28228 +;;;;;; 254072 702000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24548,14 +24553,14 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "seq" "emacs-lisp/seq.el" (22086 11929 686062 -;;;;;; 731000)) +;;;### (autoloads nil "seq" "emacs-lisp/seq.el" (22150 28227 454072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/seq.el (push (purecopy '(seq 2 3)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "server" "server.el" (22093 48588 588393 539000)) +;;;### (autoloads nil "server" "server.el" (22150 28228 998072 702000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24622,7 +24627,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (22092 27718 416268 464000)) +;;;### (autoloads nil "ses" "ses.el" (22150 28229 14072 702000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24666,8 +24671,8 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (22092 -;;;;;; 27718 512268 464000)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (22150 +;;;;;; 28229 150072 702000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24732,8 +24737,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (22092 -;;;;;; 27718 260268 464000)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (22150 +;;;;;; 28228 918072 702000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24748,7 +24753,8 @@ assumed. Since filenames rarely give a clue, they are not further analyzed. This mode adapts to the variations between shells (see `sh-set-shell') by means of an inheritance based feature lookup (see `sh-feature'). This mechanism applies to all variables (including skeletons) that pertain to -shell-specific features. +shell-specific features. Shell script files can use the `sh-shell' local +variable to indicate the shell variant to be used for the file. The default style of this mode is that of Rosenblatt's Korn shell book. The syntax of the statements varies with the shell being used. The @@ -24796,8 +24802,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (22086 11929 -;;;;;; 686062 731000)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (22150 28227 +;;;;;; 454072 702000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24846,8 +24852,8 @@ function, `load-path-shadows-find'. ;;;*** -;;;### (autoloads nil "shadowfile" "shadowfile.el" (22086 11930 278062 -;;;;;; 731000)) +;;;### (autoloads nil "shadowfile" "shadowfile.el" (22150 28229 14072 +;;;;;; 702000)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -24885,7 +24891,7 @@ Set up file shadowing. ;;;*** -;;;### (autoloads nil "shell" "shell.el" (22086 11930 278062 731000)) +;;;### (autoloads nil "shell" "shell.el" (22150 28229 14072 702000)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -24933,7 +24939,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (22087 9807 382279 951000)) +;;;### (autoloads nil "shr" "net/shr.el" (22150 28228 398072 702000)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -24950,8 +24956,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (22086 11929 850062 -;;;;;; 731000)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (22150 28228 18072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24976,8 +24982,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (22086 11929 -;;;;;; 850062 731000)) +;;;### (autoloads nil "sieve-mode" "gnus/sieve-mode.el" (22150 28228 +;;;;;; 18072 702000)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload 'sieve-mode "sieve-mode" "\ @@ -24992,8 +24998,8 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simula" "progmodes/simula.el" (22092 27718 -;;;;;; 288268 464000)) +;;;### (autoloads nil "simula" "progmodes/simula.el" (22150 28228 +;;;;;; 922072 702000)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -25041,8 +25047,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (22086 11930 290062 -;;;;;; 731000)) +;;;### (autoloads nil "skeleton" "skeleton.el" (22150 28229 18072 +;;;;;; 702000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -25161,8 +25167,8 @@ twice for the others. ;;;*** -;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (22092 27718 -;;;;;; 548268 464000)) +;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (22150 28229 +;;;;;; 286072 702000)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -25189,8 +25195,8 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** -;;;### (autoloads nil "smiley" "gnus/smiley.el" (22086 11929 850062 -;;;;;; 731000)) +;;;### (autoloads nil "smiley" "gnus/smiley.el" (22150 28228 18072 +;;;;;; 702000)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -25207,8 +25213,8 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** -;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (22086 11929 -;;;;;; 950062 731000)) +;;;### (autoloads nil "smtpmail" "mail/smtpmail.el" (22150 28228 +;;;;;; 254072 702000)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -25223,8 +25229,8 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads nil "snake" "play/snake.el" (22086 11930 130062 -;;;;;; 731000)) +;;;### (autoloads nil "snake" "play/snake.el" (22150 28228 682072 +;;;;;; 702000)) ;;; Generated autoloads from play/snake.el (autoload 'snake "snake" "\ @@ -25247,8 +25253,8 @@ Snake mode keybindings: ;;;*** -;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (22086 11930 -;;;;;; 10062 731000)) +;;;### (autoloads nil "snmp-mode" "net/snmp-mode.el" (22150 28228 +;;;;;; 402072 702000)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -25277,15 +25283,15 @@ then `snmpv2-mode-hook'. ;;;*** -;;;### (autoloads nil "soap-client" "net/soap-client.el" (22092 27717 -;;;;;; 988268 464000)) +;;;### (autoloads nil "soap-client" "net/soap-client.el" (22150 28228 +;;;;;; 406072 702000)) ;;; Generated autoloads from net/soap-client.el (push (purecopy '(soap-client 3 0 2)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "solar" "calendar/solar.el" (22086 11929 534062 -;;;;;; 731000)) +;;;### (autoloads nil "solar" "calendar/solar.el" (22150 28227 82072 +;;;;;; 702000)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -25300,8 +25306,8 @@ This function is suitable for execution in an init file. ;;;*** -;;;### (autoloads nil "solitaire" "play/solitaire.el" (22086 11930 -;;;;;; 130062 731000)) +;;;### (autoloads nil "solitaire" "play/solitaire.el" (22150 28228 +;;;;;; 682072 702000)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -25376,7 +25382,7 @@ Pick your favorite shortcuts: ;;;*** -;;;### (autoloads nil "sort" "sort.el" (22086 11930 290062 731000)) +;;;### (autoloads nil "sort" "sort.el" (22150 28229 18072 702000)) ;;; Generated autoloads from sort.el (put 'sort-fold-case 'safe-local-variable 'booleanp) @@ -25551,7 +25557,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (22086 11929 854062 731000)) +;;;### (autoloads nil "spam" "gnus/spam.el" (22150 28228 22072 702000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25565,8 +25571,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (22086 -;;;;;; 11929 850062 731000)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (22150 +;;;;;; 28228 22072 702000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25608,8 +25614,8 @@ Spam reports will be queued with the method used when ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (22092 27718 452268 -;;;;;; 464000)) +;;;### (autoloads nil "speedbar" "speedbar.el" (22150 28229 22072 +;;;;;; 702000)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25633,8 +25639,8 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** -;;;### (autoloads nil "spook" "play/spook.el" (22086 11930 130062 -;;;;;; 731000)) +;;;### (autoloads nil "spook" "play/spook.el" (22150 28228 682072 +;;;;;; 702000)) ;;; Generated autoloads from play/spook.el (autoload 'spook "spook" "\ @@ -25649,8 +25655,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (22092 27718 320268 -;;;;;; 464000)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (22150 28228 926072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 5)) package--builtin-versions) @@ -26116,15 +26122,15 @@ Run vsql as an inferior process. ;;;*** -;;;### (autoloads nil "srecode" "cedet/srecode.el" (22086 11929 578062 -;;;;;; 731000)) +;;;### (autoloads nil "srecode" "cedet/srecode.el" (22150 28227 270072 +;;;;;; 702000)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (22086 11929 582062 731000)) +;;;;;; (22150 28227 274072 702000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -26136,8 +26142,8 @@ Major-mode for writing SRecode macros. ;;;*** -;;;### (autoloads nil "starttls" "gnus/starttls.el" (22086 11929 -;;;;;; 854062 731000)) +;;;### (autoloads nil "starttls" "gnus/starttls.el" (22150 28228 +;;;;;; 22072 702000)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -26160,8 +26166,7 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (22086 11930 294062 -;;;;;; 731000)) +;;;### (autoloads nil "strokes" "strokes.el" (22150 28229 22072 702000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -26295,8 +26300,8 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (22086 11930 -;;;;;; 226062 731000)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (22150 28228 +;;;;;; 930072 702000)) ;;; Generated autoloads from progmodes/subword.el (define-obsolete-function-alias 'capitalized-words-mode 'subword-mode "25.1") @@ -26388,8 +26393,8 @@ See `superword-mode' for more information on Superword mode. ;;;*** -;;;### (autoloads nil "supercite" "mail/supercite.el" (22086 11929 -;;;;;; 950062 731000)) +;;;### (autoloads nil "supercite" "mail/supercite.el" (22150 28228 +;;;;;; 254072 702000)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -26421,8 +26426,7 @@ and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads nil "t-mouse" "t-mouse.el" (22086 11930 298062 -;;;;;; 731000)) +;;;### (autoloads nil "t-mouse" "t-mouse.el" (22150 28229 26072 702000)) ;;; Generated autoloads from t-mouse.el (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") @@ -26450,7 +26454,7 @@ It relies on the `gpm' daemon being activated. ;;;*** -;;;### (autoloads nil "tabify" "tabify.el" (22086 11930 298062 731000)) +;;;### (autoloads nil "tabify" "tabify.el" (22150 28229 26072 702000)) ;;; Generated autoloads from tabify.el (autoload 'untabify "tabify" "\ @@ -26479,8 +26483,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (22092 27718 520268 -;;;;;; 464000)) +;;;### (autoloads nil "table" "textmodes/table.el" (22150 28229 166072 +;;;;;; 702000)) ;;; Generated autoloads from textmodes/table.el (autoload 'table-insert "table" "\ @@ -27051,7 +27055,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads nil "talk" "talk.el" (22086 11930 298062 731000)) +;;;### (autoloads nil "talk" "talk.el" (22150 28229 26072 702000)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -27066,8 +27070,8 @@ Connect to the Emacs talk group from the current X display or tty frame. ;;;*** -;;;### (autoloads nil "tar-mode" "tar-mode.el" (22086 11930 298062 -;;;;;; 731000)) +;;;### (autoloads nil "tar-mode" "tar-mode.el" (22150 28229 26072 +;;;;;; 702000)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -27090,8 +27094,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** -;;;### (autoloads nil "tcl" "progmodes/tcl.el" (22086 11930 230062 -;;;;;; 731000)) +;;;### (autoloads nil "tcl" "progmodes/tcl.el" (22150 28228 934072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -27139,8 +27143,8 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads nil "telnet" "net/telnet.el" (22086 11930 14062 -;;;;;; 731000)) +;;;### (autoloads nil "telnet" "net/telnet.el" (22150 28228 406072 +;;;;;; 702000)) ;;; Generated autoloads from net/telnet.el (autoload 'telnet "telnet" "\ @@ -27165,7 +27169,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (22102 63557 312509 103000)) +;;;### (autoloads nil "term" "term.el" (22150 28229 58072 702000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -27207,8 +27211,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (22086 -;;;;;; 11929 686062 731000)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (22150 +;;;;;; 28227 458072 702000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -27218,8 +27222,8 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads nil "tetris" "play/tetris.el" (22086 11930 130062 -;;;;;; 731000)) +;;;### (autoloads nil "tetris" "play/tetris.el" (22150 28228 682072 +;;;;;; 702000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) @@ -27244,8 +27248,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (22092 27718 -;;;;;; 524268 464000)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (22150 28229 +;;;;;; 186072 702000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27546,8 +27550,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (22086 11930 -;;;;;; 350062 731000)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (22150 28229 +;;;;;; 190072 702000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27586,8 +27590,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (22086 11930 -;;;;;; 350062 731000)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (22150 28229 +;;;;;; 194072 702000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27671,8 +27675,8 @@ value of `texinfo-mode-hook'. ;;;*** -;;;### (autoloads nil "thai-util" "language/thai-util.el" (22086 -;;;;;; 11929 902062 731000)) +;;;### (autoloads nil "thai-util" "language/thai-util.el" (22150 +;;;;;; 28228 198072 702000)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -27699,8 +27703,8 @@ Compose Thai characters in the current buffer. ;;;*** -;;;### (autoloads nil "thingatpt" "thingatpt.el" (22086 11930 354062 -;;;;;; 731000)) +;;;### (autoloads nil "thingatpt" "thingatpt.el" (22150 28229 198072 +;;;;;; 702000)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27764,7 +27768,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (22086 11930 354062 731000)) +;;;### (autoloads nil "thumbs" "thumbs.el" (22150 28229 198072 702000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27798,15 +27802,15 @@ In dired, call the setroot program on the image at point. ;;;*** -;;;### (autoloads nil "thunk" "emacs-lisp/thunk.el" (22086 11929 -;;;;;; 690062 731000)) +;;;### (autoloads nil "thunk" "emacs-lisp/thunk.el" (22150 28227 +;;;;;; 458072 702000)) ;;; Generated autoloads from emacs-lisp/thunk.el (push (purecopy '(thunk 1 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (22086 -;;;;;; 11929 906062 731000)) +;;;### (autoloads nil "tibet-util" "language/tibet-util.el" (22150 +;;;;;; 28228 198072 702000)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -27879,8 +27883,8 @@ See also docstring of the function tibetan-compose-region. ;;;*** -;;;### (autoloads nil "tildify" "textmodes/tildify.el" (22086 11930 -;;;;;; 354062 731000)) +;;;### (autoloads nil "tildify" "textmodes/tildify.el" (22150 28229 +;;;;;; 198072 702000)) ;;; Generated autoloads from textmodes/tildify.el (push (purecopy '(tildify 4 6 1)) package--builtin-versions) @@ -27946,7 +27950,7 @@ variable will be set to the representation. ;;;*** -;;;### (autoloads nil "time" "time.el" (22086 11930 354062 731000)) +;;;### (autoloads nil "time" "time.el" (22150 28229 202072 702000)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -28008,8 +28012,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (22086 -;;;;;; 11929 538062 731000)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (22150 +;;;;;; 28227 82072 702000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -28112,8 +28116,8 @@ Convert the time interval in seconds to a short string. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (22092 27718 528268 -;;;;;; 464000)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (22150 28229 202072 +;;;;;; 702000)) ;;; 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) @@ -28153,8 +28157,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (22086 -;;;;;; 11929 538062 731000)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (22150 +;;;;;; 28227 82072 702000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -28264,7 +28268,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (22086 11929 886062 731000)) +;;;;;; (22150 28228 134072 702000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -28286,7 +28290,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (22086 11930 354062 731000)) +;;;### (autoloads nil "tmm" "tmm.el" (22150 28229 202072 702000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -28328,8 +28332,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (22086 -;;;;;; 11929 538062 731000)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (22150 +;;;;;; 28227 138072 702000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -28396,8 +28400,8 @@ Mode for displaying and reprioritizing top priority Todo. ;;;*** -;;;### (autoloads nil "tool-bar" "tool-bar.el" (22086 11930 358062 -;;;;;; 731000)) +;;;### (autoloads nil "tool-bar" "tool-bar.el" (22150 28229 202072 +;;;;;; 702000)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -28467,8 +28471,8 @@ holds a keymap. ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (22086 11929 690062 -;;;;;; 731000)) +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (22150 28227 458072 +;;;;;; 702000)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload 'tq-create "tq" "\ @@ -28481,8 +28485,8 @@ to a tcp server on another machine. ;;;*** -;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (22086 11929 -;;;;;; 690062 731000)) +;;;### (autoloads nil "trace" "emacs-lisp/trace.el" (22150 28227 +;;;;;; 458072 702000)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -28527,7 +28531,8 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (22092 27718 8268 464000)) +;;;### (autoloads nil "tramp" "net/tramp.el" (22150 28228 442072 +;;;;;; 702000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28642,8 +28647,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (22086 11930 -;;;;;; 14062 731000)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (22150 28228 +;;;;;; 410072 702000)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28653,8 +28658,15 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (22086 11930 358062 -;;;;;; 731000)) +;;;### (autoloads nil "trampver" "net/trampver.el" (22150 28228 442072 +;;;;;; 702000)) +;;; Generated autoloads from net/trampver.el +(push (purecopy '(tramp 2 2 13 25 1)) package--builtin-versions) + +;;;*** + +;;;### (autoloads nil "tutorial" "tutorial.el" (22150 28229 206072 +;;;;;; 702000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28689,8 +28701,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (22086 -;;;;;; 11930 354062 731000)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (22150 +;;;;;; 28229 198072 702000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28737,8 +28749,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (22086 11930 358062 -;;;;;; 731000)) +;;;### (autoloads nil "type-break" "type-break.el" (22150 28229 206072 +;;;;;; 702000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28870,7 +28882,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (22086 11929 950062 731000)) +;;;### (autoloads nil "uce" "mail/uce.el" (22150 28228 258072 702000)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -28884,7 +28896,7 @@ You might need to set `uce-mail-reader' before using this. ;;;*** ;;;### (autoloads nil "ucs-normalize" "international/ucs-normalize.el" -;;;;;; (22086 11929 886062 731000)) +;;;;;; (22150 28228 134072 702000)) ;;; Generated autoloads from international/ucs-normalize.el (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\ @@ -28949,8 +28961,8 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus. ;;;*** -;;;### (autoloads nil "underline" "textmodes/underline.el" (22086 -;;;;;; 11930 354062 731000)) +;;;### (autoloads nil "underline" "textmodes/underline.el" (22150 +;;;;;; 28229 198072 702000)) ;;; Generated autoloads from textmodes/underline.el (autoload 'underline-region "underline" "\ @@ -28970,8 +28982,8 @@ which specify the range to operate on. ;;;*** -;;;### (autoloads nil "unrmail" "mail/unrmail.el" (22086 11929 950062 -;;;;;; 731000)) +;;;### (autoloads nil "unrmail" "mail/unrmail.el" (22150 28228 258072 +;;;;;; 702000)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -28991,8 +29003,8 @@ The variable `unrmail-mbox-format' controls which mbox format to use. ;;;*** -;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (22086 11929 -;;;;;; 690062 731000)) +;;;### (autoloads nil "unsafep" "emacs-lisp/unsafep.el" (22150 28227 +;;;;;; 458072 702000)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload 'unsafep "unsafep" "\ @@ -29004,7 +29016,7 @@ UNSAFEP-VARS is a list of symbols with local bindings. ;;;*** -;;;### (autoloads nil "url" "url/url.el" (22086 11930 366062 731000)) +;;;### (autoloads nil "url" "url/url.el" (22150 28229 234072 702000)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -29051,8 +29063,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (22092 27718 528268 -;;;;;; 464000)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (22150 28229 210072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -29093,8 +29105,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** -;;;### (autoloads nil "url-cache" "url/url-cache.el" (22086 11930 -;;;;;; 362062 731000)) +;;;### (autoloads nil "url-cache" "url/url-cache.el" (22150 28229 +;;;;;; 210072 702000)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -29115,8 +29127,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-cid" "url/url-cid.el" (22086 11930 362062 -;;;;;; 731000)) +;;;### (autoloads nil "url-cid" "url/url-cid.el" (22150 28229 210072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-cid.el (autoload 'url-cid "url-cid" "\ @@ -29126,8 +29138,8 @@ Extract FNAM from the local disk cache. ;;;*** -;;;### (autoloads nil "url-dav" "url/url-dav.el" (22086 11930 362062 -;;;;;; 731000)) +;;;### (autoloads nil "url-dav" "url/url-dav.el" (22150 28229 214072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -29161,8 +29173,8 @@ added to this list, so most requests can just pass in nil. ;;;*** -;;;### (autoloads nil "url-file" "url/url-file.el" (22086 11930 362062 -;;;;;; 731000)) +;;;### (autoloads nil "url-file" "url/url-file.el" (22150 28229 214072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-file.el (autoload 'url-file "url-file" "\ @@ -29172,8 +29184,8 @@ Handle file: and ftp: URLs. ;;;*** -;;;### (autoloads nil "url-gw" "url/url-gw.el" (22086 11930 362062 -;;;;;; 731000)) +;;;### (autoloads nil "url-gw" "url/url-gw.el" (22150 28229 218072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-gw.el (autoload 'url-gateway-nslookup-host "url-gw" "\ @@ -29194,8 +29206,8 @@ overriding the value of `url-gateway-method'. ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (22089 -;;;;;; 51528 372929 316000)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (22150 +;;;;;; 28229 218072 702000)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -29242,6 +29254,13 @@ accessible. \(fn URL &rest IGNORED)" nil nil) +(autoload 'url-insert-buffer-contents "url-handlers" "\ +Insert the contents of BUFFER into current buffer. +This is like `url-insert', but also decodes the current buffer as +if it had been inserted from a file named URL. + +\(fn BUFFER URL &optional VISIT BEG END REPLACE)" nil nil) + (autoload 'url-insert-file-contents "url-handlers" "\ @@ -29249,8 +29268,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (22092 27718 532268 -;;;;;; 464000)) +;;;### (autoloads nil "url-http" "url/url-http.el" (22150 28229 218072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -29262,8 +29281,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-irc" "url/url-irc.el" (22086 11930 366062 -;;;;;; 731000)) +;;;### (autoloads nil "url-irc" "url/url-irc.el" (22150 28229 222072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-irc.el (autoload 'url-irc "url-irc" "\ @@ -29273,8 +29292,8 @@ accessible. ;;;*** -;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (22086 11930 366062 -;;;;;; 731000)) +;;;### (autoloads nil "url-ldap" "url/url-ldap.el" (22150 28229 222072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -29287,8 +29306,8 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** -;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (22086 11930 -;;;;;; 366062 731000)) +;;;### (autoloads nil "url-mailto" "url/url-mailto.el" (22150 28229 +;;;;;; 222072 702000)) ;;; Generated autoloads from url/url-mailto.el (autoload 'url-mail "url-mailto" "\ @@ -29303,8 +29322,8 @@ Handle the mailto: URL syntax. ;;;*** -;;;### (autoloads nil "url-misc" "url/url-misc.el" (22086 11930 366062 -;;;;;; 731000)) +;;;### (autoloads nil "url-misc" "url/url-misc.el" (22150 28229 222072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-misc.el (autoload 'url-man "url-misc" "\ @@ -29335,8 +29354,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-news" "url/url-news.el" (22086 11930 366062 -;;;;;; 731000)) +;;;### (autoloads nil "url-news" "url/url-news.el" (22150 28229 222072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-news.el (autoload 'url-news "url-news" "\ @@ -29351,8 +29370,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-ns" "url/url-ns.el" (22086 11930 366062 -;;;;;; 731000)) +;;;### (autoloads nil "url-ns" "url/url-ns.el" (22150 28229 222072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-ns.el (autoload 'isPlainHostName "url-ns" "\ @@ -29392,8 +29411,8 @@ Fetch a data URL (RFC 2397). ;;;*** -;;;### (autoloads nil "url-parse" "url/url-parse.el" (22086 11930 -;;;;;; 366062 731000)) +;;;### (autoloads nil "url-parse" "url/url-parse.el" (22150 28229 +;;;;;; 222072 702000)) ;;; Generated autoloads from url/url-parse.el (autoload 'url-recreate-url "url-parse" "\ @@ -29444,8 +29463,8 @@ parses to ;;;*** -;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (22086 11930 -;;;;;; 366062 731000)) +;;;### (autoloads nil "url-privacy" "url/url-privacy.el" (22150 28229 +;;;;;; 222072 702000)) ;;; Generated autoloads from url/url-privacy.el (autoload 'url-setup-privacy-info "url-privacy" "\ @@ -29455,8 +29474,8 @@ Setup variables that expose info about you and your system. ;;;*** -;;;### (autoloads nil "url-queue" "url/url-queue.el" (22086 11930 -;;;;;; 366062 731000)) +;;;### (autoloads nil "url-queue" "url/url-queue.el" (22150 28229 +;;;;;; 226072 702000)) ;;; Generated autoloads from url/url-queue.el (autoload 'url-queue-retrieve "url-queue" "\ @@ -29470,8 +29489,8 @@ The variable `url-queue-timeout' sets a timeout. ;;;*** -;;;### (autoloads nil "url-tramp" "url/url-tramp.el" (22086 11930 -;;;;;; 366062 731000)) +;;;### (autoloads nil "url-tramp" "url/url-tramp.el" (22150 28229 +;;;;;; 226072 702000)) ;;; Generated autoloads from url/url-tramp.el (defvar url-tramp-protocols '("ftp" "ssh" "scp" "rsync" "telnet") "\ @@ -29489,8 +29508,8 @@ would have been passed to OPERATION. ;;;*** -;;;### (autoloads nil "url-util" "url/url-util.el" (22092 27718 532268 -;;;;;; 464000)) +;;;### (autoloads nil "url-util" "url/url-util.el" (22150 28229 234072 +;;;;;; 702000)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29658,8 +29677,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (22092 27718 532268 -;;;;;; 464000)) +;;;### (autoloads nil "userlock" "userlock.el" (22150 28229 234072 +;;;;;; 702000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29687,8 +29706,8 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf-7" "international/utf-7.el" (22086 11929 -;;;;;; 886062 731000)) +;;;### (autoloads nil "utf-7" "international/utf-7.el" (22150 28228 +;;;;;; 134072 702000)) ;;; Generated autoloads from international/utf-7.el (autoload 'utf-7-post-read-conversion "utf-7" "\ @@ -29713,7 +29732,7 @@ The buffer in question is current when this function is called. ;;;*** -;;;### (autoloads nil "utf7" "gnus/utf7.el" (22086 11929 854062 731000)) +;;;### (autoloads nil "utf7" "gnus/utf7.el" (22150 28228 26072 702000)) ;;; Generated autoloads from gnus/utf7.el (autoload 'utf7-encode "utf7" "\ @@ -29723,8 +29742,8 @@ Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil. ;;;*** -;;;### (autoloads nil "uudecode" "mail/uudecode.el" (22086 11929 -;;;;;; 954062 731000)) +;;;### (autoloads nil "uudecode" "mail/uudecode.el" (22150 28228 +;;;;;; 258072 702000)) ;;; Generated autoloads from mail/uudecode.el (autoload 'uudecode-decode-region-external "uudecode" "\ @@ -29748,7 +29767,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (22093 48588 592393 539000)) +;;;### (autoloads nil "vc" "vc/vc.el" (22150 28229 306072 702000)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29979,7 +29998,8 @@ Update the current fileset or branch. You must be visiting a version controlled file, or in a `vc-dir' buffer. On a distributed version control system, this runs a \"pull\" operation to update the current branch, prompting for an argument -list if required. Optional prefix ARG forces a prompt. +list if required. Optional prefix ARG forces a prompt for the VCS +command to run. On a non-distributed version control system, update the current fileset to the tip revisions. For each unchanged and unlocked @@ -29996,8 +30016,11 @@ Push the current branch. You must be visiting a version controlled file, or in a `vc-dir' buffer. On a distributed version control system, this runs a \"push\" operation on the current branch, prompting for the precise command -if required. Optional prefix ARG non-nil forces a prompt. +if required. Optional prefix ARG non-nil forces a prompt for the +VCS command to run. + On a non-distributed version control system, this signals an error. +It also signals an error in a Bazaar bound branch. \(fn &optional ARG)" t nil) @@ -30060,8 +30083,8 @@ Return the branch part of a revision number REV. ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (22086 11930 -;;;;;; 382062 731000)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (22150 28229 +;;;;;; 286072 702000)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -30100,8 +30123,8 @@ should be applied to the background or to the foreground. ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (22086 11930 382062 -;;;;;; 731000)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (22150 28229 290072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -30117,8 +30140,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (22099 26170 434017 -;;;;;; 16000)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (22150 28229 290072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -30129,8 +30152,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (22086 11930 386062 -;;;;;; 731000)) +;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (22150 28229 294072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -30154,8 +30177,8 @@ These are the commands available for use in the file status buffer: ;;;*** -;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (22104 -;;;;;; 18893 237441 487000)) +;;;### (autoloads nil "vc-dispatcher" "vc/vc-dispatcher.el" (22150 +;;;;;; 28229 294072 702000)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -30178,8 +30201,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (22097 45637 495432 -;;;;;; 455000)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (22150 28229 294072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -30190,7 +30213,7 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (22097 45637 503432 455000)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (22150 28229 298072 702000)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." @@ -30201,8 +30224,8 @@ case, and the process object in the asynchronous case. ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (22097 45637 515432 -;;;;;; 455000)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (22150 28229 298072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-mtn.el (defconst vc-mtn-admin-dir "_MTN" "\ @@ -30218,8 +30241,8 @@ Name of the monotone directory's format file.") ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (22097 45637 527432 -;;;;;; 455000)) +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (22150 28229 302072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -30232,8 +30255,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (22086 11930 386062 -;;;;;; 731000)) +;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (22150 28229 302072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-sccs.el (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ @@ -30251,8 +30274,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-src" "vc/vc-src.el" (22086 11930 386062 -;;;;;; 731000)) +;;;### (autoloads nil "vc-src" "vc/vc-src.el" (22150 28229 302072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-src.el (defvar vc-src-master-templates (purecopy '("%s.src/%s,v")) "\ @@ -30265,8 +30288,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (22101 42694 157526 -;;;;;; 804000)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (22150 28229 302072 +;;;;;; 702000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -30279,8 +30302,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (22092 -;;;;;; 27718 320268 464000)) +;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (22150 +;;;;;; 28228 938072 702000)) ;;; 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)) @@ -30339,7 +30362,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (22092 27718 348268 464000)) +;;;;;; (22150 28228 970072 702000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30478,8 +30501,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (22092 -;;;;;; 27718 400268 464000)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (22150 +;;;;;; 28228 986072 702000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -31033,8 +31056,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "viet-util" "language/viet-util.el" (22086 -;;;;;; 11929 906062 731000)) +;;;### (autoloads nil "viet-util" "language/viet-util.el" (22150 +;;;;;; 28228 198072 702000)) ;;; Generated autoloads from language/viet-util.el (autoload 'viet-encode-viscii-char "viet-util" "\ @@ -31078,7 +31101,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics. ;;;*** -;;;### (autoloads nil "view" "view.el" (22086 11930 390062 731000)) +;;;### (autoloads nil "view" "view.el" (22150 28229 322072 702000)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -31334,8 +31357,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads nil "viper" "emulation/viper.el" (22086 11929 698062 -;;;;;; 731000)) +;;;### (autoloads nil "viper" "emulation/viper.el" (22150 28227 478072 +;;;;;; 702000)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) @@ -31352,8 +31375,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (22086 -;;;;;; 11929 690062 731000)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (22150 +;;;;;; 28227 458072 702000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -31443,7 +31466,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (22086 11930 394062 731000)) +;;;### (autoloads nil "wdired" "wdired.el" (22150 28229 322072 702000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -31461,8 +31484,8 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads nil "webjump" "net/webjump.el" (22086 11930 22062 -;;;;;; 731000)) +;;;### (autoloads nil "webjump" "net/webjump.el" (22150 28228 442072 +;;;;;; 702000)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -31478,8 +31501,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (22086 -;;;;;; 11930 242062 731000)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (22150 +;;;;;; 28228 986072 702000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31509,8 +31532,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (22086 11930 394062 -;;;;;; 731000)) +;;;### (autoloads nil "whitespace" "whitespace.el" (22150 28229 326072 +;;;;;; 702000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31878,8 +31901,8 @@ cleaning up these problems. ;;;*** -;;;### (autoloads nil "wid-browse" "wid-browse.el" (22086 11930 394062 -;;;;;; 731000)) +;;;### (autoloads nil "wid-browse" "wid-browse.el" (22150 28229 326072 +;;;;;; 702000)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -31907,8 +31930,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (22092 27718 580268 -;;;;;; 464000)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (22150 28229 330072 +;;;;;; 702000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31950,8 +31973,8 @@ Setup current buffer so editing string widgets works. ;;;*** -;;;### (autoloads nil "windmove" "windmove.el" (22092 27718 580268 -;;;;;; 464000)) +;;;### (autoloads nil "windmove" "windmove.el" (22150 28229 330072 +;;;;;; 702000)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -32003,7 +32026,7 @@ Default MODIFIER is `shift'. ;;;*** -;;;### (autoloads nil "winner" "winner.el" (22086 11930 398062 731000)) +;;;### (autoloads nil "winner" "winner.el" (22150 28229 354072 702000)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -32026,7 +32049,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (22092 27718 620268 464000)) +;;;### (autoloads nil "woman" "woman.el" (22150 28229 374072 702000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -32075,7 +32098,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (22092 27718 620268 464000)) +;;;### (autoloads nil "xml" "xml.el" (22150 28229 378072 702000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -32131,8 +32154,8 @@ Both features can be combined by providing a cons cell ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (22086 11930 30062 -;;;;;; 731000)) +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (22150 28228 462072 +;;;;;; 702000)) ;;; Generated autoloads from nxml/xmltok.el (autoload 'xmltok-get-declared-encoding-position "xmltok" "\ @@ -32150,8 +32173,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xref" "progmodes/xref.el" (22105 39773 959886 -;;;;;; 896000)) +;;;### (autoloads nil "xref" "progmodes/xref.el" (22150 28228 986072 +;;;;;; 702000)) ;;; Generated autoloads from progmodes/xref.el (autoload 'xref-find-backend "xref" "\ @@ -32213,8 +32236,8 @@ The argument has the same meaning as in `apropos'. ;;;*** -;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (22086 11930 402062 -;;;;;; 731000)) +;;;### (autoloads nil "xt-mouse" "xt-mouse.el" (22150 28229 378072 +;;;;;; 702000)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -32243,7 +32266,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** -;;;### (autoloads nil "yenc" "gnus/yenc.el" (22086 11929 854062 731000)) +;;;### (autoloads nil "yenc" "gnus/yenc.el" (22150 28228 26072 702000)) ;;; Generated autoloads from gnus/yenc.el (autoload 'yenc-decode-region "yenc" "\ @@ -32258,7 +32281,7 @@ Extract file name from an yenc header. ;;;*** -;;;### (autoloads nil "zone" "play/zone.el" (22086 11930 130062 731000)) +;;;### (autoloads nil "zone" "play/zone.el" (22150 28228 682072 702000)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -32394,33 +32417,33 @@ Zone out, completely. ;;;;;; "leim/quail/indian.el" "leim/quail/ipa-praat.el" "leim/quail/ipa.el" ;;;;;; "leim/quail/japanese.el" "leim/quail/lao.el" "leim/quail/latin-alt.el" ;;;;;; "leim/quail/latin-ltx.el" "leim/quail/latin-post.el" "leim/quail/latin-pre.el" -;;;;;; "leim/quail/lrt.el" "leim/quail/persian.el" "leim/quail/py-punct.el" -;;;;;; "leim/quail/pypunct-b5.el" "leim/quail/rfc1345.el" "leim/quail/sgml-input.el" -;;;;;; "leim/quail/sisheng.el" "leim/quail/slovak.el" "leim/quail/symbol-ksc.el" -;;;;;; "leim/quail/tamil-dvorak.el" "leim/quail/thai.el" "leim/quail/tibetan.el" -;;;;;; "leim/quail/viqr.el" "leim/quail/vntelex.el" "leim/quail/vnvni.el" -;;;;;; "leim/quail/welsh.el" "loadup.el" "mail/blessmail.el" "mail/mailheader.el" -;;;;;; "mail/mspools.el" "mail/rfc2368.el" "mail/rfc822.el" "mail/rmail-spam-filter.el" -;;;;;; "mail/rmailedit.el" "mail/rmailkwd.el" "mail/rmailmm.el" -;;;;;; "mail/rmailmsc.el" "mail/rmailsort.el" "mail/rmailsum.el" -;;;;;; "mail/undigest.el" "mh-e/mh-acros.el" "mh-e/mh-alias.el" -;;;;;; "mh-e/mh-buffers.el" "mh-e/mh-compat.el" "mh-e/mh-funcs.el" -;;;;;; "mh-e/mh-gnus.el" "mh-e/mh-identity.el" "mh-e/mh-inc.el" -;;;;;; "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el" +;;;;;; "leim/quail/lrt.el" "leim/quail/persian.el" "leim/quail/programmer-dvorak.el" +;;;;;; "leim/quail/py-punct.el" "leim/quail/pypunct-b5.el" "leim/quail/rfc1345.el" +;;;;;; "leim/quail/sgml-input.el" "leim/quail/sisheng.el" "leim/quail/slovak.el" +;;;;;; "leim/quail/symbol-ksc.el" "leim/quail/tamil-dvorak.el" "leim/quail/thai.el" +;;;;;; "leim/quail/tibetan.el" "leim/quail/viqr.el" "leim/quail/vntelex.el" +;;;;;; "leim/quail/vnvni.el" "leim/quail/welsh.el" "loadup.el" "mail/blessmail.el" +;;;;;; "mail/mailheader.el" "mail/mspools.el" "mail/rfc2368.el" +;;;;;; "mail/rfc822.el" "mail/rmail-spam-filter.el" "mail/rmailedit.el" +;;;;;; "mail/rmailkwd.el" "mail/rmailmm.el" "mail/rmailmsc.el" "mail/rmailsort.el" +;;;;;; "mail/rmailsum.el" "mail/undigest.el" "mh-e/mh-acros.el" +;;;;;; "mh-e/mh-alias.el" "mh-e/mh-buffers.el" "mh-e/mh-compat.el" +;;;;;; "mh-e/mh-funcs.el" "mh-e/mh-gnus.el" "mh-e/mh-identity.el" +;;;;;; "mh-e/mh-inc.el" "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el" ;;;;;; "mh-e/mh-loaddefs.el" "mh-e/mh-mime.el" "mh-e/mh-print.el" ;;;;;; "mh-e/mh-scan.el" "mh-e/mh-search.el" "mh-e/mh-seq.el" "mh-e/mh-show.el" ;;;;;; "mh-e/mh-speed.el" "mh-e/mh-thread.el" "mh-e/mh-tool-bar.el" ;;;;;; "mh-e/mh-utils.el" "mh-e/mh-xface.el" "mouse-copy.el" "mwheel.el" ;;;;;; "net/dns.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" "net/eudcb-ldap.el" -;;;;;; "net/eudcb-mab.el" "net/eudcb-ph.el" "net/hmac-def.el" "net/hmac-md5.el" -;;;;;; "net/imap.el" "net/ldap.el" "net/mairix.el" "net/newsticker.el" -;;;;;; "net/nsm.el" "net/rfc2104.el" "net/sasl-cram.el" "net/sasl-digest.el" +;;;;;; "net/eudcb-mab.el" "net/hmac-def.el" "net/hmac-md5.el" "net/imap.el" +;;;;;; "net/ldap.el" "net/mairix.el" "net/newsticker.el" "net/nsm.el" +;;;;;; "net/rfc2104.el" "net/sasl-cram.el" "net/sasl-digest.el" ;;;;;; "net/sasl-scram-rfc.el" "net/sasl.el" "net/shr-color.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" +;;;;;; "net/tramp-sh.el" "net/tramp-smb.el" "net/tramp-uu.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" @@ -32475,7 +32498,7 @@ Zone out, completely. ;;;;;; "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el" ;;;;;; "vc/pcvs-util.el" "vc/vc-dav.el" "vc/vc-filewise.el" "vcursor.el" ;;;;;; "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el" -;;;;;; "x-dnd.el") (22108 15942 558032 987000)) +;;;;;; "x-dnd.el") (22150 28575 326072 702000)) ;;;*** diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 2eb19df..9a03b05 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4725,7 +4725,7 @@ Argument MIME is non-nil if this is a mime message." ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "rmailedit" "rmailedit.el" "1ed1c211e6e9c254ba3e0dd8d546e745") +;;;### (autoloads nil "rmailedit" "rmailedit.el" "03eb8c36b3c57d58eecedb9eeffa623e") ;;; Generated autoloads from rmailedit.el (autoload 'rmail-edit-current-message "rmailedit" "\ @@ -4735,7 +4735,7 @@ Edit the contents of this message. ;;;*** -;;;### (autoloads nil "rmailkwd" "rmailkwd.el" "298dcda7febb6e4ebf0a166101f40650") +;;;### (autoloads nil "rmailkwd" "rmailkwd.el" "4e1b251929961e2b9d3b126301d697d0") ;;; Generated autoloads from rmailkwd.el (autoload 'rmail-add-label "rmailkwd" "\ @@ -4778,7 +4778,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads nil "rmailmm" "rmailmm.el" "36f518e036612a33eb436cb267fd39c7") +;;;### (autoloads nil "rmailmm" "rmailmm.el" "7ab6ab96dfdeeec6bc8f4620295b7119") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ @@ -4804,7 +4804,7 @@ The arguments ARG and STATE have no effect in this case. ;;;*** -;;;### (autoloads nil "rmailmsc" "rmailmsc.el" "c3f0d33739768fc12acc4258ae0da72e") +;;;### (autoloads nil "rmailmsc" "rmailmsc.el" "471c370ff9f183806c8d749961ec9d79") ;;; Generated autoloads from rmailmsc.el (autoload 'set-rmail-inbox-list "rmailmsc" "\ @@ -4818,7 +4818,7 @@ This applies only to the current session. ;;;*** -;;;### (autoloads nil "rmailsort" "rmailsort.el" "8f551773021df4fa1a14ec2517e6a4f1") +;;;### (autoloads nil "rmailsort" "rmailsort.el" "2c8e39f7bae6fcc465a83ebccd46c8a4") ;;; Generated autoloads from rmailsort.el (autoload 'rmail-sort-by-date "rmailsort" "\ @@ -4875,7 +4875,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. ;;;*** -;;;### (autoloads nil "rmailsum" "rmailsum.el" "4bc0d1a65aede332348200e1937c84d4") +;;;### (autoloads nil "rmailsum" "rmailsum.el" "8205e67c8188aa5c01715e79e10667c1") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ @@ -4922,7 +4922,7 @@ SENDERS is a regular expression. ;;;*** -;;;### (autoloads nil "undigest" "undigest.el" "c0ddfad4fe34ef9c1e790c2cc72b571d") +;;;### (autoloads nil "undigest" "undigest.el" "20561f083496eb113fa9e501902bfcc3") ;;; Generated autoloads from undigest.el (autoload 'undigestify-rmail-message "undigest" "\ diff --git a/lisp/ps-print.el b/lisp/ps-print.el index d5a4a4b..965e675 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -6589,7 +6589,7 @@ If FACE is not a valid face name, use default face." ;; To make this file smaller, some commands go in a separate file. ;; But autoload them here to make the separation invisible. -;;;### (autoloads nil "ps-mule" "ps-mule.el" "231b07356e5a37ebf517c613a3a12bba") +;;;### (autoloads nil "ps-mule" "ps-mule.el" "4a263b7a727e853f2e6672922c4e5755") ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 0d30e0e..bfd4290 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -2397,7 +2397,7 @@ Your bug report will be posted to the AUCTeX bug reporting list. ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "reftex-auc" "reftex-auc.el" "7c0e0b46919f4ceefe1026e31e73ebcd") +;;;### (autoloads nil "reftex-auc" "reftex-auc.el" "32dc44348a7eaf247f63c81b3ead2ba4") ;;; Generated autoloads from reftex-auc.el (autoload 'reftex-arg-label "reftex-auc" "\ @@ -2465,7 +2465,7 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL). See ;;;*** -;;;### (autoloads nil "reftex-cite" "reftex-cite.el" "7eaa61c05a6578999ea68f1be0fbcf49") +;;;### (autoloads nil "reftex-cite" "reftex-cite.el" "7ee48dcf194ffd3cce3b7a2eb990e300") ;;; Generated autoloads from reftex-cite.el (autoload 'reftex-default-bibliography "reftex-cite" "\ @@ -2567,7 +2567,7 @@ created files in the variables `reftex-create-bibtex-header' or ;;;*** -;;;### (autoloads nil "reftex-dcr" "reftex-dcr.el" "08fc5bd6c35f9d6ab4a6ad336d3769c0") +;;;### (autoloads nil "reftex-dcr" "reftex-dcr.el" "8a1cb9d9c9190eefd4e22ab89d278e03") ;;; Generated autoloads from reftex-dcr.el (autoload 'reftex-view-crossref "reftex-dcr" "\ @@ -2615,7 +2615,7 @@ Calling this function several times find successive citation locations. ;;;*** -;;;### (autoloads nil "reftex-global" "reftex-global.el" "5fdd9c2edced0882471f86baf4b4b234") +;;;### (autoloads nil "reftex-global" "reftex-global.el" "a7a6a1872e4509da5b211972c2a588ad") ;;; Generated autoloads from reftex-global.el (autoload 'reftex-create-tags-file "reftex-global" "\ @@ -2695,7 +2695,7 @@ With no argument, this command toggles ;;;*** -;;;### (autoloads nil "reftex-index" "reftex-index.el" "29cb6e91c2e06592053e9d543f30f0ea") +;;;### (autoloads nil "reftex-index" "reftex-index.el" "0e0eef2a199fb9de6f13b5eef601843f") ;;; Generated autoloads from reftex-index.el (autoload 'reftex-index-selection-or-word "reftex-index" "\ @@ -2793,7 +2793,7 @@ Here are all local bindings. ;;;*** -;;;### (autoloads nil "reftex-parse" "reftex-parse.el" "7bfdcb2f040dbe9a08d2c38c005c8f21") +;;;### (autoloads nil "reftex-parse" "reftex-parse.el" "9015d91c86a135c850f92b828eca6b62") ;;; Generated autoloads from reftex-parse.el (autoload 'reftex-parse-one "reftex-parse" "\ @@ -2951,7 +2951,7 @@ When LEVEL is non-nil, increase section numbers on that level. ;;;*** -;;;### (autoloads nil "reftex-ref" "reftex-ref.el" "86c0a243e49d55bb33a32ddac613e189") +;;;### (autoloads nil "reftex-ref" "reftex-ref.el" "166ebc4928231b5b42134783b94557f3") ;;; Generated autoloads from reftex-ref.el (autoload 'reftex-label-location "reftex-ref" "\ @@ -3012,7 +3012,7 @@ Optional prefix argument OTHER-WINDOW goes to the label in another window. ;;;*** -;;;### (autoloads nil "reftex-sel" "reftex-sel.el" "faea36cbe37033efd3f9063187eef7ee") +;;;### (autoloads nil "reftex-sel" "reftex-sel.el" "b5e68431056b461d8a0562e9e685a5f1") ;;; Generated autoloads from reftex-sel.el (autoload 'reftex-select-label-mode "reftex-sel" "\ @@ -3065,7 +3065,7 @@ During a selection process, these are the local bindings. ;;;*** -;;;### (autoloads nil "reftex-toc" "reftex-toc.el" "db9b727d89e2a6ff01986e7c6aff1058") +;;;### (autoloads nil "reftex-toc" "reftex-toc.el" "af8f426ef3a0607322ca4c9742e177a8") ;;; Generated autoloads from reftex-toc.el (autoload 'reftex-toc "reftex-toc" "\ commit ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 Author: Paul Eggert Date: Fri Jan 1 01:58:41 2016 -0800 Spelling and grammar fixes diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index b001821..eafd238 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -883,8 +883,8 @@ This method works only for unified file names, see @ref{Issues}. @cindex smb method This is another non-native @value{tramp} method. @command{smbclient} -connects to any host with SMB/CIFS protocol, such as MS Windows and -Samba Servers running on Unixes. Tests show this @value{tramp} method +connects to any server supporting the SMB/CIFS protocol, such as MS Windows and +Samba running on GNU/Linux. Tests show this @value{tramp} method works with MS Windows NT, MS Windows 2000, MS Windows XP, MS Windows Vista, and MS Windows 7. @@ -973,13 +973,13 @@ name when a single Android device is connected to @command{adb}. name. @command{adb devices} shows available host names. @option{adb} method normally does not need user name to authenticate -on the Andriod device because it runs under the @command{adbd} +on the Android device because it runs under the @command{adbd} process. But when a user name is specified, however, @value{tramp} applies an @command{su} in the syntax. When authentication does not succeed, especially on un-rooted Android devices, @value{tramp} displays login errors. -For Andriod devices connected through TCP/IP, a port number can be +For Android devices connected through TCP/IP, a port number can be specified using @file{device#42} host name syntax or @value{tramp} can use the default value as declared in @command{adb} command. Port numbers are not applicable to Android devices connected through USB@. @@ -1965,7 +1965,7 @@ where @samp{192.168.0.1} is the remote host IP address @value{tramp} uses the @option{adb} method to access Android devices. Android devices provide a restricted shell access through an -USB connection. The local host must have Andriod SDK installed. +USB connection. The local host must have the Android SDK installed. Applications such as @code{SSHDroid} that run @command{sshd} process on the Android device can accept any @option{ssh}-based methods @@ -2088,7 +2088,7 @@ To ``turns off'' the backup feature for @value{tramp} files and stop @ifset emacs @noindent -Disabling backups can be targetted to just @option{su} and +Disabling backups can be targeted to just the @option{su} and @option{sudo} methods: @lisp @@ -2173,7 +2173,7 @@ direct all auto saves to that location. @end ifset @ifset xemacs @code{auto-save-directory} can also be used here instead of other -locations specfied above. +locations specified above. @end ifset @node Windows setup hints @@ -2187,7 +2187,7 @@ This section is incomplete. Please share your solutions. Cygwin's @command{ssh} works only with a Cygwin version of @value{emacsname}. To check for compatibility: type @kbd{M-x eshell}, and -start @kbd{ssh test.host}. Incompatbilities trigger this message: +start @kbd{ssh test.host}. Incompatibilities trigger this message: @example Pseudo-terminal will not be allocated because stdin is not a terminal. @@ -2242,7 +2242,7 @@ authentication, host names, and file names. Unlike opening local files in @value{emacsname}, which are instantaneous, opening remote files in @value{tramp} is slower at -first. Sometimes there is a noticable delay before the prompts for +first. Sometimes there is a noticeable delay before the prompts for passwords or authentication appear in the minibuffer. Hitting @kbd{@key{RET}} or other keys during this gap will be processed by @value{emacsname}. This type-ahead facility is a feature of @@ -2322,7 +2322,7 @@ This is done by replacing the initial @file{@value{prefix}} with @file{@value{prefix}@var{method}@value{postfixhop}} (Note the trailing slash!). @end ifset -The syntax specificaton for user, host, and file do not change. +The syntax specifications for user, host, and file do not change. To connect to the host @code{melancholia} as @code{daniel}, using @option{ssh} method for @file{.emacs} in @code{daniel}'s home @@ -2400,8 +2400,8 @@ persistently (@pxref{Connection caching}) will be included in the completion lists. After remote host name completion comes completion of file names on -the remote host. It works the same as on loal host file completion -except when killing with double-slash @file{//} kills only the file +the remote host. It works the same as with local host file completion, +except that killing with double-slash @file{//} kills only the file name part of the @value{tramp} file name syntax. @ifset emacs A triple-slash stands for the default behavior. diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1 index 644b9c4..b2694d7 100644 --- a/etc/ChangeLog.1 +++ b/etc/ChangeLog.1 @@ -5110,7 +5110,7 @@ * PROBLEMS: More reorganization to exile old stuff to the pre-2000 section. I looked up end-of-life dates for a bunch - of old Unixes to check. + of old Unix systems to check. 2004-08-24 Bill Wohler commit 9c3dbabee3cc8cddce33aaa7622dfb4c11353123 Author: Paul Eggert Date: Fri Jan 1 01:38:07 2016 -0800 Fix copyright years by hand These are dates that admin/update-copyright did not update, or updated incorrectly. diff --git a/config.bat b/config.bat index 218690f..04fce0f 100644 --- a/config.bat +++ b/config.bat @@ -1,7 +1,7 @@ @echo off rem ---------------------------------------------------------------------- rem Configuration script for MSDOS -rem Copyright (C) 1994-1999, 2001-2015 Free Software Foundation, Inc. +rem Copyright (C) 1994-1999, 2001-2016 Free Software Foundation, Inc. rem This file is part of GNU Emacs. diff --git a/configure.ac b/configure.ac index 0581a88..8c01aba 100644 --- a/configure.ac +++ b/configure.ac @@ -4800,7 +4800,7 @@ fi version=$PACKAGE_VERSION -copyright="Copyright (C) 2015 Free Software Foundation, Inc." +copyright="Copyright (C) 2016 Free Software Foundation, Inc." AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"], [Short copyright string for this version of Emacs.]) AC_SUBST(copyright) @@ -5146,7 +5146,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ) AH_TOP([/* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2015 +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi index 3490c08..786ba65 100644 --- a/doc/emacs/emacs-xtra.texi +++ b/doc/emacs/emacs-xtra.texi @@ -12,7 +12,7 @@ @copying This manual describes specialized features of Emacs. -Copyright @copyright{} 2004--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 0030467..53b689f 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -27,7 +27,7 @@ This is the @cite{GNU Emacs Manual}, @end ifnottex updated for Emacs version @value{EMACSVER}. -Copyright @copyright{} 1985--1987, 1993--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1985--1987, 1993--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 245113b..36e60c2 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -113,7 +113,7 @@ Edition @value{edition-number}, @value{update-date} Distributed with Emacs version @value{EMACSVER}. @end ifnottex @sp 1 -Copyright @copyright{} 1990--1995, 1997, 2001--2015 Free Software +Copyright @copyright{} 1990--1995, 1997, 2001--2016 Free Software Foundation, Inc. @sp 1 diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 56d303e..da519f5 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -99,7 +99,7 @@ This is the @cite{GNU Emacs Lisp Reference Manual} @end ifnottex corresponding to Emacs version @value{EMACSVER}. -Copyright @copyright{} 1990--1996, 1998--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1990--1996, 1998--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index 770d217..8e92bb9 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -930,7 +930,7 @@ explains these conventions, starting with an example: @group ;;; foo.el --- Support for the Foo programming language -;; Copyright (C) 2010-2015 Your Name +;; Copyright (C) 2010-2016 Your Name @end group ;; Author: Your Name diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index 40c82a4..efbb95b 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 @@ -85,7 +85,7 @@ was written by Gerd Moellmann. Copyright .if t \(co .if n (C) -2008-2015 Free Software Foundation, Inc. +2008-2016 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in index 98322aa..3b1566f 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in @@ -651,7 +651,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual. Copyright .if t \(co .if n (C) -1995, 1999-2015 Free Software Foundation, Inc. +1995, 1999-2016 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/etags.1 b/doc/man/etags.1 index 7cb6b6c..7d5d374 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -278,7 +278,7 @@ Stallman. Copyright .if t \(co .if n (C) -1992, 1999, 2001-2015 Free Software Foundation, Inc. +1992, 1999, 2001-2016 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index e84ef6e..4fc0c05 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi @@ -4,7 +4,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 1999--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 082dc1d..fa4be24 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -11,7 +11,7 @@ @copying This file describes the Emacs auth-source library. -Copyright @copyright{} 2008--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2008--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index f7c1fa1..839782a 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -11,7 +11,7 @@ @c @cindex autotypist @copying -Copyright @copyright{} 1994--1995, 1999, 2001--2015 +Copyright @copyright{} 1994--1995, 1999, 2001--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi index ec11aa8..11dbfff 100644 --- a/doc/misc/bovine.texi +++ b/doc/misc/bovine.texi @@ -24,7 +24,7 @@ @c %**end of header @copying -Copyright @copyright{} 1999--2004, 2012--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2004, 2012--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 02f9446..b4c69ba 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -95,7 +95,7 @@ This file documents Calc, the GNU Emacs calculator, included with GNU Emacs @value{EMACSVER}. @end ifnotinfo -Copyright @copyright{} 1990--1991, 2001--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1990--1991, 2001--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 7415da5..bc8d24f 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -157,7 +157,7 @@ CC Mode @copying This manual is for CC Mode in Emacs. -Copyright @copyright{} 1995--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 0ab2477..572124d 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -7,7 +7,7 @@ @copying This file documents the GNU Emacs Common Lisp emulation package. -Copyright @copyright{} 1993, 2001--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1993, 2001--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 5dd8bf2..c5901af 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -10,7 +10,7 @@ @syncodeindex fn cp @copying -Copyright @copyright{} 2007--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index e6370f3..474dd0a 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -20,7 +20,7 @@ @comment %**end of header (This is for running Texinfo on a region.) @copying -Copyright @copyright{} 1994--1995, 1999, 2001--2015 +Copyright @copyright{} 1994--1995, 1999, 2001--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 74183a4..28fa42b 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi @@ -11,7 +11,7 @@ @copying This file documents Ebrowse, a C++ class browser for GNU Emacs. -Copyright @copyright{} 2000--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2000--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 7a824ac..839b5ac 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -6,7 +6,7 @@ @copying This file describes EDE, the Emacs Development Environment. -Copyright @copyright{} 1998--2001, 2004--2005, 2008--2015 +Copyright @copyright{} 1998--2001, 2004--2005, 2008--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index f7876a3..376aaee 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. -Copyright @copyright{} 1995--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi index 91f36e6..4f3fdae 100644 --- a/doc/misc/edt.texi +++ b/doc/misc/edt.texi @@ -6,7 +6,7 @@ @copying This file documents the EDT emulation package for Emacs. -Copyright @copyright{} 1986, 1992, 1994--1995, 1999--2015 +Copyright @copyright{} 1986, 1992, 1994--1995, 1999--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 6557f4d..bbd9354 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -12,7 +12,7 @@ @c appreciate a notice if you do). @copying -Copyright @copyright{} 2001--2015 Free Software Foundation, Inc.@* +Copyright @copyright{} 2001--2016 Free Software Foundation, Inc.@* Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000 Reuven M. Lerner@* Copyright @copyright{} 1992, 1993 Steven Byrnes@* diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index fb4e147..3193002 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -12,7 +12,7 @@ @copying This manual documents EIEIO, an object framework for Emacs Lisp. -Copyright @copyright{} 2007--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi index d951e2f..1a850c6 100644 --- a/doc/misc/emacs-gnutls.texi +++ b/doc/misc/emacs-gnutls.texi @@ -9,7 +9,7 @@ @copying This file describes the Emacs GnuTLS integration. -Copyright @copyright{} 2012--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2012--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 3b3df0f..b252b11 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -12,7 +12,7 @@ @copying This file documents the Emacs MIME interface functionality. -Copyright @copyright{} 1998--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1998--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index 3c9aa8a..527b44f 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -10,7 +10,7 @@ @copying This file describes EasyPG Assistant @value{VERSION}. -Copyright @copyright{} 2007--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 56aea0c..d9b646f 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -10,7 +10,7 @@ @copying This manual is for ERC as distributed with Emacs @value{EMACSVER}. -Copyright @copyright{} 2005--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2005--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index c236323..144dfd9 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -11,7 +11,7 @@ @end direntry @copying -Copyright @copyright{} 2008, 2010--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2010--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 60a1af0..9b14dcf 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -10,7 +10,7 @@ @copying This manual is for Eshell, the Emacs shell. -Copyright @copyright{} 1999--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index 8d59e97..da63975 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -14,7 +14,7 @@ This file documents EUDC version 1.40.0. EUDC is the Emacs Unified Directory Client, a common interface to directory servers and contact information. -Copyright @copyright{} 1998, 2000--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1998, 2000--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi index f1347b7..16511de 100644 --- a/doc/misc/eww.texi +++ b/doc/misc/eww.texi @@ -8,7 +8,7 @@ @copying This file documents the GNU Emacs Web Wowser (EWW) package. -Copyright @copyright{} 2014--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2014--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index 6c924cf..99633b6 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -12,7 +12,7 @@ This manual is for GNU Flymake (version @value{VERSION}, @value{UPDATED}), which is a universal on-the-fly syntax checker for GNU Emacs. -Copyright @copyright{} 2004--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index 487cebd..13654ed 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi @@ -19,7 +19,7 @@ @copying This file documents Forms mode, a form-editing major mode for GNU Emacs. -Copyright @copyright{} 1989, 1997, 2001--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1989, 1997, 2001--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi index a3be0ed..3b2c4af 100644 --- a/doc/misc/gnus-coding.texi +++ b/doc/misc/gnus-coding.texi @@ -8,7 +8,7 @@ @syncodeindex pg cp @copying -Copyright @copyright{} 2004--2005, 2007--2015 Free Software +Copyright @copyright{} 2004--2005, 2007--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/gnus-news.el b/doc/misc/gnus-news.el index 15056ee..5ccd3f4 100644 --- a/doc/misc/gnus-news.el +++ b/doc/misc/gnus-news.el @@ -26,7 +26,7 @@ (defvar gnus-news-header-disclaimer "GNUS NEWS -- history of user-visible changes. -Copyright (C) 1999-2015 Free Software Foundation, Inc. +Copyright (C) 1999-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Gnus bug reports to bugs@gnus.org. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 9093fa2..ab96684 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -10,7 +10,7 @@ @syncodeindex pg cp @copying -Copyright @copyright{} 1995--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 7fe8f51..64b1585 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -23,7 +23,7 @@ Emacs, and interacting with an IDL shell run as a subprocess. This is edition @value{EDITION} of the IDLWAVE User Manual for IDLWAVE @value{VERSION}. -Copyright @copyright{} 1999--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/info.texi b/doc/misc/info.texi index 1439d30..135c443 100644 --- a/doc/misc/info.texi +++ b/doc/misc/info.texi @@ -15,7 +15,7 @@ This file describes how to use Info, the menu-driven GNU documentation system. -Copyright @copyright{} 1989, 1992, 1996--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1989, 1992, 1996--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index ef253a0..8deead5 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -5,7 +5,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 2008--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2008--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/message.texi b/doc/misc/message.texi index d63f7e6..dbc7759 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -11,7 +11,7 @@ @copying This file documents Message, the Emacs message composition mode. -Copyright @copyright{} 1996--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1996--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index 54f7591..d1fd8f7 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -25,7 +25,7 @@ This is version @value{VERSION}@value{EDITION} of @cite{The MH-E Manual}, last updated @value{UPDATED}. -Copyright @copyright{} 1995, 2001--2003, 2005--2015 Free Software +Copyright @copyright{} 1995, 2001--2003, 2005--2016 Free Software Foundation, Inc. @c This dual license has been agreed upon by the FSF. diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index 9f7b6df..f7a7620 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -15,7 +15,7 @@ This manual documents Newsticker, a feed reader for Emacs. It corresponds to Emacs version @value{EMACSVER}. @noindent -Copyright @copyright{} 2004--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi index e87e6a0..62bd6bd 100644 --- a/doc/misc/nxml-mode.texi +++ b/doc/misc/nxml-mode.texi @@ -9,7 +9,7 @@ This manual documents nXML mode, an Emacs major mode for editing XML with RELAX NG support. -Copyright @copyright{} 2007--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/octave-mode.texi b/doc/misc/octave-mode.texi index 34499c2..65cc6a4 100644 --- a/doc/misc/octave-mode.texi +++ b/doc/misc/octave-mode.texi @@ -6,7 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 1996--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1996--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 71572f7..ec676fc 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -259,7 +259,7 @@ @copying This manual is for Org version @value{VERSION}. -Copyright @copyright{} 2004--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2004--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -12955,7 +12955,7 @@ Copyright information is printed on the back of the title page. This is a short example of a complete Texinfo file, version 1.0. - Copyright \copy 2015 Free Software Foundation, Inc. + Copyright \copy 2016 Free Software Foundation, Inc. @end example @subsubheading The Top node diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index dd2ba38..237ba5c 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi @@ -7,7 +7,7 @@ @c %**end of header @copying -Copyright @copyright{} 1991--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1991--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index 49a2cfd..3b31e4b 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi @@ -12,7 +12,7 @@ This file describes PGG @value{VERSION}, an Emacs interface to various PGP implementations. -Copyright @copyright{} 2001, 2003--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2001, 2003--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index a707ba5..0098e20 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi @@ -6,7 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 2006--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2006--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index 01d5ad7..3dc3ed4 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -46,7 +46,7 @@ This manual documents @RefTeX{} (version @value{VERSION}), a package to do labels, references, citations and indices for LaTeX documents with Emacs. -Copyright @copyright{} 1997--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1997--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi index d5a03b6..965962c 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -9,7 +9,7 @@ @copying This manual is for Remember Mode, version 2.0 -Copyright @copyright{} 2001, 2004--2005, 2007--2015 +Copyright @copyright{} 2001, 2004--2005, 2007--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi index 86bcd1a..d012e80 100644 --- a/doc/misc/sasl.texi +++ b/doc/misc/sasl.texi @@ -11,7 +11,7 @@ @copying This file describes the Emacs SASL library, version @value{VERSION}. -Copyright @copyright{} 2000, 2004--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2000, 2004--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index ba36672..1f7b73d 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -15,7 +15,7 @@ This document describes Supercite, an Emacs package for citing and attributing replies to mail and news messages. -Copyright @copyright{} 1993, 2001--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1993, 2001--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index 71b81e7..2023f24 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -25,7 +25,7 @@ @copying This manual documents the Semantic library and utilities. -Copyright @copyright{} 1999--2005, 2007, 2009--2015 Free Software +Copyright @copyright{} 1999--2005, 2007, 2009--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index 9b2a457..58f9ba8 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -12,7 +12,7 @@ @copying This file documents @acronym{SES}: the Simple Emacs Spreadsheet. -Copyright @copyright{} 2002--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2002--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi index e9cd9ac..5bc38d4 100644 --- a/doc/misc/sieve.texi +++ b/doc/misc/sieve.texi @@ -12,7 +12,7 @@ @copying This file documents the Emacs Sieve package, for server-side mail filtering. -Copyright @copyright{} 2001--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2001--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi index 2d4e7f9..2647331 100644 --- a/doc/misc/smtpmail.texi +++ b/doc/misc/smtpmail.texi @@ -4,7 +4,7 @@ @include docstyle.texi @syncodeindex vr fn @copying -Copyright @copyright{} 2003--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2003--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi index 6ad369c..377e412 100644 --- a/doc/misc/speedbar.texi +++ b/doc/misc/speedbar.texi @@ -5,7 +5,7 @@ @syncodeindex fn cp @copying -Copyright @copyright{} 1999--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi index 98fab5c..9a5d717 100644 --- a/doc/misc/srecode.texi +++ b/doc/misc/srecode.texi @@ -16,7 +16,7 @@ @c %**end of header @copying -Copyright @copyright{} 2007--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2007--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index bd7d921..b001821 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -66,7 +66,7 @@ @end ifclear @copying -Copyright @copyright{} 1999--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 121c28e..acdad6b 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -21,7 +21,7 @@ @copying This is the manual for the @code{url} Emacs Lisp library. -Copyright @copyright{} 1993--1999, 2002, 2004--2015 Free Software +Copyright @copyright{} 1993--1999, 2002, 2004--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi index b8b3850..ec83b7e 100644 --- a/doc/misc/vhdl-mode.texi +++ b/doc/misc/vhdl-mode.texi @@ -10,7 +10,7 @@ @copying This file documents VHDL Mode, an Emacs mode for editing VHDL code. -Copyright @copyright{} 1995--2008, 2010, 2012, 2015 Free Software +Copyright @copyright{} 1995--2008, 2010, 2012, 2015--2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index 4680a09..0f7e8a7 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi @@ -4,7 +4,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 1987, 2001--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1987, 2001--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 8f57e8c..3f81f67 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -8,7 +8,7 @@ @include docstyle.texi @copying -Copyright @copyright{} 1995--1997, 2001--2015 Free Software Foundation, Inc. +Copyright @copyright{} 1995--1997, 2001--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index ea78550..49606ed 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -9,7 +9,7 @@ @c %**end of header @copying -Copyright @copyright{} 2000--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2000--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi index 7bcc46d..a446293 100644 --- a/doc/misc/wisent.texi +++ b/doc/misc/wisent.texi @@ -24,7 +24,7 @@ @c %**end of header @copying -Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2015 +Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2016 Free Software Foundation, Inc. @c Since we are both GNU manuals, we do not need to ack each other here. diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index f1286fc..59320d2 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -15,7 +15,7 @@ This file documents WoMan: A program to browse Unix manual pages ``W.O. (without) man''. -Copyright @copyright{} 2001--2015 Free Software Foundation, Inc. +Copyright @copyright{} 2001--2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/etc/images/README b/etc/images/README index 34f1f24..47c797c 100644 --- a/etc/images/README +++ b/etc/images/README @@ -31,15 +31,15 @@ File: mh-logo.xpm Files: gnus.pbm Author: Luis Fernandes - Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. Files: splash.png, splash.svg, splash.pbm, splash.xpm Author: Francesc Rocher - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. Files: checked.xpm, unchecked.xpm Author: Chong Yidong - Copyright (C) 2010-2015 Free Software Foundation, Inc. + Copyright (C) 2010-2016 Free Software Foundation, Inc. * The following icons are from GTK+ 2.x. They are not part of Emacs, but diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm index 0e01b4b..f09dd7c 100644 --- a/etc/images/checked.xpm +++ b/etc/images/checked.xpm @@ -1,5 +1,5 @@ /* XPM */ -/* Copyright (C) 2010-2015 Free Software Foundation, Inc. +/* Copyright (C) 2010-2016 Free Software Foundation, Inc. * * Author: Chong Yidong * diff --git a/etc/images/gnus/README b/etc/images/gnus/README index 97af764..ee9d964 100644 --- a/etc/images/gnus/README +++ b/etc/images/gnus/README @@ -21,11 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm uu-post.pbm uu-post.xpm Author: Luis Fernandes -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. Files: gnus.png, gnus.svg Author: Francesc Rocher - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. * The following icons are from GNOME 2.x. They are not part of Emacs, diff --git a/etc/images/gud/README b/etc/images/gud/README index ae101a7..4bc4d0a 100644 --- a/etc/images/gud/README +++ b/etc/images/gud/README @@ -31,7 +31,7 @@ their copyright assignment included the icons. The following icons are converted from the Insight Windows style icon set in src/gdb/gdbtk/library/images2. -Copyright (C) 2002-2015 Free Software Foundation, Inc. +Copyright (C) 2002-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) cont.pbm and cont.xpm were converted from continue.gif @@ -47,7 +47,7 @@ License: GNU General Public License version 3 or later (see COPYING) The following icons are created from the Insight Windows style icon set in src/gdb/gdbtk/library/images2. -Copyright (C) 2002-2015 Free Software Foundation, Inc. +Copyright (C) 2002-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) rcont.xpm rfinish.xpm diff --git a/etc/images/icons/README b/etc/images/icons/README index 6281f67..40fce27 100644 --- a/etc/images/icons/README +++ b/etc/images/icons/README @@ -14,7 +14,7 @@ Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg Author: Kentaro Ohkouchi -Copyright (C) 2007-2015 Free Software Foundation, Inc. +Copyright (C) 2007-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) @@ -22,7 +22,7 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png Author: Andrew Zhilin -Copyright (C) 2005-2015 Free Software Foundation, Inc. +Copyright (C) 2005-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) Files: allout-widgets-dark-bg/closed.png @@ -71,5 +71,5 @@ Files: allout-widgets-dark-bg/closed.png allout-widgets-light-bg/through-descender.xpm Author: Ken Manheimer -Copyright (C) 2011-2015 Free Software Foundation, Inc. +Copyright (C) 2011-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm index 657bd46..3b5d6eb 100644 --- a/etc/images/mh-logo.xpm +++ b/etc/images/mh-logo.xpm @@ -1,7 +1,7 @@ /* XPM */ /* MH-E Logo * - * Copyright (C) 2003-2015 Free Software Foundation, Inc. + * Copyright (C) 2003-2016 Free Software Foundation, Inc. * * Author: Satyaki Das * diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm index e2104d7..de6a0d9 100644 --- a/etc/images/unchecked.xpm +++ b/etc/images/unchecked.xpm @@ -1,5 +1,5 @@ /* XPM */ -/* Copyright (C) 2010-2015 Free Software Foundation, Inc. +/* Copyright (C) 2010-2016 Free Software Foundation, Inc. * * Author: Chong Yidong * diff --git a/etc/refcards/README b/etc/refcards/README index 55ee725..245078b 100644 --- a/etc/refcards/README +++ b/etc/refcards/README @@ -32,7 +32,7 @@ it is reproduced here for convenience. File: gnus-logo.eps, gnus-logo.pdf Author: Luis Fernandes - Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex index fb8890e..d51e2ac 100644 --- a/etc/refcards/gnus-refcard.tex +++ b/etc/refcards/gnus-refcard.tex @@ -120,7 +120,7 @@ %% Gnus logo by Luis Fernandes. \newcommand{\Copyright}{% \begin{center} - Copyright \copyright\ 1995, 2000, 2002--2015 Free Software Foundation, Inc.\\* + Copyright \copyright\ 1995, 2000, 2002--2016 Free Software Foundation, Inc.\\* \end{center} Permission is granted to make and distribute copies of this reference diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn index 57c0123..28d71a5 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn @@ -1026,7 +1026,7 @@ using, writing, and sharing free software! 本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝： - Copyright (C) 1985, 1996, 1998, 2001-2015 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. 本文件为 GNU Emacs 的一部分。 diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he index beb406e..566207a 100644 --- a/etc/tutorials/TUTORIAL.he +++ b/etc/tutorials/TUTORIAL.he @@ -996,7 +996,7 @@ find-file. גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן: - Copyright (C) 2010-2015 Free Software Foundation, Inc. + Copyright (C) 2010-2016 Free Software Foundation, Inc. ‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl index d7f36fe..a48a9c3 100644 --- a/etc/tutorials/TUTORIAL.nl +++ b/etc/tutorials/TUTORIAL.nl @@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities: This version of the tutorial is a part of GNU Emacs. It is copyrighted and comes with permission to distribute copies on certain conditions: - Copyright (C) 1985, 1996, 1998, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro index 3cf254f..4bb180b 100644 --- a/etc/tutorials/TUTORIAL.ro +++ b/etc/tutorials/TUTORIAL.ro @@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză. This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1998, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1998, 2001-2016 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl index 8fb5113..38b15e7 100644 --- a/etc/tutorials/TUTORIAL.sl +++ b/etc/tutorials/TUTORIAL.sl @@ -1119,7 +1119,7 @@ Emacs. V slovenščino ga je prevedel Primož Peterlin. To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo razmnoževanje in razširjanje je dovoljeno pod naslednjimi pogoji: -Copyright © 1985, 1996, 1998, 2001-2015 Free Software Foundation, Inc. +Copyright © 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. Ta datoteka je del paketa GNU Emacs. diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 3df439d..73213c5 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -20,7 +20,7 @@ # along with this program. If not, see . -Copyright='Copyright (C) 2015 Free Software Foundation, Inc. +Copyright='Copyright (C) 2016 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. diff --git a/lib/getopt_.h b/lib/getopt_.h index 6209ab9..cd6ba05 100644 --- a/lib/getopt_.h +++ b/lib/getopt_.h @@ -130,7 +130,7 @@ /* The definition of _GL_ARG_NONNULL is copied here. */ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el index 4fc271b..cd1d700 100644 --- a/lisp/emacs-lisp/cl-preloaded.el +++ b/lisp/emacs-lisp/cl-preloaded.el @@ -1,6 +1,6 @@ ;;; cl-preloaded.el --- Preloaded part of the CL library -*- lexical-binding: t; -*- -;; Copyright (C) 2015 Free Software Foundation, Inc +;; Copyright (C) 2015-2016 Free Software Foundation, Inc ;; Author: Stefan Monnier ;; Package: emacs diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 2e6233a..ca0707f 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -790,7 +790,7 @@ on the remote host.") (defconst tramp-perl-encode "%s -e ' # This script contributed by Juanma Barranquero . -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. use strict; my %%trans = do { @@ -828,7 +828,7 @@ This string is passed to `format', so percent characters need to be doubled.") (defconst tramp-perl-decode "%s -e ' # This script contributed by Juanma Barranquero . -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. use strict; my %%trans = do { diff --git a/msdos/README b/msdos/README index 4bf6d21..4950da5 100644 --- a/msdos/README +++ b/msdos/README @@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on Windows 3.X. Since these are binary files, their copyright notice is reproduced here: -# Copyright (C) 1993, 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2016 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/autogen/Makefile.in b/msdos/autogen/Makefile.in index 58fea06..67c3c35 100644 --- a/msdos/autogen/Makefile.in +++ b/msdos/autogen/Makefile.in @@ -13,7 +13,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ # Generated by gnulib-tool. # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat index 5b46429..76a00ec 100644 --- a/msdos/depfiles.bat +++ b/msdos/depfiles.bat @@ -1,7 +1,7 @@ @echo off rem ---------------------------------------------------------------------- rem Auxiliary script for MSDOS, run by ../config.bat -rem Copyright (C) 2011-2015 Free Software Foundation, Inc. +rem Copyright (C) 2011-2016 Free Software Foundation, Inc. rem This file is part of GNU Emacs. diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index d909c33..1787356 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -27,7 +27,7 @@ #ifndef MSDOS\ #define MSDOS\ #endif -/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2015 Free Software Foundation, Inc."/ +/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2016 Free Software Foundation, Inc."/ /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ diff --git a/nt/configure.bat b/nt/configure.bat index 629bcc8..b5f6595 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -1,7 +1,7 @@ @echo off rem ---------------------------------------------------------------------- rem This was the old configuration script for MS Windows operating systems -rem Copyright (C) 1999-2015 Free Software Foundation, Inc. +rem Copyright (C) 1999-2016 Free Software Foundation, Inc. rem This file is part of GNU Emacs. diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in index da85885..542af86 100644 --- a/nt/emacs.rc.in +++ b/nt/emacs.rc.in @@ -31,7 +31,7 @@ BEGIN VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "Emacs\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2016\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in index c78aa0a..147d145 100644 --- a/nt/emacsclient.rc.in +++ b/nt/emacsclient.rc.in @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "EmacsClient\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2016\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" VALUE "ProductVersion", "@comma_space_version@\0" diff --git a/nt/icons/README b/nt/icons/README index 21e2354..0b4eb9e 100644 --- a/nt/icons/README +++ b/nt/icons/README @@ -8,7 +8,7 @@ License: GNU General Public License version 3 or later File: emacs22.ico Author: Andrew Zhilin -Copyright (C) 2005-2015 Free Software Foundation, Inc. +Copyright (C) 2005-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) @@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico gnu7.ico gnu8.ico gnu9.ico Author: Rob Davenport -Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) commit 0e963201d03d9229bb8ac4323291d2b0119526ed Author: Paul Eggert Date: Fri Jan 1 01:16:19 2016 -0800 Update copyright year to 2016 Run admin/update-copyright. diff --git a/.gitattributes b/.gitattributes index ac26a2b..8f61c80 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ # Attributes of Emacs files in the Git repository. -# Copyright 2015 Free Software Foundation, Inc. +# Copyright 2015-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/.gitignore b/.gitignore index 34b0c02..7c8b743 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Files that Git should ignore in the Emacs source directory. -# Copyright 2009-2015 Free Software Foundation, Inc. +# Copyright 2009-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/ChangeLog.1 b/ChangeLog.1 index d1b8d0f..dee582f 100644 --- a/ChangeLog.1 +++ b/ChangeLog.1 @@ -14700,7 +14700,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/ChangeLog.2 b/ChangeLog.2 index 945f787..6988f96 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -17962,7 +17962,7 @@ See ChangeLog.1 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 2015 Free Software Foundation, Inc. + Copyright (C) 2015-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/GNUmakefile b/GNUmakefile index 6de8ca2..83bb718 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,6 @@ # Build Emacs from a fresh tarball or version-control checkout. -# Copyright (C) 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2011-2016 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/INSTALL b/INSTALL index 5ca88fe..37ba9d9 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ GNU Emacs Installation Guide -Copyright (C) 1992, 1994, 1996-1997, 2000-2015 Free Software Foundation, +Copyright (C) 1992, 1994, 1996-1997, 2000-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/INSTALL.REPO b/INSTALL.REPO index 7c956f0..1720758 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -64,7 +64,7 @@ never platform-specific. -Copyright (C) 2002-2015 Free Software Foundation, Inc. +Copyright (C) 2002-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/Makefile.in b/Makefile.in index 1245f76..c6a7bda 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1992-2015 Free Software Foundation, Inc. +# Copyright (C) 1992-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/README b/README index 1f3de15..61f4cc1 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1 index d3fabd4..c7cae0c 100644 --- a/admin/ChangeLog.1 +++ b/admin/ChangeLog.1 @@ -2577,7 +2577,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/README b/admin/README index b7621ff..7184015 100644 --- a/admin/README +++ b/admin/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/admin.el b/admin/admin.el index 6b213a7..7923f0b 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -1,6 +1,6 @@ ;;; admin.el --- utilities for Emacs administration -;; Copyright (C) 2001-2015 Free Software Foundation, Inc. +;; Copyright (C) 2001-2016 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index 777c048..9f6161e 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -1,6 +1,6 @@ /* Allocate X colors. Used for testing with dense colormaps. -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/authors.el b/admin/authors.el index 9903218..d579c1f 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -1,6 +1,6 @@ ;;; authors.el --- utility for maintaining Emacs's AUTHORS file -;; Copyright (C) 2000-2015 Free Software Foundation, Inc. +;; Copyright (C) 2000-2016 Free Software Foundation, Inc. ;; Author: Gerd Moellmann ;; Maintainer: Kim F. Storm diff --git a/admin/build-configs b/admin/build-configs index 55530b3..928ea4f 100755 --- a/admin/build-configs +++ b/admin/build-configs @@ -1,7 +1,7 @@ #! /usr/bin/perl # Build Emacs in several different configurations. -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 1bcbaa2..1de7bc4 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -1,6 +1,6 @@ ;;; bzrmerge.el --- help merge one Emacs bzr branch to another -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: maint diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index a5e7212..0ca7e14 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2015 Free Software Foundation, Inc. +# Copyright (C) 2015-2016 Free Software Foundation, Inc. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index 3747ae2..5a72fbd 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2015 Free Software Foundation, Inc. +# Copyright (C) 2015-2016 Free Software Foundation, Inc. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index a05e2da..fb200e5 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -1,4 +1,4 @@ -Copyright (C) 2009-2015 Free Software Foundation, Inc. +Copyright (C) 2009-2016 Free Software Foundation, Inc. Copyright (C) 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/admin/cus-test.el b/admin/cus-test.el index c7faedb..3a4fd12 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -1,6 +1,6 @@ ;;; cus-test.el --- tests for custom types and load problems -;; Copyright (C) 1998, 2000, 2002-2015 Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002-2016 Free Software Foundation, Inc. ;; Author: Markus Rost ;; Maintainer: Markus Rost diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 6a8824f..ddb107b 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/find-gc.el b/admin/find-gc.el index 5c6a45b..26bbc54 100644 --- a/admin/find-gc.el +++ b/admin/find-gc.el @@ -1,6 +1,6 @@ ;;; find-gc.el --- detect functions that call the garbage collector -;; Copyright (C) 1992, 2001-2015 Free Software Foundation, Inc. +;; Copyright (C) 1992, 2001-2016 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org diff --git a/admin/gitmerge.el b/admin/gitmerge.el index c8cf2dc..a08a369 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -1,6 +1,6 @@ ;;; gitmerge.el --- help merge one Emacs branch into another -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Authors: David Engster ;; Stefan Monnier diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index 6b54ecc..9037343 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -## Copyright (C) 2013-2015 Free Software Foundation, Inc. +## Copyright (C) 2013-2016 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 8a3a194..be41bd8 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by @@ -1,5 +1,5 @@ ;;; c.by -- LL grammar for C/C++ language specification -;; Copyright (C) 1999-2015 Free Software Foundation, Inc. +;; Copyright (C) 1999-2016 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index fcb36fd..9bac098 100644 --- a/admin/grammars/grammar.wy +++ b/admin/grammars/grammar.wy @@ -1,6 +1,6 @@ ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars ;; -;; Copyright (C) 2002-2015 Free Software Foundation, Inc. +;; Copyright (C) 2002-2016 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy index bc22f4f..7284f02 100644 --- a/admin/grammars/java-tags.wy +++ b/admin/grammars/java-tags.wy @@ -1,6 +1,6 @@ ;;; java-tags.wy -- Semantic LALR grammar for Java -;; Copyright (C) 2002-2015 Free Software Foundation, Inc. +;; Copyright (C) 2002-2016 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index 1579b07..a49952f 100644 --- a/admin/grammars/js.wy +++ b/admin/grammars/js.wy @@ -1,6 +1,6 @@ ;;; javascript-jv.wy -- LALR grammar for Javascript -;; Copyright (C) 2005-2015 Free Software Foundation, Inc. +;; Copyright (C) 2005-2016 Free Software Foundation, Inc. ;; Copyright (C) 1998-2011 Ecma International. ;; Author: Joakim Verona diff --git a/admin/grammars/make.by b/admin/grammars/make.by index be3cc43..a9a8564 100644 --- a/admin/grammars/make.by +++ b/admin/grammars/make.by @@ -1,6 +1,6 @@ ;;; make.by -- BY notation for Makefiles. -;; Copyright (C) 1999-2015 Free Software Foundation, Inc. +;; Copyright (C) 1999-2016 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index 9b37a8d..4db3548 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy @@ -1,6 +1,6 @@ ;;; python.wy -- LALR grammar for Python -;; Copyright (C) 2002-2015 Free Software Foundation, Inc. +;; Copyright (C) 2002-2016 Free Software Foundation, Inc. ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, ;; 2009, 2010 Python Software Foundation; All Rights Reserved diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by index 1b67d62..c1613c8 100644 --- a/admin/grammars/scheme.by +++ b/admin/grammars/scheme.by @@ -1,6 +1,6 @@ ;;; scheme.by -- Scheme BNF language specification -;; Copyright (C) 2001-2015 Free Software Foundation, Inc. +;; Copyright (C) 2001-2016 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy index 32ef7ea..33c8d24 100644 --- a/admin/grammars/srecode-template.wy +++ b/admin/grammars/srecode-template.wy @@ -1,6 +1,6 @@ ;;; srecode-template.wy --- Semantic Recoder Template parser -;; Copyright (C) 2005-2015 Free Software Foundation, Inc. +;; Copyright (C) 2005-2016 Free Software Foundation, Inc. ;; Author: Eric Ludlam ;; Keywords: syntax diff --git a/admin/make-emacs b/admin/make-emacs index 24e9844..6a79cdc 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -2,7 +2,7 @@ # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. -# Copyright (C) 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 2001-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 818dc1a..363bb23 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -4,7 +4,7 @@ # # admin/merge-gnulib -# Copyright 2012-2015 Free Software Foundation, Inc. +# Copyright 2012-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config index 3029372..2066c9b 100755 --- a/admin/merge-pkg-config +++ b/admin/merge-pkg-config @@ -4,7 +4,7 @@ # # admin/merge-pkg-config -# Copyright 2014-2015 Free Software Foundation, Inc. +# Copyright 2014-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/notes/copyright b/admin/notes/copyright index 3ba9c55..2dc33c1 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2007-2015 Free Software Foundation, Inc. +Copyright (C) 2007-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/font-backend b/admin/notes/font-backend index 03663d3..5b65ae5 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend @@ -1,4 +1,4 @@ -Copyright (C) 2002-2015 Free Software Foundation, Inc. +Copyright (C) 2002-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/hydra b/admin/notes/hydra index ce4a683..aadc169 100644 --- a/admin/notes/hydra +++ b/admin/notes/hydra @@ -1,6 +1,6 @@ -*- mode: outline; coding: utf-8 -*- -Copyright (C) 2013-2015 Free Software Foundation, Inc. +Copyright (C) 2013-2016 Free Software Foundation, Inc. See the end of the file for license conditions. NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 868d451..ac1c7b2 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -1,6 +1,6 @@ -*- coding: utf-8; mode: text; -*- -Copyright (C) 2007-2015 Free Software Foundation, Inc. +Copyright (C) 2007-2016 Free Software Foundation, Inc. See the end of the file for license conditions. From README.multi-tty in the multi-tty branch. diff --git a/admin/notes/unicode b/admin/notes/unicode index 3901f60..51314b1 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -1,6 +1,6 @@ -*-mode: text; coding: utf-8;-*- -Copyright (C) 2002-2015 Free Software Foundation, Inc. +Copyright (C) 2002-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Importing a new Unicode Standard version into Emacs diff --git a/admin/notes/www b/admin/notes/www index 27aabe0..eddaa91 100644 --- a/admin/notes/www +++ b/admin/notes/www @@ -1,6 +1,6 @@ -*- outline -*- -Copyright (C) 2013-2015 Free Software Foundation, Inc. +Copyright (C) 2013-2016 Free Software Foundation, Inc. See the end of the file for license conditions. NOTES FOR EMACS WWW PAGES diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index f210556..3cd25c3 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Emacs for Windows diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index eaee7cb..337be1a 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Precompiled Distributions of diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 4de7416..b1b3793 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -1,7 +1,7 @@ #!/bin/sh ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly -## Copyright (C) 2001-2015 Free Software Foundation, Inc. +## Copyright (C) 2001-2016 Free Software Foundation, Inc. ## Author: Miles Bader diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index 954e9fa..d46420d 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 2012-2015 Free Software Foundation, Inc. +# Copyright (C) 2012-2016 Free Software Foundation, Inc. # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/unidata/blocks.awk b/admin/unidata/blocks.awk index 892ac58..bf9a942 100755 --- a/admin/unidata/blocks.awk +++ b/admin/unidata/blocks.awk @@ -1,6 +1,6 @@ #!/usr/bin/awk -f -## Copyright (C) 2015 Free Software Foundation, Inc. +## Copyright (C) 2015-2016 Free Software Foundation, Inc. ## Author: Glenn Morris diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index 9e39fd0..043bf22 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -1,6 +1,6 @@ ;; unidata-gen.el -- Create files containing character property data. -;; Copyright (C) 2008-2015 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el index 8d3ffe2..bd03621 100644 --- a/admin/unidata/uvs.el +++ b/admin/unidata/uvs.el @@ -1,6 +1,6 @@ ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts. -;; Copyright (C) 2014-2015 Free Software Foundation, Inc. +;; Copyright (C) 2014-2016 Free Software Foundation, Inc. ;; Author: YAMAMOTO Mitsuharu diff --git a/admin/update-copyright b/admin/update-copyright index 459ee83..2f6dc11 100755 --- a/admin/update-copyright +++ b/admin/update-copyright @@ -7,7 +7,7 @@ # By default, this script uses the local-time calendar year. # Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default. -# Copyright 2013-2015 Free Software Foundation, Inc. +# Copyright 2013-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/update_autogen b/admin/update_autogen index 23e1d40..199a3aa 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -1,7 +1,7 @@ #!/bin/bash ### update_autogen - update some auto-generated files in the Emacs tree -## Copyright (C) 2011-2015 Free Software Foundation, Inc. +## Copyright (C) 2011-2016 Free Software Foundation, Inc. ## Author: Glenn Morris diff --git a/autogen.sh b/autogen.sh index 563a024..a63c53c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,7 @@ #!/bin/sh ### autogen.sh - tool to help build Emacs from a repository checkout -## Copyright (C) 2011-2015 Free Software Foundation, Inc. +## Copyright (C) 2011-2016 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index 9661376..52f9225 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -1,7 +1,7 @@ #!/bin/sh # Check the format of GNU Emacs change log entries. -# Copyright 2014-2015 Free Software Foundation, Inc. +# Copyright 2014-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit index 8bce1f5..5a51244 100755 --- a/build-aux/git-hooks/pre-commit +++ b/build-aux/git-hooks/pre-commit @@ -1,7 +1,7 @@ #!/bin/sh # Check file names in git commits for GNU Emacs. -# Copyright 2014-2015 Free Software Foundation, Inc. +# Copyright 2014-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog index cd93ece..bcc47b1 100755 --- a/build-aux/gitlog-to-emacslog +++ b/build-aux/gitlog-to-emacslog @@ -2,7 +2,7 @@ # Convert git log output to ChangeLog format for GNU Emacs. -# Copyright (C) 2014-2015 Free Software Foundation, Inc. +# Copyright (C) 2014-2016 Free Software Foundation, Inc. # Author: Paul Eggert diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir index 829dc2c..3154812 100755 --- a/build-aux/make-info-dir +++ b/build-aux/make-info-dir @@ -2,7 +2,7 @@ ### make-info-dir - create info/dir, for systems without install-info -## Copyright (C) 2013-2015 Free Software Foundation, Inc. +## Copyright (C) 2013-2016 Free Software Foundation, Inc. ## Author: Glenn Morris ## Maintainer: emacs-devel@gnu.org diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32 index d30047f..8b1c970 100755 --- a/build-aux/msys-to-w32 +++ b/build-aux/msys-to-w32 @@ -2,7 +2,7 @@ # Convert a MSYS path list to Windows-native format. # Status is zero if successful, nonzero otherwise. -# Copyright (C) 2013-2015 Free Software Foundation, Inc. +# Copyright (C) 2013-2016 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs index f0ce039..6b7d0bd 100755 --- a/build-aux/update-subdirs +++ b/build-aux/update-subdirs @@ -1,7 +1,7 @@ #!/bin/sh # Write into $1/subdirs.el a list of subdirs of directory $1. -# Copyright (C) 1994-1995, 1997, 1999, 2001-2015 Free Software +# Copyright (C) 1994-1995, 1997, 1999, 2001-2016 Free Software # Foundation, Inc. # This file is part of GNU Emacs. diff --git a/configure.ac b/configure.ac index 9c783e6..0581a88 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl autoconf dnl in the directory containing this script. dnl If you changed any AC_DEFINES, also run autoheader. dnl -dnl Copyright (C) 1994-1996, 1999-2015 Free Software Foundation, Inc. +dnl Copyright (C) 1994-1996, 1999-2016 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1 index 469fdc3..ecb0cb7 100644 --- a/doc/emacs/ChangeLog.1 +++ b/doc/emacs/ChangeLog.1 @@ -10919,7 +10919,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 7630780..aeb80a8 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994, 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1994, 1996-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi index 695ffa8..e0441a1 100644 --- a/doc/emacs/abbrevs.texi +++ b/doc/emacs/abbrevs.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Abbrevs diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index 4d53456..6a0a289 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1994-1997, 1999-2015 Free Software Foundation, Inc. +@c Copyright (C) 1994-1997, 1999-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @node Acknowledgments diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index d702ff7..26e3d2e 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2005-2015 Free Software Foundation, Inc. +@c Copyright (C) 2005-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Antinews diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi index 69431c6..7b0b6d2 100644 --- a/doc/emacs/arevert-xtra.texi +++ b/doc/emacs/arevert-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index e5d34c6..68581d0 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Basic diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index ae64fef..1efd1d9 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Buffers diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index fbef9fe..3a12795 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Building diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index 3b5b3c5..2dff8c9 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -*- coding: utf-8 -*- -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index bc13d4b..0fc18fc 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -*- coding: utf-8 -*- -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Calendar/Diary diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index fcaf87f..a1b0b09 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Emacs Invocation diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index 98e1253..cf5ce14 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index fc405e3..670848c 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Customization diff --git a/doc/emacs/dired-xtra.texi b/doc/emacs/dired-xtra.texi index 2b9ddae..e91aa8c 100644 --- a/doc/emacs/dired-xtra.texi +++ b/doc/emacs/dired-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index e7e4944..f3211b5 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Dired diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index a722ec4..38e7a90 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi index 836b27c..d56fbae 100644 --- a/doc/emacs/emerge-xtra.texi +++ b/doc/emacs/emerge-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index 8b8a918..3e936e7 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 4f7596e..bfa55d3 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Files diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi index 993f0dc..b398a7d 100644 --- a/doc/emacs/fixit.texi +++ b/doc/emacs/fixit.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Fixit diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi index 870bfcd..5763c9f 100644 --- a/doc/emacs/fortran-xtra.texi +++ b/doc/emacs/fortran-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index acfdfe2..a048997 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Frames diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index cc81101..4b9832f 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Glossary diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi index 3c23b9c..282d24d 100644 --- a/doc/emacs/gnu.texi +++ b/doc/emacs/gnu.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 1985-1987, 1993, 1995, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993, 1995, 2001-2016 Free Software @c Foundation, Inc. @c @c Permission is granted to anyone to make or distribute verbatim copies diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index 25e783f..ed813ff 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Help diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 76dfa55..f9f231d 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Indentation diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 9761ac7..dd3671c 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi index 2cbcc8b..a6344c0 100644 --- a/doc/emacs/kmacro.texi +++ b/doc/emacs/kmacro.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Keyboard Macros diff --git a/doc/emacs/m-x.texi b/doc/emacs/m-x.texi index 795d6fe..9e5f50b 100644 --- a/doc/emacs/m-x.texi +++ b/doc/emacs/m-x.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node M-x diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index c046825..71d2e99 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2000-2015 Free Software Foundation, Inc. +@c Copyright (C) 2000-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mac OS / GNUstep @appendix Emacs and Mac OS / GNUstep diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 801d147..7b72e66 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual., Abbrevs, This is part of the Emacs manual., Top -@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Maintaining diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 09c766b..28b4e3d 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mark diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 869e064..6ab716d 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Minibuffer diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 41dce52..2d8137e 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index 4abbb59..c1564e9 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Modes diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi index c8e2669..45edd6c 100644 --- a/doc/emacs/msdos-xtra.texi +++ b/doc/emacs/msdos-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi index f1cdb26..ea8a24d 100644 --- a/doc/emacs/msdos.texi +++ b/doc/emacs/msdos.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Microsoft Windows diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 88bbccd..bcde81b 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1997, 1999-2015 Free Software Foundation, Inc. +@c Copyright (C) 1997, 1999-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node International @chapter International Character Set Support diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi index 5f80b0a..3c09983 100644 --- a/doc/emacs/package.texi +++ b/doc/emacs/package.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Packages diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index 8a087ac..b7d3cb3 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 83695b1..97c74a9 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Programs diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 13c03f7..a62d2b6 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Registers diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index b37f42c..ef9894d 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Rmail diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi index 37e0e7e..580df5f 100644 --- a/doc/emacs/screen.texi +++ b/doc/emacs/screen.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Screen diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 1cc7753..cc516ec 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Search diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index c5ca73b..30b8491 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Sending Mail diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 3e8e0ac..41abb42 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1,6 +1,6 @@ @c -*- coding: utf-8 -*- @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Text diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 4286cfe..3268063 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi index d224043..abd29fd 100644 --- a/doc/emacs/vc-xtra.texi +++ b/doc/emacs/vc-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included in emacs-xtra.texi when producing the printed diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index 3eb9b03..9cbe4b5 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in vc-xtra.texi (when producing the diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index d844f3e..cd7d08d 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Windows diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index afd2766..61fdb0a 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1987, 1993-1995, 1997, 2001-2015 Free Software +@c Copyright (C) 1987, 1993-1995, 1997, 2001-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node X Resources diff --git a/doc/lispintro/ChangeLog.1 b/doc/lispintro/ChangeLog.1 index c54c165..d00f288 100644 --- a/doc/lispintro/ChangeLog.1 +++ b/doc/lispintro/ChangeLog.1 @@ -782,7 +782,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index d1a696c..58ebd81 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994-1999, 2001-2015 Free Software Foundation, Inc. +# Copyright (C) 1994-1999, 2001-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispintro/README b/doc/lispintro/README index e24f8f5..aa7d07c 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps index 4853d6a..1dc7aa7 100644 --- a/doc/lispintro/cons-1.eps +++ b/doc/lispintro/cons-1.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:26:58 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps index 258caa9..fbb13f2 100644 --- a/doc/lispintro/cons-2.eps +++ b/doc/lispintro/cons-2.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:26:39 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps index 710f66e..b91ea17 100644 --- a/doc/lispintro/cons-2a.eps +++ b/doc/lispintro/cons-2a.eps @@ -4,7 +4,7 @@ %%CreationDate: Tue Mar 14 15:09:30 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps index 2849a31..349a941 100644 --- a/doc/lispintro/cons-3.eps +++ b/doc/lispintro/cons-3.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:25:41 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps index d933124..c6e2d44 100644 --- a/doc/lispintro/cons-4.eps +++ b/doc/lispintro/cons-4.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:25:06 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps index 6ceec51..7421a5d 100644 --- a/doc/lispintro/cons-5.eps +++ b/doc/lispintro/cons-5.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:27:28 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps index dcd27a6..3acf54e 100644 --- a/doc/lispintro/drawers.eps +++ b/doc/lispintro/drawers.eps @@ -9,7 +9,7 @@ %%EndComments %%BeginProlog -% Copyright (C) 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps index 21b180c..fb9e41b 100644 --- a/doc/lispintro/lambda-1.eps +++ b/doc/lispintro/lambda-1.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:31:53 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps index 6eff61b..4aa38df 100644 --- a/doc/lispintro/lambda-2.eps +++ b/doc/lispintro/lambda-2.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:33:09 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps index 6ab2282..0612eb3 100644 --- a/doc/lispintro/lambda-3.eps +++ b/doc/lispintro/lambda-3.eps @@ -4,7 +4,7 @@ %%CreationDate: Wed Mar 8 14:33:49 1995 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) -% Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1 index e508839..610e754 100644 --- a/doc/lispref/ChangeLog.1 +++ b/doc/lispref/ChangeLog.1 @@ -13989,7 +13989,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1998-2015 Free Software Foundation, Inc. + Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index 9475917..7aadee7 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1990-1996, 1998-2015 Free Software Foundation, Inc. +# Copyright (C) 1990-1996, 1998-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/README b/doc/lispref/README index fd943ce..c7dced8 100644 --- a/doc/lispref/README +++ b/doc/lispref/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. -*- outline -*- +Copyright (C) 2001-2016 Free Software Foundation, Inc. -*- outline -*- See the end of the file for license conditions. diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi index bcbea87..5f5a395 100644 --- a/doc/lispref/abbrevs.texi +++ b/doc/lispref/abbrevs.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1994, 1999, 2001-2015 Free Software Foundation, +@c Copyright (C) 1990-1994, 1999, 2001-2016 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Abbrevs diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi index 2fc43da..4b08401 100644 --- a/doc/lispref/anti.texi +++ b/doc/lispref/anti.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2002-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This node must have no pointers. diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi index c4f2b5e..ecd9c61 100644 --- a/doc/lispref/back.texi +++ b/doc/lispref/back.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001-2015 Free Software Foundation, Inc. +@c Copyright (C) 2001-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c @c %**start of header diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi index d37df25..b9e6466 100644 --- a/doc/lispref/backups.texi +++ b/doc/lispref/backups.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1999, 2001-2015 Free Software Foundation, +@c Copyright (C) 1990-1995, 1999, 2001-2016 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Backups and Auto-Saving diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 55fa5bc..e56d77c7 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Buffers diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 7ddf5ee..dee43ce 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Command Loop diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi index 8c23086..f7fed5e 100644 --- a/doc/lispref/compile.texi +++ b/doc/lispref/compile.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1994, 2001-2015 Free Software Foundation, Inc. +@c Copyright (C) 1990-1994, 2001-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Byte Compilation @chapter Byte Compilation diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 412903f..008a991 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Control Structures diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi index 51d729f..1f207dc 100644 --- a/doc/lispref/customize.texi +++ b/doc/lispref/customize.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1997-2015 Free Software Foundation, Inc. +@c Copyright (C) 1997-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Customization @chapter Customization Settings diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi index e82efbb..3f1574f 100644 --- a/doc/lispref/debugging.texi +++ b/doc/lispref/debugging.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1994, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1994, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Debugging diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index d1ac85a..93b00e1 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-2015 Free Software Foundation, Inc. +@c Copyright (C) 1990-1995, 1998-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Display @chapter Emacs Display diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi index 96bb03b..47fe02a 100644 --- a/doc/lispref/edebug.texi +++ b/doc/lispref/edebug.texi @@ -1,6 +1,6 @@ @comment -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1992-1994, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1992-1994, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi index d485b3b..c2bab01 100644 --- a/doc/lispref/errors.texi +++ b/doc/lispref/errors.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1993, 1999, 2001-2015 Free Software Foundation, +@c Copyright (C) 1990-1993, 1999, 2001-2016 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Standard Errors diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index dfad9fb..28bf600 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1994, 1998, 2001-2015 Free Software Foundation, +@c Copyright (C) 1990-1994, 1998, 2001-2016 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Evaluation diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 918bf5b..6b7ee19 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Files diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 80a4af2..1c6674c 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Frames diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 7cc041fa7..e596bad 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Functions diff --git a/doc/lispref/hash.texi b/doc/lispref/hash.texi index 22b7217..8389c21 100644 --- a/doc/lispref/hash.texi +++ b/doc/lispref/hash.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc. +@c Copyright (C) 1999, 2001-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Hash Tables @chapter Hash Tables diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 685995b..0b8182c 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Documentation diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi index eb2e343..cbbaa8e 100644 --- a/doc/lispref/hooks.texi +++ b/doc/lispref/hooks.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1993, 1998, 2001-2015 Free Software Foundation, +@c Copyright (C) 1990-1993, 1998, 2001-2016 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Standard Hooks diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index e111d35..41064df 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1993, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1993, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node GNU Emacs Internals diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 865c698..9d4a720 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -1,6 +1,6 @@ @c -*-coding: utf-8-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1994, 2001-2015 Free Software Foundation, Inc. +@c Copyright (C) 1990-1994, 2001-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Introduction diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 9bea4b0..354be3c 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1994, 1998-2015 Free Software Foundation, Inc. +@c Copyright (C) 1990-1994, 1998-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Keymaps @chapter Keymaps diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi index 04aabd8..42bc266 100644 --- a/doc/lispref/lay-flat.texi +++ b/doc/lispref/lay-flat.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001-2015 Free Software Foundation, Inc. +@c Copyright (C) 2001-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c @comment %**start of header diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi index 48e1b57..d961caf 100644 --- a/doc/lispref/lists.texi +++ b/doc/lispref/lists.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Lists diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index e01f316..0a01162 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Loading diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi index a90c6f1..7f3b670 100644 --- a/doc/lispref/macros.texi +++ b/doc/lispref/macros.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998, 2001-2015 Free Software Foundation, +@c Copyright (C) 1990-1995, 1998, 2001-2016 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Macros diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi index cc12726..cf2c648 100644 --- a/doc/lispref/maps.texi +++ b/doc/lispref/maps.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1993, 1999, 2001-2015 Free Software Foundation, +@c Copyright (C) 1990-1993, 1999, 2001-2016 Free Software Foundation, @c Inc. @c See the file elisp.texi for copying conditions. @node Standard Keymaps diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index 3eaba41..d440855 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Markers diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 0b1a4a9..bf95646 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Minibuffers diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 3b8550e..2b621e4 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Modes diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 3351b84..744351e 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1998-1999, 2001-2015 Free Software Foundation, Inc. +@c Copyright (C) 1998-1999, 2001-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Non-ASCII Characters @chapter Non-@acronym{ASCII} Characters diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index 54c8d3e..20d3c42 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Numbers diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 3cd4a38..3245930 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Lisp Data Types diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 5b89e1a..969c1d6 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node System Interface diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index 21a8ddd..67fd45b 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2010-2015 Free Software Foundation, Inc. +@c Copyright (C) 2010-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Packaging @chapter Preparing Lisp code for distribution diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 9daf5ce..b88e76e 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-2015 Free Software Foundation, Inc. +@c Copyright (C) 1990-1995, 1998-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Positions @chapter Positions diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 41255e7..2a4bd8a 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Processes diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index adaf431..5ff7ef1 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Searching and Matching diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 66d88e4..9869fe4 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Sequences Arrays Vectors diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi index 025b0e9..80c194b 100644 --- a/doc/lispref/streams.texi +++ b/doc/lispref/streams.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1994, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1994, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Read and Print diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 8aa4539..95723ca 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Strings and Characters diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index 2605a3e..c99f993 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Symbols diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index 831ebd1..af24b99 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Syntax Tables diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index f3679a8..5d9f192 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-2015 Free Software Foundation, Inc. +@c Copyright (C) 1990-1995, 1998-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Text @chapter Text diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index ffce920..770d217 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -1,6 +1,6 @@ @c -*- mode: texinfo; coding: utf-8 -*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1993, 1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1993, 1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Tips diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt index 89336e1..658ae15 100644 --- a/doc/lispref/two-volume-cross-refs.txt +++ b/doc/lispref/two-volume-cross-refs.txt @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See end for copying conditions. Two Volume Cross References diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make index bdcdb2f..5023f79 100644 --- a/doc/lispref/two-volume.make +++ b/doc/lispref/two-volume.make @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 Free Software Foundation, Inc. +# Copyright (C) 2007-2016 Free Software Foundation, Inc. # See end for copying conditions. # although it would be nice to use tex rather than pdftex to avoid diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 5a2cae0..c48af9a 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-2015 Free Software Foundation, Inc. +@c Copyright (C) 1990-1995, 1998-2016 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Variables @chapter Variables diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 778e38b..7186791 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software +@c Copyright (C) 1990-1995, 1998-1999, 2001-2016 Free Software @c Foundation, Inc. @c See the file elisp.texi for copying conditions. @node Windows diff --git a/doc/man/ChangeLog.1 b/doc/man/ChangeLog.1 index 205e9b9..d5a2771 100644 --- a/doc/man/ChangeLog.1 +++ b/doc/man/ChangeLog.1 @@ -176,7 +176,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1 index 2fd0d2c..eb16d4a 100644 --- a/doc/misc/ChangeLog.1 +++ b/doc/misc/ChangeLog.1 @@ -12116,7 +12116,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index aa35002..4dffeaf 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994, 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1994, 1996-2016 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index 28cf680..fe65da6 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -15,7 +15,7 @@ Answers to Frequently asked Questions about using Emacs on Microsoft Windows. @include emacsver.texi @copying -Copyright @copyright{} 2008, 2010-2015 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2010-2016 Free Software Foundation, Inc. @quotation This list of frequently asked questions about GNU Emacs on MS Windows diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 26b9210..90bb10f 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -1,7 +1,7 @@ @c \input texinfo @c -*-texinfo-*- @c Uncomment 1st line before texing this file alone. @c %**start of header -@c Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc. +@c Copyright (C) 1995, 2001-2016 Free Software Foundation, Inc. @c @c @setfilename gnus-faq.info @c @settitle Frequently Asked Questions diff --git a/doc/misc/gnus-news.el b/doc/misc/gnus-news.el index ba8a463..15056ee 100644 --- a/doc/misc/gnus-news.el +++ b/doc/misc/gnus-news.el @@ -1,5 +1,5 @@ ;;; gnus-news.el --- a hack to create GNUS-NEWS from texinfo source -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Reiner Steib ;; Keywords: tools diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index ef6573f..d1e83a7 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- -@c Copyright (C) 2004-2015 Free Software Foundation, Inc. +@c Copyright (C) 2004-2016 Free Software Foundation, Inc. @c Permission is granted to anyone to make or distribute verbatim copies @c of this document as received, in any medium, provided that the diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi index 1b0afdd..20cde71 100644 --- a/doc/misc/htmlfontify.texi +++ b/doc/misc/htmlfontify.texi @@ -10,7 +10,7 @@ This manual documents Htmlfontify, a source code -> crosslinked + formatted + syntax colorized html transformer. -Copyright @copyright{} 2002-2003, 2013-2015 Free Software Foundation, +Copyright @copyright{} 2002-2003, 2013-2016 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi index e06d248..0a56bc3 100644 --- a/doc/misc/ido.texi +++ b/doc/misc/ido.texi @@ -7,7 +7,7 @@ @copying This file documents the Ido package for GNU Emacs. -Copyright @copyright{} 2013-2015 Free Software Foundation, Inc. +Copyright @copyright{} 2013-2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi index 2d9eac2..f11e0b8 100644 --- a/doc/misc/sem-user.texi +++ b/doc/misc/sem-user.texi @@ -1,5 +1,5 @@ @c This is part of the Semantic manual. -@c Copyright (C) 1999-2005, 2007, 2009-2015 Free Software Foundation, +@c Copyright (C) 1999-2005, 2007, 2009-2016 Free Software Foundation, @c Inc. @c See file semantic.texi for copying conditions. diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index f140bba..0ad0e85 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -5,10 +5,7 @@ % \def\texinfoversion{2015-12-20.12} % -% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 -% Free Software Foundation, Inc. +% Copyright 1985-1986, 1988, 1990-2016 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi index 69656da..d68af9a 100644 --- a/doc/misc/todo-mode.texi +++ b/doc/misc/todo-mode.texi @@ -9,7 +9,7 @@ @c %**end of header @copying -Copyright @copyright{} 2013-2015 Free Software Foundation, Inc. +Copyright @copyright{} 2013-2016 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 4366796..0cdf08d 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -2,7 +2,7 @@ @c texi/trampver.texi. Generated from trampver.texi.in by configure. @c This is part of the Emacs manual. -@c Copyright (C) 2003-2015 Free Software Foundation, Inc. +@c Copyright (C) 2003-2016 Free Software Foundation, Inc. @c See file doclicense.texi for copying conditions. @c In the Tramp GIT, the version number is auto-frobbed from diff --git a/etc/CALC-NEWS b/etc/CALC-NEWS index 09b12a2..8c116e2 100644 --- a/etc/CALC-NEWS +++ b/etc/CALC-NEWS @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Calc is an advanced desk calculator for GNU Emacs. diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1 index ed37524..644b9c4 100644 --- a/etc/ChangeLog.1 +++ b/etc/ChangeLog.1 @@ -6891,7 +6891,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/DEBUG b/etc/DEBUG index be6d9ec..41678b5 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -1,6 +1,6 @@ Debugging GNU Emacs -Copyright (C) 1985, 2000-2015 Free Software Foundation, Inc. +Copyright (C) 1985, 2000-2016 Free Software Foundation, Inc. See the end of the file for license conditions. ** Preliminaries diff --git a/etc/DISTRIB b/etc/DISTRIB index a95a646..7c0cd4c 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB @@ -1,7 +1,7 @@ -*- text -*- GNU Emacs availability information -Copyright (C) 1986-1993, 1995, 1998, 2000-2015 Free Software Foundation, +Copyright (C) 1986-1993, 1995, 1998, 2000-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 68aca96..13827c6 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1,6 +1,6 @@ ERC NEWS -*- outline -*- -Copyright (C) 2006-2015 Free Software Foundation, Inc. +Copyright (C) 2006-2016 Free Software Foundation, Inc. See the end of the file for license conditions. * For changes after ERC 5.3, see the main Emacs NEWS file diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index 4a67af8..dfbf02b 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF @@ -94,7 +94,7 @@ those. ===================== end of discussion of tag names ===================== -Copyright (C) 2002-2015 Free Software Foundation, Inc. +Copyright (C) 2002-2016 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/ETAGS.README b/etc/ETAGS.README index aebe8d3..c590d32 100644 --- a/etc/ETAGS.README +++ b/etc/ETAGS.README @@ -28,7 +28,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2015 Free Software +Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2016 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS index ee3584f..4efb53e 100644 --- a/etc/GNUS-NEWS +++ b/etc/GNUS-NEWS @@ -1,6 +1,6 @@ GNUS NEWS -- history of user-visible changes. -Copyright (C) 1999-2015 Free Software Foundation, Inc. +Copyright (C) 1999-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Gnus bug reports to bugs@gnus.org. diff --git a/etc/HELLO b/etc/HELLO index f776107..3675299 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -73,7 +73,7 @@ Korean ($(CGQ1[(B) $(C>H3gGO<H3gGO=J4O1n(B -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/MACHINES b/etc/MACHINES index 024149c..085f169 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -1,6 +1,6 @@ Emacs machines list -Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2015 Free Software +Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index c9429fe..efdcaf2 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -1,6 +1,6 @@ * COPYRIGHT -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. * Changes in MH-E 8.6 diff --git a/etc/NEWS b/etc/NEWS index b6c805a..25bd69e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2014-2015 Free Software Foundation, Inc. +Copyright (C) 2014-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index bd96f81..4eacd6d 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986 -Copyright (C) 1985-1986, 2006-2015 Free Software Foundation, Inc. +Copyright (C) 1985-1986, 2006-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.18 b/etc/NEWS.18 index 581bf7c..ab1ded8 100644 --- a/etc/NEWS.18 +++ b/etc/NEWS.18 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 17-Aug-1988 -Copyright (C) 1988, 2006-2015 Free Software Foundation, Inc. +Copyright (C) 1988, 2006-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 5945444..3f3b587 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 1992. -Copyright (C) 1993-1995, 2001, 2006-2015 Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001, 2006-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.20 b/etc/NEWS.20 index 462b0cc..e5cca54 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 1999-2001, 2006-2015 Free Software Foundation, Inc. +Copyright (C) 1999-2001, 2006-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.21 b/etc/NEWS.21 index 37ccfba..7dfdc4d 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 2000-2015 Free Software Foundation, Inc. +Copyright (C) 2000-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 9e62cf2..1bc4967 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.23 b/etc/NEWS.23 index d192d52..d92bf23 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2007-2015 Free Software Foundation, Inc. +Copyright (C) 2007-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.24 b/etc/NEWS.24 index 7d9e1f0..df2e11f 100644 --- a/etc/NEWS.24 +++ b/etc/NEWS.24 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2010-2015 Free Software Foundation, Inc. +Copyright (C) 2010-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP index e6997b8..ad2ab95 100644 --- a/etc/NEXTSTEP +++ b/etc/NEXTSTEP @@ -1,4 +1,4 @@ -Copyright (C) 2008-2015 Free Software Foundation, Inc. +Copyright (C) 2008-2016 Free Software Foundation, Inc. See the end of the file for license conditions. This file contains information about GNU Emacs on "Nextstep" platforms. diff --git a/etc/NXML-NEWS b/etc/NXML-NEWS index de9f18d..9197777 100644 --- a/etc/NXML-NEWS +++ b/etc/NXML-NEWS @@ -1,4 +1,4 @@ -Copyright (C) 2007-2015 Free Software Foundation, Inc. +Copyright (C) 2007-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 5d9062a..9d80139 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -3,7 +3,7 @@ ORG NEWS -- history of user-visible changes. -*- mode: org; coding: utf-8 -*- #+LINK: doc http://orgmode.org/worg/doc.html#%s #+LINK: git http://orgmode.org/w/?p=org-mode.git;a=commit;h=%s -Copyright (C) 2012-2015 Free Software Foundation, Inc. +Copyright (C) 2012-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Org bug reports to emacs-orgmode@gnu.org. diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 18b1f84..58faef2 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1,6 +1,7 @@ Known Problems with GNU Emacs -Copyright (C) 1987-1989, 1993-1999, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1987-1989, 1993-1999, 2001-2016 Free Software Foundation, +Inc. See the end of the file for license conditions. diff --git a/etc/README b/etc/README index c809d39..e7758fd 100644 --- a/etc/README +++ b/etc/README @@ -7,5 +7,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.icon Author: Sun Microsystems, Inc - Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/TERMS b/etc/TERMS index 05df853..99d6c46 100644 --- a/etc/TERMS +++ b/etc/TERMS @@ -1,4 +1,4 @@ -Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2016 Free Software Foundation, Inc. See the end of the file for copying permissions. This file describes what you must or might want to do to termcap entries diff --git a/etc/TODO b/etc/TODO index 7045731..590d233 100644 --- a/etc/TODO +++ b/etc/TODO @@ -1,6 +1,6 @@ Emacs TODO List -*-outline-*- -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/charsets/README b/etc/charsets/README index af71f25..b159ffe 100644 --- a/etc/charsets/README +++ b/etc/charsets/README @@ -1,6 +1,6 @@ # README file for charset mapping files in this directory. -# Copyright (C) 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 2003-2016 Free Software Foundation, Inc. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 diff --git a/etc/compilation.txt b/etc/compilation.txt index da6df8a..d26af20 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -599,7 +599,7 @@ Compilation segmentation fault at Thu Jul 13 10:55:49 Compilation finished at Thu Jul 21 15:02:15 -Copyright (C) 2004-2015 Free Software Foundation, Inc. +Copyright (C) 2004-2016 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/edt-user.el b/etc/edt-user.el index 2666856..5541ce6 100644 --- a/etc/edt-user.el +++ b/etc/edt-user.el @@ -1,6 +1,6 @@ ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation -;; Copyright (C) 1986, 1992-1993, 2000-2015 Free Software Foundation, +;; Copyright (C) 1986, 1992-1993, 2000-2016 Free Software Foundation, ;; Inc. ;; Author: Kevin Gallagher diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index 8f6c321..26c13c1 100644 --- a/etc/emacs-buffer.gdb +++ b/etc/emacs-buffer.gdb @@ -1,6 +1,6 @@ # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps -# Copyright (C) 2005-2015 Free Software Foundation, Inc. +# Copyright (C) 2005-2016 Free Software Foundation, Inc. # Maintainer: Noah Friedman # Created: 2005-04-28 diff --git a/etc/emacs.appdata.xml b/etc/emacs.appdata.xml index bbe4a9a..05c5e2a 100644 --- a/etc/emacs.appdata.xml +++ b/etc/emacs.appdata.xml @@ -1,5 +1,5 @@ - + emacs.desktop GFDL-1.3 diff --git a/etc/enriched.txt b/etc/enriched.txt index 974a90a..253f3dd 100644 --- a/etc/enriched.txt +++ b/etc/enriched.txt @@ -239,7 +239,7 @@ it. -Copyright (C) 1995, 1997, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1995, 1997, 2001-2016 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/forms/forms-d2.el b/etc/forms/forms-d2.el index 7ae99cb..d219532 100644 --- a/etc/forms/forms-d2.el +++ b/etc/forms/forms-d2.el @@ -1,6 +1,6 @@ ;;; forms-d2.el --- demo forms-mode -;; Copyright (C) 1991, 1994-1997, 2001-2015 Free Software Foundation, +;; Copyright (C) 1991, 1994-1997, 2001-2016 Free Software Foundation, ;; Inc. ;; Author: Johan Vromans diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 42089b1..530b27b 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -24,7 +24,7 @@ was done by moi, yours truly, your humble servant, Lars Magne Ingebrigtsen. If you have a WWW browser, you can investigate to your heart's delight at . -;; Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2016 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/etc/grep.txt b/etc/grep.txt index 0721810..3861a7f 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -97,7 +97,7 @@ grep -nH -e "xyzxyz" ../info/* -Copyright (C) 2005-2015 Free Software Foundation, Inc. +Copyright (C) 2005-2016 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/images/README b/etc/images/README index 05d7241..34f1f24 100644 --- a/etc/images/README +++ b/etc/images/README @@ -27,7 +27,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: mh-logo.xpm Author: Satyaki Das - Copyright (C) 2003-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2016 Free Software Foundation, Inc. Files: gnus.pbm Author: Luis Fernandes diff --git a/etc/images/custom/README b/etc/images/custom/README index 8fbe751..c90c555 100644 --- a/etc/images/custom/README +++ b/etc/images/custom/README @@ -6,5 +6,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm Author: Juri Linkov -Copyright (C) 2008-2015 Free Software Foundation, Inc. +Copyright (C) 2008-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/ezimage/README b/etc/images/ezimage/README index c91aa5e..20c2cca 100644 --- a/etc/images/ezimage/README +++ b/etc/images/ezimage/README @@ -7,5 +7,5 @@ Files: bits.xpm bitsbang.xpm box-minus.xpm box-plus.xpm tag-gt.xpm tag-minus.xpm tag-plus.xpm tag-type.xpm tag-v.xpm tag.xpm unlock.xpm Author: Eric M. Ludlam -Copyright (C) 1999-2015 Free Software Foundation, Inc. +Copyright (C) 1999-2016 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/gnus/README b/etc/images/gnus/README index f886d9d..97af764 100644 --- a/etc/images/gnus/README +++ b/etc/images/gnus/README @@ -7,7 +7,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: important.xpm, unimportant.xpm Author: Simon Josefsson -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg index cf3efd3..720dcbb 100644 --- a/etc/images/gnus/gnus.svg +++ b/etc/images/gnus/gnus.svg @@ -1,7 +1,7 @@