Mercurial > emacs

changeset 107669:1dc7dbba5184

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 24 Mar 2010 21:54:09 +0000
parents e6a6d8c247e4 (current diff) fd2cdc4e0e6a (diff)
children c1ed6f085ec9
files
diffstat 5 files changed, 34 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Mar 24 06:29:13 2010 +0000
+++ b/lisp/ChangeLog	Wed Mar 24 21:54:09 2010 +0000
@@ -1,3 +1,15 @@
+2010-03-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* simple.el (append-to-buffer): Ensure that point is preserved if
+	BUFFER is the current buffer.  Suggested by YAMAMOTO Mitsuharu.
+	(Bug#5749)
+
+2010-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/make-mode.el (makefile-rule-action-regex): Backtrack less.
+	(makefile-make-font-lock-keywords): Adjust rule since submatch 1 may
+	not be present any more.
+
 2010-03-24  Juanma Barranquero  <lekktu@gmail.com>
 
 	* faces.el (set-face-attribute): Fix typo in docstring.
@@ -7,7 +19,7 @@
 
 2010-03-23  Glenn Morris  <rgm@gnu.org>
 
-	* textmodes/flyspell.el (sgml-lexical-context): Autoload it.  (Bug#5752)
+	* textmodes/flyspell.el (sgml-lexical-context): Autoload it (Bug#5752).
 
 2010-03-21  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -15,16 +27,16 @@
 
 2010-03-22  Alan Mackenzie  <acm@muc.de>
 
-	* progmodes/cc-engine.el (c-remove-stale-state-cache): Fix
-	off-by-one error.  Fixes bug #5747.
+	* progmodes/cc-engine.el (c-remove-stale-state-cache):
+	Fix off-by-one error.  Fixes bug #5747.
 
 2010-03-22  Juanma Barranquero  <lekktu@gmail.com>
 
 	* image-dired.el (image-dired-display-thumbs): Fix typo in docstring.
 	(image-dired-read-comment): Doc fix.
 
-	* json.el (json-object-type, json-array-type, json-key-type, json-false)
-	(json-null, json-read-number):
+	* json.el (json-object-type, json-array-type, json-key-type)
+	(json-false, json-null, json-read-number):
 	* minibuffer.el (completion-in-region-functions):
 	* calendar/cal-tex.el (cal-tex-daily-end, cal-tex-number-weeks)
 	(cal-tex-cursor-week):
@@ -70,8 +82,8 @@
 
 2010-03-13  Michael Albinus  <michael.albinus@gmx.de>
 
-	* net/tramp.el (tramp-find-executable): Use
-	`tramp-get-connection-buffer'.  Make the regexp for checking
+	* net/tramp.el (tramp-find-executable):
+	Use `tramp-get-connection-buffer'.  Make the regexp for checking
 	output of "wc -l" more robust.
 	(tramp-find-shell): Use another shell but /bin/sh on OpenSolaris.
 	(tramp-open-connection-setup-interactive-shell): Remove workaround
--- a/lisp/progmodes/make-mode.el	Wed Mar 24 06:29:13 2010 +0000
+++ b/lisp/progmodes/make-mode.el	Wed Mar 24 21:54:09 2010 +0000
@@ -272,7 +272,7 @@
   "Characters to skip to find a line that might be a dependency.")
 
 (defvar makefile-rule-action-regex
-  "^\t[ \t]*\\([-@]*\\)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)"
+  "^\t[ \t]*\\(?:\\([-@]+\\)[ \t]*\\)\\(.*\\(?:\\\\\n.*\\)*\\)"
   "Regex used to highlight rule action lines in font lock mode.")
 
 (defconst makefile-makepp-rule-action-regex
@@ -355,8 +355,9 @@
      (3 'font-lock-string-face prepend t))
 
     ;; Rule actions.
+    ;; FIXME: When this spans multiple lines we need font-lock-multiline.
     (makefile-match-action
-     (1 font-lock-type-face)
+     (1 font-lock-type-face nil t)
      (2 'makefile-shell prepend)
      ;; Only makepp has builtin commands.
      (3 font-lock-builtin-face prepend t))
--- a/lisp/simple.el	Wed Mar 24 06:29:13 2010 +0000
+++ b/lisp/simple.el	Wed Mar 24 21:54:09 2010 +0000
@@ -3473,12 +3473,13 @@
            (windows (get-buffer-window-list append-to t t))
            point)
       (with-current-buffer append-to
-	(setq point (point))
-	(barf-if-buffer-read-only)
-	(insert-buffer-substring oldbuf start end)
-	(dolist (window windows)
-	  (when (= (window-point window) point)
-	    (set-window-point window (point))))))))
+	(save-excursion
+	  (setq point (point))
+	  (barf-if-buffer-read-only)
+	  (insert-buffer-substring oldbuf start end)
+	  (dolist (window windows)
+	    (when (= (window-point window) point)
+	      (set-window-point window (point)))))))))
 
 (defun prepend-to-buffer (buffer start end)
   "Prepend to specified buffer the text of the region.
--- a/src/ChangeLog	Wed Mar 24 06:29:13 2010 +0000
+++ b/src/ChangeLog	Wed Mar 24 21:54:09 2010 +0000
@@ -1,3 +1,7 @@
+2010-03-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730).
+
 2010-03-20  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736).
--- a/src/xdisp.c	Wed Mar 24 06:29:13 2010 +0000
+++ b/src/xdisp.c	Wed Mar 24 21:54:09 2010 +0000
@@ -1375,33 +1375,7 @@
 	visible_p = 1;
       if (visible_p)
 	{
-	  if (it_method == GET_FROM_BUFFER)
-	    {
-	      Lisp_Object window, prop;
-
-	      XSETWINDOW (window, w);
-	      prop = Fget_char_property (make_number (charpos),
-					 Qinvisible, window);
-
-	      /* If charpos coincides with invisible text covered with an
-		 ellipsis, use the first glyph of the ellipsis to compute
-		 the pixel positions.  */
-	      if (TEXT_PROP_MEANS_INVISIBLE (prop) == 2)
-		{
-		  struct glyph_row *row = it.glyph_row;
-		  struct glyph *glyph = row->glyphs[TEXT_AREA];
-		  struct glyph *end = glyph + row->used[TEXT_AREA];
-		  int x = row->x;
-
-		  for (; glyph < end
-			 && (!BUFFERP (glyph->object)
-			     || glyph->charpos < charpos);
-		       glyph++)
-		    x += glyph->pixel_width;
-		  top_x = x;
-		}
-	    }
-	  else if (it_method == GET_FROM_DISPLAY_VECTOR)
+	  if (it_method == GET_FROM_DISPLAY_VECTOR)
 	    {
 	      /* We stopped on the last glyph of a display vector.
 		 Try and recompute.  Hack alert!  */