merge master

10 files changed, 160 insertions, 53 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7a38af9609..57aaea0f4ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,41 @@
+2015-01-16  Jorgen Schaefer  <contact@jorgenschaefer.de>
+
+        * emacs-lisp/package.el: Provide repository priorities.
+        (package-archive-priorities): New variable.
+        (package--add-to-alist): New function.
+        (package--add-to-archive-contents): Use it.
+        (package-menu--find-upgrades): Use it as well. Small clean up to
+        make the use of the package name here explicit.
+        (package-archive-priority): New function.
+        (package-desc-priority-version): New function.
+
+2015-01-16  Daniel Colascione  <dancol@dancol.org>
+
+        * cus-start.el (all): Make `ring-bell-function' customizable.
+
+2015-01-16  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * vc/vc-svn.el (vc-svn-dir-status-files): Pass t as
+        vc-svn-after-dir-status's second argument.  (Bug#19429)
+
+2015-01-16  Samer Masterson  <samer@samertm.com>  (tiny change)
+
+        * pcomplete.el (pcomplete-parse-arguments): Parse arguments
+        regardless of pcomplete-cycle-completions's value.  (Bug#18950)
+
+2015-01-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dom.el (dom-strings): New function.
+
+        * files.el (directory-files-recursively): Don't use the word
+        "path" for a file name.
+
+2015-01-15  Wolfgang Jenkner  <wjenkner@inode.at>
+
+        * calc/calc-units.el (math-units-in-expr-p)
+        (math-single-units-in-expr-p, math-find-compatible-unit-rec)
+        (math-extract-units): Handle the `neg' operator.  (Bug#19582)
+
 2015-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/eieio-core.el: Provide support for cl-generic.
@@ -28,27 +66,22 @@
 
 2015-01-13  Alan Mackenzie  <acm@muc.de>
 
-        Allow compilation during loading of Modes derived from a CC Mode mode.
-        Fixes debbugs#19206.
-
+        Allow compilation during loading of CC Mode-derived modes (bug#19206).
         * progmodes/cc-bytecomp.el (cc-bytecomp-compiling-or-loading):
         New function which walks the stack to discover whether we're compiling
         or loading.
-        (cc-bytecomp-is-compiling): Reformulate, and move towards
-        beginning.
+        (cc-bytecomp-is-compiling): Reformulate, and move towards beginning.
         (cc-bytecomp-is-loading): New defsubst.
         (cc-bytecomp-setup-environment, cc-bytecomp-restore-environment):
         Use the above defsubsts.
         (cc-require-when-compile, cc-bytecomp-defvar)
         (cc-bytecomp-defun): Simplify conditionals.
-
         * progmodes/cc-defs.el (cc-bytecomp-compiling-or-loading):
         "Borrow" this function from cc-bytecomp.el.
         (c-get-current-file): Reformulate using the above.
         (c-lang-defconst): Prevent duplicate entries of file names in a
         symbol's 'source property.
         (c-lang-const): Use cc-bytecomp-is-compiling.
-
         * progmodes/cc-langs.el (c-make-init-lang-vars-fun):
         Use cc-bytecomp-is-compiling.
 
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 26a644a29ba..05950864a52 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -904,10 +904,12 @@ If COMP or STD is non-nil, put that in the units table instead."
   (and (consp expr)
        (if (eq (car expr) 'var)
            (math-check-unit-name expr)
-         (and (or sub-exprs
-                  (memq (car expr) '(* / ^)))
-              (or (math-units-in-expr-p (nth 1 expr) sub-exprs)
-                  (math-units-in-expr-p (nth 2 expr) sub-exprs))))))
+         (if (eq (car expr) 'neg)
+             (math-units-in-expr-p (nth 1 expr) sub-exprs)
+           (and (or sub-exprs
+                    (memq (car expr) '(* / ^)))
+                (or (math-units-in-expr-p (nth 1 expr) sub-exprs)
+                    (math-units-in-expr-p (nth 2 expr) sub-exprs)))))))
 
 (defun math-only-units-in-expr-p (expr)
   (and (consp expr)
@@ -924,6 +926,8 @@ If COMP or STD is non-nil, put that in the units table instead."
   (cond ((math-scalarp expr) nil)
         ((eq (car expr) 'var)
          (math-check-unit-name expr))
+        ((eq (car expr) 'neg)
+         (math-single-units-in-expr-p (nth 1 expr)))
         ((eq (car expr) '*)
          (let ((u1 (math-single-units-in-expr-p (nth 1 expr)))
                (u2 (math-single-units-in-expr-p (nth 2 expr))))
@@ -1079,6 +1083,8 @@ If COMP or STD is non-nil, put that in the units table instead."
         ((eq (car-safe expr) '/)
          (or (math-find-compatible-unit-rec (nth 1 expr) pow)
              (math-find-compatible-unit-rec (nth 2 expr) (- pow))))
+        ((eq (car-safe expr) 'neg)
+         (math-find-compatible-unit-rec (nth 1 expr) pow))
         ((and (eq (car-safe expr) '^)
               (integerp (nth 2 expr)))
          (math-find-compatible-unit-rec (nth 1 expr) (* pow (nth 2 expr))))
@@ -1497,6 +1503,8 @@ If COMP or STD is non-nil, put that in the units table instead."
    ((memq (car-safe expr) '(* /))
     (cons (car expr)
           (mapcar 'math-extract-units (cdr expr))))
+   ((eq (car-safe expr) 'neg)
+    (math-extract-units (nth 1 expr)))
    ((eq (car-safe expr) '^)
     (list '^ (math-extract-units (nth 1 expr)) (nth 2 expr)))
    ((math-check-unit-name expr) expr)
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 299b18d0118..71506cb680e 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -421,6 +421,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                                     "21.1")
              ;; term.c
              (visible-cursor cursor boolean "22.1")
+             ;; terminal.c
+             (ring-bell-function display
+              (choice
+               (const :tag "Default" nil)
+               (const :tag "Silent" ignore)
+               function))
              ;; undo.c
              (undo-limit undo integer)
              (undo-strong-limit undo integer)
diff --git a/lisp/dom.el b/lisp/dom.el
index 527b8e61f2e..11357e88804 100644
--- a/lisp/dom.el
+++ b/lisp/dom.el
@@ -103,6 +103,14 @@ A name is a symbol like `td'."
         (cons dom matches)
       matches)))
 
+(defun dom-strings (dom)
+  "Return elements in DOM that are strings."
+  (cl-loop for child in (dom-children dom)
+           if (stringp child)
+           collect child
+           else
+           append (dom-strings child)))
+
 (defun dom-by-class (dom match)
   "Return elements in DOM that have a class name that matches regexp MATCH."
   (dom-elements dom 'class match))
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 79f8b65d43c..5336271b65b 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -228,6 +228,22 @@ a package can run arbitrary code."
   :group 'package
   :version "24.1")
 
+(defcustom package-archive-priorities nil
+  "An alist of priorities for packages.
+
+Each element has the form (ARCHIVE-ID . PRIORITY).
+
+When installing packages, the package with the highest version
+number from the archive with the highest priority is
+selected. When higher versions are available from archives with
+lower priorities, the user has to select those manually.
+
+Archives not in this list have the priority 0."
+  :type 'integer
+  :risky t
+  :group 'package
+  :version "25.1")
+
 (defcustom package-pinned-packages nil
   "An alist of packages that are pinned to specific archives.
 This can be useful if you have multiple package archives enabled,
@@ -1114,23 +1130,32 @@ Also, add the originating archive to the `package-desc' structure."
                         ;; Older archive-contents files have only 4
                         ;; elements here.
                         (package--ac-desc-extras (cdr package)))))
-         (existing-packages (assq name package-archive-contents))
          (pinned-to-archive (assoc name package-pinned-packages)))
-    (cond
-     ;; Skip entirely if pinned to another archive.
-     ((and pinned-to-archive
-           (not (equal (cdr pinned-to-archive) archive)))
-      nil)
-     ((not existing-packages)
-      (push (list name pkg-desc) package-archive-contents))
-     (t
-      (while
-          (if (and (cdr existing-packages)
-                   (version-list-<
-                    version (package-desc-version (cadr existing-packages))))
-              (setq existing-packages (cdr existing-packages))
-            (push pkg-desc (cdr existing-packages))
-            nil))))))
+    ;; Skip entirely if pinned to another archive.
+    (when (not (and pinned-to-archive
+                    (not (equal (cdr pinned-to-archive) archive))))
+      (setq package-archive-contents
+            (package--add-to-alist pkg-desc package-archive-contents)))))
+
+(defun package--add-to-alist (pkg-desc alist)
+  "Add PKG-DESC to ALIST.
+
+Packages are grouped by name. The package descriptions are sorted
+by version number."
+  (let* ((name (package-desc-name pkg-desc))
+         (priority-version (package-desc-priority-version pkg-desc))
+         (existing-packages (assq name alist)))
+    (if (not existing-packages)
+        (cons (list name pkg-desc)
+              alist)
+      (while (if (and (cdr existing-packages)
+                      (version-list-< priority-version
+                                      (package-desc-priority-version
+                                       (cadr existing-packages))))
+                 (setq existing-packages (cdr existing-packages))
+               (push pkg-desc (cdr existing-packages))
+               nil))
+      alist)))
 
 (defun package-download-transaction (packages)
   "Download and install all the packages in PACKAGES.
@@ -1319,6 +1344,25 @@ The file can either be a tar file or an Emacs Lisp file."
   "Return the archive containing the package NAME."
   (cdr (assoc (package-desc-archive desc) package-archives)))
 
+(defun package-archive-priority (archive)
+  "Return the priority of ARCHIVE.
+
+The archive priorities are specified in
+`package-archive-priorities'. If not given there, the priority
+defaults to 0."
+  (or (cdr (assoc archive package-archive-priorities))
+      0))
+
+(defun package-desc-priority-version (pkg-desc)
+  "Return the version PKG-DESC with the archive priority prepended.
+
+This allows for easy comparison of package versions from
+different archives if archive priorities are meant to be taken in
+consideration."
+  (cons (package-archive-priority
+         (package-desc-archive pkg-desc))
+        (package-desc-version pkg-desc)))
+
 (defun package--download-one-archive (archive file)
   "Retrieve an archive file FILE from ARCHIVE, and cache it.
 ARCHIVE should be a cons cell of the form (NAME . LOCATION),
@@ -1991,18 +2035,18 @@ If optional arg BUTTON is non-nil, describe its associated package."
       ;; ENTRY is (PKG-DESC [NAME VERSION STATUS DOC])
       (let ((pkg-desc (car entry))
             (status (aref (cadr entry) 2)))
-        (cond ((member status '("installed" "unsigned"))
-               (push pkg-desc installed))
-              ((member status '("available" "new"))
-               (push (cons (package-desc-name pkg-desc) pkg-desc)
-                     available)))))
+        (cond ((member status '("installed" "unsigned"))
+               (push pkg-desc installed))
+              ((member status '("available" "new"))
+               (setq available (package--add-to-alist pkg-desc available))))))
     ;; Loop through list of installed packages, finding upgrades.
     (dolist (pkg-desc installed)
-      (let ((avail-pkg (assq (package-desc-name pkg-desc) available)))
-        (and avail-pkg
-             (version-list-< (package-desc-version pkg-desc)
-                             (package-desc-version (cdr avail-pkg)))
-             (push avail-pkg upgrades))))
+      (let* ((name (package-desc-name pkg-desc))
+             (avail-pkg (cadr (assq name available))))
+        (and avail-pkg
+             (version-list-< (package-desc-priority-version pkg-desc)
+                             (package-desc-priority-version avail-pkg))
+             (push (cons name avail-pkg) upgrades))))
     upgrades))
 
 (defun package-menu-mark-upgrades ()
diff --git a/lisp/files.el b/lisp/files.el
index 175f85b29d0..f8318d8a34d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -749,14 +749,15 @@ If INCLUDE-DIRECTORIES, also include directories that have matching names."
       (unless (member file '("./" "../"))
         (if (directory-name-p file)
             (let* ((leaf (substring file 0 (1- (length file))))
-                   (path (expand-file-name leaf dir)))
+                   (full-file (expand-file-name leaf dir)))
               ;; Don't follow symlinks to other directories.
-              (unless (file-symlink-p path)
-                (setq result (nconc result (directory-files-recursively
-                                            path match include-directories))))
+              (unless (file-symlink-p full-file)
+                (setq result
+                      (nconc result (directory-files-recursively
+                                     full-file match include-directories))))
               (when (and include-directories
                          (string-match match leaf))
-                (setq result (nconc result (list path)))))
+                (setq result (nconc result (list full-file)))))
           (when (string-match match file)
             (push (expand-file-name file dir) files)))))
     (nconc result (nreverse files))))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 20de9aea136..5a61a211661 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nntp.el (nntp-send-authinfo): Error out if the password is wrong.
+
 2015-01-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * registry.el: Don't use <class> as a variable.
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index e071368401b..0891dba0387 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1219,14 +1219,17 @@ If SEND-IF-FORCE, only send authinfo to the server if the
               nntp-authinfo-user user))
       (unless (member user '(nil ""))
         (nntp-send-command "^3.*\r?\n" "AUTHINFO USER" user)
-        (when t                         ;???Should check if AUTHINFO succeeded
-          (nntp-send-command
-           "^2.*\r?\n" "AUTHINFO PASS"
-           (or passwd
-               nntp-authinfo-password
-               (setq nntp-authinfo-password
-                     (read-passwd (format "NNTP (%s@%s) password: "
-                                          user nntp-address))))))))))
+        (let ((result
+               (nntp-send-command
+                "^2.*\r?\n" "AUTHINFO PASS"
+                (or passwd
+                    nntp-authinfo-password
+                    (setq nntp-authinfo-password
+                          (read-passwd (format "NNTP (%s@%s) password: "
+                                               user nntp-address)))))))
+          (if (not result)
+              (signal 'nntp-authinfo-rejected "Password rejected")
+            result))))))
 
 ;;; Internal functions.
 
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 17327ea5c95..7bcf2c1759e 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -755,8 +755,7 @@ this is `comint-dynamic-complete-functions'."
             pcomplete-index 0
             pcomplete-stub (pcomplete-arg 'last))
       (let ((begin (pcomplete-begin 'last)))
-        (if (and pcomplete-cycle-completions
-                 (listp pcomplete-stub) ;??
+        (if (and (listp pcomplete-stub) ;??
                  (not pcomplete-expand-only-p))
             (let* ((completions pcomplete-stub) ;??
                    (common-stub (car completions))
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index bae178df3f7..d74daf9c36f 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -164,6 +164,7 @@ If you want to force an empty list of arguments, use t."
 
 ;; FIXME it would be better not to have the "remote" argument,
 ;; but to distinguish the two output formats based on content.
+;; FIXME: the local format isn't used by the (sole) caller anymore.
 (defun vc-svn-after-dir-status (callback &optional remote)
   (let ((state-map '((?A . added)
                      (?C . conflict)
@@ -208,7 +209,7 @@ CALLBACK is called as (CALLBACK RESULT BUFFER), where
 RESULT is a list of conses (FILE . STATE) for directory DIR."
   ;; FIXME shouldn't this rather default to all the files in dir?
   (apply #'vc-svn-command (current-buffer) 'async nil "status" "-u" files)
-  (vc-run-delayed (vc-svn-after-dir-status callback)))
+  (vc-run-delayed (vc-svn-after-dir-status callback t)))
 
 (defun vc-svn-dir-extra-headers (_dir)
   "Generate extra status headers for a Subversion working copy."