Now on revision 112643. ------------------------------------------------------------ revno: 112643 committer: YAMAMOTO Mitsuharu branch nick: trunk timestamp: Mon 2013-05-20 12:15:20 +0900 message: Mention `display-monitor-attributes-list' in docstrings of X11 display measurement functions. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-05-20 03:09:22 +0000 +++ src/ChangeLog 2013-05-20 03:15:20 +0000 @@ -1,6 +1,9 @@ 2013-05-20 YAMAMOTO Mitsuharu * xfns.c (check_x_display_info): Don't use XINT for terminal object. + (Fx_display_pixel_width, Fx_display_pixel_height) + (Fx_display_mm_width, Fx_display_mm_height): Mention + `display-monitor-attributes-list' in docstrings. 2013-05-18 Paul Eggert === modified file 'src/xfns.c' --- src/xfns.c 2013-05-20 03:09:22 +0000 +++ src/xfns.c 2013-05-20 03:15:20 +0000 @@ -3569,7 +3569,11 @@ doc: /* Return the width in pixels of the X display TERMINAL. The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). -If omitted or nil, that stands for the selected frame's display. */) +If omitted or nil, that stands for the selected frame's display. + +On \"multi-monitor\" setups this refers to the pixel width for all +physical monitors associated with TERMINAL. To get information for +each physical monitor, use `display-monitor-attributes-list'. */) (Lisp_Object terminal) { struct x_display_info *dpyinfo = check_x_display_info (terminal); @@ -3582,7 +3586,11 @@ doc: /* Return the height in pixels of the X display TERMINAL. The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). -If omitted or nil, that stands for the selected frame's display. */) +If omitted or nil, that stands for the selected frame's display. + +On \"multi-monitor\" setups this refers to the pixel height for all +physical monitors associated with TERMINAL. To get information for +each physical monitor, use `display-monitor-attributes-list'. */) (Lisp_Object terminal) { struct x_display_info *dpyinfo = check_x_display_info (terminal); @@ -3690,7 +3698,11 @@ doc: /* Return the height in millimeters of the X display TERMINAL. The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). -If omitted or nil, that stands for the selected frame's display. */) +If omitted or nil, that stands for the selected frame's display. + +On \"multi-monitor\" setups this refers to the height in millimeters for +all physical monitors associated with TERMINAL. To get information +for each physical monitor, use `display-monitor-attributes-list'. */) (Lisp_Object terminal) { struct x_display_info *dpyinfo = check_x_display_info (terminal); @@ -3702,7 +3714,11 @@ doc: /* Return the width in millimeters of the X display TERMINAL. The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). -If omitted or nil, that stands for the selected frame's display. */) +If omitted or nil, that stands for the selected frame's display. + +On \"multi-monitor\" setups this refers to the width in millimeters for +all physical monitors associated with TERMINAL. To get information +for each physical monitor, use `display-monitor-attributes-list'. */) (Lisp_Object terminal) { struct x_display_info *dpyinfo = check_x_display_info (terminal); ------------------------------------------------------------ revno: 112642 committer: YAMAMOTO Mitsuharu branch nick: trunk timestamp: Mon 2013-05-20 12:09:22 +0900 message: * xfns.c (check_x_display_info): Don't use XINT for terminal object. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-05-18 05:32:17 +0000 +++ src/ChangeLog 2013-05-20 03:09:22 +0000 @@ -1,3 +1,7 @@ +2013-05-20 YAMAMOTO Mitsuharu + + * xfns.c (check_x_display_info): Don't use XINT for terminal object. + 2013-05-18 Paul Eggert Port --enable-gcc-warnings to clang. === modified file 'src/xfns.c' --- src/xfns.c 2013-05-09 14:49:56 +0000 +++ src/xfns.c 2013-05-20 03:09:22 +0000 @@ -169,7 +169,7 @@ struct terminal *t = get_terminal (object, 1); if (t->type != output_x_window) - error ("Terminal %"pI"d is not an X display", XINT (object)); + error ("Terminal %d is not an X display", t->id); dpyinfo = t->display_info.x; } ------------------------------------------------------------ revno: 112641 author: Adam Sjøgren committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2013-05-19 22:50:16 +0000 message: lisp/gnus/message.el (message-insert-formatted-citation-line): Handle finding first/lastname when more than 2 names appear diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-05-19 22:49:17 +0000 +++ lisp/gnus/ChangeLog 2013-05-19 22:50:16 +0000 @@ -1,5 +1,10 @@ 2013-05-19 Adam Sjøgren + * message.el (message-insert-formatted-citation-line): Handle finding + first/lastname when more than 2 names appear. + +2013-05-19 Adam Sjøgren + * shr.el (shr-tag-span): New function. 2013-05-18 Glenn Morris === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2013-05-18 00:30:49 +0000 +++ lisp/gnus/message.el 2013-05-19 22:50:16 +0000 @@ -3944,18 +3944,19 @@ (let ((i ?A) lst) (when (stringp name) ;; Guess first name and last name: - (cond ((string-match - "\\`\\(\\w\\|[-.]\\)+ \\(\\w\\|[-.]\\)+\\'" name) - (setq fname (nth 0 (split-string name "[ \t]+")) - lname (nth 1 (split-string name "[ \t]+")))) - ((string-match - "\\`\\(\\w\\|[-.]\\)+, \\(\\w\\|[-.]\\)+\\'" name) - (setq fname (nth 1 (split-string name "[ \t,]+")) - lname (nth 0 (split-string name "[ \t,]+")))) - ((string-match - "\\`\\(\\w\\|[-.]\\)+\\'" name) - (setq fname name - lname "")))) + (let* ((names (delq nil (mapcar (lambda (x) + (if (string-match "\\`\\(\\w\\|[-.]\\)+\\'" x) x nil)) + (split-string name "[ \t]+")))) + (count (length names))) + (cond ((= count 1) (setq fname (car names) + lname "")) + ((or (= count 2) (= count 3)) (setq fname (car names) + lname (mapconcat 'identity (cdr names) " "))) + ((> count 3) (setq fname (mapconcat 'identity (butlast names (- count 2)) " ") + lname (mapconcat 'identity (nthcdr 2 names) " "))) ) + (when (string-match "\\(.*\\),\\'" fname) + (let ((newlname (match-string 1 fname))) + (setq fname lname lname newlname))))) ;; The following letters are not used in `format-time-string': (push ?E lst) (push "" lst) (push ?F lst) (push fname lst) ------------------------------------------------------------ revno: 112640 author: Adam Sjøgren committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2013-05-19 22:49:17 +0000 message: lisp/gnus/shr.el (shr-tag-span): New function diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-05-18 00:30:49 +0000 +++ lisp/gnus/ChangeLog 2013-05-19 22:49:17 +0000 @@ -1,3 +1,7 @@ +2013-05-19 Adam Sjøgren + + * shr.el (shr-tag-span): New function. + 2013-05-18 Glenn Morris * message.el (message-mode): Use message-mode-abbrev-table, === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2013-05-09 01:40:20 +0000 +++ lisp/gnus/shr.el 2013-05-19 22:49:17 +0000 @@ -1088,6 +1088,14 @@ (shr-indent)) (shr-generic cont)) +(defun shr-tag-span (cont) + (let ((title (cdr (assq :title cont)))) + (shr-generic cont) + (when title + (when shr-start + (let ((overlay (shr-make-overlay shr-start (point)))) + (overlay-put overlay 'help-echo title)))))) + (defun shr-tag-h1 (cont) (shr-heading cont 'bold 'underline)) ------------------------------------------------------------ revno: 112639 author: Adam Sjøgren committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2013-05-19 22:47:25 +0000 message: doc/misc/gnus.texi (Fancy Mail Splitting): Fix missing backslash on \\& diff: === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2013-02-22 17:13:05 +0000 +++ doc/misc/gnus.texi 2013-05-19 22:47:25 +0000 @@ -15400,7 +15400,7 @@ In this example, messages sent to @samp{debian-foo@@lists.debian.org} will be filed in @samp{mail.debian.foo}. -If the string contains the element @samp{\&}, then the previously +If the string contains the element @samp{\\&}, then the previously matched string will be substituted. Similarly, the elements @samp{\\1} up to @samp{\\9} will be substituted with the text matched by the groupings 1 through 9. ------------------------------------------------------------ revno: 112638 committer: Dmitry Gutov branch nick: trunk timestamp: Sun 2013-05-19 10:52:22 +0400 message: * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Leave point at bol following the heredoc openers. (ruby-syntax-propertize-expansions): Remove. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-05-19 06:01:23 +0000 +++ lisp/ChangeLog 2013-05-19 06:52:22 +0000 @@ -16,11 +16,12 @@ call to `ruby-syntax-propertize-function'. (ruby-syntax-propertize-expansion): Extracted from `ruby-syntax-propertize-expansions'. Handles one expansion. - (ruby-syntax-propertize-heredoc): Explicitly call - `ruby-syntax-propertize-expansions'. (ruby-syntax-propertize-percent-literal): Leave point right after the percent symbol, so that the expression expansion rule can propertize the contents. + (ruby-syntax-propertize-heredoc): Leave point at bol following the + heredoc openers. + (ruby-syntax-propertize-expansions): Remove. 2013-05-18 Juri Linkov === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-05-19 06:01:23 +0000 +++ lisp/progmodes/ruby-mode.el 2013-05-19 06:52:22 +0000 @@ -1435,7 +1435,7 @@ (line-end-position) t) (unless (ruby-singleton-class-p (match-beginning 0)) (push (concat (ruby-here-doc-end-match) "\n") res)))) - (let ((start (point))) + (save-excursion ;; With multiple openers on the same line, we don't know in which ;; part `start' is, so we have to go back to the beginning. (when (cdr res) @@ -1445,11 +1445,9 @@ (if (null res) (put-text-property (1- (point)) (point) 'syntax-table (string-to-syntax "\"")))) - ;; Make extra sure we don't move back, lest we could fall into an - ;; inf-loop. - (if (< (point) start) - (goto-char start) - (ruby-syntax-propertize-expansions start (point))))))) + ;; End up at bol following the heredoc openers. + ;; Propertize expression expansions from this point forward. + )))) (defun ruby-syntax-enclosing-percent-literal (limit) (let ((state (syntax-ppss))