Merge from emacs-24; up to 2014-06-12T14:55:[email protected]

5 files changed, 49 insertions, 20 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87d834af76..5293d8dda9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2014-06-28  Stephen Berman  <[email protected]>
+
+	* calendar/todo-mode.el (todo-set-top-priorities): Fix logic to
+	account for file-wide setting of todo-top-priorities-overrides.
+	Make code a bit cleaner.
+
+2014-06-28  Glenn Morris  <[email protected]>
+
+	* net/eww.el (eww-mode) <eww-current-title>: Make local.  (Bug#17860)
+
+2014-06-28  Stephen Berman  <[email protected]>
+
+	* calendar/todo-mode.el (todo-prefix-overlays): If there is no
+	category-wide setting of todo-top-priorities-overrides, check for
+	a file-wide setting and fontify accordingly.
+
+2014-06-28  Glenn Morris  <[email protected]>
+
+	* subr.el (read-passwd): Warn about batch mode.  (Bug#17839)
+
 2014-06-28  Stefan Monnier  <[email protected]>
 
 	* progmodes/hideif.el: Use lexical-binding.  Fix up cl-lib usage.
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 1a54cc2c67..b4945c542c 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -4292,30 +4292,30 @@ set the user customizable option `todo-top-priorities-overrides'."
 	 (file todo-current-todo-file)
 	 (rules todo-top-priorities-overrides)
 	 (frule (assoc-string file rules))
-	 (crule (assoc-string cat (nth 2 frule)))
 	 (crules (nth 2 frule))
-	 (cur (or (if arg (cdr crule) (nth 1 frule))
+	 (crule (assoc-string cat crules))
+	 (cur (or (and arg (cdr crule))
+		  (nth 1 frule)
 		  todo-top-priorities))
 	 (prompt (if arg (concat "Number of top priorities in this category"
 				 " (currently %d): ")
 		   (concat "Default number of top priorities per category"
 				 " in this file (currently %d): ")))
-	 (new -1)
-	 nrule)
+	 (new -1))
     (while (< new 0)
       (let ((cur0 cur))
 	(setq new (read-number (format prompt cur0))
 	      prompt "Enter a non-negative number: "
 	      cur0 nil)))
-    (setq nrule (if arg
-		    (append (delete crule crules) (list (cons cat new)))
-		  (append (list file new) (list crules))))
-    (setq rules (cons (if arg
-			  (list file cur nrule)
-			nrule)
-		      (delete frule rules)))
-    (customize-save-variable 'todo-top-priorities-overrides rules)
-    (todo-prefix-overlays)))
+    (let ((nrule (if arg
+		     (append (delete crule crules) (list (cons cat new)))
+		   (append (list file new) (list crules)))))
+      (setq rules (cons (if arg
+			    (list file cur nrule)
+			  nrule)
+			(delete frule rules)))
+      (customize-save-variable 'todo-top-priorities-overrides rules)
+      (todo-prefix-overlays))))
 
 (defun todo-find-item (str)
   "Search for filtered item STR in its saved todo file.
@@ -5303,6 +5303,8 @@ of each other."
 			  (todo-current-category)
 			  (nth 2 (assoc-string todo-current-todo-file
 					       todo-top-priorities-overrides))))
+		    (nth 1 (assoc-string todo-current-todo-file
+					 todo-top-priorities-overrides))
 		    todo-top-priorities))
 	done prefix)
     (save-excursion
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index e8eb09c9a8..02fc575c26 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -478,6 +478,7 @@ word(s) will be searched for via `eww-search-prefix'."
   (setq-local eww-current-url 'author)
   (setq-local eww-current-dom nil)
   (setq-local eww-current-source nil)
+  (setq-local eww-current-title "")
   (setq-local browse-url-browser-function 'eww-browse-url)
   (setq-local after-change-functions 'eww-process-text-input)
   (setq-local eww-history nil)
diff --git a/lisp/subr.el b/lisp/subr.el
index 09a085288a..a0c56bf975 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2016,6 +2016,7 @@ If optional CONFIRM is non-nil, read the password twice to make sure.
 Optional DEFAULT is a default password to use instead of empty input.
 
 This function echoes `.' for each character that the user types.
+Note that in batch mode, the input is not hidden!
 
 Once the caller uses the password, it can erase the password
 by doing (clear-string STRING)."
@@ -2055,7 +2056,11 @@ by doing (clear-string STRING)."
             (add-hook 'after-change-functions hide-chars-fun nil 'local))
         (unwind-protect
             (let ((enable-recursive-minibuffers t))
-              (read-string prompt nil t default)) ; t = "no history"
+              (read-string
+               (if noninteractive
+                   (format "%s[INPUT WILL NOT BE HIDDEN!] " prompt) ; bug#17839
+                 prompt)
+               nil t default)) ; t = "no history"
           (when (buffer-live-p minibuf)
             (with-current-buffer minibuf
               ;; Not sure why but it seems that there might be cases where the
diff --git a/lisp/url/url-domsuf.el b/lisp/url/url-domsuf.el
index 6cedd3c3ca..365cf561ae 100644
--- a/lisp/url/url-domsuf.el
+++ b/lisp/url/url-domsuf.el
@@ -72,11 +72,11 @@
        ((and (null modifier)
 	     (string= domain entry))
 	(setq allowedp nil))
-       ;; "!pref.hokkaido.jp"
+       ;; "!city.yokohama.jp"
        ((and (eq modifier t)
 	     (string= domain entry))
 	(setq allowedp t))
-       ;; "*.ar"
+       ;; "*.bd"
        ((and (numberp modifier)
 	     (= length modifier)
 	     (string= entry upper-domain))
@@ -85,13 +85,14 @@
 
 ;; Tests:
 
+;; TODO convert to a proper test/automated test.
 ;; (url-domsuf-cookie-allowed-p "com") => nil
-;; (url-domsuf-cookie-allowed-p "foo.bar.ar") => t
-;; (url-domsuf-cookie-allowed-p "bar.ar") => nil
+;; (url-domsuf-cookie-allowed-p "foo.bar.bd") => t
+;; (url-domsuf-cookie-allowed-p "bar.bd") => nil
 ;; (url-domsuf-cookie-allowed-p "co.uk") => nil
 ;; (url-domsuf-cookie-allowed-p "foo.bar.hokkaido.jo") => t
-;; (url-domsuf-cookie-allowed-p "bar.hokkaido.jp") => nil
-;; (url-domsuf-cookie-allowed-p "pref.hokkaido.jp") => t
+;; (url-domsuf-cookie-allowed-p "bar.yokohama.jp") => nil
+;; (url-domsuf-cookie-allowed-p "city.yokohama.jp") => t
 
 (provide 'url-domsuf)