------------------------------------------------------------ revno: 114820 committer: Dmitry Antipov branch nick: trunk timestamp: Sun 2013-10-27 09:30:34 +0400 message: * xftfont.c (struct xftfont_info): Remove set-but-unused 'screen' member. (xftfont_open): Adjust user. (xftfont_get_colors): Remove useless prototype. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-10-26 13:43:58 +0000 +++ src/ChangeLog 2013-10-27 05:30:34 +0000 @@ -1,3 +1,10 @@ +2013-10-27 Dmitry Antipov + + * xftfont.c (struct xftfont_info): Remove set-but-unused + 'screen' member. + (xftfont_open): Adjust user. + (xftfont_get_colors): Remove useless prototype. + 2013-10-26 Eli Zaretskii * emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments === modified file 'src/xftfont.c' --- src/xftfont.c 2013-10-25 06:55:36 +0000 +++ src/xftfont.c 2013-10-27 05:30:34 +0000 @@ -58,7 +58,6 @@ int index; FT_Matrix matrix; Display *display; - int screen; XftFont *xftfont; }; @@ -70,11 +69,6 @@ XftColor xft_bg; /* color for face->background */ }; -static void xftfont_get_colors (struct frame *, struct face *, GC gc, - struct xftface_info *, - XftColor *fg, XftColor *bg); - - /* Setup foreground and background colors of GC into FG and BG. If XFTFACE_INFO is not NULL, reuse the colors in it if possible. BG may be NULL. */ @@ -377,7 +371,6 @@ xftfont_info = (struct xftfont_info *) font; xftfont_info->display = display; - xftfont_info->screen = FRAME_X_SCREEN_NUMBER (f); xftfont_info->xftfont = xftfont; /* This means that there's no need of transformation. */ xftfont_info->matrix.xx = 0; ------------------------------------------------------------ revno: 114819 committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2013-10-27 12:40:16 +0800 message: Add an index for edge-detection algorithms. * doc/lispref/display.texi (Image Descriptors): Add an index for edge-detection algorithms. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-10-26 02:25:54 +0000 +++ doc/lispref/ChangeLog 2013-10-27 04:40:16 +0000 @@ -1,3 +1,7 @@ +2013-10-27 Xue Fuqiao + + * display.texi (Image Descriptors): Add an index for edge-detection algorithms. + 2013-10-26 Xue Fuqiao * display.texi (Fringe Indicators): Add indexes for fringe indicators. === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2013-10-26 02:25:54 +0000 +++ doc/lispref/display.texi 2013-10-27 04:40:16 +0000 @@ -4132,6 +4132,7 @@ @table @asis @item @code{(+ @var{n})} +@c FIXME: Add an index for "step"? --xfq This means to use a font that is @var{n} steps larger. A ``step'' is defined by the set of available fonts---specifically, those that match what was otherwise specified for this text, in all attributes except @@ -4412,6 +4413,7 @@ ``disabled'' button. @item (edge-detection :matrix @var{matrix} :color-adjust @var{adjust}) +@cindex edge detection, images Specifies a general edge-detection algorithm. @var{matrix} must be either a nine-element list or a nine-element vector of numbers. A pixel at position @math{x/y} in the transformed image is computed from ------------------------------------------------------------ revno: 114818 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13446 author: Nathan Trapuzzano committer: Stefan Monnier branch nick: trunk timestamp: Sun 2013-10-27 00:18:28 -0400 message: * lisp/linum.el (linum-update-window): Fix boundary test. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-10-25 15:23:45 +0000 +++ etc/NEWS 2013-10-27 04:18:28 +0000 @@ -216,7 +216,7 @@ * Changes in Specialized Modes and Packages in Emacs 24.4 -** prolog-use-smie has been remvoed, along with the non-SMIE indentation code. +** prolog-use-smie has been removed, along with the non-SMIE indentation code. ** SMIE indentation can be customized via `smie-config'. The customizaton can be guessed by Emacs by providing a sample indented === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-27 03:25:03 +0000 +++ lisp/ChangeLog 2013-10-27 04:18:28 +0000 @@ -1,3 +1,7 @@ +2013-10-27 Nathan Trapuzzano + + * linum.el (linum-update-window): Fix boundary test (bug#13446). + 2013-10-27 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie--bosp): Anything that goes === modified file 'lisp/linum.el' --- lisp/linum.el 2013-01-01 09:11:05 +0000 +++ lisp/linum.el 2013-10-27 04:18:28 +0000 @@ -152,7 +152,7 @@ (run-hooks 'linum-before-numbering-hook) ;; Create an overlay (or reuse an existing one) for each ;; line visible in this window, if necessary. - (while (and (not (eobp)) (<= (point) limit)) + (while (and (not (eobp)) (< (point) limit)) (let* ((str (if fmt (propertize (format fmt line) 'face 'linum) (funcall linum-format line))) ------------------------------------------------------------ revno: 114817 committer: Dmitry Gutov branch nick: trunk timestamp: Sun 2013-10-27 07:25:03 +0400 message: * lisp/progmodes/ruby-mode.el (ruby-smie--bosp): Anything that goes after `=' is probably a new expression. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-27 02:02:02 +0000 +++ lisp/ChangeLog 2013-10-27 03:25:03 +0000 @@ -1,3 +1,8 @@ +2013-10-27 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-smie--bosp): Anything that goes + after `=' is probably a new expression. + 2013-10-27 Rüdiger Sonderfeld * man.el (man-imenu-title): New option. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-10-26 01:16:37 +0000 +++ lisp/progmodes/ruby-mode.el 2013-10-27 03:25:03 +0000 @@ -334,7 +334,7 @@ (defun ruby-smie--bosp () (save-excursion (skip-chars-backward " \t") - (or (bolp) (eq (char-before) ?\;)))) + (or (bolp) (memq (char-before) '(?\; ?=))))) (defun ruby-smie--implicit-semi-p () (save-excursion === modified file 'test/indent/ruby.rb' --- test/indent/ruby.rb 2013-10-26 01:22:50 +0000 +++ test/indent/ruby.rb 2013-10-27 03:25:03 +0000 @@ -220,6 +220,11 @@ .baz end +# http://stackoverflow.com/questions/17786563/emacs-ruby-mode-if-expressions-indentation +tee = if foo + bar + end + # Examples below still fail with `ruby-use-smie' on: foo = [1, 2, 3].map do |i| ------------------------------------------------------------ revno: 114816 fixes bug: http://debbugs.gnu.org/15722 author: Rüdiger Sonderfeld committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-10-26 19:02:02 -0700 message: Add menu for M-x man * lisp/man.el (man-imenu-title): New option. (Man-mode-map): Add menu. (Man-mode): Add imenu to menu. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-26 01:16:37 +0000 +++ lisp/ChangeLog 2013-10-27 02:02:02 +0000 @@ -1,3 +1,9 @@ +2013-10-27 Rüdiger Sonderfeld + + * man.el (man-imenu-title): New option. + (Man-mode-map): Add menu. (Bug#15722) + (Man-mode): Add imenu to menu. + 2013-10-26 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie--args-separator-p): Be more === modified file 'lisp/man.el' --- lisp/man.el 2013-10-13 00:31:19 +0000 +++ lisp/man.el 2013-10-27 02:02:02 +0000 @@ -89,6 +89,7 @@ ;;; Code: (require 'ansi-color) +(require 'cl-lib) (require 'button) (defgroup man nil @@ -368,6 +369,12 @@ Otherwise, the value is whatever the function `Man-support-local-filenames' should return.") +(defcustom man-imenu-title "Contents" + "The title to use if man adds a Contents menu to the menubar." + :version "24.4" + :type 'string + :group 'man) + ;; other variables and keymap initializations (defvar Man-original-frame) @@ -446,6 +453,28 @@ ;; manual page can contain references to other man pages (define-key map "\r" 'man-follow) (define-key map "?" 'describe-mode) + + (easy-menu-define nil map + "`Man-mode' menu." + '("Man" + ["Next Section" Man-next-section t] + ["Previous Section" Man-previous-section t] + ["Go To Section..." Man-goto-section t] + ["Go To \"SEE ALSO\" Section" Man-goto-see-also-section + :active (cl-member Man-see-also-regexp Man--sections + :test #'string-match-p)] + ["Follow Reference..." Man-follow-manual-reference + :active Man--refpages + :help "Go to a manpage referred to in the \"SEE ALSO\" section"] + "--" + ["Next Manpage" Man-next-manpage + :active (> (length Man-page-list) 1)] + ["Previous Manpage" Man-previous-manpage + :active (> (length Man-page-list) 1)] + "--" + ["Man..." man t] + ["Kill Buffer" Man-kill t] + ["Quit" Man-quit t])) map) "Keymap for Man mode.") @@ -1396,6 +1425,7 @@ (buffer-disable-undo) (auto-fill-mode -1) (setq imenu-generic-expression (list (list nil Man-heading-regexp 0))) + (imenu-add-to-menubar man-imenu-title) (set (make-local-variable 'outline-regexp) Man-heading-regexp) (set (make-local-variable 'outline-level) (lambda () 1)) (set (make-local-variable 'bookmark-make-record-function) ------------------------------------------------------------ revno: 114815 fixes bug: http://debbugs.gnu.org/15260 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-10-26 16:43:58 +0300 message: Fix part of bug #15260 with from directory with a non-ASCII name. src/emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments before passing them to 'unexec'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-10-26 03:13:18 +0000 +++ src/ChangeLog 2013-10-26 13:43:58 +0000 @@ -1,3 +1,8 @@ +2013-10-26 Eli Zaretskii + + * emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments + before passing them to 'unexec'. (Bug#15260) + 2013-10-26 Xue Fuqiao * fringe.c (set_fringe_bitmap_face): Add usage note from lispref. === modified file 'src/emacs.c' --- src/emacs.c 2013-10-20 16:47:42 +0000 +++ src/emacs.c 2013-10-26 13:43:58 +0000 @@ -2044,11 +2044,15 @@ CHECK_STRING (filename); filename = Fexpand_file_name (filename, Qnil); + filename = ENCODE_FILE (filename); if (!NILP (symfile)) { CHECK_STRING (symfile); if (SCHARS (symfile)) - symfile = Fexpand_file_name (symfile, Qnil); + { + symfile = Fexpand_file_name (symfile, Qnil); + symfile = ENCODE_FILE (symfile); + } } tem = Vpurify_flag; ------------------------------------------------------------ revno: 114814 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-10-26 11:13:18 +0800 message: Doc fix for set-fringe-bitmap-face. * src/fringe.c (set_fringe_bitmap_face): Add usage note from lispref. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-10-25 09:52:37 +0000 +++ src/ChangeLog 2013-10-26 03:13:18 +0000 @@ -1,3 +1,7 @@ +2013-10-26 Xue Fuqiao + + * fringe.c (set_fringe_bitmap_face): Add usage note from lispref. + 2013-10-25 Eli Zaretskii * w32uniscribe.c (uniscribe_close): Adjust the argument list to === modified file 'src/fringe.c' --- src/fringe.c 2013-10-04 07:36:22 +0000 +++ src/fringe.c 2013-10-26 03:13:18 +0000 @@ -1690,6 +1690,8 @@ DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face, 1, 2, 0, doc: /* Set face for fringe bitmap BITMAP to FACE. +FACE is merged with the `fringe' face, so normally FACE should specify +only the foreground color. If FACE is nil, reset face to default fringe face. */) (Lisp_Object bitmap, Lisp_Object face) {