From d30550b193d253aa054816f21b6f6a190ee7b3a1 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 4 Jun 2011 23:30:14 +0200 Subject: [PATCH 01/10] lisp/loadhist.el (unload-feature-special-hooks): Add comint-output-filter-functions. --- lisp/ChangeLog | 5 +++++ lisp/loadhist.el | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 965886b02ae..8abc61b4abb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-04 Juanma Barranquero + + * loadhist.el (unload-feature-special-hooks): + Add `comint-output-filter-functions'. + 2011-05-27 Kenichi Handa * mail/sendmail.el (mail-encode-header): Avoid double encoding by diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 17f4035bf2a..2c359618bf6 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -118,16 +118,16 @@ from a file." '(after-change-functions after-insert-file-functions after-make-frame-functions auto-fill-function before-change-functions blink-paren-function buffer-access-fontify-functions - choose-completion-string-functions command-line-functions - comment-indent-function compilation-finish-functions delete-frame-functions - disabled-command-function find-file-not-found-functions - font-lock-beginning-of-syntax-function font-lock-fontify-buffer-function - font-lock-fontify-region-function font-lock-mark-block-function - font-lock-syntactic-face-function font-lock-unfontify-buffer-function - font-lock-unfontify-region-function kill-buffer-query-functions - kill-emacs-query-functions lisp-indent-function mouse-position-function - redisplay-end-trigger-functions suspend-tty-functions - temp-buffer-show-function window-scroll-functions + choose-completion-string-functions comint-output-filter-functions + command-line-functions comment-indent-function compilation-finish-functions + delete-frame-functions disabled-command-function + find-file-not-found-functions font-lock-beginning-of-syntax-function + font-lock-fontify-buffer-function font-lock-fontify-region-function + font-lock-mark-block-function font-lock-syntactic-face-function + font-lock-unfontify-buffer-function font-lock-unfontify-region-function + kill-buffer-query-functions kill-emacs-query-functions lisp-indent-function + mouse-position-function redisplaylay-end-trigger-functions + suspend-tty-functions temp-buffer-show-function window-scroll-functions window-size-change-functions write-contents-functions write-file-functions write-region-annotate-functions) "A list of special hooks from Info node `(elisp)Standard Hooks'. From a800408659eaa9ac63e299ae750046300634e1f9 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 4 Jun 2011 19:00:29 -0400 Subject: [PATCH 02/10] * lisp/repeat.el (repeat-on-final-keystroke): Fix type (Bug#8696). --- lisp/ChangeLog | 4 ++++ lisp/repeat.el | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8abc61b4abb..2eab5ba254b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-06-04 Chong Yidong + + * repeat.el (repeat-on-final-keystroke): Fix type (Bug#8696). + 2011-06-04 Juanma Barranquero * loadhist.el (unload-feature-special-hooks): diff --git a/lisp/repeat.el b/lisp/repeat.el index ab0c42a0dde..a25b68d6220 100644 --- a/lisp/repeat.el +++ b/lisp/repeat.el @@ -124,7 +124,9 @@ if `repeat' is bound to C-x z, typing C-x z z z repeats the previous command only occurs if the final character by which `repeat' was invoked is a member of that sequence. If this variable is nil, no re-execution occurs." :group 'convenience - :type 'boolean) + :type '(choice (const :tag "Repeat for all keys" t) + (const :tag "Don't repeat" nil) + (sexp :tag "Repeat for specific keys"))) ;;;;; ****************** HACKS TO THE REST OF EMACS ******************* ;;;;; From b1adde906f7265d93b392a7ed2da37df39c65ae1 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sat, 4 Jun 2011 19:06:53 -0400 Subject: [PATCH 03/10] * flymake.el (flymake-compilation-prevents-syntax-check): Doc fix (Bug#8713). --- lisp/ChangeLog | 5 +++++ lisp/progmodes/flymake.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2eab5ba254b..805cee8021a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-04 Reuben Thomas + + * progmodes/flymake.el (flymake-compilation-prevents-syntax-check): + Doc fix (Bug#8713). + 2011-06-04 Chong Yidong * repeat.el (repeat-on-final-keystroke): Fix type (Bug#8696). diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index da28a2e36f6..03e9956b845 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -1112,7 +1112,7 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'." (flymake-log 1 "Failed to delete dir %s, error ignored" dir-name)))) (defcustom flymake-compilation-prevents-syntax-check t - "If non-nil, syntax check won't be started in case compilation is running." + "If non-nil, don't start syntax check if compilation is running." :group 'flymake :type 'boolean) From 499719b7762b7dea99f0306b9d907ba50432215e Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sun, 5 Jun 2011 02:32:23 +0200 Subject: [PATCH 04/10] Fixes bug#8730, bug#8781. Do not merge into trunk. lisp/progmodes/python.el (python-after-info-look): Add autoload cookie. (python-unload-function): New function. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/python.el | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 805cee8021a..c403c8045d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-05 Juanma Barranquero + + * progmodes/python.el (python-after-info-look): Add autoload cookie. + (python-unload-function): New function. (Bug#8730, bug#8781) + 2011-06-04 Reuben Thomas * progmodes/flymake.el (flymake-compilation-prevents-syntax-check): diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 86f82432578..f2dbdb5a013 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1914,6 +1914,7 @@ instance. Assumes an inferior Python is running." (declare-function info-lookup-maybe-add-help "info-look" (&rest arg)) +;;;###autoload (defun python-after-info-look () "Set up info-look for Python. Used with `eval-after-load'." @@ -2895,6 +2896,32 @@ filter." (defun python-sentinel (proc msg) (setq overlay-arrow-position nil)) +(defun python-unload-function () + "Unload the Python library." + (let* ((default-mode (default-value 'major-mode)) + (inferior-mode (or (get 'inferior-python-mode 'derived-mode-parent) + default-mode))) + (dolist (buffer (buffer-list)) + (set-buffer buffer) + (cond ((memq major-mode '(python-mode jython-mode)) + (funcall default-mode)) + ((eq major-mode 'inferior-python-mode) + (remove-hook 'comint-preoutput-filter-functions + 'python-preoutput-filter t) + (remove-hook 'comint-output-filter-functions + 'python-comint-output-filter-function t) + (let ((proc (get-buffer-process (current-buffer)))) + (if (not proc) + (funcall default-mode) + (set-process-sentinel proc nil) + (funcall inferior-mode))))))) + (setq minor-mode-alist (assq-delete-all 'python-pdbtrack-is-tracking-p + minor-mode-alist)) + (dolist (error '("^No symbol" "^Can't shift all lines enough")) + (setq debug-ignored-errors (delete error debug-ignored-errors))) + ;; continue standard unloading + nil) + (provide 'python) (provide 'python-21) From 638e9005f1a275c6f8f3298ae7aaca4dba3abb25 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 9 Jun 2011 12:40:51 +0300 Subject: [PATCH 05/10] Fix bug #8780 with decoding files after using ange-ftp. lisp/net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind buffer-file-type before setting its value, to avoid disastrous global effects on decoding files for DOS/Windows systems. --- lisp/ChangeLog | 7 +++++++ lisp/net/ange-ftp.el | 1 + 2 files changed, 8 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c403c8045d2..47da6d77c90 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-06-09 Eli Zaretskii + + * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind + buffer-file-type before setting its value, to avoid disastrous + global effects on decoding files for DOS/Windows systems. + (Bug#8780) + 2011-06-05 Juanma Barranquero * progmodes/python.el (python-after-info-look): Add autoload cookie. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index c009671ce7c..a3a11756253 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3290,6 +3290,7 @@ system TYPE.") (binary (or (ange-ftp-binary-file filename) (memq (ange-ftp-host-type host user) '(unix dumb-unix)))) + (buffer-file-type buffer-file-type) (abbr (ange-ftp-abbreviate-filename filename)) (coding-system-used last-coding-system-used) size) From dfc47e35111ff5332791303a881bfa5d262e3a10 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 14 Jun 2011 11:13:26 -0400 Subject: [PATCH 06/10] Fix errors in 2011-05-29 change to Lisp manual. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/lispref/keymaps.texi (Searching Keymaps): * doc/lispref/display.texi (Overlay Properties): Fix errors in 2011-05-29 change. Suggested by Johan Bockgård. --- doc/lispref/ChangeLog | 6 ++++++ doc/lispref/display.texi | 6 +++--- doc/lispref/keymaps.texi | 14 +++++++------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index fd8a9945cf9..0178e91ba4f 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2011-06-14 Chong Yidong + + * keymaps.texi (Searching Keymaps): + * display.texi (Overlay Properties): Fix errors in 2011-05-29 + change. Suggested by Johan Bockgård. + 2011-05-29 Chong Yidong * help.texi (Accessing Documentation): diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 4a647ef15a2..e8e9e38939d 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -1443,9 +1443,9 @@ specify a particular attribute for certain text. @xref{Face Attributes}. @item -A cons cell, either of the form @code{(fg-color . @var{color-name})} -or @code{(bg-color . @var{color-name})}. These elements specify just -the foreground color or just the background color. +A cons cell, of the form @code{(foreground-color . @var{color-name})} +or @code{(background-color . @var{color-name})}. These elements +specify just the foreground color or just the background color. @code{(foreground-color . @var{color-name})} has the same effect as @code{(:foreground @var{color-name})}; likewise for the background. diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index b1f02d6b26e..5befa9136dd 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -725,13 +725,13 @@ them: (@var{find-in} overriding-terminal-local-map)) (overriding-local-map (@var{find-in} overriding-local-map)) - (or (@var{find-in} (get-char-property (point) 'keymap)) - (@var{find-in-any} emulation-mode-map-alists) - (@var{find-in-any} minor-mode-overriding-map-alist) - (@var{find-in-any} minor-mode-map-alist) - (if (get-text-property (point) 'local-map) - (@var{find-in} (get-char-property (point) 'local-map)) - (@var{find-in} (current-local-map))))) + ((or (@var{find-in} (get-char-property (point) 'keymap)) + (@var{find-in-any} emulation-mode-map-alists) + (@var{find-in-any} minor-mode-overriding-map-alist) + (@var{find-in-any} minor-mode-map-alist) + (if (get-text-property (point) 'local-map) + (@var{find-in} (get-char-property (point) 'local-map)) + (@var{find-in} (current-local-map)))))) (@var{find-in} (current-global-map))) @end lisp From d65e8a993fa02bf52ed8bd5ae4ea5771eb0c1018 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 16 Jun 2011 11:31:16 -0400 Subject: [PATCH 07/10] Merge: nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF. --- src/ChangeLog | 5 ++++ src/nsmenu.m | 70 +++++++++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a86a23e7c0b..f51078f87ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -127,6 +127,11 @@ * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]: New version that can reserve upto 2GB of heap space. +2011-04-27 Paul Eggert + + * nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF. + This makes this file independent of the recent pseudovector change. + 2011-04-26 Chong Yidong * nsfns.m (Fns_read_file_name): Doc fix (Bug#8534). diff --git a/src/nsmenu.m b/src/nsmenu.m index 5fd74333f22..482b33afb8f 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -227,19 +227,19 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) menu_items = f->menu_bar_vector; menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0; - submenu_start = (int *) alloca (XVECTOR (items)->size * sizeof (int *)); - submenu_end = (int *) alloca (XVECTOR (items)->size * sizeof (int *)); - submenu_n_panes = (int *) alloca (XVECTOR (items)->size * sizeof (int)); + submenu_start = (int *) alloca (ASIZE (items) * sizeof (int *)); + submenu_end = (int *) alloca (ASIZE (items) * sizeof (int *)); + submenu_n_panes = (int *) alloca (ASIZE (items) * sizeof (int)); submenu_top_level_items - = (int *) alloca (XVECTOR (items)->size * sizeof (int *)); + = (int *) alloca (ASIZE (items) * sizeof (int *)); init_menu_items (); - for (i = 0; i < XVECTOR (items)->size; i += 4) + for (i = 0; i < ASIZE (items); i += 4) { Lisp_Object key, string, maps; - key = XVECTOR (items)->contents[i]; - string = XVECTOR (items)->contents[i + 1]; - maps = XVECTOR (items)->contents[i + 2]; + key = AREF (items, i); + string = AREF (items, i + 1); + maps = AREF (items, i + 2); if (NILP (string)) break; @@ -312,11 +312,11 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) /* FIXME: this ALWAYS fails on Buffers menu items.. something about their strings causes them to change every time, so we double-check failures */ - if (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i])) + if (!EQ (previous_items[i], AREF (menu_items, i))) if (!(STRINGP (previous_items[i]) - && STRINGP (XVECTOR (menu_items)->contents[i]) + && STRINGP (AREF (menu_items, i)) && !strcmp (SDATA (previous_items[i]), - SDATA (XVECTOR (menu_items)->contents[i])))) + SDATA (AREF (menu_items, i))))) break; if (i == previous_menu_items_used) { @@ -347,10 +347,10 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) /* Parse stage 2a: now GC cannot happen during the lifetime of the widget_value, so it's safe to store data from a Lisp_String */ wv = first_wv->contents; - for (i = 0; i < XVECTOR (items)->size; i += 4) + for (i = 0; i < ASIZE (items); i += 4) { Lisp_Object string; - string = XVECTOR (items)->contents[i + 1]; + string = AREF (items, i + 1); if (NILP (string)) break; /* if (submenu && strcmp (submenuTitle, SDATA (string))) @@ -408,7 +408,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) /* check if no change.. this mechanism is a bit rough, but ready */ - n = XVECTOR (items)->size / 4; + n = ASIZE (items) / 4; if (f == last_f && n_previous_strings == n) { for (i = 0; isize; i += 4) + for (i = 0; i < ASIZE (items); i += 4) { - string = XVECTOR (items)->contents[i + 1]; + string = AREF (items, i + 1); if (NILP (string)) break; @@ -608,7 +608,7 @@ name_is_separator (name) if (!key || !strlen (key)) return @""; - + while (*tpos == ' ' || *tpos == '(') tpos++; if ((*tpos == 's') && (*(tpos+1) == '-')) @@ -669,7 +669,7 @@ name_is_separator (name) -(void)clear { int n; - + for (n = [self numberOfItems]-1; n >= 0; n--) { NSMenuItem *item = [self itemAtIndex: n]; @@ -809,7 +809,7 @@ ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, i = 0; while (i < menu_items_used) { - if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) + if (EQ (AREF (menu_items, i), Qnil)) { submenu_stack[submenu_depth++] = save_wv; save_wv = prev_wv; @@ -817,21 +817,21 @@ ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, first_pane = 1; i++; } - else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda)) + else if (EQ (AREF (menu_items, i), Qlambda)) { prev_wv = save_wv; save_wv = submenu_stack[--submenu_depth]; first_pane = 0; i++; } - else if (EQ (XVECTOR (menu_items)->contents[i], Qt) + else if (EQ (AREF (menu_items, i), Qt) && submenu_depth != 0) i += MENU_ITEMS_PANE_LENGTH; /* Ignore a nil in the item list. It's meaningful only for dialog boxes. */ - else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) + else if (EQ (AREF (menu_items, i), Qquote)) i += 1; - else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) + else if (EQ (AREF (menu_items, i), Qt)) { /* Create a new pane. */ Lisp_Object pane_name, prefix; @@ -921,7 +921,7 @@ ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, make the call_data null so that it won't display a box when the mouse is on it. */ wv->call_data - = !NILP (def) ? (void *) &XVECTOR (menu_items)->contents[i] : 0; + = !NILP (def) ? (void *) &AREF (menu_items, i) : 0; wv->enabled = !NILP (enable); if (NILP (type)) @@ -1262,12 +1262,12 @@ update_frame_tool_bar (FRAME_PTR f) { NSString *str = [NSString stringWithUTF8String: text]; NSRect r = [textField frame]; - NSSize textSize = [str sizeWithAttributes: + NSSize textSize = [str sizeWithAttributes: [NSDictionary dictionaryWithObject: [[textField font] screenFont] forKey: NSFontAttributeName]]; - NSSize padSize = [[[textField font] screenFont] + NSSize padSize = [[[textField font] screenFont] boundingRectForFont].size; - + r.size.width = textSize.width + padSize.width/2; r.size.height = textSize.height + padSize.height/2; [textField setFrame: r]; @@ -1350,7 +1350,7 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header) BOOL isQ; NSTRACE (x-popup-dialog); - + check_ns (); isQ = NILP (header); @@ -1512,10 +1512,10 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header) [cell setCellAttribute: NSCellIsInsetButton to: 8]; [cell setBezelStyle: NSRoundedBezelStyle]; - matrix = [[NSMatrix alloc] initWithFrame: contentRect - mode: NSHighlightModeMatrix - prototype: cell - numberOfRows: 0 + matrix = [[NSMatrix alloc] initWithFrame: contentRect + mode: NSHighlightModeMatrix + prototype: cell + numberOfRows: 0 numberOfColumns: 1]; [[self contentView] addSubview: matrix]; [matrix release]; @@ -1566,7 +1566,7 @@ void process_dialog (id window, Lisp_Object list) - addButton: (char *)str value: (Lisp_Object)val row: (int)row { id cell; - + if (row >= rows) { [matrix addRow]; @@ -1587,7 +1587,7 @@ void process_dialog (id window, Lisp_Object list) - addString: (char *)str row: (int)row { id cell; - + if (row >= rows) { [matrix addRow]; @@ -1616,7 +1616,7 @@ void process_dialog (id window, Lisp_Object list) EMACS_INT seltag; sellist = [sender selectedCells]; - if ([sellist count]<1) + if ([sellist count]<1) return self; seltag = [[sellist objectAtIndex: 0] tag]; From 4fd75609cb0c15c2ef10c6ce0a189089fd05e085 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 16 Jun 2011 23:54:08 -0700 Subject: [PATCH 08/10] Fix ChangeLog entry (no need to merge to trunk) --- src/ChangeLog | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f51078f87ef..503f0c8e300 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-06-16 Paul Eggert + + * nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF. (Bug#8839) + 2011-06-02 Dan Nicolaescu * emacs.c (main): Warn when starting a GTK emacs in daemon mode. @@ -127,11 +131,6 @@ * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]: New version that can reserve upto 2GB of heap space. -2011-04-27 Paul Eggert - - * nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF. - This makes this file independent of the recent pseudovector change. - 2011-04-26 Chong Yidong * nsfns.m (Fns_read_file_name): Doc fix (Bug#8534). From 989b42d2c7e50480d1bec3503239a3da22a38ae7 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sat, 18 Jun 2011 09:37:38 +0900 Subject: [PATCH 09/10] * dispnew.c (scrolling_window): Before scrolling, turn off a mouse-highlight in the window being scrolled. --- src/ChangeLog | 5 +++++ src/dispnew.c | 1 + 2 files changed, 6 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 503f0c8e300..46fef8b9285 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-06-18 YAMAMOTO Mitsuharu + + * dispnew.c (scrolling_window): Before scrolling, turn off a + mouse-highlight in the window being scrolled. + 2011-06-16 Paul Eggert * nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF. (Bug#8839) diff --git a/src/dispnew.c b/src/dispnew.c index 4c460abd636..d2878a4fa57 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5206,6 +5206,7 @@ scrolling_window (w, header_line_p) /* Copy on the display. */ if (r->current_y != r->desired_y) { + rif->clear_window_mouse_face (w); rif->scroll_run_hook (w, r); /* Invalidate runs that copy from where we copied to. */ From c9e799dbb100c5161f7a485452d29f554d95e6c7 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 18 Jun 2011 15:23:43 -0400 Subject: [PATCH 10/10] Merge fix for Bug#8879 from trunk --- lisp/ChangeLog | 4 ++++ lisp/textmodes/fill.el | 1 + 2 files changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 47da6d77c90..d38aad95067 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-06-18 Chong Yidong + + * textmodes/fill.el (default-justification): Add :safe (Bug#8879). + 2011-06-09 Eli Zaretskii * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 044806ef5b0..8c2b54b05d8 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -1053,6 +1053,7 @@ The `justification' text-property can locally override this variable." (const full) (const center) (const none)) + :safe 'symbolp :group 'fill) (make-variable-buffer-local 'default-justification)