Mercurial > emacs
changeset 109416:c3ebf31421b2
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 24 Jun 2010 22:51:08 +0000 |
| parents | 5922ae6fb6dc (current diff) f0d32dbd0fcf (diff) |
| children | 338717febe80 |
| files | lisp/vc/vc.el |
| diffstat | 8 files changed, 40 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Tue Jun 22 22:50:34 2010 +0000 +++ b/lib-src/ChangeLog Thu Jun 24 22:51:08 2010 +0000 @@ -1,3 +1,7 @@ +2010-06-24 Juanma Barranquero <lekktu@gmail.com> + + * movemail.c (error): Avoid warning when there are no args. + 2010-06-11 Juanma Barranquero <lekktu@gmail.com> * makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
--- a/lib-src/movemail.c Tue Jun 22 22:50:34 2010 +0000 +++ b/lib-src/movemail.c Thu Jun 24 22:51:08 2010 +0000 @@ -612,7 +612,7 @@ else if (s2) fprintf (stderr, s1, s2); else - fprintf (stderr, s1); + fprintf (stderr, "%s", s1); fprintf (stderr, "\n"); }
--- a/lisp/ChangeLog Tue Jun 22 22:50:34 2010 +0000 +++ b/lisp/ChangeLog Thu Jun 24 22:51:08 2010 +0000 @@ -1,3 +1,19 @@ +2010-06-24 Juri Linkov <juri@jurta.org> + + * minibuffer.el (completions-format): Change default from nil to + `horizontal'. Remove `nil' value from :type. Doc fix. (Bug#6459) + +2010-06-24 Juri Linkov <juri@jurta.org> + + * vc/vc.el (vc-diff-internal): Set `revert-buffer-function' + buffer-locally to lambda that re-runs the vc diff command. + (Bug#6447) + +2010-06-24 Chong Yidong <cyd@stupidchicken.com> + + * kmacro.el (kmacro-call-macro): Don't issue hint message if the + echo area is in use (Bug#3412). + 2010-06-22 Glenn Morris <rgm@gnu.org> * textmodes/texinfmt.el (texinfo-format-region)
--- a/lisp/kmacro.el Tue Jun 22 22:50:34 2010 +0000 +++ b/lisp/kmacro.el Thu Jun 24 22:51:08 2010 +0000 @@ -642,11 +642,13 @@ kmacro-call-repeat-key))) (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil)) (while repeat-key - (message "(Type %s to repeat macro%s)" - repeat-key-str - (if (and kmacro-call-repeat-with-arg - arg (> arg 1)) - (format " %d times" arg) "")) + ;; Issue a hint to the user, if the echo area isn't in use. + (unless (current-message) + (message "(Type %s to repeat macro%s)" + repeat-key-str + (if (and kmacro-call-repeat-with-arg + arg (> arg 1)) + (format " %d times" arg) ""))) (if (equal repeat-key (read-event)) (progn (clear-this-command-keys t)
--- a/lisp/minibuffer.el Tue Jun 22 22:50:34 2010 +0000 +++ b/lisp/minibuffer.el Thu Jun 24 22:51:08 2010 +0000 @@ -891,13 +891,13 @@ (defface completions-annotations '((t :inherit italic)) "Face to use for annotations in the *Completions* buffer.") -(defcustom completions-format nil +(defcustom completions-format 'horizontal "Define the appearance and sorting of completions. If the value is `vertical', display completions sorted vertically in columns in the *Completions* buffer. -If the value is `horizontal' or nil, display completions sorted +If the value is `horizontal', display completions sorted horizontally in alphabetical order, rather than down the screen." - :type '(choice (const nil) (const horizontal) (const vertical)) + :type '(choice (const horizontal) (const vertical)) :group 'minibuffer :version "23.2")
--- a/lisp/vc/vc.el Tue Jun 22 22:50:34 2010 +0000 +++ b/lisp/vc/vc.el Thu Jun 24 22:51:08 2010 +0000 @@ -1547,6 +1547,9 @@ (message "%s" (cdr messages)) nil) (diff-mode) + (set (make-local-variable 'revert-buffer-function) + `(lambda (ignore-auto noconfirm) + (vc-diff-internal ,async ',vc-fileset ,rev1 ,rev2 ,verbose))) ;; Make the *vc-diff* buffer read only, the diff-mode key ;; bindings are nicer for read only buffers. pcl-cvs does the ;; same thing.
--- a/src/ChangeLog Tue Jun 22 22:50:34 2010 +0000 +++ b/src/ChangeLog Thu Jun 24 22:51:08 2010 +0000 @@ -1,3 +1,8 @@ +2010-06-24 Juanma Barranquero <lekktu@gmail.com> + + * gtkutil.c (xg_update_scrollbar_pos): + Avoid C99 mid-block variable declaration. + 2010-06-22 Jan Djärv <jan.h.d@swipnet.se> * xterm.c (x_scroll_bar_create): Remove call to xg_show_scroll_bar.
--- a/src/gtkutil.c Tue Jun 22 22:50:34 2010 +0000 +++ b/src/gtkutil.c Thu Jun 24 22:51:08 2010 +0000 @@ -3213,6 +3213,7 @@ GtkWidget *wfixed = f->output_data.x->edit_widget; GtkWidget *wparent = gtk_widget_get_parent (wscroll); GtkFixed *wf = GTK_FIXED (wfixed); + gint msl; /* Clear out old position. */ GList *iter; @@ -3232,7 +3233,6 @@ /* Move and resize to new values. */ gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top); - gint msl; gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL); if (msl > height) {