commit 9530108fbc8bbf1ad5c1debe4b4f21da1238325b (HEAD, refs/remotes/origin/master) Author: Philipp Stephani Date: Wed Jan 2 22:01:54 2019 +0100 Disable electric quotes for most files in the Emacs codebase. * .dir-locals.el: Disable electric quotes in comments and strings for C, Emacs Lisp, and Texinfo, as the Emacs codebase doesn't use them. diff --git a/.dir-locals.el b/.dir-locals.el index 68eb58fa18..96473a7086 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -2,8 +2,12 @@ (sentence-end-double-space . t) (fill-column . 70))) (c-mode . ((c-file-style . "GNU") - (c-noise-macro-names . ("UNINIT" "CALLBACK" "ALIGN_STACK")))) - (objc-mode . ((c-file-style . "GNU"))) + (c-noise-macro-names . ("UNINIT" "CALLBACK" "ALIGN_STACK")) + (electric-quote-comment . nil) + (electric-quote-string . nil))) + (objc-mode . ((c-file-style . "GNU") + (electric-quote-comment . nil) + (electric-quote-string . nil))) (log-edit-mode . ((log-edit-font-lock-gnu-style . t) (log-edit-setup-add-author . t))) (change-log-mode . ((add-log-time-zone-rule . t) @@ -11,4 +15,8 @@ (bug-reference-url-format . "https://debbugs.gnu.org/%s") (mode . bug-reference))) (diff-mode . ((mode . whitespace))) - (emacs-lisp-mode . ((indent-tabs-mode . nil)))) + (emacs-lisp-mode . ((indent-tabs-mode . nil) + (electric-quote-comment . nil) + (electric-quote-string . nil))) + (texinfo-mode . ((electric-quote-comment . nil) + (electric-quote-string . nil)))) commit 1b6ef26eb653c9d1e4fdbd16d314679cdb26e8ae Author: Stefan Monnier Date: Mon Jan 14 15:11:45 2019 -0500 * lisp/emacs-lisp/package.el (package-activate-all): Fix last change diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 1c64f5e4a8..9a7b54fa01 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1492,7 +1492,9 @@ The variable `package-load-list' controls which packages to load." ;; any decoding). (let ((load-source-file-function nil)) (load package-quickstart-file nil 'nomessage)) - (dolist (elt (package--alist)) + (unless package--initialized + (package-initialize t)) + (dolist (elt package-alist) (condition-case err (package-activate (car elt)) ;; Don't let failure of activation of a package arbitrarily stop commit 08634efb6ab1dd43f8818b6b2aeb31ba48cabcf0 Author: Stefan Monnier Date: Mon Jan 14 15:10:14 2019 -0500 * lisp/emacs-lisp/package.el (package-activate-all): Silence load msg diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index cf39fa2896..1c64f5e4a8 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1491,10 +1491,8 @@ The variable `package-load-list' controls which packages to load." ;; 2 (this assumes we were careful to save this file so it doesn't need ;; any decoding). (let ((load-source-file-function nil)) - (load package-quickstart-file)) - (unless package--initialized - (package-initialize t)) - (dolist (elt package-alist) + (load package-quickstart-file nil 'nomessage)) + (dolist (elt (package--alist)) (condition-case err (package-activate (car elt)) ;; Don't let failure of activation of a package arbitrarily stop commit cdb082322d4209c5104bc1a98b21bf3dd75e8f17 Author: João Távora Date: Mon Jan 14 12:46:34 2019 +0000 Fix icomplete's cycling when filename filtering kicks in Fixes: bug#34070 * lisp/icomplete.el (icomplete--filtered-completions): New variable. (icomplete-forward-completions, icomplete-backward-completions): Use it. (icomplete-completions): Set it. diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 8bed46cb3b..82e2728487 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -162,6 +162,9 @@ the default otherwise." (minibuffer-force-complete-and-exit) (minibuffer-complete-and-exit))) +(defvar icomplete--filtered-completions nil + "If non-nil completions as filtered by `icomplete-completions'") + (defun icomplete-forward-completions () "Step forward completions by one entry. Second entry becomes the first and can be selected with @@ -169,7 +172,8 @@ Second entry becomes the first and can be selected with (interactive) (let* ((beg (icomplete--field-beg)) (end (icomplete--field-end)) - (comps (completion-all-sorted-completions beg end)) + (comps (or icomplete--filtered-completions + (completion-all-sorted-completions beg end))) (last (last comps))) (when comps (setcdr last (cons (car comps) (cdr last))) @@ -182,7 +186,8 @@ Last entry becomes the first and can be selected with (interactive) (let* ((beg (icomplete--field-beg)) (end (icomplete--field-end)) - (comps (completion-all-sorted-completions beg end)) + (comps (or icomplete--filtered-completions + (completion-all-sorted-completions beg end))) (last-but-one (last comps 2)) (last (cdr last-but-one))) (when (consp last) ; At least two elements in comps @@ -382,9 +387,11 @@ matches exist." (progn ;;(debug (format "Candidates=%S field=%S" candidates name)) (format " %sNo matches%s" open-bracket close-bracket)) (if last (setcdr last nil)) - (when (and minibuffer-completing-file-name - icomplete-with-completion-tables) - (setq comps (completion-pcm--filename-try-filter comps))) + (if (and minibuffer-completing-file-name + icomplete-with-completion-tables) + (setq comps (completion-pcm--filename-try-filter comps) + icomplete--filtered-completions comps) + (setq icomplete--filtered-completions nil)) (let* ((most-try (if (and base-size (> base-size 0)) (completion-try-completion commit 80c3b9aebaf99da73d10a949f475c5778e843cf8 Author: Robert Pluim Date: Fri Jan 11 17:45:25 2019 +0100 Improve some of the breve/caron/cedilla mappings * lisp/leim/quail/latin-pre.el ("latin-prefix"): Describe new 'c with cedilla mapping'. Extend caron description. Correct dot above description. Add new mappings for 'a with breve' and 'c with caron'. Add additional mapping for 'c with cedilla'. Delete ~o mapping for 'g with dot above'. diff --git a/lisp/leim/quail/latin-pre.el b/lisp/leim/quail/latin-pre.el index a677cc19c5..bcf81f4a14 100644 --- a/lisp/leim/quail/latin-pre.el +++ b/lisp/leim/quail/latin-pre.el @@ -1089,15 +1089,15 @@ of characters from a single Latin-N charset. effect | prefix | examples ------------+--------+---------- - acute | \\=' | \\='a -> á, \\='\\=' -> ´ + acute | \\=' | \\='a -> á \\='\\=' -> ´ grave | \\=` | \\=`a -> à circumflex | ^ | ^a -> â diaeresis | \" | \"a -> ä \"\" -> ¨ tilde | ~ | ~a -> ã - cedilla | ~ | ~c -> ç + cedilla | , ~ | ,c -> ç ~c -> ç + caron | ~ | ~c -> č ~g -> ğ breve | ~ | ~a -> ă - caron | ~ | ~c -> č - dot above | ~ / . | ~o -> ġ /o -> ġ .o -> ġ + dot above | / . | /g -> ġ .g -> ġ misc | \" ~ / | \"s -> ß ~d -> ð ~t -> þ /a -> å /e -> æ /o -> ø symbol | ~ | ~> -> » ~< -> « ~! -> ¡ ~? -> ¿ ~~ -> ¸ symbol | _ / | _o -> º _a -> ª // -> ° /\\ -> × _y -> ¥ @@ -1252,7 +1252,10 @@ of characters from a single Latin-N charset. ("~>" ?\») ("~?" ?¿) ("~A" ?Ã) + ("~A" ?Ă) ("~C" ?Ç) + ("~C" ?Č) + (",C" ?Ç) ("~D" ?Ð) ("~G" ?Ğ) ("~N" ?Ñ) @@ -1265,13 +1268,15 @@ of characters from a single Latin-N charset. ("~Z" ?Ž) ("~`" ?˘) ("~a" ?ã) + ("~a" ?ă) ("~c" ?ç) + ("~c" ?č) + (",c" ?ç) ("~d" ?ð) ("~e" ?€) ("~g" ?ğ) ("~n" ?ñ) ("~o" ?õ) - ("~o" ?ġ) ("~p" ?¶) ("~s" ?§) ("~s" ?ş) commit 3018a4779efd19a6c48a3a54227605e83e4d364d Author: Robert Pluim Date: Fri Jan 11 17:34:33 2019 +0100 Fix some breve and dot above related doc strings * lisp/leim/quail/latin-pre.el ("romanian-prefix"): Correct description of 'a with breve'. ("romanian-alt-prefix"): Correct description of 'a with breve'. Reformat other entries for consistency. ("latin-3-prefix"): Correct 'dot above' description. diff --git a/lisp/leim/quail/latin-pre.el b/lisp/leim/quail/latin-pre.el index 63565d4ced..a677cc19c5 100644 --- a/lisp/leim/quail/latin-pre.el +++ b/lisp/leim/quail/latin-pre.el @@ -320,7 +320,7 @@ Key translation rules are: effect | prefix | examples ------------+--------+------------------ - tilde | ~ | ~a -> ă + breve | ~ | ~a -> ă circumflex | ^ | ^a -> â, ^i -> î cedilla | , | ,s -> ş, ,t -> ţ ~ | ~ | ~~ -> ~ @@ -342,11 +342,11 @@ Key translation rules are: effect | prefix | examples ------------+--------+------------------ - tilde | \" | \"a -> â - circumflex | \\=' | \\='a -> â, \\='i -> î - cedilla | \\=' | \\='s -> ş, \\='t -> ţ - \\=' | \\=' | \\='\\=' -> \\=' - \" | \" | \"\" -> \" + breve | \\=' | \\='a -> ă + circumflex | \" \\=' | \"a -> â \\='i -> î + cedilla | \\=' | \\='s -> ş \\='t -> ţ + \\=' | \\=' | \\='\\=' -> \\=' + \" | \" | \"\" -> \" " nil t nil nil nil nil nil nil nil nil t) (quail-define-rules @@ -606,7 +606,7 @@ Key translation rules are: circumflex | ^ | ^a -> â diaeresis | \" | \"a -> ä \"\" -> ¨ cedilla | ~ | ~c -> ç ~s -> ş ~~ -> ¸ - dot above | / . | /g -> ġ .o -> ġ + dot above | / . | /g -> ġ .g -> ġ misc | \" ~ / | \"s -> ß ~g -> ğ ~u -> ŭ /h -> ħ /i -> ı symbol | ~ | ~\\=` -> ˘ /# -> £ /$ -> ¤ // -> ° " nil t nil nil nil nil nil nil nil nil t)