------------------------------------------------------------ revno: 116269 committer: martin rudalics branch nick: trunk timestamp: Wed 2014-02-05 10:24:55 +0100 message: Fix cursor appearance in note_mouse_highlight (Bug#16647). * xdisp.c (note_mouse_highlight): When entering a margin area show a non-text cursor (Bug#16647). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-04 19:24:09 +0000 +++ src/ChangeLog 2014-02-05 09:24:55 +0000 @@ -1,3 +1,8 @@ +2014-02-05 Martin Rudalics + + * xdisp.c (note_mouse_highlight): When entering a margin area show + a non-text cursor (Bug#16647). + 2014-02-04 Paul Eggert * menu.c (Fx_popup_dialog): Remove label 'dialog_via_menu'. === modified file 'src/xdisp.c' --- src/xdisp.c 2014-02-04 07:36:58 +0000 +++ src/xdisp.c 2014-02-05 09:24:55 +0000 @@ -28568,7 +28568,15 @@ || part == ON_LEFT_MARGIN || part == ON_RIGHT_MARGIN) { note_mode_line_or_margin_highlight (window, x, y, part); - return; + + if (part == ON_LEFT_MARGIN || part == ON_RIGHT_MARGIN) + { + cursor = FRAME_X_OUTPUT (f)->nontext_cursor; + /* Sho non-text cursor (Bug#16647). */ + goto set_cursor; + } + else + return; } #ifdef HAVE_WINDOW_SYSTEM ------------------------------------------------------------ revno: 116268 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-02-05 00:37:39 -0800 message: * lisp/epa.el (epa-mail-aliases): Fic custom type. Doc tweak. * etc/NEWS: Related edit. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-02-05 07:46:40 +0000 +++ etc/NEWS 2014-02-05 08:37:39 +0000 @@ -518,17 +518,8 @@ strings and comments. ** New EPA option `epa-mail-aliases'. -You can set this to a list of alias expansions for keys to use -in `epa-mail-encrypt'. - -If one element of the variable's value is ("foo@bar.com" "foo@hello.org"), -that means: when one of the recipients of the message being encrypted -is `foo@bar.com', encrypt the message for `foo@hello.org' instead. - -If one element of the variable's value is ("foo@bar.com"), -that means: when one of the recipients of the message being encrypted -is `foo@bar.com', ignore that name as regards encryption. -This is useful to avoid a query when you have no key for that name. +You can set this to a list of email address aliases for keys to use +`epa-mail-encrypt'. --- ** New ERC option `erc-accidental-paste-threshold-seconds'. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-04 19:35:52 +0000 +++ lisp/ChangeLog 2014-02-05 08:37:39 +0000 @@ -1,3 +1,7 @@ +2014-02-05 Glenn Morris + + * epa.el (epa-mail-aliases): Fic custom type. Doc tweak. + 2014-02-04 Fabián Ezequiel Gallina * progmodes/python.el (python-shell-send-string): === modified file 'lisp/epa.el' --- lisp/epa.el 2014-01-25 19:15:42 +0000 +++ lisp/epa.el 2014-02-05 08:37:39 +0000 @@ -51,13 +51,14 @@ (defcustom epa-mail-aliases nil "Alist of aliases of email addresses that stand for encryption keys. -Each element is (ALIAS EXPANSIONS...). -It means that when a message is addressed to ALIAS, +Each element is a list of email addresses (ALIAS EXPANSIONS...). +When one of the recipients of a message being encrypted is ALIAS, instead of encrypting it for ALIAS, encrypt it for EXPANSIONS... + If EXPANSIONS is empty, ignore ALIAS as regards encryption. -That is a handy way to avoid warnings about addresses -that you don't have any key for." - :type '(repeat (cons (string :tag "Alias") (repeat '(string :tag "Expansion")))) +This is a handy way to avoid warnings about addresses that you don't +have any key for." + :type '(repeat (cons (string :tag "Alias") (repeat (string :tag "Expansion")))) :group 'epa :version "24.4") ------------------------------------------------------------ revno: 116267 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-02-05 00:35:24 -0800 message: * doc/misc/epa.texi: Add indices. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-05 07:46:40 +0000 +++ doc/misc/ChangeLog 2014-02-05 08:35:24 +0000 @@ -1,5 +1,7 @@ 2014-02-05 Glenn Morris + * epa.texi: Add indices. + * url.texi (Cookies): Mention url-cookie-list command. 2014-02-03 Glenn Morris === modified file 'doc/misc/epa.texi' --- doc/misc/epa.texi 2014-01-06 05:25:46 +0000 +++ doc/misc/epa.texi 2014-02-05 08:35:24 +0000 @@ -63,6 +63,9 @@ * Caching Passphrases:: * Bug Reports:: * GNU Free Documentation License:: The license for this documentation. +* Key Index:: +* Function Index:: +* Variable Index:: @end menu @node Overview @@ -493,6 +496,18 @@ @appendix GNU Free Documentation License @include doclicense.texi +@node Key Index +@unnumbered Key Index +@printindex ky + +@node Function Index +@unnumbered Function Index +@printindex fn + +@node Variable Index +@unnumbered Variable Index +@printindex vr + @bye @c End: ------------------------------------------------------------ revno: 116266 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-02-04 23:46:40 -0800 message: Some doc for url-cookie-list * lisp/url/url-cookie.el (url-cookie-list): Doc fix. * doc/misc/url.texi (Cookies): Mention url-cookie-list command. * etc/NEWS: Related edit. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-03 02:58:13 +0000 +++ doc/misc/ChangeLog 2014-02-05 07:46:40 +0000 @@ -1,3 +1,7 @@ +2014-02-05 Glenn Morris + + * url.texi (Cookies): Mention url-cookie-list command. + 2014-02-03 Glenn Morris * cl.texi (Blocks and Exits): Mention cl-tagbody. === modified file 'doc/misc/url.texi' --- doc/misc/url.texi 2014-01-06 05:25:46 +0000 +++ doc/misc/url.texi 2014-02-05 07:46:40 +0000 @@ -410,6 +410,13 @@ @node Cookies @subsection Cookies +@findex url-cookie-delete +@defun url-cookie-list +This command creates a @file{*url cookies*} buffer listing the current +cookies, if there are any. You can remove a cookie using the +@kbd{C-k} (@code{url-cookie-delete}) command. +@end defun + @defopt url-cookie-file The file in which cookies are stored, defaulting to @file{cookies} in the directory specified by @code{url-configuration-directory}. === modified file 'etc/NEWS' --- etc/NEWS 2014-02-04 07:36:58 +0000 +++ etc/NEWS 2014-02-05 07:46:40 +0000 @@ -871,8 +871,9 @@ *** Handlers for `file-notify-add-watch' and `file-notify-rm-watch' for remote machines which support filesystem notifications. -** New command `url-cookie-list' displays all the current cookies, and -allows deleting selected cookies. ++++ +** New URL command `url-cookie-list' displays the current cookies, +and allows you to interactively remove cookies. ** VC and related modes === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2014-01-25 19:15:42 +0000 +++ lisp/url/ChangeLog 2014-02-05 07:46:40 +0000 @@ -1,3 +1,7 @@ +2014-02-05 Glenn Morris + + * url-cookie.el (url-cookie-list): Doc fix. + 2014-01-25 Rüdiger Sonderfeld * url-vars.el (url): Link to info manual. === modified file 'lisp/url/url-cookie.el' --- lisp/url/url-cookie.el 2014-01-01 07:43:34 +0000 +++ lisp/url/url-cookie.el 2014-02-05 07:46:40 +0000 @@ -352,9 +352,9 @@ ;;; Mode for listing and editing cookies. (defun url-cookie-list () - "List the URL cookies." + "Display a buffer listing the current URL cookies, if there are any. +Use \\\\\[url-cookie-delete] to remove cookies." (interactive) - (when (and (null url-cookie-secure-storage) (null url-cookie-storage)) (error "No cookies are defined")) ------------------------------------------------------------ revno: 116265 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2014-02-05 04:35:29 +0000 message: lisp/gnus/gnus-int.el (gnus-request-accept-article): Doc fix diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-02-01 08:26:31 +0000 +++ lisp/gnus/ChangeLog 2014-02-05 04:35:29 +0000 @@ -1,3 +1,7 @@ +2014-02-05 Lars Ingebrigtsen + + * gnus-int.el (gnus-request-accept-article): Doc fix. + 2014-02-01 Lars Ingebrigtsen * nnir.el (nnir-request-update-mark): Don't try to update the source === modified file 'lisp/gnus/gnus-int.el' --- lisp/gnus/gnus-int.el 2014-01-01 07:43:34 +0000 +++ lisp/gnus/gnus-int.el 2014-02-05 04:35:29 +0000 @@ -754,7 +754,6 @@ (defun gnus-request-accept-article (group &optional gnus-command-method last no-encode) - ;; Make sure there's a newline at the end of the article. (when (stringp gnus-command-method) (setq gnus-command-method (gnus-server-to-method gnus-command-method))) (when (and (not gnus-command-method) @@ -762,6 +761,7 @@ (setq gnus-command-method (or (gnus-find-method-for-group group) (gnus-group-name-to-method group)))) (goto-char (point-max)) + ;; Make sure there's a newline at the end of the article. (unless (bolp) (insert "\n")) (unless no-encode ------------------------------------------------------------ revno: 116264 fixes bug: http://debbugs.gnu.org/16547 committer: Fabián Ezequiel Gallina branch nick: trunk timestamp: Tue 2014-02-04 16:35:52 -0300 message: * progmodes/python.el (python-shell-send-string): (python-shell-send-string-no-output): Fix docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-04 17:37:08 +0000 +++ lisp/ChangeLog 2014-02-04 19:35:52 +0000 @@ -1,3 +1,8 @@ +2014-02-04 Fabián Ezequiel Gallina + + * progmodes/python.el (python-shell-send-string): + (python-shell-send-string-no-output): Fix docstring (Bug#16547). + 2014-02-04 Anders Lindgren * emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/python.el 2014-02-04 19:35:52 +0000 @@ -2118,8 +2118,7 @@ temp-file-name)) (defun python-shell-send-string (string &optional process) - "Send STRING to inferior Python PROCESS. -When MSG is non-nil messages the first line of STRING." + "Send STRING to inferior Python PROCESS." (interactive "sPython command: ") (let ((process (or process (python-shell-get-or-create-process)))) (if (string-match ".\n+." string) ;Multiline. @@ -2168,8 +2167,7 @@ (defun python-shell-send-string-no-output (string &optional process) "Send STRING to PROCESS and inhibit output. -When MSG is non-nil messages the first line of STRING. Return -the output." +Return the output." (let ((process (or process (python-shell-get-or-create-process))) (comint-preoutput-filter-functions '(python-shell-output-filter)) ------------------------------------------------------------ revno: 116263 committer: Paul Eggert branch nick: trunk timestamp: Tue 2014-02-04 11:24:09 -0800 message: * menu.c (Fx_popup_dialog): Remove label 'dialog_via_menu'. It prompted a compile-time diagnostic on GNU/Linux. Simplify to remove the need for the label. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-04 16:13:51 +0000 +++ src/ChangeLog 2014-02-04 19:24:09 +0000 @@ -1,3 +1,9 @@ +2014-02-04 Paul Eggert + + * menu.c (Fx_popup_dialog): Remove label 'dialog_via_menu'. + It prompted a compile-time diagnostic on GNU/Linux. + Simplify to remove the need for the label. + 2014-02-04 Eli Zaretskii * w32menu.c (w32_popup_dialog): Don't condition the whole function === modified file 'src/menu.c' --- src/menu.c 2014-02-04 16:13:51 +0000 +++ src/menu.c 2014-02-04 19:24:09 +0000 @@ -1561,26 +1561,23 @@ Do this before creating the widget value that points to Lisp string contents, because Fredisplay may GC and relocate them. */ Fredisplay (Qt); -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) + +#if defined USE_X_TOOLKIT || defined USE_GTK if (FRAME_WINDOW_P (f)) return xw_popup_dialog (f, header, contents); - else #endif -#if defined (HAVE_NTGUI) +#ifdef HAVE_NTGUI if (FRAME_W32_P (f)) { Lisp_Object selection = w32_popup_dialog (f, header, contents); if (!EQ (selection, Qunsupported__w32_dialog)) return selection; - goto dialog_via_menu; } - else #endif #ifdef HAVE_NS if (FRAME_NS_P (f)) return ns_popup_dialog (position, header, contents); - else #endif /* Display a menu with these alternatives in the middle of frame F. */ @@ -1588,8 +1585,6 @@ Lisp_Object x, y, frame, newpos, prompt; int x_coord, y_coord; - dialog_via_menu: - prompt = Fcar (contents); if (FRAME_WINDOW_P (f)) { ------------------------------------------------------------ revno: 116262 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16620 author: Anders Lindgren committer: Stefan Monnier branch nick: trunk timestamp: Tue 2014-02-04 12:37:08 -0500 message: * lisp/emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in the names. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-04 07:36:58 +0000 +++ lisp/ChangeLog 2014-02-04 17:37:08 +0000 @@ -1,9 +1,12 @@ +2014-02-04 Anders Lindgren + + * emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in + the names (bug#16620). + 2014-02-03 Martin Rudalics - * faces.el (window-divider): New default value. Rewrite - doc-string. - (window-divider-first-pixel, window-divider-last-pixel): New - faces. + * faces.el (window-divider): New default value. Rewrite doc-string. + (window-divider-first-pixel, window-divider-last-pixel): New faces. 2014-02-03 Dmitry Gutov @@ -34,8 +37,8 @@ 2014-02-02 Daniel Colascione - * help-at-pt.el (help-at-pt-string,help-at-pt-maybe-display): Also - try to display local help from just before point. + * help-at-pt.el (help-at-pt-string,help-at-pt-maybe-display): + Also try to display local help from just before point. 2014-02-02 Alan Mackenzie === modified file 'lisp/emacs-lisp/ert.el' --- lisp/emacs-lisp/ert.el 2014-01-01 07:43:34 +0000 +++ lisp/emacs-lisp/ert.el 2014-02-04 17:37:08 +0000 @@ -1469,7 +1469,7 @@ "Activate font-lock keywords for some of ERT's symbols." (font-lock-add-keywords nil - '(("(\\(\\\\s *\\(\\sw+\\)?" + '(("(\\(\\\\s *\\(\\(?:\\sw\\|\\s_\\)+\\)?" (1 font-lock-keyword-face nil t) (2 font-lock-function-name-face nil t))))) ------------------------------------------------------------ revno: 116261 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2014-02-04 18:25:52 +0200 message: src/w32fns.c (Fw32_shell_execute): Improve commentary. diff: === modified file 'src/w32fns.c' --- src/w32fns.c 2014-02-02 13:00:41 +0000 +++ src/w32fns.c 2014-02-04 16:25:52 +0000 @@ -6924,11 +6924,12 @@ #else /* !CYGWIN */ current_dir = ENCODE_FILE (current_dir); /* We have a situation here. If DOCUMENT is a relative file name, - and is not in CURRENT_DIR, ShellExecute below will fail to find - it. So we need to make the file name absolute. But DOCUMENT - does not have to be a file, it can be a URL, for example. So we - make it absolute only if it is an existing file; if it is a file - that does not exist, tough. */ + but its name includes leading directories, i.e. it lives not in + CURRENT_DIR, but in its subdirectory, then ShellExecute below + will fail to find it. So we need to make the file name is + absolute. But DOCUMENT does not have to be a file, it can be a + URL, for example. So we make it absolute only if it is an + existing file; if it is a file that does not exist, tough. */ GCPRO1 (absdoc); absdoc = Fexpand_file_name (document, Qnil); /* Don't call file handlers for file-exists-p, since they might