Now on revision 111617. ------------------------------------------------------------ revno: 111617 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13297 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2013-01-28 15:00:35 -0500 message: * lisp/hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-28 02:07:42 +0000 +++ lisp/ChangeLog 2013-01-28 20:00:35 +0000 @@ -1,11 +1,16 @@ +2013-01-28 Stefan Monnier + + * hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol + (bug#13297). + 2013-01-27 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove some checks made superfluous by the \_< operator. * progmodes/ruby-mode.el (ruby-move-to-block): Work with (maybe temporarily) broken indentation. - * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight - nested constants, too. \_< broke that. + * progmodes/ruby-mode.el (ruby-font-lock-keywords): + Highlight nested constants, too. \_< broke that. 2013-01-27 Nobuyoshi Nakada @@ -117,8 +122,8 @@ 2013-01-22 Michael Albinus - * net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers): Mark - descriptive parts with `display' property. + * net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers): + Mark descriptive parts with `display' property. 2013-01-21 Agustín Martín Domingo @@ -147,13 +152,13 @@ * net/tramp-adb.el (top): Require `time-date'. (tramp-adb-ls-output-time-less-p): Use `tramp-time-less-p'. - (tramp-adb-handle-copy-file, tramp-adb-handle-rename-file): Use - `tramp-file-name-handler'. - (tramp-adb-maybe-open-connection): Use - `tramp-compat-set-process-query-on-exit-flag'. + (tramp-adb-handle-copy-file, tramp-adb-handle-rename-file): + Use `tramp-file-name-handler'. + (tramp-adb-maybe-open-connection): + Use `tramp-compat-set-process-query-on-exit-flag'. - * net/tramp-sh.el (tramp-sh-handle-file-acl): Use - `tramp-compat-funcall'. + * net/tramp-sh.el (tramp-sh-handle-file-acl): + Use `tramp-compat-funcall'. * net/tramp-smb.el (tramp-smb-handle-file-acl): Use `looking-at' and `tramp-compat-funcall'. @@ -193,8 +198,8 @@ 2013-01-19 Christian Wittern (tiny change) Chong Yidong - * image-mode.el (image-next-file, image-previous-file): New - commands (Bug#8453). + * image-mode.el (image-next-file, image-previous-file): + New commands (Bug#8453). (image-mode-map): Bind them to n and p. (image-mode--images-in-directory): New helper function. @@ -222,8 +227,8 @@ * autorevert.el (auto-revert-use-notify): In the :set function, do not modify `kill-buffer-hook'. - (auto-revert-notify-rm-watch): Remove - `auto-revert-notify-rm-watch' from `kill-buffer-hook'. + (auto-revert-notify-rm-watch): + Remove `auto-revert-notify-rm-watch' from `kill-buffer-hook'. (auto-revert-notify-add-watch): Do not call `auto-revert-notify-rm-watch', but add it to a buffer local `kill-buffer-hook'. === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2013-01-02 16:13:04 +0000 +++ lisp/hi-lock.el 2013-01-28 20:00:35 +0000 @@ -562,7 +562,8 @@ (when keyword (let ((face (hi-lock-keyword->face keyword))) ;; Make `face' the next one to use by default. - (add-to-list 'hi-lock--unused-faces (face-name face))) + (when (symbolp face) ;Don't add it if it's a list (bug#13297). + (add-to-list 'hi-lock--unused-faces (face-name face)))) (font-lock-remove-keywords nil (list keyword)) (setq hi-lock-interactive-patterns (delq keyword hi-lock-interactive-patterns)) ------------------------------------------------------------ revno: 111616 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2013-01-28 16:41:08 +0200 message: Make opendir on MS-Windows accept a 'const char *'. src/w32.c (opendir): Now accepts a 'const char *'. nt/inc/dirent.h (opendir): Update prototype. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-01-11 09:33:54 +0000 +++ nt/ChangeLog 2013-01-28 14:41:08 +0000 @@ -1,3 +1,7 @@ +2013-01-28 Eli Zaretskii + + * inc/dirent.h (opendir): Update prototype. + 2013-01-11 Eli Zaretskii * inc/unistd.h (O_IGNORE_CTTY): Define, as it is unconditionally === modified file 'nt/inc/dirent.h' --- nt/inc/dirent.h 2012-11-23 07:48:43 +0000 +++ nt/inc/dirent.h 2013-01-28 14:41:08 +0000 @@ -30,7 +30,7 @@ char dd_buf[DIRBLKSIZ]; /* directory block */ } DIR; /* stream data from opendir() */ -extern DIR *opendir (char *); +extern DIR *opendir (const char *); extern struct dirent *readdir (DIR *); extern void seekdir (DIR *, long); extern void closedir (DIR *); === modified file 'src/ChangeLog' --- src/ChangeLog 2013-01-28 05:47:51 +0000 +++ src/ChangeLog 2013-01-28 14:41:08 +0000 @@ -1,3 +1,7 @@ +2013-01-28 Eli Zaretskii + + * w32.c (opendir): Now accepts a 'const char *'. + 2013-01-28 Dmitry Antipov Remove obsolete redisplay code. See the discussion at === modified file 'src/w32.c' --- src/w32.c 2013-01-25 14:38:21 +0000 +++ src/w32.c 2013-01-28 14:41:08 +0000 @@ -2809,7 +2809,7 @@ static void close_unc_volume (HANDLE); DIR * -opendir (char *filename) +opendir (const char *filename) { DIR *dirp; ------------------------------------------------------------ revno: 111615 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2013-01-28 09:47:51 +0400 message: Remove obsolete redisplay code. See the discussion at http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00576.html. * dispnew.c (preemption_period, preemption_next_check): Remove. (Vredisplay_preemption_period): Likewise. (update_frame, update_single_window, update_window, update_frame_1): Adjust users. Always assume that PERIODIC_PREEMPTION_CHECKING is not used, following the 2012-06-22 change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-01-25 17:13:31 +0000 +++ src/ChangeLog 2013-01-28 05:47:51 +0000 @@ -1,3 +1,13 @@ +2013-01-28 Dmitry Antipov + + Remove obsolete redisplay code. See the discussion at + http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00576.html. + * dispnew.c (preemption_period, preemption_next_check): Remove. + (Vredisplay_preemption_period): Likewise. + (update_frame, update_single_window, update_window, update_frame_1): + Adjust users. Always assume that PERIODIC_PREEMPTION_CHECKING is not + used, following the 2012-06-22 change. + 2013-01-25 Eli Zaretskii * w32notify.c (Fw32notify_add_watch): Doc fix. (Bug#13540) === modified file 'src/dispnew.c' --- src/dispnew.c 2013-01-23 20:07:28 +0000 +++ src/dispnew.c 2013-01-28 05:47:51 +0000 @@ -107,12 +107,6 @@ static void adjust_frame_glyphs_for_window_redisplay (struct frame *); static void adjust_frame_glyphs_for_frame_redisplay (struct frame *); - -/* Redisplay preemption timers. */ - -static EMACS_TIME preemption_period; -static EMACS_TIME preemption_next_check; - /* True upon entry to redisplay means do not assume anything about current contents of actual terminal frame; clear and redraw it. */ @@ -3080,21 +3074,10 @@ if (redisplay_dont_pause) force_p = 1; - else if (NILP (Vredisplay_preemption_period)) - force_p = 1; - else if (!force_p && NUMBERP (Vredisplay_preemption_period)) + else if (!force_p && detect_input_pending_ignore_squeezables ()) { - double p = XFLOATINT (Vredisplay_preemption_period); - - if (detect_input_pending_ignore_squeezables ()) - { - paused_p = 1; - goto do_pause; - } - - preemption_period = EMACS_TIME_FROM_DOUBLE (p); - preemption_next_check = add_emacs_time (current_emacs_time (), - preemption_period); + paused_p = 1; + goto do_pause; } if (FRAME_WINDOW_P (f)) @@ -3232,15 +3215,6 @@ if (redisplay_dont_pause) force_p = 1; - else if (NILP (Vredisplay_preemption_period)) - force_p = 1; - else if (!force_p && NUMBERP (Vredisplay_preemption_period)) - { - double p = XFLOATINT (Vredisplay_preemption_period); - preemption_period = EMACS_TIME_FROM_DOUBLE (p); - preemption_next_check = add_emacs_time (current_emacs_time (), - preemption_period); - } /* Update W. */ update_begin (f); @@ -3394,9 +3368,7 @@ { struct glyph_matrix *desired_matrix = w->desired_matrix; bool paused_p; -#if !PERIODIC_PREEMPTION_CHECKING int preempt_count = baud_rate / 2400 + 1; -#endif struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); #ifdef GLYPH_DEBUG /* Check that W's frame doesn't have glyph matrices. */ @@ -3404,10 +3376,8 @@ #endif /* Check pending input the first time so that we can quickly return. */ -#if !PERIODIC_PREEMPTION_CHECKING if (!force_p) detect_input_pending_ignore_squeezables (); -#endif /* If forced to complete the update, or if no input is pending, do the update. */ @@ -3418,9 +3388,7 @@ struct glyph_row *header_line_row; int yb; bool changed_p = 0, mouse_face_overwritten_p = 0; -#if ! PERIODIC_PREEMPTION_CHECKING int n_updated = 0; -#endif rif->update_window_begin_hook (w); yb = window_text_bottom_y (w); @@ -3484,22 +3452,8 @@ detect_input_pending. If it's done too often, scrolling large windows with repeated scroll-up commands will too quickly pause redisplay. */ -#if PERIODIC_PREEMPTION_CHECKING - if (!force_p) - { - EMACS_TIME tm = current_emacs_time (); - if (EMACS_TIME_LT (preemption_next_check, tm)) - { - preemption_next_check = add_emacs_time (tm, - preemption_period); - if (detect_input_pending_ignore_squeezables ()) - break; - } - } -#else if (!force_p && ++n_updated % preempt_count == 0) detect_input_pending_ignore_squeezables (); -#endif changed_p |= update_window_line (w, vpos, &mouse_face_overwritten_p); @@ -4531,13 +4485,11 @@ if (preempt_count <= 0) preempt_count = 1; -#if !PERIODIC_PREEMPTION_CHECKING if (!force_p && detect_input_pending_ignore_squeezables ()) { pause_p = 1; goto do_pause; } -#endif /* If we cannot insert/delete lines, it's no use trying it. */ if (!FRAME_LINE_INS_DEL_OK (f)) @@ -4578,21 +4530,8 @@ } } -#if PERIODIC_PREEMPTION_CHECKING - if (!force_p) - { - EMACS_TIME tm = current_emacs_time (); - if (EMACS_TIME_LT (preemption_next_check, tm)) - { - preemption_next_check = add_emacs_time (tm, preemption_period); - if (detect_input_pending_ignore_squeezables ()) - break; - } - } -#else if (!force_p && (i - 1) % preempt_count == 0) detect_input_pending_ignore_squeezables (); -#endif update_frame_line (f, i); } @@ -4698,9 +4637,7 @@ } } -#if !PERIODIC_PREEMPTION_CHECKING do_pause: -#endif clear_desired_matrices (f); return pause_p; @@ -6410,15 +6347,6 @@ doc: /* Non-nil means display update isn't paused when input is detected. */); redisplay_dont_pause = 1; -#if PERIODIC_PREEMPTION_CHECKING - DEFVAR_LISP ("redisplay-preemption-period", Vredisplay_preemption_period, - doc: /* Period in seconds between checking for input during redisplay. -This has an effect only if `redisplay-dont-pause' is nil; in that -case, arriving input preempts redisplay until the input is processed. -If the value is nil, redisplay is never preempted. */); - Vredisplay_preemption_period = make_float (0.10); -#endif - #ifdef CANNOT_DUMP if (noninteractive) #endif