commit a0ef1017b87b25ebde9d31d8e4036ef3386fcd85 (HEAD, refs/remotes/origin/master) Author: Ivan Radanov Ivanov Date: Sat Apr 18 11:01:36 2015 +0300 Minor improvements in Bulgarian input methods * lisp/leim/quail/cyrillic.el (bulgarian-phonetic, bulgarian-bds): Replace U+042C with U+045D, as the former character is not used in the modern Bulgarian language. Fixes: Bug#20350 Copyright-paperwork-exempt: yes diff --git a/lisp/leim/quail/cyrillic.el b/lisp/leim/quail/cyrillic.el index a2983a3..08d53ea 100644 --- a/lisp/leim/quail/cyrillic.el +++ b/lisp/leim/quail/cyrillic.el @@ -1332,7 +1332,7 @@ The letters Ч, Ш, Щ and Ю are not affected by Caps Lock." ;; Ч ;; Я В Е Р Т Ъ У И О П Ш Щ ;; А С Д Ф Г Х Й К Л Ю -;; З Ь Ц Ж Б Н М +;; З ьѝ Ц Ж Б Н М (quail-define-rules ("/&" ?§) @@ -1364,7 +1364,7 @@ The letters Ч, Ш, Щ and Ю are not affected by Caps Lock." ("{" ?Ш) ("}" ?Щ) ("Y" ?Ъ) - ("X" ?Ь) + ("X" ?ѝ) ("|" ?Ю) ("Q" ?Я) ("a" ?а) @@ -1417,7 +1417,7 @@ keys as being transformed into ( and ) respectively. For ( and ), use ;; () 1! 2? 3+ 4" 5% 6= 7: 8/ 9_ 0№ -I .V ;; ,ы У Е И Ш Щ К С Д З Ц ;§ -;; Ь Я А О Ж Г Т Н В М Ч 'Ы +;; ьѝ Я А О Ж Г Т Н В М Ч 'Ы ;; Ю Й Ъ Э Ф Х П Р Л Б (quail-define-rules @@ -1448,7 +1448,7 @@ keys as being transformed into ( and ) respectively. For ( and ), use ("[" ?ц) ("{" ?Ц) ("]" ?\;) ("}" ?§) - ("a" ?ь) ("A" ?Ь) + ("a" ?ь) ("A" ?ѝ) ("s" ?я) ("S" ?Я) ("d" ?а) ("D" ?А) ("f" ?о) ("F" ?О) commit c05d1f047b3fd14df2169e41abc7c554704c2804 Author: Thomas Fitzsimmons Date: Fri Apr 17 22:02:03 2015 -0400 Improve EUDC manual * eudc.texi (LDAP Configuration): Mention simple and SASL authentication schemes. Add index items. Shorten example server name. diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index 7ab444c..4d6e6ad 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -226,9 +226,30 @@ Emacs. @file{ldap.el} needs an external program called (@url{http://www.openldap.org/}). The configurations in this section were tested with OpenLDAP 2.4.23. +Most servers use LDAP-over-SSL these days; the examples here reflect +that. The other possibilities are: + +@vindex ldap-host-parameters-alist +@vindex ldap-ldapsearch-args +@itemize @bullet + +@item +Servers that do not require authentication or that do not encrypt +authentication traffic. + +Include @code{auth simple} in @code{ldap-host-parameters-alist}, which +causes the @code{-x} option to be passed to @command{ldapsearch}. + +@item +Servers that require SASL authentication. + +Pass any required extra options to @command{ldapsearch} using +@code{ldap-ldapsearch-args}. +@end itemize + The following examples use a base of @code{ou=people,dc=example,dc=com} and the host name -@code{ldaps.gnu.org}, a server that supports LDAP-over-SSL (the +@code{ldap.gnu.org}, a server that supports LDAP-over-SSL (the @code{ldaps} protocol, with default port @code{636}) and which requires authentication by the user @code{emacsuser} with password @code{s3cr3t}. @@ -272,14 +293,18 @@ TLS_CACERTDIR /etc/openldap/certs In @file{.emacs}, these expressions suffice to configure EUDC for LDAP: +@vindex message-mode-map +@findex eudc-expand-inline +@vindex eudc-server-hotlist +@vindex ldap-host-parameters-alist @lisp (eval-after-load "message" '(define-key message-mode-map (kbd "TAB") 'eudc-expand-inline)) (customize-set-variable 'eudc-server-hotlist '(("" . bbdb) - ("ldaps://ldaps.gnu.org" . ldap))) + ("ldaps://ldap.gnu.org" . ldap))) (customize-set-variable 'ldap-host-parameters-alist - '(("ldaps://ldaps.gnu.org" + '(("ldaps://ldap.gnu.org" base "ou=people,dc=example,dc=com" binddn "example\\emacsuser" passwd ldap-password-read))) @@ -306,7 +331,7 @@ example, @file{/etc/openldap/ldap.conf} might contain: @example BASE ou=people,dc=example,dc=com -URI ldaps://ldaps.gnu.org +URI ldaps://ldap.gnu.org TLS_CACERTDIR /etc/openldap/certs @end example @@ -318,20 +343,24 @@ Authentication requires a password, and a @dfn{bind distinguished name @file{~/.authinfo.gpg} with the following line: @example -machine ldaps://ldaps.gnu.org binddn example\emacsuser password s3cr3t +machine ldaps://ldap.gnu.org binddn example\emacsuser password s3cr3t @end example Then in the @file{.emacs} init file, these expressions suffice to configure EUDC for LDAP: +@vindex message-mode-map +@findex eudc-expand-inline +@vindex eudc-server-hotlist +@vindex ldap-host-parameters-alist @lisp (eval-after-load "message" '(define-key message-mode-map (kbd "TAB") 'eudc-expand-inline)) (customize-set-variable 'eudc-server-hotlist '(("" . bbdb) - ("ldaps://ldaps.gnu.org" . ldap))) + ("ldaps://ldap.gnu.org" . ldap))) (customize-set-variable 'ldap-host-parameters-alist - '(("ldaps://ldaps.gnu.org" + '(("ldaps://ldap.gnu.org" auth-source t))) @end lisp @@ -349,6 +378,10 @@ binddn example\emacsuser password s3cr3t @noindent and the @file{.emacs} expressions become: +@vindex message-mode-map +@findex eudc-expand-inline +@vindex eudc-server-hotlist +@vindex ldap-host-parameters-alist @lisp (eval-after-load "message" '(define-key message-mode-map (kbd "TAB") 'eudc-expand-inline)) commit 3ec1047b57ccea0f62a2de8095d1bbc07bd43576 Author: Dmitry Gutov Date: Sat Apr 18 02:35:59 2015 +0300 Don't show both feature and function with the same name * lisp/progmodes/elisp-mode.el (elisp--xref-identifier-location): Don't show both feature and function with the same name. diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index ff427fd..ad35c48 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -606,9 +606,13 @@ It can be quoted, or be inside a quoted form." (not (fboundp sym)) (or (symbol-file sym 'defvar) (help-C-file-name sym 'var)))) - (`feature (when (featurep sym) - (ignore-errors - (find-library-name (symbol-name sym))))) + (`feature (and (featurep sym) + ;; Skip when a function with the same name + ;; is defined, because it's probably in the + ;; same file. + (not (fboundp sym)) + (ignore-errors + (find-library-name (symbol-name sym))))) (`defface (when (facep sym) (symbol-file sym 'defface)))))) (when file commit 35be45bbc9ac525bb2bc3e20b0fa27c1ceee0c15 Author: Dmitry Gutov Date: Sat Apr 18 01:47:31 2015 +0300 (elisp--xref-identifier-location): Skip variable, if it's also a functiong * lisp/progmodes/elisp-mode.el (elisp--xref-identifier-location): Avoid returning both the variable and the function for the same minor mode. diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 29f1c9a..ff427fd 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -599,9 +599,13 @@ It can be quoted, or be inside a quoted form." (find-function-library sym))) (setq sym (car fun-lib)) (cdr fun-lib)))) - (`defvar (when (boundp sym) - (or (symbol-file sym 'defvar) - (help-C-file-name sym 'var)))) + (`defvar (and (boundp sym) + ;; Don't show minor modes twice. + ;; TODO: If TYPE ever becomes dependent on the + ;; context, move this check outside. + (not (fboundp sym)) + (or (symbol-file sym 'defvar) + (help-C-file-name sym 'var)))) (`feature (when (featurep sym) (ignore-errors (find-library-name (symbol-name sym))))) commit 4841a2d8aae1b7b2aa4bda6cf16c1be11d5b132a Author: Wolfgang Jenkner Date: Fri Apr 17 19:54:35 2015 +0200 Fix fontification of keywords clobbered by the prompt. * lisp/comint.el (comint-output-filter): Remove the uses of with-silent-modifications I introduced as part of the last change. This fixes, e.g., erratically missing highlighting when running ./configure --help; ./configure in a shell-mode buffer with compilation-shell-minor-mode turned on. diff --git a/lisp/comint.el b/lisp/comint.el index 2769c87..de22061 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2082,19 +2082,19 @@ Make backspaces delete the previous character." (add-text-properties prompt-start (point) '(read-only t front-sticky (read-only))))) (when comint-last-prompt - (with-silent-modifications - (font-lock--remove-face-from-text-property - (car comint-last-prompt) - (cdr comint-last-prompt) - 'font-lock-face - 'comint-highlight-prompt))) + ;; There might be some keywords here waiting for + ;; fontification, so no `with-silent-modifications'. + (font-lock--remove-face-from-text-property + (car comint-last-prompt) + (cdr comint-last-prompt) + 'font-lock-face + 'comint-highlight-prompt)) (setq comint-last-prompt (cons (copy-marker prompt-start) (point-marker))) - (with-silent-modifications - (font-lock-prepend-text-property prompt-start (point) - 'font-lock-face - 'comint-highlight-prompt) - (add-text-properties prompt-start (point) '(rear-nonsticky t)))) + (font-lock-prepend-text-property prompt-start (point) + 'font-lock-face + 'comint-highlight-prompt) + (add-text-properties prompt-start (point) '(rear-nonsticky t))) (goto-char saved-point))))))) (defun comint-preinput-scroll-to-bottom () commit 1c565a24acc8409e7415fe6daf74d87476987183 Author: Glenn Morris Date: Fri Apr 17 13:48:00 2015 -0400 ; ChangeLog fixes diff --git a/ChangeLog.2 b/ChangeLog.2 index 5e5f15e..fbe71a2 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1124,11 +1124,9 @@ sh git commit -am"[this commit message]" -;; Local Variables: -;; coding: utf-8 -;; End: +See ChangeLog.1 for earlier changes. - Copyright 2015 Free Software Foundation, Inc. + Copyright (C) 2015 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1144,3 +1142,8 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . + +;; Local Variables: +;; coding: utf-8 +;; End: + diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1 index 03228e4..790d049 100644 --- a/lisp/erc/ChangeLog.1 +++ b/lisp/erc/ChangeLog.1 @@ -11706,7 +11706,7 @@ * erc-speak.el, erc.el: New file. - Copyright 2001-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/erc/ChangeLog.2 b/lisp/erc/ChangeLog.2 index be27ef2..8dce508 100644 --- a/lisp/erc/ChangeLog.2 +++ b/lisp/erc/ChangeLog.2 @@ -752,7 +752,7 @@ See ChangeLog.1 for earlier changes. - Copyright 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/mh-e/ChangeLog.2 b/lisp/mh-e/ChangeLog.2 index 8b547df..4b41d60 100644 --- a/lisp/mh-e/ChangeLog.2 +++ b/lisp/mh-e/ChangeLog.2 @@ -3671,8 +3671,9 @@ * ChangeLog.1: New file. Contains old ChangeLog. +See ChangeLog.1 for earlier changes. - Copyright (C) 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This file is part of GNU Emacs. commit 4b8490fdfe10771af599ad6f78f4211a522019b6 Author: Glenn Morris Date: Fri Apr 17 13:27:44 2015 -0400 * admin/authors.el (authors-valid-file-names, authors-renamed-files-alist): Additions. diff --git a/admin/authors.el b/admin/authors.el index 55839b6..c7ec3bc 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -653,6 +653,7 @@ Changes to files in this list are not listed.") "calc/calc-maint.el" "emacs-lisp/cl-specs.el" "emacs-lisp/eieio-comp.el" + "emacs-lisp/eieio-generic.el" "erc-hecomplete.el" "eshell/esh-maint.el" "language/persian.el" @@ -803,6 +804,7 @@ in the repository.") ("play/yow.el" . "yow.el") ("patcomp.el" . "patcomp.el") ("emulation/ws-mode.el" . "ws-mode.el") + ("vc/vc-arch.el" . "vc-arch.el") ;; From lisp to etc/forms. ("forms-d2.el" . "forms-d2.el") ("forms-pass.el" . "forms-pass.el") @@ -814,6 +816,9 @@ in the repository.") ("eshell/esh-test.el" . "automated/eshell.el") ("automated/cl-lib.el" . "automated/cl-lib-tests.el") ("automated/package-x-test.el" . "automated/package-test.el") + ("indent/js-indent-first-initialiser-t.js" . "indent/js-indent-init-t.js") + ("indent/js-indent-first-initialiser-dynamic.js" . + "indent/js-indent-init-dynamic.js") ;; INSTALL-CVS -> .CVS -> .BZR -> .REPO ("INSTALL-CVS" . "INSTALL.REPO") ("INSTALL.CVS" . "INSTALL.REPO") commit 0bba79e69b3b77fc31dc2f951b5715c00857e413 Author: Glenn Morris Date: Fri Apr 17 13:13:04 2015 -0400 ; ChangeLog fixes diff --git a/doc/lispref/ChangeLog.1 b/doc/lispref/ChangeLog.1 index c24bb64..e508839 100644 --- a/doc/lispref/ChangeLog.1 +++ b/doc/lispref/ChangeLog.1 @@ -50,7 +50,7 @@ 2015-03-02 Daniel Colascione * control.texi (Generators): New section - * elisp.text: Reference new section. + * elisp.texi: Reference new section. 2015-02-28 Eli Zaretskii diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index 1d25e8f..8984f48 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -1,7 +1,6 @@ 2015-04-06 Alan Mackenzie - Fix miscellaneous glitches in cc-mode.el. Fixes debbugs#20245. - + Fix miscellaneous glitches in cc-mode.el. (Bug#20245) * progmodes/cc-mode.el (c-common-init): bind \(before\|after\)-change-functions to nil around invocations of c-get-state-before-change-functions and @@ -14,16 +13,13 @@ 2015-02-01 Alan Mackenzie - CC Mode: Stop Font Lock forcing fontification from BOL. Fixes - debbugs#19669. - + CC Mode: Stop Font Lock forcing fontification from BOL. * progmodes/cc-mode.el (c-font-lock-init): Setq - font-lock-extend-region-functions to nil. + font-lock-extend-region-functions to nil. (Bug#19669) 2015-04-06 Fabián Ezequiel Gallina python.el: Do not break IPython magic completions. (Bug#19736) - * progmodes/python.el (python-shell-completion-setup-code): Cleaner setup; import rlcompleter as last resource. @@ -45,7 +41,6 @@ 2015-04-06 Fabián Ezequiel Gallina python.el: Enhance docstring detection following PEP-257. - * progmodes/python.el (python-docstring-at-p): Remove function. (python-info-assignment-statement-p): New function. (python-info-assignment-continuation-line-p): Use it. @@ -67,39 +62,21 @@ Rationalize use of c[ad]+r, expunging cl-c[ad]\{3,4\}r. Also expunge eudc-c[ad]+r. - - * subr.el (internal--compiler-macro-cXXr): "New" function, copied - from cl--compiler-macro-cXXr. - (caar, cadr, cdar, cddr): Changed from defsubsts to defuns with + * subr.el (internal--compiler-macro-cXXr): "New" function, + copied from cl--compiler-macro-cXXr. + (caar, cadr, cdar, cddr): Change from defsubsts to defuns with the above compiler-macro. - * net/eudc.el (eudc-cadr, eudc-cdar, eudc-caar, eudc-cdaar): Remove. - - * emacs-lisp/cl.el (Top level dolist doing defaliases): Remove - caaar, etc., from list of new alias functions. - + * emacs-lisp/cl.el (Top level dolist doing defaliases): + Remove caaar, etc., from list of new alias functions. * emacs-lisp/cl-lib.el (cl-caaar, etc): Rename to caaar, etc. (gen-cXXr--rawname, gen-cXXr-all-cl-aliases): New function/macro which generate obsolete cl- aliases for caaar, etc. Invoke them. - - * desktop.el: - * edmacro.el: - * emacs-lisp/cl-macs.el: - * frameset.el: - * ibuffer.el: - * mail/footnote.el: - * net/dbus.el: - * net/eudc-export.el: - * net/eudc.el: - * net/eudcb-ph.el: - * net/rcirc.el: - * net/secrets.el: - * play/5x5.el: - * play/decipher.el: - * play/hanoi.el: - * progmodes/hideif.el: - * ses.el: Replace cl-caaar, eudc-cadr, etc. with caaar and cadr, - etc. + * desktop.el, edmacro.el, emacs-lisp/cl-macs.el, frameset.el: + * ibuffer.el, mail/footnote.el, net/dbus.el, net/eudc-export.el: + * net/eudc.el, net/eudcb-ph.el, net/rcirc.el, net/secrets.el: + * play/5x5.el, play/decipher.el, play/hanoi.el, progmodes/hideif.el: + * ses.el: Replace cl-caaar, eudc-cadr, etc. with caaar and cadr, etc. 2015-04-05 Richard Stallman @@ -136,7 +113,7 @@ 2015-04-04 Alan Mackenzie - * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change + * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-03-03 change "Stop Font Lock forcing fontification from BOL." (Bug#20245) 2015-04-04 Artur Malabarba @@ -156,10 +133,8 @@ 2015-04-04 Alan Mackenzie - Fix debbugs#20240 part two (jit-lock error during `comment-dwim'). - * jit-lock.el (jit-lock-after-change): Widen the buffer before - putting 'fontified text properties. + putting 'fontified text properties. (Bug#20240) 2015-04-03 Michael Albinus @@ -186,12 +161,11 @@ 2015-04-01 Alan Mackenzie - Fix the CC Mode fixes from 2015-03-30. Fixes debbugs#20240. - + Fix the CC Mode fixes from 2015-03-30. (Bug#20240) * progmodes/cc-mode.el (c-extend-after-change-region): Widen before applying text properties. - * progmodes/cc-langs.el (c-before-font-lock-functions): Update an - entry to a new function name. + * progmodes/cc-langs.el (c-before-font-lock-functions): + Update an entry to a new function name. 2015-04-01 Paul Eggert @@ -253,7 +227,6 @@ 2015-03-30 Alan Mackenzie Correct calculation of CC Mode's font-lock region. - * progmodes/cc-mode.el (c-fl-decl-start): Rename from c-set-fl-decl-start. Change signature such that nil is returned when no declaration is found. @@ -268,7 +241,6 @@ the extra bit separately from the region calculated by CC Mode. (c-extend-after-change-region): Explicitly apply 'fontified properties to the extended bits of the font lock region. - * progmodes/cc-langs.el (c-before-font-lock-functions) (c-before-context-fontification-functions): Use new names for existing functions (see above). @@ -2326,7 +2298,7 @@ * calc/calc-ext.el (calc-init-extensions): Autoload `calc-convert-exact-units' and assign it a keybinding. - * calc/calc-help (calc-u-prefix-help): Add help for the + * calc/calc-help.el (calc-u-prefix-help): Add help for the "un" keybinding. 2015-01-28 Stefan Monnier @@ -2740,7 +2712,7 @@ * hexl.el (hexl-mode): * ielm.el (inferior-emacs-lisp-mode): * progmodes/cfengine.el (cfengine3-mode): - * progmodes/elisp-mode (emacs-lisp-mode): + * progmodes/elisp-mode.el (emacs-lisp-mode): * progmodes/octave.el (octave-mode): * progmodes/python.el (python-mode): * simple.el (read--expression): Set `eldoc-documentation-function' commit 14eea098587a61b7c551453edcaf7ea8d2444f33 Author: Stefan Monnier Date: Fri Apr 17 10:30:50 2015 -0400 * lisp/indent.el (indent-region): Don't deactivate the mark Fixes: debbugs:20357 diff --git a/lisp/indent.el b/lisp/indent.el index 74e73a6..18c1fd4 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -537,7 +537,7 @@ column to indent to; if it is nil, use one of the three methods above." ;; In most cases, reindenting modifies the buffer, but it may also ;; leave it unmodified, in which case we have to deactivate the mark ;; by hand. - (deactivate-mark)) + (setq deactivate-mark t)) (defun indent-relative-maybe () "Indent a new line like previous nonblank line. commit 310855ec5dd16ebd767d8fa0af8fa0e36a009672 Author: Sam Steingold Date: Fri Apr 17 08:45:58 2015 -0400 lisp/net/rcirc.el (defun-rcirc-command): mark `target' as ignorable diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 45bddb5..5ea1047 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -2167,6 +2167,7 @@ activity. Only run if the buffer is not visible and ,interactive-form (let ((process (or process (rcirc-buffer-process))) (target (or target rcirc-target))) + (ignore target) ; mark `target' variable as ignorable ,@body)))) (defun-rcirc-command msg (message)