]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Fri, 12 Oct 2018 17:31:22 +0000 (10:31 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 12 Oct 2018 17:31:22 +0000 (10:31 -0700)
643df63 (origin/emacs-26) Avoid byte-compiler warning in em-rebind.el
d0eca49 ; * doc/emacs/mark.texi (Disabled Transient Mark): Fix last c...
af80b10 Improve indexing of 'C-SPC C-SPC'
89a7301 ; * doc/lispref/internals.texi (Writing Dynamic Modules): Fix...
a108eaa Fix bug with precious entries in Gnus registry
ce8b458 Document in the ELisp manual how to write loadable modules
a7ebc6b dired-do-shell-command: Notify users after abort the command

# Conflicts:
# lisp/registry.el

1  2 
doc/lispref/elisp.texi
doc/lispref/internals.texi
doc/lispref/loading.texi
doc/misc/gnus.texi
lisp/dired-aux.el
lisp/registry.el

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 4928dd9b2023d2aab88cf35e40ed22b51face29f,04f3e7b974c0dfba05707a995b0a1b5c9cd6f441..c3184a820f34cf9871b9d8e65c479be2529a7375
@@@ -358,7 -358,7 +358,7 @@@ return LIMIT such candidates.  If SORTF
  entries first and return candidates from beginning of list."
    (let* ((precious (oref db precious))
         (precious-p (lambda (entry-key)
-                      (cdr (memq (car-safe entry-key) precious))))
 -                     (memq (car entry-key) precious)))
++                     (memq (car-safe entry-key) precious)))
         (data (oref db data))
         (candidates (cl-loop for k being the hash-keys of data
                              using (hash-values v)