From 921dd0de45b955577f39de5f7aab923dab1ff063 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 24 Mar 2015 22:42:42 -0700 Subject: [PATCH 1/3] * doc/lispref/objects.texi (Equality Predicates): Fix typo in example. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/objects.texi | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index a0a2b2b4d05..b11d0a00311 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2015-03-25 Glenn Morris + + * objects.texi (Equality Predicates): Fix typo in example. + 2015-03-23 Eli Zaretskii * commands.texi (Event Input Misc): Fix incorrect usage of @code. diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 739477bf372..b9d2bbed418 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -2111,12 +2111,12 @@ that for two strings to be equal, they have the same text properties. @example @group -(equal "asdf" (propertize "asdf" '(asdf t))) +(equal "asdf" (propertize "asdf" 'asdf t)) @result{} t @end group @group (equal-including-properties "asdf" - (propertize "asdf" '(asdf t))) + (propertize "asdf" 'asdf t)) @result{} nil @end group @end example From 13cf575c1d32bbe7cf42e017bce2e8cdc30a2946 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Wed, 25 Mar 2015 11:17:30 +0100 Subject: [PATCH 2/3] Don't round up scroll bar width with GTK3 (Bug#20182). * gtkutil.c (update_theme_scrollbar_width): Don't round up scroll bar width with GTK3 (Bug#20182). --- src/ChangeLog | 5 +++++ src/gtkutil.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index d09b9de34fa..09b4b3f59a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-25 Martin Rudalics + + * gtkutil.c (update_theme_scrollbar_width): Don't round up + scroll bar width with GTK3 (Bug#20182). + 2015-03-22 John F Carr (tiny change) * fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with diff --git a/src/gtkutil.c b/src/gtkutil.c index b23d84c8b82..fedaa0f3a2d 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3570,7 +3570,9 @@ update_theme_scrollbar_width (void) gtk_widget_destroy (wscroll); g_object_unref (G_OBJECT (wscroll)); w += 2*b; +#ifndef HAVE_GTK3 if (w < 16) w = 16; +#endif scroll_bar_width_for_theme = w; } From 5e0314f6fabca1af214240177a28d3822d6ef3e5 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 26 Mar 2015 09:36:24 -0400 Subject: [PATCH 3/3] * smie.el (smie*ward-sexp-command): Don't pretend the arg is optional Fixes: debbugs:20205 * lisp/emacs-lisp/smie.el (smie-backward-sexp-command) (smie-forward-sexp-command): Don't pretend the arg is optional. --- lisp/ChangeLog | 56 +++++++++++++++++++++++------------------ lisp/emacs-lisp/smie.el | 4 +-- 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 40f1e9ff279..fd9857e792c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-26 Stefan Monnier + + * emacs-lisp/smie.el (smie-backward-sexp-command) + (smie-forward-sexp-command): Don't pretend the arg is optional + (bug#20205). + 2015-03-23 Glenn Morris * emacs-lisp/authors.el (authors-aliases) @@ -20,19 +26,19 @@ 2015-03-20 Dmitry Gutov - * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect - regexps after `!'. (Bug#19285) + * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): + Detect regexps after `!'. (Bug#19285) 2015-03-20 Dmitry Gutov - * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use - `font-lock-constant-face' for nil, true and false. Highlight - `self' as a keyword. (Bug#17733) + * progmodes/ruby-mode.el (ruby-font-lock-keywords): + Use `font-lock-constant-face' for nil, true and false. + Highlight `self' as a keyword. (Bug#17733) 2015-03-20 Nobuyoshi Nakada - * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect - beginning of regexp also after open brace or vertical bar. + * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): + Expect beginning of regexp also after open brace or vertical bar. (Bug#20026) 2015-03-07 Michael Albinus @@ -105,8 +111,8 @@ 2015-02-12 Agustín Martín Domingo Improve string search in `flyspell-word-search-*`. (Bug#16800) - * textmodes/flyspell.el (flyspell-duplicate-distance): Limit - default search distance for duplicated words to 40000. + * textmodes/flyspell.el (flyspell-duplicate-distance): + Limit default search distance for duplicated words to 40000. (flyspell-word-search-backward, flyspell-word-search-forward): Search as full word with defined casechars, not as substring. @@ -122,8 +128,8 @@ 2015-02-08 Eli Zaretskii * frame.el (frame-notice-user-settings): Refresh the value of - frame parameters after calling tty-handle-reverse-video. Call - face-set-after-frame-default with the actual parameters, to avoid + frame parameters after calling tty-handle-reverse-video. + Call face-set-after-frame-default with the actual parameters, to avoid resetting colors back to unspecified. (set-background-color, set-foreground-color): Pass the foreground and background colors to face-set-after-frame-default. (Bug#19802) @@ -156,8 +162,8 @@ 2015-02-04 Eli Zaretskii - * textmodes/artist.el (artist-ellipse-compute-fill-info): Use - mapcar, not mapc, to create the other half of fill-info. + * textmodes/artist.el (artist-ellipse-compute-fill-info): + Use mapcar, not mapc, to create the other half of fill-info. (Bug#19763) 2015-02-04 Nicolas Petton @@ -182,18 +188,18 @@ 2015-02-01 Alan Mackenzie - CC Mode: Stop Font Lock forcing fontification from BOL. Fixes - debbugs#19669. + CC Mode: Stop Font Lock forcing fontification from BOL. + Fixes debbugs#19669. - * progmodes/cc-mode.el (c-font-lock-init): Setq - font-lock-extend-region-functions to nil. + * progmodes/cc-mode.el (c-font-lock-init): + Setq font-lock-extend-region-functions to nil. 2015-01-31 Alan Mackenzie Handle "#" operator properly inside macro. Fix coding bug. - * progmodes/cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): On - finding a "#" which looks like the start of a macro, check it + * progmodes/cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): + On finding a "#" which looks like the start of a macro, check it isn't already inside a macro. * progmodes/cc-engine.el (c-state-safe-place): Don't record a new @@ -236,8 +242,8 @@ python.el: New non-global state dependent indentation engine. (Bug#18319, Bug#19595) - * progmodes/python.el (python-syntax-comment-or-string-p): Accept - PPSS as argument. + * progmodes/python.el (python-syntax-comment-or-string-p): + Accept PPSS as argument. (python-syntax-closing-paren-p): New function. (python-indent-current-level) (python-indent-levels): Mark obsolete. @@ -262,8 +268,8 @@ * subr.el (posnp): Correct docstring of `posnp'. (posn-col-row): Make it work with all mouse position objects. - * textmodes/artist.el (artist-mouse-draw-continously): Cancel - timers if an error occurs during continuous drawing. (Bug#6130) + * textmodes/artist.el (artist-mouse-draw-continously): + Cancel timers if an error occurs during continuous drawing. (Bug#6130) 2015-01-20 Eli Zaretskii @@ -368,8 +374,8 @@ 2014-12-27 Fabián Ezequiel Gallina - * progmodes/python.el (python-shell-buffer-substring): Handle - cornercase when region sent starts at point-min. + * progmodes/python.el (python-shell-buffer-substring): + Handle cornercase when region sent starts at point-min. 2014-12-27 Eli Zaretskii diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 184912d9fc4..4f3f12d5285 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -834,12 +834,12 @@ Possible return values: ;;; Miscellaneous commands using the precedence parser. -(defun smie-backward-sexp-command (&optional n) +(defun smie-backward-sexp-command (n) "Move backward through N logical elements." (interactive "^p") (smie-forward-sexp-command (- n))) -(defun smie-forward-sexp-command (&optional n) +(defun smie-forward-sexp-command (n) "Move forward through N logical elements." (interactive "^p") (let ((forw (> n 0))