[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104201: Merge from emacs-23; up to r
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104201: Merge from emacs-23; up to r100577. |
|
Date: |
Thu, 12 May 2011 00:07:06 -0700 |
|
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104201 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-12 00:07:06 -0700
message:
Merge from emacs-23; up to r100577.
modified:
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/lispref/files.texi
doc/lispref/modes.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
lisp/ChangeLog
lisp/emacs-lisp/lisp.el
lisp/progmodes/which-func.el
lisp/vc/smerge-mode.el
src/ChangeLog
src/textprop.c
src/w32term.c
src/xterm.c
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2011-05-06 07:13:19 +0000
+++ b/doc/lispref/ChangeLog 2011-05-12 07:07:06 +0000
@@ -1,3 +1,15 @@
+2011-05-12 Stefan Monnier <address@hidden>
+
+ * modes.texi (Region to Refontify): Rename from "Region to Fontify".
+ (Multiline Font Lock):
+ * vol2.texi (Top):
+ * vol1.texi (Top):
+ * elisp.texi (Top): Update menu accordingly.
+
+2011-05-12 Drew Adams <address@hidden>
+
+ * modes.texi (Region to Fontify): Fix typo.
+
2011-05-06 Paul Eggert <address@hidden>
* numbers.texi (Integer Basics): Large integers are treated as floats.
=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi 2011-03-21 16:42:16 +0000
+++ b/doc/lispref/elisp.texi 2011-05-12 07:07:06 +0000
@@ -828,7 +828,7 @@
Multiline Font Lock Constructs
* Font Lock Multiline:: Marking multiline chunks with a text property.
-* Region to Fontify:: Controlling which region gets refontified
+* Region to Refontify:: Controlling which region gets refontified
after a buffer change.
Documentation
=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi 2011-03-03 08:10:52 +0000
+++ b/doc/lispref/files.texi 2011-05-12 07:07:06 +0000
@@ -251,7 +251,7 @@
@code{find-file-literally} sets this variable's local value, but other
equivalent functions and commands can do that as well, e.g.@: to avoid
automatic addition of a newline at the end of the file. This variable
-us permanent local, so it is unaffected by changes of major modes.
+is permanent local, so it is unaffected by changes of major modes.
@end defvar
@node Subroutines of Visiting
=== modified file 'doc/lispref/modes.texi'
--- a/doc/lispref/modes.texi 2011-03-10 05:48:33 +0000
+++ b/doc/lispref/modes.texi 2011-05-12 07:07:06 +0000
@@ -3174,7 +3174,7 @@
@menu
* Font Lock Multiline:: Marking multiline chunks with a text property.
-* Region to Fontify:: Controlling which region gets refontified
+* Region to Refontify:: Controlling which region gets refontified
after a buffer change.
@end menu
@@ -3226,7 +3226,7 @@
Font-Lock looks at it, or use
@code{font-lock-fontify-region-function}.
address@hidden Region to Fontify
address@hidden Region to Refontify
@subsubsection Region to Fontify after a Buffer Change
When a buffer is changed, the region that Font Lock refontifies is
@@ -3235,15 +3235,15 @@
example, when a change alters the syntactic meaning of text on an
earlier line.
- You can enlarge (or even reduce) the region to fontify by setting
-one the following variables:
+ You can enlarge (or even reduce) the region to refontify by setting
+the following variable:
@defvar font-lock-extend-after-change-region-function
This buffer-local variable is either @code{nil} or a function for
Font-Lock to call to determine the region to scan and fontify.
The function is given three parameters, the standard @var{beg},
address@hidden, and @var{old-len} from after-change-functions
address@hidden, and @var{old-len} from @code{after-change-functions}
(@pxref{Change Hooks}). It should return either a cons of the
beginning and end buffer positions (in that order) of the region to
fontify, or @code{nil} (which means choose the region in the standard
=== modified file 'doc/lispref/vol1.texi'
--- a/doc/lispref/vol1.texi 2011-03-21 16:42:16 +0000
+++ b/doc/lispref/vol1.texi 2011-05-12 07:07:06 +0000
@@ -847,7 +847,7 @@
Multiline Font Lock Constructs
* Font Lock Multiline:: Marking multiline chunks with a text property.
-* Region to Fontify:: Controlling which region gets refontified
+* Region to Refontify:: Controlling which region gets refontified
after a buffer change.
Documentation
=== modified file 'doc/lispref/vol2.texi'
--- a/doc/lispref/vol2.texi 2011-03-21 16:42:16 +0000
+++ b/doc/lispref/vol2.texi 2011-05-12 07:07:06 +0000
@@ -846,7 +846,7 @@
Multiline Font Lock Constructs
* Font Lock Multiline:: Marking multiline chunks with a text property.
-* Region to Fontify:: Controlling which region gets refontified
+* Region to Refontify:: Controlling which region gets refontified
after a buffer change.
Documentation
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-12 02:36:05 +0000
+++ b/lisp/ChangeLog 2011-05-12 07:07:06 +0000
@@ -1,3 +1,19 @@
+2011-05-12 Eli Zaretskii <address@hidden>
+
+ * smerge-mode.el (smerge-resolve): Use null-device rather than a
+ literal "/dev/null".
+
+2011-05-12 Stefan Monnier <address@hidden>
+
+ * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):
+ Fix typo.
+
+2011-05-12 Ralph Schleicher <address@hidden>
+
+ * progmodes/which-func.el (which-function):
+ Use add-log-current-defun instead of add-log-current-defun-function,
+ which might not be defined (Bug#8260).
+
2011-05-12 Glenn Morris <address@hidden>
* emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):
=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el 2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lisp/lisp.el 2011-05-12 07:07:06 +0000
@@ -636,8 +636,8 @@
(plist (nthcdr 3 data)))
(if (null data)
(minibuffer-message "Nothing to complete")
- (let ((completion-annotate-function
- (plist-get plist :annotate-function)))
+ (let ((completion-annotate-function
+ (plist-get plist :annotation-function)))
(completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
(plist-get plist :predicate))))))
@@ -685,7 +685,7 @@
(when end
(list beg end obarray
:predicate predicate
- :annotate-function
+ :annotation-function
(unless (eq predicate 'fboundp)
(lambda (str) (if (fboundp (intern-soft str)) " <f>"))))))))
=== modified file 'lisp/progmodes/which-func.el'
--- a/lisp/progmodes/which-func.el 2011-01-25 04:08:28 +0000
+++ b/lisp/progmodes/which-func.el 2011-05-12 07:07:06 +0000
@@ -270,7 +270,7 @@
(defun which-function ()
"Return current function name based on point.
Uses `which-func-functions', `imenu--index-alist'
-or `add-log-current-defun-function'.
+or `add-log-current-defun'.
If no function name is found, return nil."
(let ((name
;; Try the `which-func-functions' functions first.
@@ -320,9 +320,8 @@
(reverse (cons (car pair) namestack))))))))))))
;; Try using add-log support.
- (when (and (null name) (boundp 'add-log-current-defun-function)
- add-log-current-defun-function)
- (setq name (funcall add-log-current-defun-function)))
+ (when (null name)
+ (setq name (add-log-current-defun)))
;; Filter the name if requested.
(when name
(if which-func-cleanup-function
=== modified file 'lisp/vc/smerge-mode.el'
--- a/lisp/vc/smerge-mode.el 2011-03-11 20:04:22 +0000
+++ b/lisp/vc/smerge-mode.el 2011-05-12 07:07:06 +0000
@@ -566,7 +566,7 @@
(with-current-buffer buf
(zerop (call-process-region
(point-min) (point-max) "patch" t nil nil
- "-r" "/dev/null" "--no-backup-if-mismatch"
+ "-r" null-device "--no-backup-if-mismatch"
"-fl" o))))
(save-restriction
(narrow-to-region m0b m0e)
@@ -582,7 +582,7 @@
(with-current-buffer buf
(zerop (call-process-region
(point-min) (point-max) "patch" t nil nil
- "-r" "/dev/null" "--no-backup-if-mismatch"
+ "-r" null-device "--no-backup-if-mismatch"
"-fl" m))))
(save-restriction
(narrow-to-region m0b m0e)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-05-10 10:31:33 +0000
+++ b/src/ChangeLog 2011-05-12 07:07:06 +0000
@@ -1,3 +1,19 @@
+2011-05-12 Drew Adams <address@hidden>
+
+ * textprop.c (Fprevious_single_char_property_change): Doc fix
(bug#8655).
+
+2011-05-12 YAMAMOTO Mitsuharu <address@hidden>
+
+ * w32term.c (w32_draw_fringe_bitmap): Rename local vars `left' and
+ `width' to `bar_area_x' and `bar_area_width', respectively.
+ (x_scroll_run): Take account of fringe background extension.
+
+ * xterm.c (x_draw_fringe_bitmap) [USE_TOOLKIT_SCROLL_BARS]: Rename
+ local vars `left' and `width' to `bar_area_x' and
+ `bar_area_width', respectively.
+ (x_scroll_run) [USE_TOOLKIT_SCROLL_BARS]: Take account of fringe
+ background extension.
+
2011-05-10 Juanma Barranquero <address@hidden>
* image.c (Finit_image_library): Return t for built-in image types,
=== modified file 'src/textprop.c'
--- a/src/textprop.c 2011-04-26 06:17:52 +0000
+++ b/src/textprop.c 2011-05-12 07:07:06 +0000
@@ -838,8 +838,8 @@
The property values are compared with `eq'.
If the property is constant all the way to the start of OBJECT, return the
first valid position in OBJECT.
-If the optional fourth argument LIMIT is non-nil, don't search
-back past position LIMIT; return LIMIT if nothing is found before LIMIT. */)
+If the optional fourth argument LIMIT is non-nil, don't search back past
+position LIMIT; return LIMIT if nothing is found before reaching LIMIT. */)
(Lisp_Object position, Lisp_Object prop, Lisp_Object object, Lisp_Object
limit)
{
if (STRINGP (object))
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2011-03-25 15:39:59 +0000
+++ b/src/w32term.c 2011-05-12 07:07:06 +0000
@@ -715,22 +715,22 @@
if (sb_width > 0)
{
- int left = WINDOW_SCROLL_BAR_AREA_X (w);
- int width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w)
- * FRAME_COLUMN_WIDTH (f));
+ int bar_area_x = WINDOW_SCROLL_BAR_AREA_X (w);
+ int bar_area_width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w)
+ * FRAME_COLUMN_WIDTH (f));
if (bx < 0)
{
/* Bitmap fills the fringe. */
- if (left + width == p->x)
- bx = left + sb_width;
- else if (p->x + p->wd == left)
- bx = left;
+ if (bar_area_x + bar_area_width == p->x)
+ bx = bar_area_x + sb_width;
+ else if (p->x + p->wd == bar_area_x)
+ bx = bar_area_x;
if (bx >= 0)
{
int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w);
- nx = width - sb_width;
+ nx = bar_area_width - sb_width;
by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
row->y));
ny = row->visible_height;
@@ -738,13 +738,13 @@
}
else
{
- if (left + width == bx)
+ if (bar_area_x + bar_area_width == bx)
{
- bx = left + sb_width;
- nx += width - sb_width;
+ bx = bar_area_x + sb_width;
+ nx += bar_area_width - sb_width;
}
- else if (bx + nx == left)
- nx += width - sb_width;
+ else if (bx + nx == bar_area_x)
+ nx += bar_area_width - sb_width;
}
}
}
@@ -2619,6 +2619,32 @@
fringes of W. */
window_box (w, -1, &x, &y, &width, &height);
+ /* If the fringe is adjacent to the left (right) scroll bar of a
+ leftmost (rightmost, respectively) window, then extend its
+ background to the gap between the fringe and the bar. */
+ if ((WINDOW_LEFTMOST_P (w)
+ && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
+ || (WINDOW_RIGHTMOST_P (w)
+ && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w)))
+ {
+ int sb_width = WINDOW_CONFIG_SCROLL_BAR_WIDTH (w);
+
+ if (sb_width > 0)
+ {
+ int bar_area_x = WINDOW_SCROLL_BAR_AREA_X (w);
+ int bar_area_width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w)
+ * FRAME_COLUMN_WIDTH (f));
+
+ if (bar_area_x + bar_area_width == x)
+ {
+ x = bar_area_x + sb_width;
+ width += bar_area_width - sb_width;
+ }
+ else if (x + width == bar_area_x)
+ width += bar_area_width - sb_width;
+ }
+ }
+
from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y);
to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y);
bottom_y = y + height;
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2011-05-03 15:54:54 +0000
+++ b/src/xterm.c 2011-05-12 07:07:06 +0000
@@ -753,22 +753,22 @@
if (sb_width > 0)
{
- int left = WINDOW_SCROLL_BAR_AREA_X (w);
- int width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w)
- * FRAME_COLUMN_WIDTH (f));
+ int bar_area_x = WINDOW_SCROLL_BAR_AREA_X (w);
+ int bar_area_width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w)
+ * FRAME_COLUMN_WIDTH (f));
if (bx < 0)
{
/* Bitmap fills the fringe. */
- if (left + width == p->x)
- bx = left + sb_width;
- else if (p->x + p->wd == left)
- bx = left;
+ if (bar_area_x + bar_area_width == p->x)
+ bx = bar_area_x + sb_width;
+ else if (p->x + p->wd == bar_area_x)
+ bx = bar_area_x;
if (bx >= 0)
{
int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w);
- nx = width - sb_width;
+ nx = bar_area_width - sb_width;
by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height,
row->y));
ny = row->visible_height;
@@ -776,13 +776,13 @@
}
else
{
- if (left + width == bx)
+ if (bar_area_x + bar_area_width == bx)
{
- bx = left + sb_width;
- nx += width - sb_width;
+ bx = bar_area_x + sb_width;
+ nx += bar_area_width - sb_width;
}
- else if (bx + nx == left)
- nx += width - sb_width;
+ else if (bx + nx == bar_area_x)
+ nx += bar_area_width - sb_width;
}
}
}
@@ -3232,6 +3232,34 @@
fringe of W. */
window_box (w, -1, &x, &y, &width, &height);
+#ifdef USE_TOOLKIT_SCROLL_BARS
+ /* If the fringe is adjacent to the left (right) scroll bar of a
+ leftmost (rightmost, respectively) window, then extend its
+ background to the gap between the fringe and the bar. */
+ if ((WINDOW_LEFTMOST_P (w)
+ && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
+ || (WINDOW_RIGHTMOST_P (w)
+ && WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w)))
+ {
+ int sb_width = WINDOW_CONFIG_SCROLL_BAR_WIDTH (w);
+
+ if (sb_width > 0)
+ {
+ int bar_area_x = WINDOW_SCROLL_BAR_AREA_X (w);
+ int bar_area_width = (WINDOW_CONFIG_SCROLL_BAR_COLS (w)
+ * FRAME_COLUMN_WIDTH (f));
+
+ if (bar_area_x + bar_area_width == x)
+ {
+ x = bar_area_x + sb_width;
+ width += bar_area_width - sb_width;
+ }
+ else if (x + width == bar_area_x)
+ width += bar_area_width - sb_width;
+ }
+ }
+#endif
+
from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y);
to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y);
bottom_y = y + height;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104201: Merge from emacs-23; up to r100577.,
Glenn Morris <=