merge trunk

10 files changed, 110 insertions, 49 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b6d0b0e379..68ebad48d42 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,15 +3,38 @@
         * international/mule.el (coding-system-iso-2022-flags): Add
         `8-bit-level-4'.  (Bug#8522)
 
+2013-07-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/shr.el (shr-mouse-browse-url): New command and keystroke
+        (bug#14815).
+
+        * net/eww.el (eww-process-text-input): Allow inputting when the
+        point is at the start of the line, as the properties aren't
+        front-sticky.
+
+        * net/shr.el (shr-make-table-1): Ensure that we don't infloop on
+        degenerate widths.
+
+2013-07-19  Richard Stallman  <rms@gnu.org>
+
+        * epa.el (epa-popup-info-window): Doc fix.
+
+        * subr.el (split-string): New arg TRIM.
+
+2013-07-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frame.el (blink-cursor-timer-function, blink-cursor-suspend):
+        Add check for W32 (followup to 2013-07-16T11:41:06Z!jan.h.d@swipnet.se).
+
 2013-07-18  Michael Albinus  <michael.albinus@gmx.de>
 
-        * filenotify.el (file-notify--library): Renamed from
+        * filenotify.el (file-notify--library): Rename from
         `file-notify-support'.  Do not autoload.  Adapt all uses.
         (file-notify-supported-p): New defun.
 
-        * autorevert.el (auto-revert-use-notify): Use
-        `file-notify-supported-p' instead of `file-notify-support'.  Adapt
-        docstring.
+        * autorevert.el (auto-revert-use-notify):
+        Use `file-notify-supported-p' instead of `file-notify-support'.
+        Adapt docstring.
         (auto-revert-notify-add-watch): Use `file-notify-supported-p'.
 
         * net/tramp.el (tramp-file-name-for-operation):
@@ -3572,8 +3595,8 @@
         (prolog-char-quote-workaround):
         * progmodes/cperl-mode.el (cperl-under-as-char):
         * progmodes/vhdl-mode.el (vhdl-underscore-is-part-of-word):
-         Mark as obsolete.
-         (vhdl-mode-syntax-table, vhdl-mode-ext-syntax-table): Initialize in
+        Mark as obsolete.
+        (vhdl-mode-syntax-table, vhdl-mode-ext-syntax-table): Initialize in
         their declaration.
         (vhdl-mode-syntax-table-init): Remove.
 
diff --git a/lisp/epa.el b/lisp/epa.el
index 14f8879c1c6..68e7a18fe17 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -34,8 +34,7 @@
   :group 'epg)
 
 (defcustom epa-popup-info-window t
-  "If non-nil, status information from epa commands is displayed on
-the separate window."
+  "If non-nil, display status information from epa commands in another window."
   :type 'boolean
   :group 'epa)
 
diff --git a/lisp/frame.el b/lisp/frame.el
index a37d1189552..ed47afa4b94 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1709,7 +1709,7 @@ command starts, by installing a pre-command hook."
   "Timer function of timer `blink-cursor-timer'."
   (internal-show-cursor nil (not (internal-show-cursor-p)))
   ;; Each blink is two calls to this function.
-  (when (memq window-system '(x ns))
+  (when (memq window-system '(x ns w32))
     (setq blink-cursor-blinks-done (1+ blink-cursor-blinks-done))
     (when (and (> blink-cursor-blinks 0)
                (<= (* 2 blink-cursor-blinks) blink-cursor-blinks-done))
@@ -1729,11 +1729,11 @@ itself as a pre-command hook."
     (setq blink-cursor-timer nil)))
 
 (defun blink-cursor-suspend ()
-  "Suspend cursor blinking on NS and X.
+  "Suspend cursor blinking on NS, X and W32.
 This is called when no frame has focus and timers can be suspended.
 Timers are restarted by `blink-cursor-check', which is called when a
 frame receives focus."
-  (when (memq window-system '(x ns))
+  (when (memq window-system '(x ns w32))
     (blink-cursor-end)
     (when blink-cursor-idle-timer
       (cancel-timer blink-cursor-idle-timer)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c68013f6da3..4b2892ae4b0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2013-07-19  Geoff Kuenning  <geoff@cs.hmc.edu>  (tiny change)
+
+        * gnus-art.el (gnus-treat-predicate): Allow functions as predicates
+        (bug#13384).
+
+2013-07-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-start.el (gnus-clean-old-newsrc): Remove the newsrc cleanups
+        that were only relevant in a development version a long time ago.
+
 2013-07-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-shr-put-image): Make it work as well for shr.el's
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 304ac3da88c..31a108a3c98 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -8419,6 +8419,8 @@ For example:
         (not (gnus-treat-predicate (car val))))
        ((eq pred 'typep)
         (equal (car val) gnus-treat-type))
+       ((functionp pred)
+        (funcall pred))
        (t
         (error "%S is not a valid predicate" pred)))))
    ((eq val t)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 94803800e0b..05cf290cac9 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2305,24 +2305,8 @@ If FORCE is non-nil, the .newsrc file is read."
       (gnus-clean-old-newsrc))))
 
 (defun gnus-clean-old-newsrc (&optional force)
-  (when gnus-newsrc-file-version
-    ;; Remove totally bogus `unexists' entries.  The name is
-    ;; `unexist'.
-    (dolist (info (cdr gnus-newsrc-alist))
-      (let ((exist (assoc 'unexists (gnus-info-marks info))))
-        (when exist
-          (gnus-info-set-marks
-           info (delete exist (gnus-info-marks info))))))
-    (when (or force
-              (not (string= gnus-newsrc-file-version gnus-version)))
-      (message (concat "Removing unexist marks because newsrc "
-                       "version does not match Gnus version."))
-      ;; Remove old `exist' marks from old nnimap groups.
-      (dolist (info (cdr gnus-newsrc-alist))
-        (let ((exist (assoc 'unexist (gnus-info-marks info))))
-          (when exist
-            (gnus-info-set-marks
-             info (delete exist (gnus-info-marks info)))))))))
+  ;; Currently no cleanups.
+  )
 
 (defun gnus-convert-old-newsrc ()
   "Convert old newsrc formats into the current format, if needed."
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index c5f1e3921fa..4d9b24e0043 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -209,7 +209,9 @@ removed from alias expansions."
             (if (re-search-forward "[ \t]*[\n,][ \t]*" end1 t)
                 (setq epos (match-beginning 0)
                       seplen (- (point) epos))
-              (setq epos (marker-position end1) seplen 0))
+              ;; Handle the last name in this header field.
+              ;; We already moved END1 back across whitespace after it.
+              (setq epos (marker-position end1) seplen 0))
             (let ((string (buffer-substring-no-properties pos epos))
                   translation)
               (if (and (not (assoc string disabled-aliases))
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index d832aa7ef3e..d65932ae7c9 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -603,7 +603,7 @@ appears in a <link> or <a> tag."
     (insert " ")))
 
 (defun eww-process-text-input (beg end length)
-  (let* ((form (get-text-property end 'eww-form))
+  (let* ((form (get-text-property (min (1+ end) (point-max)) 'eww-form))
          (properties (text-properties-at end))
          (type (plist-get form :type)))
     (when (and form
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 4506ede8722..6ddf8d2af90 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -143,6 +143,7 @@ cid: URL as the argument.")
     (define-key map [tab] 'shr-next-link)
     (define-key map [backtab] 'shr-previous-link)
     (define-key map [follow-link] 'mouse-face)
+    (define-key map [mouse-2] 'shr-mouse-browse-url)
     (define-key map "I" 'shr-insert-image)
     (define-key map "w" 'shr-copy-url)
     (define-key map "u" 'shr-copy-url)
@@ -657,6 +658,12 @@ size, and full-buffer size."
             (forward-line 1)
           (goto-char end))))))
 
+(defun shr-mouse-browse-url (ev)
+  "Browse the URL under the mouse cursor."
+  (interactive "e")
+  (mouse-set-point ev)
+  (shr-browse-url))
+
 (defun shr-browse-url (&optional external)
   "Browse the URL under point.
 If EXTERNAL, browse the URL using `shr-external-browser'."
@@ -1476,9 +1483,6 @@ ones, in case fg and bg are nil."
                     (if column
                         (aref widths width-column)
                       10))
-              ;; Sanity check for degenerate tables.
-              (when (zerop width)
-                (setq width 10))
               (when (and fill
                          (setq colspan (cdr (assq :colspan (cdr column)))))
                 (setq colspan (string-to-number colspan))
@@ -1491,6 +1495,9 @@ ones, in case fg and bg are nil."
                 (setq width-column (+ width-column (1- colspan))))
               (when (or column
                         (not fill))
+                ;; Sanity check for degenerate tables.
+                (when (zerop width)
+                  (setq width 10))
                 (push (shr-render-td (cdr column) width fill)
                       tds))
               (setq i (1+ i)
@@ -1499,6 +1506,7 @@ ones, in case fg and bg are nil."
     (nreverse trs)))
 
 (defun shr-render-td (cont width fill)
+  (when (= width 0) (debug))
   (with-temp-buffer
     (let ((bgcolor (cdr (assq :bgcolor cont)))
           (fgcolor (cdr (assq :fgcolor cont)))
diff --git a/lisp/subr.el b/lisp/subr.el
index b6ee96f879e..75c6b3a0620 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3529,7 +3529,7 @@ likely to have undesired semantics.")
 ;; defaulted, OMIT-NULLS should be treated as t.  Simplifying the logical
 ;; expression leads to the equivalent implementation that if SEPARATORS
 ;; is defaulted, OMIT-NULLS is treated as t.
-(defun split-string (string &optional separators omit-nulls)
+(defun split-string (string &optional separators omit-nulls trim)
   "Split STRING into substrings bounded by matches for SEPARATORS.
 
 The beginning and end of STRING, and each match for SEPARATORS, are
@@ -3547,17 +3547,50 @@ that for the default value of SEPARATORS leading and trailing whitespace
 are effectively trimmed).  If nil, all zero-length substrings are retained,
 which correctly parses CSV format, for example.
 
+If TRIM is non-nil, it should be a regular expression to match
+text to trim from the beginning and end of each substring.  If trimming
+makes the substring empty, it is treated as null.
+
+If you want to trim whitespace from the substrings, the reliably correct
+way is using TRIM.  Making SEPARATORS match that whitespace gives incorrect
+results when there is whitespace at the start or end of STRING.  If you
+see such calls to `split-string', please fix them.
+
 Note that the effect of `(split-string STRING)' is the same as
 `(split-string STRING split-string-default-separators t)'.  In the rare
 case that you wish to retain zero-length substrings when splitting on
 whitespace, use `(split-string STRING split-string-default-separators)'.
 
 Modifies the match data; use `save-match-data' if necessary."
-  (let ((keep-nulls (not (if separators omit-nulls t)))
-        (rexp (or separators split-string-default-separators))
-        (start 0)
-        notfirst
-        (list nil))
+  (let* ((keep-nulls (not (if separators omit-nulls t)))
+         (rexp (or separators split-string-default-separators))
+         (start 0)
+         this-start this-end
+         notfirst
+         (list nil)
+         (push-one
+          ;; Push the substring in range THIS-START to THIS-END
+          ;; onto LIST, trimming it and perhaps discarding it.
+          (lambda ()
+            (when trim
+              ;; Discard the trim from start of this substring.
+              (let ((tem (string-match trim string this-start)))
+                (and (eq tem this-start)
+                     (setq this-start (match-end 0)))))
+
+            (when (or keep-nulls (< this-start this-end))
+              (let ((this (substring string this-start this-end)))
+
+                ;; Discard the trim from end of this substring.
+                (when trim
+                  (let ((tem (string-match (concat trim "\\'") this 0)))
+                    (and tem (< tem (length this))
+                         (setq this (substring this 0 tem)))))
+
+                ;; Trimming could make it empty; check again.
+                (when (or keep-nulls (> (length this) 0))
+                  (push this list)))))))
+
     (while (and (string-match rexp string
                               (if (and notfirst
                                        (= start (match-beginning 0))
@@ -3565,15 +3598,15 @@ Modifies the match data; use `save-match-data' if necessary."
                                   (1+ start) start))
                 (< start (length string)))
       (setq notfirst t)
-      (if (or keep-nulls (< start (match-beginning 0)))
-          (setq list
-                (cons (substring string start (match-beginning 0))
-                      list)))
-      (setq start (match-end 0)))
-    (if (or keep-nulls (< start (length string)))
-        (setq list
-              (cons (substring string start)
-                    list)))
+      (setq this-start start this-end (match-beginning 0)
+            start (match-end 0))
+
+      (funcall push-one))
+
+    ;; Handle the substring at the end of STRING.
+    (setq this-start start this-end (length string))
+    (funcall push-one)
+
     (nreverse list)))
 
 (defun combine-and-quote-strings (strings &optional separator)