commit f4ad42936e0b83caca91389a977d7258b69ed40a (HEAD, refs/remotes/origin/master) Author: Artur Malabarba Date: Thu Apr 30 02:27:10 2015 +0100 * lisp/emacs-lisp/package.el: Some speed optimizations on menu refresh (package-menu--print-info): Obsolete. (package-menu--print-info-simple): New function. (package-menu--refresh): Use it, simplify code, and improve performance. * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print-entry): Tiny performance improvement. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c3bec36..db61aba 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2458,8 +2458,6 @@ of these dependencies, similar to the list returned by ((version-list-= version hv) "held") ((version-list-< version hv) "obsolete") (t "disabled")))) - ((package-built-in-p name version) "obsolete") - ((package--incompatible-p pkg-desc) "incompat") (dir ;One of the installed packages. (cond ((not (file-exists-p (package-desc-dir pkg-desc))) "deleted") @@ -2468,6 +2466,7 @@ of these dependencies, similar to the list returned by (if (package--user-selected-p name) "installed" "dependency"))) (t "obsolete"))) + ((package--incompatible-p pkg-desc) "incompat") (t (let* ((ins (cadr (assq name package-alist))) (ins-v (if ins (package-desc-version ins)))) @@ -2542,24 +2541,25 @@ PACKAGES should be nil or t, which means to display all known packages. KEYWORDS should be nil or a list of keywords." ;; Construct list of (PKG-DESC . STATUS). (unless packages (setq packages t)) - (let (info-list name) + (let (info-list) ;; Installed packages: (dolist (elt package-alist) - (setq name (car elt)) - (when (or (eq packages t) (memq name packages)) - (dolist (pkg (cdr elt)) - (when (package--has-keyword-p pkg keywords) - (package--push pkg (package-desc-status pkg) info-list))))) + (let ((name (car elt))) + (when (or (eq packages t) (memq name packages)) + (dolist (pkg (cdr elt)) + (when (package--has-keyword-p pkg keywords) + (push pkg info-list)))))) ;; Built-in packages: (dolist (elt package--builtins) - (setq name (car elt)) - (when (and (not (eq name 'emacs)) ; Hide the `emacs' package. - (package--has-keyword-p (package--from-builtin elt) keywords) - (or package-list-unversioned - (package--bi-desc-version (cdr elt))) - (or (eq packages t) (memq name packages))) - (package--push (package--from-builtin elt) "built-in" info-list))) + (let ((pkg (package--from-builtin elt)) + (name (car elt))) + (when (not (eq name 'emacs)) ; Hide the `emacs' package. + (when (and (package--has-keyword-p pkg keywords) + (or package-list-unversioned + (package--bi-desc-version (cdr elt))) + (or (eq packages t) (memq name packages))) + (push pkg info-list))))) ;; Available and disabled packages: (dolist (elt package-archive-contents) @@ -2568,11 +2568,11 @@ KEYWORDS should be nil or a list of keywords." ;; Hide available-obsolete or low-priority packages. (dolist (pkg (package--remove-hidden (cdr elt))) (when (package--has-keyword-p pkg keywords) - (package--push pkg (package-desc-status pkg) info-list)))))) + (push pkg info-list)))))) ;; Print the result. (setq tabulated-list-entries - (mapcar #'package-menu--print-info info-list)))) + (mapcar #'package-menu--print-info-simple info-list)))) (defun package-all-keywords () "Collect all package keywords" @@ -2654,8 +2654,15 @@ shown." "Return a package entry suitable for `tabulated-list-entries'. PKG has the form (PKG-DESC . STATUS). Return (PKG-DESC [NAME VERSION STATUS DOC])." - (let* ((pkg-desc (car pkg)) - (status (cdr pkg)) + (package-menu--print-info-simple (car pkg))) +(make-obsolete 'package-menu--print-info + 'package-menu--print-info-simple "25.1") + +(defun package-menu--print-info-simple (pkg) + "Return a package entry suitable for `tabulated-list-entries'. +PKG is a package-desc object. +Return (PKG-DESC [NAME VERSION STATUS DOC])." + (let* ((status (package-desc-status pkg)) (face (pcase status (`"built-in" 'font-lock-builtin-face) (`"available" 'default) @@ -2668,21 +2675,20 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])." (`"unsigned" 'font-lock-warning-face) (`"incompat" 'font-lock-comment-face) (_ 'font-lock-warning-face)))) ; obsolete. - (list pkg-desc - `[,(list (symbol-name (package-desc-name pkg-desc)) - 'face 'link - 'follow-link t - 'package-desc pkg-desc - 'action 'package-menu-describe-package) + (list pkg + `[(,(symbol-name (package-desc-name pkg)) + face link + follow-link t + package-desc ,pkg + action package-menu-describe-package) ,(propertize (package-version-join - (package-desc-version pkg-desc)) + (package-desc-version pkg)) 'font-lock-face face) ,(propertize status 'font-lock-face face) ,@(if (cdr package-archives) - (list (propertize (or (package-desc-archive pkg-desc) "") + (list (propertize (or (package-desc-archive pkg) "") 'font-lock-face face))) - ,(propertize (package-desc-summary pkg-desc) - 'font-lock-face face)]))) + ,(package-desc-summary pkg)]))) (defvar package-menu--old-archive-contents nil "`package-archive-contents' before the latest refresh.") diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index 15a0914..b12edc8 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -341,8 +341,10 @@ of column descriptors." (dotimes (n ncols) (setq x (tabulated-list-print-col n (aref cols n) x))) (insert ?\n) - (put-text-property beg (point) 'tabulated-list-id id) - (put-text-property beg (point) 'tabulated-list-entry cols))) + ;; Ever so slightly faster than calling `put-text-property' twice. + (add-text-properties + beg (point) + `(tabulated-list-id ,id tabulated-list-entry ,cols)))) (defun tabulated-list-print-col (n col-desc x) "Insert a specified Tabulated List entry at point. commit 5b6c58395d0f4976323d2e5b39a06baae09dcc40 Author: Artur Malabarba Date: Thu Apr 30 01:19:01 2015 +0100 * lisp/emacs-lisp/package.el (package--message): inhibit-message diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index a655641..c3bec36 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1380,10 +1380,9 @@ it to the file." (defun package--message (format &rest args) "Like `message', except sometimes don't print to minibuffer. If the variable `package--silence' is non-nil, the message is not -displayed on the minibuffer." - (apply #'message format args) - (when package--silence - (message nil))) +displayed on the echo area." + (let ((inhibit-message package--silence)) + (apply #'message format args))) ;;;###autoload (defun package-import-keyring (&optional file) commit 69d0a2d8989a4f07815e53bcbadea3e1ee0f7256 Author: Paul Eggert Date: Wed Apr 29 20:30:49 2015 -0700 Omit -Wstrict-overflow workaround in GCC 5 * src/process.c: Remove workaround for GCC -Wstrict-overflow bug if it's GCC 5 or later, as the bug appears to be fixed in GCC 5.1. diff --git a/src/process.c b/src/process.c index 3e04cb7..ce78d81 100644 --- a/src/process.c +++ b/src/process.c @@ -136,8 +136,8 @@ extern int sys_select (int, fd_set *, fd_set *, fd_set *, /* Work around GCC 4.7.0 bug with strict overflow checking; see . - These lines can be removed once the GCC bug is fixed. */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) + This bug appears to be fixed in GCC 5.1, so don't work around it there. */ +#if __GNUC__ == 4 && __GNUC_MINOR__ >= 3 # pragma GCC diagnostic ignored "-Wstrict-overflow" #endif commit 6eaa9a57a172181f866d9c50f3e5880601551932 Author: Paul Eggert Date: Wed Apr 29 20:11:59 2015 -0700 Merge from gnulib This incorporates: 2015-04-29 extern-inline: no need for workaround in GCC 5.1 2015-04-26 file-has-acl: port to CentOS 6 * m4/acl.m4, m4/extern-inline.m4: Update from gnulib. diff --git a/m4/acl.m4 b/m4/acl.m4 index 186353c..b8f4660 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,5 +1,5 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 18 +# serial 19 # Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -181,12 +181,26 @@ AC_DEFUN([gl_FILE_HAS_ACL], [ AC_REQUIRE([gl_FUNC_ACL_ARG]) if test "$enable_acl" != no; then - AC_CHECK_HEADERS([linux/xattr.h], - [AC_CHECK_HEADERS([sys/xattr.h], - [AC_CHECK_FUNCS([getxattr])])]) + AC_CACHE_CHECK([for getxattr with XATTR_NAME_POSIX_ACL macros], + [gl_cv_getxattr_with_posix_acls], + [gl_cv_getxattr_with_posix_acls=no + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + ]], + [[ssize_t a = getxattr (".", XATTR_NAME_POSIX_ACL_ACCESS, 0, 0); + ssize_t b = getxattr (".", XATTR_NAME_POSIX_ACL_DEFAULT, 0, 0); + return a < 0 || b < 0; + ]])], + [gl_cv_getxattr_with_posix_acls=yes])]) fi - if test "$ac_cv_header_sys_xattr_h,$ac_cv_header_linux_xattr_h,$ac_cv_func_getxattr" = yes,yes,yes; then + if test "$gl_cv_getxattr_with_posix_acls" = yes; then LIB_HAS_ACL= + AC_DEFINE([GETXATTR_WITH_POSIX_ACLS], 1, + [Define to 1 if getxattr works with XATTR_NAME_POSIX_ACL_ACCESS + and XATTR_NAME_POSIX_ACL_DEFAULT.]) else dnl Set gl_need_lib_has_acl to a nonempty value, so that any dnl later gl_FUNC_ACL call will set LIB_HAS_ACL=$LIB_ACL. diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index e74339a..7280065 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -74,12 +74,13 @@ AC_DEFUN([gl_EXTERN_INLINE], # define _GL_EXTERN_INLINE static _GL_UNUSED #endif -/* In GCC, suppress bogus "no previous prototype for 'FOO'" +/* In GCC 4.6 (inclusive) to 5.1 (exclusive), + suppress bogus "no previous prototype for 'FOO'" and "no previous declaration for 'FOO'" diagnostics, when FOO is an inline function in the header; see and . */ -#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ # define _GL_INLINE_HEADER_CONST_PRAGMA # else commit fa175b449597256dc4cb0411ce1978aa2016c170 Author: Helmut Eller Date: Thu Apr 30 03:41:34 2015 +0300 Set next-error-* in xref--xref-buffer-mode * xref.el (xref--xref-buffer-mode): Set `next-error-function' and `next-error-last-buffer'. (xref--next-error-function): New function. (http://lists.gnu.org/archive/html/emacs-devel/2015-04/msg01311.html) diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 9f10686..fc27c26 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -444,7 +444,22 @@ Used for temporary buffers.") (define-derived-mode xref--xref-buffer-mode special-mode "XREF" "Mode for displaying cross-references." - (setq buffer-read-only t)) + (setq buffer-read-only t) + (setq next-error-function #'xref--next-error-function) + (setq next-error-last-buffer (current-buffer))) + +(defun xref--next-error-function (n reset?) + (when reset? + (goto-char (point-min))) + (let ((backward (< n 0)) + (n (abs n)) + (loc nil)) + (dotimes (_ n) + (setq loc (xref--search-property 'xref-location backward))) + (cond (loc + (xref--pop-to-location loc)) + (t + (error "No %s xref" (if backward "previous" "next")))))) (defun xref-quit (&optional kill) "Bury temporarily displayed buffers, then quit the current window. commit 8b7e2c495af65d28ae1320f52f7a08a6a0920ee1 Author: Fabián Ezequiel Gallina Date: Wed Apr 29 21:09:58 2015 -0300 python.el: Fix warnings on looking-back calls missing LIMIT * lisp/progmodes/python.el (python-shell-accept-process-output): Pass LIMIT arg to looking-back. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index eb17d07..2e7410a 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2268,7 +2268,7 @@ banner and the initial prompt are received separately." (while t (when (not (accept-process-output process timeout)) (throw 'found nil)) - (when (looking-back regexp) + (when (looking-back regexp (point-min)) (throw 'found t)))))) (defun python-shell-comint-end-of-output-p (output) commit c1d30c4b132d851c298c52d8c275e43da36ab70f Author: Artur Malabarba Date: Thu Apr 30 00:57:46 2015 +0100 * lisp/emacs-lisp/package.el: Use pushnew for downloads in progress (package--download-and-read-archives): Use pushnew instead of append. If something terrible happened during a previous download, simply refreshing should now make things work again. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 84b6987..a655641 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1463,9 +1463,9 @@ This populates `package-archive-contents'. If ASYNC is non-nil, perform the downloads asynchronously." ;; The downloaded archive contents will be read as part of ;; `package--update-downloads-in-progress'. - (setq package--downloads-in-progress - (append package-archives - package--downloads-in-progress)) + (dolist (archive package-archives) + (cl-pushnew archive package--downloads-in-progress + :test #'equal)) (dolist (archive package-archives) (condition-case-unless-debug nil (package--download-one-archive commit 768edb6e7b8e69443f56af7ec4ce056f88a404df Author: Dmitry Gutov Date: Thu Apr 30 01:55:43 2015 +0300 Introduce etags-xref-find-definitions-tag-order * lisp/progmodes/etags.el (etags-xref-find-definitions-tag-order): New variable. (etags--xref-find-definitions): Use it (bug#19468). diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index b470352..b4ce8b1 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -2073,6 +2073,11 @@ for \\[find-tag] (which see)." ;; we hit the limit rarely. (defconst etags--xref-limit 1000) +(defvar etags-xref-find-definitions-tag-order '(tag-exact-match-p + tag-implicit-name-match-p + tag-symbol-match-p) + "Tag order used in `etags-xref-find' to look for definitions.") + ;;;###autoload (defun etags-xref-find (action id) (pcase action @@ -2094,7 +2099,7 @@ for \\[find-tag] (which see)." (while (visit-tags-table-buffer (not first-time)) (setq first-time nil) (dolist (order-fun (cond (regexp? find-tag-regexp-tag-order) - (t find-tag-tag-order))) + (t etags-xref-find-definitions-tag-order))) (goto-char (point-min)) (while (and (funcall search-fun pattern nil t) (< (hash-table-count marks) etags--xref-limit)) commit 3c3eb1d5f2f56bc8e49ae40881a543fbddf8f312 Author: Eli Zaretskii Date: Wed Apr 29 20:52:02 2015 +0300 PATH- and completion-related fixes in Eshell on MS-Windows * lisp/eshell/esh-ext.el (eshell-search-path): When running on MS-Windows, prepend "." to list of directories produced from PATH, as Windows always implicitly searches the current directory first. (eshell-force-execution): Make it have a non-nil default value on MS-Windows and MS-DOS. * lisp/eshell/em-cmpl.el (eshell-complete-commands-list): If eshell-force-execution is non-nil, complete on readable files and directories, not only executables. When running on MS-Windows, prepend "." to list of directories produced from PATH, as Windows always implicitly searches the current directory first. diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index dbea9e5..93b275e 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -405,7 +405,9 @@ to writing a completion function." "Generate list of applicable, visible commands." (let ((filename (pcomplete-arg)) glob-name) (if (file-name-directory filename) - (pcomplete-executables) + (if eshell-force-execution + (pcomplete-dirs-or-entries nil 'file-readable-p) + (pcomplete-executables)) (if (and (> (length filename) 0) (eq (aref filename 0) eshell-explicit-command-char)) (setq filename (substring filename 1) @@ -416,6 +418,8 @@ to writing a completion function." (expand-file-name default-directory))) (path "") (comps-in-path ()) (file "") (filepath "") (completions ())) + (if (eshell-under-windows-p) + (push "." paths)) ;; Go thru each path in the search path, finding completions. (while paths (setq path (file-name-as-directory @@ -431,7 +435,9 @@ to writing a completion function." (if (and (not (member file completions)) ; (or (string-equal path cwd) (not (file-directory-p filepath))) - (file-executable-p filepath)) + (if eshell-force-execution + (file-readable-p filepath) + (file-executable-p filepath))) (setq completions (cons file completions))) (setq comps-in-path (cdr comps-in-path))) (setq paths (cdr paths))) diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 0b25b31..91c4f4b 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -60,14 +60,15 @@ loaded into memory, thus beginning a new process." :type '(repeat string) :group 'eshell-ext) -(defcustom eshell-force-execution nil - "If non-nil, try to execute binary files regardless of permissions. +(defcustom eshell-force-execution + (not (null (memq system-type '(windows-nt ms-dos)))) + "If non-nil, try to execute files regardless of execute permissions. This can be useful on systems like Windows, where the operating system -doesn't happen to honor the permission bits in certain cases; or in -cases where you want to associate an interpreter with a particular -kind of script file, but the language won't let you but a '#!' -interpreter line in the file, and you don't want to make it executable -since nothing else but Eshell will be able to understand +doesn't support the execution bit for shell scripts; or in cases where +you want to associate an interpreter with a particular kind of script +file, but the language won't let you but a '#!' interpreter line in +the file, and you don't want to make it executable since nothing else +but Eshell will be able to understand `eshell-interpreter-alist'." :type 'boolean :group 'eshell-ext) @@ -78,6 +79,8 @@ since nothing else but Eshell will be able to understand name (let ((list (eshell-parse-colon-path eshell-path-env)) suffixes n1 n2 file) + (if (eshell-under-windows-p) + (push "." list)) (while list (setq n1 (concat (car list) name)) (setq suffixes eshell-binary-suffixes) commit 5e7ed98f7c6497b67376977fafdf2dd860537f14 Author: Sam Steingold Date: Tue Apr 21 08:54:04 2015 -0400 bury RCIRC buffers when there is no activity lisp/net/rcirc.el (rcirc-non-irc-buffer): remove (rcirc-bury-buffers): new function (rcirc-next-active-buffer): when there is no new activity, use `rcirc-bury-buffers' to hide all RCIRC buffers diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 5ea1047..11db7a2 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -1924,17 +1924,13 @@ Uninteresting lines are those whose responses are listed in (goto-char overlay-arrow-position) (message "No unread messages"))) -(defun rcirc-non-irc-buffer () - (let ((buflist (buffer-list)) - buffer) - (while (and buflist (not buffer)) - (with-current-buffer (car buflist) - (unless (or (eq major-mode 'rcirc-mode) - (= ?\s (aref (buffer-name) 0)) ; internal buffers - (get-buffer-window (current-buffer))) - (setq buffer (current-buffer)))) - (setq buflist (cdr buflist))) - buffer)) +(defun rcirc-bury-buffers () + "Bury all RCIRC buffers." + (interactive) + (dolist (buf (buffer-list)) + (when (eq 'rcirc-mode (with-current-buffer buf major-mode)) + (bury-buffer buf) ; buffers not shown + (quit-windows-on buf)))) ; buffers shown in a window (defun rcirc-next-active-buffer (arg) "Switch to the next rcirc buffer with activity. @@ -1949,15 +1945,13 @@ With prefix ARG, go to the next low priority buffer with activity." (switch-to-buffer (car (if arg lopri hipri))) (when (> (point) rcirc-prompt-start-marker) (recenter -1))) - (if (eq major-mode 'rcirc-mode) - (switch-to-buffer (rcirc-non-irc-buffer)) - (message "%s" (concat - "No IRC activity." - (when lopri - (concat - " Type C-u " - (key-description (this-command-keys)) - " for low priority activity.")))))))) + (rcirc-bury-buffers) + (message "No IRC activity.%s" + (if lopri + (concat + " Type C-u " (key-description (this-command-keys)) + " for low priority activity.") + ""))))) (define-obsolete-variable-alias 'rcirc-activity-hooks 'rcirc-activity-functions "24.3") commit 967f054bff9dfaf507a77a16465c38a738040ee8 Author: Glenn Morris Date: Wed Apr 29 06:20:05 2015 -0400 ; Auto-commit of loaddefs files. diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 934b9d8..98c6906 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4843,7 +4843,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. ;;;*** -;;;### (autoloads nil "rmailsum" "rmailsum.el" "3203e61425330fc20f3154b559f8b539") +;;;### (autoloads nil "rmailsum" "rmailsum.el" "b34aec2c31535804e2731992a64c8cdf") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ commit 13cf735fb1c4685c0b4e7a7f8554d2064dc70073 Merge: 7fbdb57 3c0ea58 Author: Michael Albinus Date: Wed Apr 29 11:18:25 2015 +0200 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs commit 7fbdb57f801159618f761b8dd510516575b6c5b2 Author: Krzysztof Jurewicz Date: Wed Apr 29 11:18:08 2015 +0200 Fix DBUS query result parsing for secrets-search-items * lisp/net/secrets.el (secrets-search-items): Fix DBUS query result parsing. The function assumed that return value of the SearchItems method called on a collection is a list of two lists, however this is true only when no collection is specified. GNOME had used to incorrectly return a list of two lists in both cases, but this was already fixed: https://bugzilla.gnome.org/show_bug.cgi?id=695115 . Also fix an incorrect information in the secrets-search-items’ docstring. (Bug#20449) Copyright-paperwork-exempt: yes diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index 6f4e173..56cbec4 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el @@ -598,10 +598,9 @@ If successful, return the object path of the collection." ATTRIBUTES are key-value pairs. The keys are keyword symbols, starting with a colon. Example: - \(secrets-create-item \"Tramp collection\" \"item\" \"geheim\" - :method \"sudo\" :user \"joe\" :host \"remote-host\"\) + \(secrets-search-items \"Tramp collection\" :user \"joe\") -The object paths of the found items are returned as list." +The object labels of the found items are returned as list." (let ((collection-path (secrets-unlock-collection collection)) result props) (unless (secrets-empty-path collection-path) @@ -618,8 +617,7 @@ The object paths of the found items are returned as list." (cadr attributes)) 'append) attributes (cddr attributes))) - ;; Search. The result is a list of two lists, the object paths - ;; of the unlocked and the locked items. + ;; Search. The result is a list of object paths. (setq result (dbus-call-method :session secrets-service collection-path @@ -630,7 +628,7 @@ The object paths of the found items are returned as list." ;; Return the found items. (mapcar (lambda (item-path) (secrets-get-item-property item-path "Label")) - (append (car result) (cadr result)))))) + result)))) (defun secrets-create-item (collection item password &rest attributes) "Create a new item in COLLECTION with label ITEM and password PASSWORD. commit 3c0ea587daf8b17960b90603a70e3ac4057d883d Author: Artur Malabarba Date: Wed Apr 29 09:47:07 2015 +0100 * lisp/emacs-lisp/bytecomp.el: Use `inhibit-message' (byte-compile--message): Use `inhibit-message' instead of hiding the previous message with (message nil). diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 51bbf8a..d732c73 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -986,9 +986,8 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." "Like `message', except sometimes don't print to minibuffer. If the variable `byte-compile--interactive' is nil, the message is not displayed on the minibuffer." - (apply #'message format args) - (unless byte-compile--interactive - (message nil))) + (let ((inhibit-message (not byte-compile--interactive))) + (apply #'message format args))) ;; Log something that isn't a warning. (defun byte-compile-log-1 (string)