Now on revision 109094.
------------------------------------------------------------
revno: 109094
committer: Leo Liu <sdl.web@gmail.com>
branch nick: trunk
timestamp: Sun 2012-07-15 08:52:16 +0800
message:
  Add news for exclamation-mark and flymake
diff:
=== modified file 'doc/lispref/ChangeLog'
--- doc/lispref/ChangeLog	2012-07-14 02:08:32 +0000
+++ doc/lispref/ChangeLog	2012-07-15 00:52:16 +0000
@@ -1,3 +1,7 @@
+2012-07-15  Leo Liu  <sdl.web@gmail.com>
+
+	* display.texi (Fringe Bitmaps): Add exclamation-mark.
+
 2012-07-13  Chong Yidong  <cyd@gnu.org>
 
 	* buffers.texi (Read Only Buffers): Document toggle-read-only

=== modified file 'doc/lispref/display.texi'
--- doc/lispref/display.texi	2012-06-17 05:13:40 +0000
+++ doc/lispref/display.texi	2012-07-15 00:52:16 +0000
@@ -3550,7 +3550,7 @@
 @itemx @code{vertical-bar}, @code{horizontal-bar}
 Used for different types of fringe cursors.
 
-@item @code{empty-line}, @code{question-mark}
+@item @code{empty-line}, @code{question-mark}, @code{exclamation-mark}
 Unused.
 @end table
 

=== modified file 'etc/ChangeLog'
--- etc/ChangeLog	2012-07-14 02:08:32 +0000
+++ etc/ChangeLog	2012-07-15 00:52:16 +0000
@@ -1,3 +1,7 @@
+2012-07-15  Leo Liu  <sdl.web@gmail.com>
+
+	* NEWS: Mention exclamation-mark and flymake.
+
 2012-07-08  Juanma Barranquero  <lekktu@gmail.com>
 
 	* tutorials/TUTORIAL.es: Sync with changes in revno:108936.

=== modified file 'etc/NEWS'
--- etc/NEWS	2012-07-14 02:19:07 +0000
+++ etc/NEWS	2012-07-15 00:52:16 +0000
@@ -113,6 +113,8 @@
 ** Face underlining can now use a wave.
 See the "Face Attributes" section of the Elisp manual.
 
+** New fringe bitmap exclamation-mark.
+
 ** String values for `initial-buffer-choice' also apply to emacsclient
 frames, if emacsclient is only told to open a new frame without
 specifying any file to visit or expression to evaluate.
@@ -268,6 +270,10 @@
 the face `diff-changed', or `diff-removed' and `diff-added'
 to highlight changes in context diffs.
 
+** Flymake uses fringe bitmaps to indicate errors and warnings.
+See flymake-fringe-indicator-position, flymake-error-bitmap and
+flymake-warning-bitmap.
+
 ** Ediff now uses the same color scheme as Diff mode
 on high color displays.
 

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2012-07-14 11:44:39 +0000
+++ src/ChangeLog	2012-07-15 00:52:16 +0000
@@ -1,3 +1,7 @@
+2012-07-15  Leo Liu  <sdl.web@gmail.com>
+
+	* fringe.c: Fix typo in comments.
+
 2012-07-14  Leo Liu  <sdl.web@gmail.com>
 
 	* fringe.c: Add a new bitmap exclamation-mark.

=== modified file 'src/fringe.c'
--- src/fringe.c	2012-07-14 11:44:39 +0000
+++ src/fringe.c	2012-07-15 00:52:16 +0000
@@ -107,7 +107,7 @@
 static unsigned short question_mark_bits[] = {
   0x3c, 0x7e, 0x7e, 0x0c, 0x18, 0x18, 0x00, 0x18, 0x18};
 
-/* A exclamation mark.  */
+/* An exclamation mark.  */
 /*
   ...XX...
   ...XX...
------------------------------------------------------------
revno: 109093
fixes bug(s): http://debbugs.gnu.org/10642
committer: Chong Yidong <cyd@gnu.org>
branch nick: trunk
timestamp: Sat 2012-07-14 23:40:12 +0800
message:
  * xt-mouse.el: Implement extended mouse coordinates.
  (xterm-mouse-translate): Move code into xterm-mouse-translate-1.
  (xterm-mouse-translate-extended, xterm-mouse-translate-1)
  (xterm-mouse--read-event-sequence-1000)
  (xterm-mouse--read-event-sequence-1006): New functions.  For old
  mouse protocol, handle M-mouse-X events correctly.
  (xterm-mouse-event): New arg specifying mouse protocol.
  (turn-on-xterm-mouse-tracking-on-terminal)
  (turn-off-xterm-mouse-tracking-on-terminal): Send DEC 1006
  sequence to toggle extended coordinates on newer XTerms.  This
  appears to be harmless on terminals which do not support this.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-07-14 12:02:22 +0000
+++ lisp/ChangeLog	2012-07-14 15:40:12 +0000
@@ -1,3 +1,17 @@
+2012-07-14  Chong Yidong  <cyd@gnu.org>
+
+	* xt-mouse.el: Implement extended mouse coordinates (Bug#10642).
+	(xterm-mouse-translate): Move code into xterm-mouse-translate-1.
+	(xterm-mouse-translate-extended, xterm-mouse-translate-1)
+	(xterm-mouse--read-event-sequence-1000)
+	(xterm-mouse--read-event-sequence-1006): New functions.  For old
+	mouse protocol, handle M-mouse-X events correctly.
+	(xterm-mouse-event): New arg specifying mouse protocol.
+	(turn-on-xterm-mouse-tracking-on-terminal)
+	(turn-off-xterm-mouse-tracking-on-terminal): Send DEC 1006
+	sequence to toggle extended coordinates on newer XTerms.  This
+	appears to be harmless on terminals which do not support this.
+
 2012-07-14  Leo Liu  <sdl.web@gmail.com>
 
 	Add fringe bitmap indicators for flymake.  (Bug#11253)

=== modified file 'lisp/xt-mouse.el'
--- lisp/xt-mouse.el	2012-01-19 07:21:25 +0000
+++ lisp/xt-mouse.el	2012-07-14 15:40:12 +0000
@@ -47,33 +47,49 @@
 ;; Mouse events symbols must have an 'event-kind property with
 ;; the value 'mouse-click.
 (dolist (event-type '(mouse-1 mouse-2 mouse-3
-			      M-down-mouse-1 M-down-mouse-2 M-down-mouse-3))
+		      M-down-mouse-1 M-down-mouse-2 M-down-mouse-3))
   (put event-type 'event-kind 'mouse-click))
 
 (defun xterm-mouse-translate (_event)
   "Read a click and release event from XTerm."
+  (xterm-mouse-translate-1))
+
+(defun xterm-mouse-translate-extended (_event)
+  "Read a click and release event from XTerm.
+Similar to `xterm-mouse-translate', but using the \"1006\"
+extension, which supports coordinates >= 231 (see
+http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
+  (xterm-mouse-translate-1 1006))
+
+(defun xterm-mouse-translate-1 (&optional extension)
   (save-excursion
     (save-window-excursion
       (deactivate-mark)
-      (let* ((xterm-mouse-last)
-	     (down (xterm-mouse-event))
+      (let* ((xterm-mouse-last nil)
+	     (down (xterm-mouse-event extension))
 	     (down-command (nth 0 down))
-	     (down-data (nth 1 down))
-	     (down-where (nth 1 down-data))
+	     (down-data    (nth 1 down))
+	     (down-where   (nth 1 down-data))
 	     (down-binding (key-binding (if (symbolp down-where)
 					    (vector down-where down-command)
 					  (vector down-command))))
 	     (is-click (string-match "^mouse" (symbol-name (car down)))))
 
+	;; Retrieve the expected preface for the up-event.
 	(unless is-click
-	  (unless (and (eq (read-char) ?\e)
-		       (eq (read-char) ?\[)
-		       (eq (read-char) ?M))
+	  (unless (cond ((null extension)
+			 (and (eq (read-char) ?\e)
+			      (eq (read-char) ?\[)
+			      (eq (read-char) ?M)))
+			((eq extension 1006)
+			 (and (eq (read-char) ?\e)
+			      (eq (read-char) ?\[)
+			      (eq (read-char) ?<))))
 	    (error "Unexpected escape sequence from XTerm")))
 
-	(let* ((click (if is-click down (xterm-mouse-event)))
-	       ;; (click-command (nth 0 click))
-	       (click-data (nth 1 click))
+	;; Process the up-event.
+	(let* ((click (if is-click down (xterm-mouse-event extension)))
+	       (click-data  (nth 1 click))
 	       (click-where (nth 1 click-data)))
 	  (if (memq down-binding '(nil ignore))
 	      (if (and (symbolp click-where)
@@ -81,17 +97,18 @@
 		  (vector (list click-where click-data) click)
 		(vector click))
 	    (setq unread-command-events
-		  (if (eq down-where click-where)
-		      (list click)
-		    (list
-		     ;; Cheat `mouse-drag-region' with move event.
-		     (list 'mouse-movement click-data)
-		     ;; Generate a drag event.
-		     (if (symbolp down-where)
-			 0
-		       (list (intern (format "drag-mouse-%d"
-					     (+ 1 xterm-mouse-last)))
-			     down-data click-data)))))
+		  (append (if (eq down-where click-where)
+			      (list click)
+			    (list
+			     ;; Cheat `mouse-drag-region' with move event.
+			     (list 'mouse-movement click-data)
+			     ;; Generate a drag event.
+			     (if (symbolp down-where)
+				 0
+			       (list (intern (format "drag-mouse-%d"
+						     (1+ xterm-mouse-last)))
+				     down-data click-data))))
+			  unread-command-events))
 	    (if xterm-mouse-debug-buffer
 		(print unread-command-events xterm-mouse-debug-buffer))
 	    (if (and (symbolp down-where)
@@ -118,7 +135,7 @@
 		      (terminal-parameter nil 'xterm-mouse-y))))
   pos)
 
-;; read xterm sequences above ascii 127 (#x7f)
+;; Read XTerm sequences above ASCII 127 (#x7f)
 (defun xterm-mouse-event-read ()
   ;; We get the characters decoded by the keyboard coding system.  Try
   ;; to recover the raw character.
@@ -147,11 +164,82 @@
             (fdiff (- f (* 1.0 maxwrap dbig))))
        (+ (truncate fdiff) (* maxwrap dbig))))))
 
-(defun xterm-mouse-event ()
-  "Convert XTerm mouse event to Emacs mouse event."
-  (let* ((type (- (xterm-mouse-event-read) #o40))
-	 (x (- (xterm-mouse-event-read) #o40 1))
-	 (y (- (xterm-mouse-event-read) #o40 1))
+;; Normal terminal mouse click reporting: expect three bytes, of the
+;; form <BUTTON+32> <X+32> <Y+32>.  Return a list (EVENT-TYPE X Y).
+(defun xterm-mouse--read-event-sequence-1000 ()
+  (list (let ((code (- (xterm-mouse-event-read) 32)))
+	  (intern
+	   ;; For buttons > 3, the release-event looks differently
+	   ;; (see xc/programs/xterm/button.c, function EditorButton),
+	   ;; and come in a release-event only, no down-event.
+	   (cond ((>= code 64)
+		  (format "mouse-%d" (- code 60)))
+		 ((memq code '(8 9 10))
+		  (setq xterm-mouse-last code)
+		  (format "M-down-mouse-%d" (- code 7)))
+		 ((= code 11)
+		  (format "M-mouse-%d" (- xterm-mouse-last 7)))
+		 ((= code 3)
+		  ;; For buttons > 5 xterm only reports a
+		  ;; button-release event.  Avoid error by mapping
+		  ;; them all to mouse-1.
+		  (format "mouse-%d" (+ 1 (or xterm-mouse-last 0))))
+		 (t
+		  (setq xterm-mouse-last code)
+		  (format "down-mouse-%d" (+ 1 code))))))
+	;; x and y coordinates
+	(- (xterm-mouse-event-read) 33)
+	(- (xterm-mouse-event-read) 33)))
+
+;; XTerm's 1006-mode terminal mouse click reporting has the form
+;; <BUTTON> ; <X> ; <Y> <M or m>, where the button and ordinates are
+;; in encoded (decimal) form.  Return a list (EVENT-TYPE X Y).
+(defun xterm-mouse--read-event-sequence-1006 ()
+  (let (button-bytes x-bytes y-bytes c)
+    (while (not (eq (setq c (xterm-mouse-event-read)) ?\;))
+      (push c button-bytes))
+    (while (not (eq (setq c (xterm-mouse-event-read)) ?\;))
+      (push c x-bytes))
+    (while (not (memq (setq c (xterm-mouse-event-read)) '(?m ?M)))
+      (push c y-bytes))
+    (list (let* ((code (string-to-number
+			(apply 'string (nreverse button-bytes))))
+		 (wheel (>= code 64))
+		 (down (and (not wheel)
+			    (eq c ?M))))
+	    (intern (format "%s%smouse-%d"
+			    (cond (wheel "")
+				  ((< code 4)  "")
+				  ((< code 8)  "S-")
+				  ((< code 12) "M-")
+				  ((< code 16) "M-S-")
+				  ((< code 20) "C-")
+				  ((< code 24) "C-S-")
+				  ((< code 28) "C-M-")
+				  ((< code 32) "C-M-S-")
+				  (t
+				   (error "Unexpected escape sequence from XTerm")))
+			    (if down "down-" "")
+			    (if wheel
+				(- code 60)
+			      (1+ (setq xterm-mouse-last (mod code 4)))))))
+	  (1- (string-to-number (apply 'string (nreverse x-bytes))))
+	  (1- (string-to-number (apply 'string (nreverse y-bytes)))))))
+
+(defun xterm-mouse-event (&optional extension)
+  "Convert XTerm mouse event to Emacs mouse event.
+EXTENSION, if non-nil, means to use an extension to the usual
+terminal mouse protocol; we currently support the value 1006,
+which is the \"1006\" extension implemented in Xterm >= 277."
+  (let* ((click (cond ((null extension)
+		       (xterm-mouse--read-event-sequence-1000))
+		      ((eq extension 1006)
+		       (xterm-mouse--read-event-sequence-1006))
+		      (t
+		       (error "Unsupported XTerm mouse protocol"))))
+	 (type (nth 0 click))
+	 (x    (nth 1 click))
+	 (y    (nth 2 click))
 	 ;; Emulate timestamp information.  This is accurate enough
 	 ;; for default value of mouse-1-click-follows-link (450msec).
 	 (timestamp (xterm-mouse-truncate-wrap
@@ -159,36 +247,15 @@
                         (- (float-time)
                            (or xt-mouse-epoch
                                (setq xt-mouse-epoch (float-time)))))))
-         (mouse (intern
-		 ;; For buttons > 3, the release-event looks
-		 ;; differently (see xc/programs/xterm/button.c,
-		 ;; function EditorButton), and there seems to come in
-		 ;; a release-event only, no down-event.
-		 (cond ((>= type 64)
-			(format "mouse-%d" (- type 60)))
-		       ((memq type '(8 9 10))
-			(setq xterm-mouse-last type)
-			(format "M-down-mouse-%d" (- type 7)))
-		       ((= type 11)
-			(format "mouse-%d" (- xterm-mouse-last 7)))
-		       ((= type 3)
-			;; For buttons > 5 xterm only reports a
-			;; button-release event.  Avoid error by mapping
-			;; them all to mouse-1.
-			(format "mouse-%d" (+ 1 (or xterm-mouse-last 0))))
-		       (t
-			(setq xterm-mouse-last type)
-			(format "down-mouse-%d" (+ 1 type))))))
 	 (w (window-at x y))
          (ltrb (window-edges w))
          (left (nth 0 ltrb))
          (top (nth 1 ltrb)))
-
     (set-terminal-parameter nil 'xterm-mouse-x x)
     (set-terminal-parameter nil 'xterm-mouse-y y)
     (setq
      last-input-event
-     (list mouse
+     (list type
 	   (let ((event (if w
 			    (posn-at-x-y (- x left) (- y top) w t)
 			  (append (list nil 'menu-bar)
@@ -248,11 +315,14 @@
 	     ;; FIXME: is there more elegant way to detect the initial terminal?
 	     (not (string= (terminal-name terminal) "initial_terminal")))
     (unless (terminal-parameter terminal 'xterm-mouse-mode)
-      ;; Simulate selecting a terminal by selecting one of its frames ;-(
+      ;; Simulate selecting a terminal by selecting one of its frames
       (with-selected-frame (car (frames-on-display-list terminal))
-        (define-key input-decode-map "\e[M" 'xterm-mouse-translate))
+        (define-key input-decode-map "\e[M" 'xterm-mouse-translate)
+        (define-key input-decode-map "\e[<" 'xterm-mouse-translate-extended))
       (set-terminal-parameter terminal 'xterm-mouse-mode t))
-    (send-string-to-terminal "\e[?1000h" terminal)))
+    (send-string-to-terminal "\e[?1000h" terminal)
+    ;; Request extended mouse support, if available (xterm >= 277).
+    (send-string-to-terminal "\e[?1006h" terminal)))
 
 (defun turn-off-xterm-mouse-tracking-on-terminal (terminal)
   "Disable xterm mouse tracking on TERMINAL."
@@ -268,7 +338,8 @@
     ;; command too many times (or to catch an unintended key sequence), than
     ;; to send it too few times (or to fail to let xterm-mouse events
     ;; pass by untranslated).
-    (send-string-to-terminal "\e[?1000l" terminal)))
+    (send-string-to-terminal "\e[?1000l" terminal)
+    (send-string-to-terminal "\e[?1006l" terminal)))
 
 (provide 'xt-mouse)
------------------------------------------------------------
revno: 109092
fixes bug(s): http://debbugs.gnu.org/11253
committer: Leo Liu <sdl.web@gmail.com>
branch nick: trunk
timestamp: Sat 2012-07-14 20:02:22 +0800
message:
  Add fringe bitmap indicators for flymake
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-07-14 11:44:39 +0000
+++ lisp/ChangeLog	2012-07-14 12:02:22 +0000
@@ -1,5 +1,11 @@
 2012-07-14  Leo Liu  <sdl.web@gmail.com>
 
+	Add fringe bitmap indicators for flymake.  (Bug#11253)
+	* progmodes/flymake.el (flymake-highlight-line): Use fringe bitmaps.
+	(flymake-make-overlay): New arg BITMAP.
+	(flymake-error-bitmap, flymake-warning-bitmap)
+	(flymake-fringe-indicator-position): New user variables.
+
 	* fringe.el: New bitmap exclamation-mark.
 
 2012-07-14  Jan Djärv  <jan.h.d@swipnet.se>

=== modified file 'lisp/progmodes/flymake.el'
--- lisp/progmodes/flymake.el	2012-07-11 23:13:41 +0000
+++ lisp/progmodes/flymake.el	2012-07-14 12:02:22 +0000
@@ -763,15 +763,46 @@
   "Determine whether overlay OV was created by flymake."
   (and (overlayp ov) (overlay-get ov 'flymake-overlay)))
 
-(defun flymake-make-overlay (beg end tooltip-text face mouse-face)
+(defcustom flymake-error-bitmap '(exclamation-mark error)
+  "Bitmap used in the fringe for indicating errors.
+The value may also be a list of two elements where the second
+element specifies the face for the bitmap."
+  :group 'flymake
+  :type 'symbol)
+
+(defcustom flymake-warning-bitmap 'question-mark
+  "Bitmap used in the fringe for indicating warnings.
+The value may also be a list of two elements where the second
+element specifies the face for the bitmap."
+  :group 'flymake
+  :type 'symbol)
+
+(defcustom flymake-fringe-indicator-position 'left-fringe
+  "The position to put flymake fringe indicator.
+The value can be nil, left-fringe or right-fringe.
+Fringe indicators are disabled if nil."
+  :group 'flymake
+  :type '(choice (const left-fringe)
+		 (const right-fringe)
+		 (const :tag "No fringe indicators" nil)))
+
+(defun flymake-make-overlay (beg end tooltip-text face bitmap mouse-face)
   "Allocate a flymake overlay in range BEG and END."
   (when (not (flymake-region-has-flymake-overlays beg end))
-    (let ((ov (make-overlay beg end nil t t)))
+    (let ((ov (make-overlay beg end nil t t))
+	  (fringe (and flymake-fringe-indicator-position
+		       (propertize "!" 'display
+				   (cons flymake-fringe-indicator-position
+					 (if (listp bitmap)
+					     bitmap
+					   (list bitmap)))))))
       (overlay-put ov 'face           face)
       (overlay-put ov 'mouse-face     mouse-face)
       (overlay-put ov 'help-echo      tooltip-text)
       (overlay-put ov 'flymake-overlay  t)
       (overlay-put ov 'priority 100)
+      (overlay-put ov 'evaporate t)
+      (overlay-put ov 'before-string fringe)
       ;;+(flymake-log 3 "created overlay %s" ov)
       ov)
     (flymake-log 3 "created an overlay at (%d-%d)" beg end)))
@@ -815,7 +846,8 @@
 	 (beg      line-beg)
 	 (end      line-end)
 	 (tooltip-text (flymake-ler-text (nth 0 line-err-info-list)))
-	 (face     nil))
+	 (face     nil)
+	 (bitmap   nil))
 
     (goto-char line-beg)
     (while (looking-at "[ \t]")
@@ -839,10 +871,12 @@
       (setq end (point)))
 
     (if (> (flymake-get-line-err-count line-err-info-list "e") 0)
-	(setq face 'flymake-errline)
-      (setq face 'flymake-warnline))
+	(setq face 'flymake-errline
+	      bitmap flymake-error-bitmap)
+      (setq face 'flymake-warnline
+	    bitmap flymake-warning-bitmap))
 
-    (flymake-make-overlay beg end tooltip-text face nil)))
+    (flymake-make-overlay beg end tooltip-text face bitmap nil)))
 
 (defun flymake-parse-err-lines (err-info-list lines)
   "Parse err LINES, store info in ERR-INFO-LIST."
------------------------------------------------------------
revno: 109091
committer: Leo Liu <sdl.web@gmail.com>
branch nick: trunk
timestamp: Sat 2012-07-14 19:44:39 +0800
message:
  Add a new bitmap exclamation-mark
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-07-14 09:08:36 +0000
+++ lisp/ChangeLog	2012-07-14 11:44:39 +0000
@@ -1,3 +1,7 @@
+2012-07-14  Leo Liu  <sdl.web@gmail.com>
+
+	* fringe.el: New bitmap exclamation-mark.
+
 2012-07-14  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* progmodes/cc-cmds.el (c-defun-name): Recognize Objective-C methods

=== modified file 'lisp/fringe.el'
--- lisp/fringe.el	2012-06-29 11:48:08 +0000
+++ lisp/fringe.el	2012-07-14 11:44:39 +0000
@@ -43,7 +43,7 @@
 ;; Define the built-in fringe bitmaps and setup default mappings
 
 (when (boundp 'fringe-bitmaps)
-  (let ((bitmaps '(question-mark
+  (let ((bitmaps '(question-mark exclamation-mark
 		   left-arrow right-arrow up-arrow down-arrow
 		   left-curly-arrow right-curly-arrow
 		   left-triangle right-triangle

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2012-07-14 10:03:30 +0000
+++ src/ChangeLog	2012-07-14 11:44:39 +0000
@@ -1,3 +1,7 @@
+2012-07-14  Leo Liu  <sdl.web@gmail.com>
+
+	* fringe.c: Add a new bitmap exclamation-mark.
+
 2012-07-14  Eli Zaretskii  <eliz@gnu.org>
 
 	* gmalloc.c (GMALLOC_INHIBIT_VALLOC): Don't reference.

=== modified file 'src/fringe.c'
--- src/fringe.c	2012-07-05 18:35:48 +0000
+++ src/fringe.c	2012-07-14 11:44:39 +0000
@@ -107,6 +107,22 @@
 static unsigned short question_mark_bits[] = {
   0x3c, 0x7e, 0x7e, 0x0c, 0x18, 0x18, 0x00, 0x18, 0x18};
 
+/* A exclamation mark.  */
+/*
+  ...XX...
+  ...XX...
+  ...XX...
+  ...XX...
+  ...XX...
+  ...XX...
+  ...XX...
+  ........
+  ...XX...
+  ...XX...
+*/
+static unsigned short exclamation_mark_bits[] = {
+  0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18};
+
 /* An arrow like this: `<-'.  */
 /*
   ...xx...
@@ -432,6 +448,7 @@
 {
   { NULL, 0, 0, 0, 0, 0 }, /* NO_FRINGE_BITMAP */
   { FRBITS (question_mark_bits),      8, 0, ALIGN_BITMAP_CENTER, 0 },
+  { FRBITS (exclamation_mark_bits),   8, 0, ALIGN_BITMAP_CENTER, 0 },
   { FRBITS (left_arrow_bits),         8, 0, ALIGN_BITMAP_CENTER, 0 },
   { FRBITS (right_arrow_bits),        8, 0, ALIGN_BITMAP_CENTER, 0 },
   { FRBITS (up_arrow_bits),           8, 0, ALIGN_BITMAP_TOP,    0 },
------------------------------------------------------------
revno: 109090
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2012-07-14 14:32:01 +0300
message:
  Improve commentary in src/systime.h.
diff:
=== modified file 'src/systime.h'
--- src/systime.h	2012-07-10 23:24:36 +0000
+++ src/systime.h	2012-07-14 11:32:01 +0000
@@ -41,8 +41,9 @@
 
 #include <sys/time.h>	/* for 'struct timeval' */
 
-/* The type to use to represent temporal intervals.  Its address can be passed
-   as the timeout argument to the pselect system call.  */
+/* The type to use to represent non-negative temporal intervals.  Its
+   address can be passed as the timeout argument to the pselect system
+   call.  */
 typedef struct timespec EMACS_TIME;
 
 /* Resolution of EMACS_TIME time stamps (in units per second), and log
@@ -84,7 +85,13 @@
 
 /* Return the result of adding A to B, or of subtracting B from A.
    On overflow, store an extremal value: ergo, if time_t is unsigned,
-   return 0 if the true answer would be negative.  */
+   return 0 if the true answer would be negative.
+
+   WARNING: These are NOT general-purpose macros for adding or
+   subtracting arbitrary time values!  They are generally intended to
+   be used with their first argument an absolute time since the epoch
+   and the second argument a non-negative offset.  Do NOT use them for
+   anything else.  */
 static inline EMACS_TIME
 add_emacs_time (EMACS_TIME a, EMACS_TIME b)
 {
@@ -96,7 +103,9 @@
   return timespec_sub (a, b);
 }
 
-/* Return the sign of the valid time stamp TIME, either -1, 0, or 1.  */
+/* Return the sign of the valid time stamp TIME, either -1, 0, or 1.
+   Note: this can only return a negative value if time_t is a signed
+   data type.  */
 static inline int
 EMACS_TIME_SIGN (EMACS_TIME t)
 {
@@ -111,8 +120,9 @@
 }
 
 /* Convert the double D to the greatest EMACS_TIME not greater than D.
-   On overflow, return an extremal value.  Return the minimum
-   EMACS_TIME if D is not a number.  */
+   On overflow, return an extremal value; in particular, if time_t is
+   an unsigned data type and D is negative, return zero.  Return the
+   minimum EMACS_TIME if D is not a number.  */
 static inline EMACS_TIME
 EMACS_TIME_FROM_DOUBLE (double d)
 {
------------------------------------------------------------
revno: 109089 [merge]
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2012-07-14 13:08:14 +0300
message:
  Adapt the MS-DOS build to the latest configury changes.
  
   msdos/sed1v2.inp: In the recipe for $(leimdir)/leim-list.el, edit the
   prerequisites to be "temacs$(EXEEXT) $(BOOTSTRAPEMACS)", to avoid
   the need to rebuild $(bootstrap_exe), which requires a Unixy shell
   via lisp/Makefile.in's "update-subdirs" command.
   msdos/sedlibmk.inp (am_libgnu_a_OBJECTS): Adjust the removal of
   careadlinkat.$(OBJEXT) to the changes in lib/Makefile.in.
   msdos/sed2v2.inp (DATA_START, GC_SETJMP_WORKS, HAVE_MENUS)
   (HAVE_MOUSE): Edit for DJGPP, according to what was previously
   done on src/s/msdos.h.
   msdos/gmalloc.c (GMALLOC_INHIBIT_VALLOC): Don't reference.
   src/s/msdos.h (BSD_SYSTEM, DATA_START, GC_SETJMP_WORKS, HAVE_MOUSE)
   (HAVE_MENUS): Don't define, defined by editing config.in with
   msdos/sed2v2.inp.
   (GMALLOC_INHIBIT_VALLOC): Don't define.
   (MODE_LINE_BINARY_TEXT): Remove, not used anymore.
diff:
=== modified file 'msdos/ChangeLog'
--- msdos/ChangeLog	2012-07-14 02:08:32 +0000
+++ msdos/ChangeLog	2012-07-14 10:03:30 +0000
@@ -1,3 +1,17 @@
+2012-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* sed1v2.inp: In the recipe for $(leimdir)/leim-list.el, edit the
+	prerequisites to be "temacs$(EXEEXT) $(BOOTSTRAPEMACS)", to avoid
+	the need to rebuild $(bootstrap_exe), which requires a Unixy shell
+	via lisp/Makefile.in's "update-subdirs" command.
+
+	* sedlibmk.inp (am_libgnu_a_OBJECTS): Adjust the removal of
+	careadlinkat.$(OBJEXT) to the changes in lib/Makefile.in.
+
+	* sed2v2.inp (DATA_START, GC_SETJMP_WORKS, HAVE_MENUS)
+	(HAVE_MOUSE): Edit for DJGPP, according to what was previously
+	done on src/s/msdos.h.
+
 2012-06-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not

=== modified file 'msdos/sed1v2.inp'
--- msdos/sed1v2.inp	2012-06-30 15:32:51 +0000
+++ msdos/sed1v2.inp	2012-07-14 10:03:30 +0000
@@ -136,11 +136,13 @@
 /^.\$(libsrc)\/make-doc/s!>.*$!!
 /^	[ 	]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src!
 /^[ 	]*$/d
+/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/temacs$(EXEEXT) $(BOOTSTRAPEMACS)/
 /^	if test -f/,/^	fi$/c\
 	command.com /c if exist .gdbinit rm -f _gdbinit
 /^	 *test "X\$(PAXCTL)" = X/d
 /^	 *test "\$(CANNOT_DUMP)" = "yes"/d
 /^	if test "\$(CANNOT_DUMP)" =/,/^	else /d
+/^	-\{0,1\} *ln -/s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/
 /^	fi/d
 /^	 *LC_ALL=C \$(RUN_TEMACS)/i\
 	stubedit temacs.exe minstack=1024k

=== modified file 'msdos/sed2v2.inp'
--- msdos/sed2v2.inp	2012-06-30 15:32:51 +0000
+++ msdos/sed2v2.inp	2012-07-14 10:03:30 +0000
@@ -54,6 +54,10 @@
 /^#undef HAVE_STRUCT_TM_TM_ZONE *$/s/^.*$/#define HAVE_STRUCT_TM_TM_ZONE 1/
 /^#undef HAVE_SYNC *$/s/^.*$/#define HAVE_SYNC 1/
 /^#undef HAVE___BUILTIN_UNWIND_INIT *$/s/^.*$/#define HAVE___BUILTIN_UNWIND_INIT 1/
+/^#undef HAVE_MENUS *$/s/^.*$/#define HAVE_MENUS 1/
+/^#undef HAVE_MOUSE *$/s/^.*$/#define HAVE_MOUSE 1/
+/^#undef DATA_START/s/^.*$/#define DATA_START (\&etext + 1)/
+/^#undef GC_SETJMP_WORKS/s/^.*$/#define GC_SETJMP_WORKS 1/
 /^#undef ORDINARY_LINK/s/^.*$/#define ORDINARY_LINK 1/
 /^#undef PACKAGE_BUGREPORT/s/^.*$/#define PACKAGE_BUGREPORT ""/
 /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/

=== modified file 'msdos/sedlibmk.inp'
--- msdos/sedlibmk.inp	2012-06-30 15:32:51 +0000
+++ msdos/sedlibmk.inp	2012-07-14 10:03:30 +0000
@@ -605,7 +605,9 @@
   s| *sys/select\.h||
   s| *sys/time\.h||
 }
-/^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)//
+/^am_libgnu_a_OBJECTS *=/,/^[ 	]/{
+  s/careadlinkat\.\$(OBJEXT) //
+}
 /^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)//
 /^srcdir *=/s/@[^@\n]*@/./
 /^top_srcdir *=/s/@[^@\n]*@/../

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2012-07-14 02:26:31 +0000
+++ src/ChangeLog	2012-07-14 10:03:30 +0000
@@ -1,3 +1,13 @@
+2012-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* gmalloc.c (GMALLOC_INHIBIT_VALLOC): Don't reference.
+
+	* s/msdos.h (BSD_SYSTEM, DATA_START, GC_SETJMP_WORKS, HAVE_MOUSE)
+	(HAVE_MENUS): Don't define, defined by editing config.in with
+	msdos/sed2v2.inp.
+	(GMALLOC_INHIBIT_VALLOC): Don't define.
+	(MODE_LINE_BINARY_TEXT): Remove, not used anymore.
+
 2012-07-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* s/ms-w32.h (GC_SETJMP_WORKS, GC_MARK_STACK): Set in nt/config.nt.

=== modified file 'src/gmalloc.c'
--- src/gmalloc.c	2012-07-05 18:35:48 +0000
+++ src/gmalloc.c	2012-07-14 10:03:30 +0000
@@ -1687,11 +1687,6 @@
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
 
-/* Emacs defines GMALLOC_INHIBIT_VALLOC to avoid this definition
-   on MSDOS, where it conflicts with a system header file.  */
-
-#ifndef	GMALLOC_INHIBIT_VALLOC
-
 /* Allocate SIZE bytes on a page boundary.  */
 extern void *valloc (size_t);
 
@@ -1712,8 +1707,6 @@
   return memalign (pagesize, size);
 }
 
-#endif	/* Not ELIDE_VALLOC.  */
-
 #ifdef GC_MCHECK
 
 /* Standard debugging hooks for `malloc'.

=== modified file 'src/s/msdos.h'
--- src/s/msdos.h	2012-06-11 23:17:11 +0000
+++ src/s/msdos.h	2012-07-14 10:03:30 +0000
@@ -31,7 +31,6 @@
 #endif
 
 #define DOS_NT	/* MSDOS or WINDOWSNT */
-#undef BSD_SYSTEM
 
 /* subprocesses should be defined if you want to have code for
    asynchronous subprocesses (as used in M-x compile and M-x shell).
@@ -44,10 +43,6 @@
    different things on your system and must be used only through an
    encapsulation (which you should place, by convention, in sysdep.c).  */
 
-/* Avoid incompatibilities between gmalloc.c and system header files
-   in how to declare valloc.  */
-#define GMALLOC_INHIBIT_VALLOC
-
 /* This overrides the default value on editfns.c, since DJGPP
    does not have pw->pw_gecos.  */
 #define USER_FULL_NAME (getenv ("NAME"))
@@ -57,15 +52,16 @@
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-#define DATA_START  (&etext + 1)
-
 #define _NAIVE_DOS_REGS
 
-/* command.com does not understand `...` so we define this.  */
+/* Used by emacs.c:decode_env_path.  */
 #define SEPCHAR ';'
 
+/* Used by callproc.c (and process.c, but in the part not compiled on
+   MSDOS).  The default is defined on process.h.  */
 #define NULL_DEVICE "nul"
 
+/* Used by floatfns.c.  */
 #define HAVE_INVERSE_HYPERBOLIC
 #define FLOAT_CHECK_DOMAIN
 
@@ -94,23 +90,14 @@
    likes that.  */
 #define FILE_SYSTEM_CASE Fmsdos_downcase_filename
 
-/* Define this to be the separator between devices and paths.  */
+/* Define this to be the separator between devices and paths.  Used by
+   lisp.h to define IS_DEVICE_SEP.  */
 #define DEVICE_SEP ':'
 
-/* We'll support either convention on MSDOG.  */
+/* We'll support either convention of slashes on MSDOS.  */
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\')
 #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))
 
-
-/* Mode line description of a buffer's type.  */
-#define MODE_LINE_BINARY_TEXT(buf) (NILP(B_(buf,buffer_file_type)) ? "T" : "B")
-
-/* We have (the code to control) a mouse.  */
-#define HAVE_MOUSE
-
-/* We can use mouse menus.  */
-#define HAVE_MENUS
-
 /* Define one of these for easier conditionals.  */
 #ifdef HAVE_X_WINDOWS
 /* We need a little extra space, see ../../lisp/loadup.el and the
@@ -129,7 +116,3 @@
    enlarging Emacs footprint by another 100+ KBytes.  */
 #define SYSTEM_PURESIZE_EXTRA (-170000+65000)
 #endif
-
-/* Tell the garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the jmp_buf.  */
-#define GC_SETJMP_WORKS 1
------------------------------------------------------------
revno: 109088
committer: Jan D. <jan.h.d@swipnet.se>
branch nick: trunk
timestamp: Sat 2012-07-14 11:08:36 +0200
message:
  *** empty log message ***
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-07-14 05:32:23 +0000
+++ lisp/ChangeLog	2012-07-14 09:08:36 +0000
@@ -1,3 +1,8 @@
+2012-07-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* progmodes/cc-cmds.el (c-defun-name): Recognize Objective-C methods
+	also (Bug#7879).
+
 2012-07-14  Chong Yidong  <cyd@gnu.org>
 
 	* electric.el (electric-pair-post-self-insert-function): Fix pair

=== modified file 'lisp/progmodes/cc-cmds.el'
--- lisp/progmodes/cc-cmds.el	2012-06-02 10:56:09 +0000
+++ lisp/progmodes/cc-cmds.el	2012-07-14 09:08:36 +0000
@@ -1826,6 +1826,15 @@
 	    ;; DEFFLAGSET(syslog_opt_flags,LOG_PID ...) ==> syslog_opt_flags
 	    (match-string-no-properties 1))
 
+	   ;; Objective-C method starting with + or -.
+	   ((and (derived-mode-p 'objc-mode)
+		 (looking-at "[-+]\s*("))
+	    (when (c-syntactic-re-search-forward ")\s*" nil t)
+	      (c-forward-token-2)
+	      (setq name-end (point))
+	      (c-backward-token-2)
+	      (buffer-substring-no-properties (point) name-end)))
+
 	   (t
 	    ;; Normal function or initializer.
 	    (when (c-syntactic-re-search-forward "[{(]" nil t)
------------------------------------------------------------
revno: 109087
fixes bug(s): http://debbugs.gnu.org/11520
committer: Chong Yidong <cyd@gnu.org>
branch nick: trunk
timestamp: Sat 2012-07-14 13:32:23 +0800
message:
  Fix electric-pair-mode/delete-selection-mode interaction.
  
  * lisp/electric.el (electric-pair-post-self-insert-function): Fix pair
  insertion in empty-region case.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-07-14 02:19:07 +0000
+++ lisp/ChangeLog	2012-07-14 05:32:23 +0000
@@ -1,5 +1,10 @@
 2012-07-14  Chong Yidong  <cyd@gnu.org>
 
+	* electric.el (electric-pair-post-self-insert-function): Fix pair
+	insertion in empty-region case (Bug#11520).
+
+2012-07-14  Chong Yidong  <cyd@gnu.org>
+
 	* bindings.el: Consolidate ctl-x-r-map bindings.  Bind
 	copy-rectangle-as-kill to C-x r w.
 

=== modified file 'lisp/electric.el'
--- lisp/electric.el	2012-07-10 11:51:54 +0000
+++ lisp/electric.el	2012-07-14 05:32:23 +0000
@@ -322,12 +322,13 @@
      ((and (memq syntax '(?\( ?\" ?\$)) (use-region-p))
       (if (> (mark) (point))
           (goto-char (mark))
-        ;; We already inserted the open-paren but at the end of the region,
-        ;; so we have to remove it and start over.
-        (delete-char -1)
-        (save-excursion
+	;; We already inserted the open-paren but at the end of the
+	;; region, so we have to remove it and start over.
+	(delete-char -1)
+	(save-excursion
           (goto-char (mark))
-          (insert last-command-event)))
+	  ;; Do not insert after `save-excursion' marker (Bug#11520).
+          (insert-before-markers last-command-event)))
       (insert closer))
      ;; Backslash-escaped: no pairing, no skipping.
      ((save-excursion
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.