commit d46f31b4b2b0c56f2708e3225eb9fa973441e696 (HEAD, refs/remotes/origin/master) Author: Nicolas Petton Date: Wed Mar 25 09:21:14 2015 +0100 * lisp/emacs-lisp/seq.el: Documentation improvements diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 72a45d0..4fb1999 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-25 Nicolas Petton + + * emacs-lisp/seq.el: Documentation improvements. + 2015-03-25 Glenn Morris * net/browse-url.el (browse-url-browser-function) diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index 59b9140..c5f5906 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -33,8 +33,8 @@ ;; ;; All provided functions work on lists, strings and vectors. ;; -;; Functions taking a predicate or a function iterating over the -;; sequence as argument take the function as their first argument and +;; Functions taking a predicate or iterating over a sequence using a +;; function as argument take the function as their first argument and ;; the sequence as their second argument. All other functions take ;; the sequence as their first argument. ;; commit dcac0090daa378d8db5c63b586c8ea664132a8ce Author: Glenn Morris Date: Tue Mar 24 23:32:40 2015 -0700 * doc/misc/idlwave.texi: Fix typo in previous. diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index f6d702c..496674c 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -3817,7 +3817,7 @@ equivalents (yet can be bookmarked, browsed as history, searched, etc.). @c Not updated in over a decade. -@C Maybe you want to recommend eww these days. +@c Maybe you want to recommend eww these days. @ignore @noindent Individual platform recommendations: commit 3227a059177134df6c908639c099a6fe82dc16ad Author: Glenn Morris Date: Tue Mar 24 23:29:34 2015 -0700 * doc/misc/newsticker.texi (Supported Formats): Remove dead url. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 2b04f25..2fd0d2c 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,5 +1,7 @@ 2015-03-25 Glenn Morris + * newsticker.texi (Supported Formats): Remove dead url. + * remember.texi (Function Reference): Copyedit. * idlwave.texi (HTML Help Browser Tips): Remove obsolete info. diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index aa1ad72..0520a4e 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -590,8 +590,7 @@ Newsticker works with the standard RSS and Atom formats listed below @subheading RSS formats @itemize -@item RSS 0.91 (see @uref{http://backend.userland.com/rss091} or -@uref{http://my.netscape.com/publish/formats/rss-spec-0.91.html}) +@item RSS 0.91 (see @uref{http://backend.userland.com/rss091}) @item RSS 0.92 (see @uref{http://backend.userland.com/rss092}) @item RSS 1.0 (see @uref{http://purl.org/rss/1.0/spec}) @item RSS 2.0 (see @uref{http://blogs.law.harvard.edu/tech/rss}) commit 8294ea7ed679020750d4e6202cf102f8571f02ad Author: Glenn Morris Date: Tue Mar 24 23:28:58 2015 -0700 * doc/misc/remember.texi (Function Reference): Copyedit. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index b7419b5..2b04f25 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,5 +1,7 @@ 2015-03-25 Glenn Morris + * remember.texi (Function Reference): Copyedit. + * idlwave.texi (HTML Help Browser Tips): Remove obsolete info. 2015-03-18 Eli Zaretskii diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi index ff481b7..c0d2ba3 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -270,7 +270,7 @@ that region, will be remembered. @defun remember-clipboard Remember the contents of the current clipboard. This is most useful -for remembering things from Netscape or other X Windows applications. +for remembering things from a web browser or other X Windows applications. @end defun @defun remember-finalize commit f314d48159083f9f660fe6a3fb038016a77ae4bf Author: Glenn Morris Date: Tue Mar 24 23:26:48 2015 -0700 browse-url: mark some of the more obsolete stuff as such * lisp/net/browse-url.el (browse-url-browser-function) (browse-url-default-browser): Remove obsolete items from the explicit listing. (browse-url-new-window-flag, browse-url-of-file-hook): Doc fixes. (browse-url-netscape-program, browse-url-netscape-arguments) (browse-url-netscape-startup-arguments) (browse-url-galeon-program, browse-url-galeon-arguments) (browse-url-galeon-startup-arguments) (browse-url-gnome-moz-program, browse-url-gnome-moz-arguments) (browse-url-galeon-new-window-is-tab) (browse-url-netscape-new-window-is-tab) (browse-url-mosaic-program, browse-url-mosaic-arguments) (browse-url-mosaic-pidfile, browse-url-CCI-port) (browse-url-CCI-host, browse-url-netscape-version) (browse-url-netscape, browse-url-netscape-sentinel) (browse-url-netscape-reload, browse-url-netscape-send) (browse-url-galeon, browse-url-galeon-sentinel) (browse-url-gnome-moz, browse-url-mosaic, browse-url-cci) (browse-url-w3-gnudoit): Make obsolete. * etc/NEWS: Mention this. * doc/misc/idlwave.texi (HTML Help Browser Tips): Remove obsolete info. * lisp/ffap.el (ffap-url-fetcher): Simplify default and doc. * lisp/x-dnd.el: Comment update. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 62f5651..b7419b5 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,10 +1,15 @@ +2015-03-25 Glenn Morris + + * idlwave.texi (HTML Help Browser Tips): Remove obsolete info. + 2015-03-18 Eli Zaretskii * efaq-w32.texi: Remove outdated information and update. 2015-03-18 Martin Rudalics - * efaq.texi (Fullscreen mode on MS-Windows): Fix description (Bug#20110). + * efaq.texi (Fullscreen mode on MS-Windows): + Fix description (Bug#20110). 2015-03-04 Michael Albinus diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 7cf9673..f6d702c 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -3800,31 +3800,25 @@ available, it is the preferred choice, and the default. The variable whether this help browser is used. If you use the IDL Assistant, the tips here are not relevant. -Since IDLWAVE runs on a many different system types, a single browser -configuration is not possible, but choices abound. On many systems, -the default browser configured in @code{browse-url-browser-function}, -and hence inherited by default by -@code{idlwave-help-browser-function}, is Netscape. Unfortunately, the -HTML manuals decompiled from the original source contain formatting -structures which Netscape 4.x does not handle well, though they are -still readable. A much better choice is Mozilla, or one of the -Mozilla-derived browsers such as -@uref{http://galeon.sourceforge.net/,Galeon} (GNU/Linux), -@uref{http://www.mozilla.org/projects/camino/,Camino} (MacOSX), or -@uref{http://www.mozilla.org/projects/firebird/,Firebird} (all -platforms). Newer versions of Emacs provide a browser-function choice -@code{browse-url-gnome-moz} which uses the Gnome-configured browser. +Since IDLWAVE runs on many different system types, a single browser +configuration is not possible, but choices abound. The default +@code{idlwave-help-browser-function} inherits the browser configured +in @code{browse-url-browser-function}. Note that the HTML files decompiled from the help sources contain specific references to the @samp{Symbol} font, which by default is not permitted in normal encodings (it's invalid, technically). Though it only impacts a few symbols, you can trick Mozilla-based browsers into recognizing @samp{Symbol} by following the directions +@c This page is 11 years old. Is it still relevant? @uref{http://hutchinson.belmont.ma.us/tth/Xfonts.html, here}. With this fix in place, HTML help pages look almost identical to their PDF equivalents (yet can be bookmarked, browsed as history, searched, etc.). +@c Not updated in over a decade. +@C Maybe you want to recommend eww these days. +@ignore @noindent Individual platform recommendations: @itemize @bullet @@ -3861,6 +3855,7 @@ following, to get consistent behavior with the @kbd{q} key: Note that you can open the file in an external browser from within @code{w3m} using @kbd{M}. @end itemize +@end ignore @node Configuration Examples @appendix Configuration Examples diff --git a/etc/NEWS b/etc/NEWS index 5a19fc3..45d5ab3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -582,7 +582,10 @@ command line's password prompt. ** Browse-url -*** browse-url now supports the Conkeror Web Browser. +*** Support for the Conkeror web browser. + +--- +*** Support for several ancient browsers is now officially obsolete. +++ ** tar-mode: new `tar-new-entry' command, allowing for new members to diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0d2f592..72a45d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,26 @@ +2015-03-25 Glenn Morris + + * net/browse-url.el (browse-url-browser-function) + (browse-url-default-browser): + Remove obsolete items from the explicit listing. + (browse-url-new-window-flag, browse-url-of-file-hook): Doc fixes. + (browse-url-netscape-program, browse-url-netscape-arguments) + (browse-url-netscape-startup-arguments) + (browse-url-galeon-program, browse-url-galeon-arguments) + (browse-url-galeon-startup-arguments) + (browse-url-gnome-moz-program, browse-url-gnome-moz-arguments) + (browse-url-galeon-new-window-is-tab) + (browse-url-netscape-new-window-is-tab) + (browse-url-mosaic-program, browse-url-mosaic-arguments) + (browse-url-mosaic-pidfile, browse-url-CCI-port) + (browse-url-CCI-host, browse-url-netscape-version) + (browse-url-netscape, browse-url-netscape-sentinel) + (browse-url-netscape-reload, browse-url-netscape-send) + (browse-url-galeon, browse-url-galeon-sentinel) + (browse-url-gnome-moz, browse-url-mosaic, browse-url-cci) + (browse-url-w3-gnudoit): Make obsolete. + * ffap.el (ffap-url-fetcher): Simplify default and doc. + 2015-03-25 Olaf Rogalsky * xt-mouse.el: Add mouse-tracking support (bug#19416). diff --git a/lisp/ffap.el b/lisp/ffap.el index 350a6bd..d4e30a0 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -265,20 +265,10 @@ ffap most of the time." :group 'ffap :risky t) -(defcustom ffap-url-fetcher - (if (fboundp 'browse-url) - 'browse-url ; rely on browse-url-browser-function - 'w3-fetch) - ;; Remote control references: - ;; http://www.ncsa.uiuc.edu/SDG/Software/XMosaic/remote-control.html - ;; http://home.netscape.com/newsref/std/x-remote.html +(defcustom ffap-url-fetcher 'browse-url "A function of one argument, called by ffap to fetch an URL. -Reasonable choices are `w3-fetch' or a `browse-url-*' function. For a fancy alternative, get `ffap-url.el'." - :type '(choice (const w3-fetch) - (const browse-url) ; in recent versions of browse-url - (const browse-url-netscape) - (const browse-url-mosaic) + :type '(choice (const browse-url) function) :group 'ffap :risky t) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index b44bb71..c4ed233 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -31,90 +31,33 @@ ;; different methods of remote control so there is one function for ;; each supported browser. If the chosen browser is not running, it ;; is started. Currently there is support for the following browsers, -;; some of them probably now obsolete: +;; as well as some other obsolete ones: ;; Function Browser Earliest version ;; browse-url-mozilla Mozilla Don't know ;; browse-url-firefox Firefox Don't know (tried with 1.0.1) ;; browse-url-chromium Chromium 3.0 -;; browse-url-galeon Galeon Don't know ;; browse-url-epiphany Epiphany Don't know -;; browse-url-netscape Netscape 1.1b1 -;; browse-url-mosaic XMosaic/mMosaic <= 2.4 -;; browse-url-cci XMosaic 2.5 ;; browse-url-conkeror Conkeror Don't know ;; browse-url-w3 w3 0 -;; browse-url-w3-gnudoit w3 remotely ;; browse-url-text-* Any text browser 0 ;; browse-url-generic arbitrary ;; browse-url-default-windows-browser MS-Windows browser ;; browse-url-default-macosx-browser Mac OS X browser ;; browse-url-xdg-open Free Desktop xdg-open on Gnome, KDE, Xfce4, LXDE -;; browse-url-gnome-moz GNOME interface to Mozilla ;; browse-url-kde KDE konqueror (kfm) ;; browse-url-elinks Elinks Don't know (tried with 0.12.GIT) -;; [A version of the Netscape browser is now free software -;; , albeit not GPLed, so it is -;; reasonable to have that as the default.] - -;; Note that versions of Netscape before 1.1b1 did not have remote -;; control. . - ;; Browsers can cache Web pages so it may be necessary to tell them to ;; reload the current page if it has changed (e.g., if you have edited ;; it). There is currently no perfect automatic solution to this. -;; Netscape allows you to specify the id of the window you want to -;; control but which window DO you want to control and how do you -;; discover its id? - -;; William M. Perry's excellent "w3" WWW browser for -;; Emacs -;; has a function w3-follow-url-at-point, but that -;; doesn't let you edit the URL like browse-url. -;; The `gnuserv' package that can be used to control it in another -;; Emacs process is available from -;; . - -;; Lynx is now distributed by the FSF. See also -;; . - -;; Free graphical browsers that could be used by `browse-url-generic' -;; include Chimera and -;; , Arena -;; and Amaya -;; . mMosaic -;; , -;; (with development -;; support for Java applets and multicast) can be used like Mosaic by -;; setting `browse-url-mosaic-program' appropriately. - -;; I [Denis Howe, not Dave Love] recommend Nelson Minar -;; 's excellent html-helper-mode.el for editing -;; HTML and thank Nelson for his many useful comments on this code. -;; - -;; See also hm--html-menus . For composing correct HTML see also -;; PSGML the general SGML structure editor package -;; ; hm--html-menus can be used -;; with this. - ;; This package generalizes function html-previewer-process in Marc ;; Andreessen's html-mode (LCD modes/html-mode.el.Z). See also the ;; ffap.el package. The huge hyperbole package also contains similar ;; functions. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Help! - -;; Can you write and test some code for the Macintrash and Windoze -;; Netscape remote control APIs? (See the URL above). - -;; Do any other browsers have remote control? - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Usage ;; To display the URL at or before point: @@ -170,34 +113,9 @@ ;; To always save modified buffers before displaying the file in a browser: ;; (setq browse-url-save-file t) -;; To get round the Netscape caching problem, you could EITHER have -;; write-file in html-helper-mode make Netscape reload the document: -;; -;; (autoload 'browse-url-netscape-reload "browse-url" -;; "Ask a WWW browser to redisplay the current file." t) -;; (add-hook 'html-helper-mode-hook -;; (lambda () -;; (add-hook 'local-write-file-hooks -;; (lambda () -;; (let ((local-write-file-hooks)) -;; (save-buffer)) -;; (browse-url-netscape-reload) -;; t) ; => file written by hook -;; t))) ; append to l-w-f-hooks -;; -;; OR have browse-url-of-file ask Netscape to load and then reload the -;; file: -;; -;; (add-hook 'browse-url-of-file-hook 'browse-url-netscape-reload) - -;; You may also want to customize browse-url-netscape-arguments, e.g. -;; (setq browse-url-netscape-arguments '("-install")) -;; -;; or similarly for the other browsers. - ;; To invoke different browsers for different URLs: ;; (setq browse-url-browser-function '(("^mailto:" . browse-url-mail) -;; ("." . browse-url-netscape))) +;; ("." . browse-url-firefox))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Code: @@ -226,17 +144,11 @@ function is passed the URL and any other args of `browse-url'. The last regexp should probably be \".\" to specify a default browser." :type '(choice (function-item :tag "Emacs W3" :value browse-url-w3) - (function-item :tag "W3 in another Emacs via `gnudoit'" - :value browse-url-w3-gnudoit) (function-item :tag "eww" :value eww-browse-url) (function-item :tag "Mozilla" :value browse-url-mozilla) (function-item :tag "Firefox" :value browse-url-firefox) (function-item :tag "Chromium" :value browse-url-chromium) - (function-item :tag "Galeon" :value browse-url-galeon) (function-item :tag "Epiphany" :value browse-url-epiphany) - (function-item :tag "Netscape" :value browse-url-netscape) - (function-item :tag "Mosaic" :value browse-url-mosaic) - (function-item :tag "Mosaic using CCI" :value browse-url-cci) (function-item :tag "Conkeror" :value browse-url-conkeror) (function-item :tag "Text browser in an xterm window" :value browse-url-text-xterm) @@ -250,8 +162,6 @@ regexp should probably be \".\" to specify a default browser." :value browse-url-default-windows-browser) (function-item :tag "Default Mac OS X browser" :value browse-url-default-macosx-browser) - (function-item :tag "GNOME invoking Mozilla" - :value browse-url-gnome-moz) (function-item :tag "Default browser" :value browse-url-default-browser) (function :tag "Your own function") @@ -284,18 +194,25 @@ system, given vroot.h from the same directory, with cc flags :type 'string :group 'browse-url) +(make-obsolete-variable 'browse-url-netscape-program nil "25.1") + (defcustom browse-url-netscape-arguments nil "A list of strings to pass to Netscape as arguments." :type '(repeat (string :tag "Argument")) :group 'browse-url) +(make-obsolete-variable 'browse-url-netscape-arguments nil "25.1") + (defcustom browse-url-netscape-startup-arguments browse-url-netscape-arguments "A list of strings to pass to Netscape when it starts up. Defaults to the value of `browse-url-netscape-arguments' at the time `browse-url' is loaded." :type '(repeat (string :tag "Argument")) + :group 'browse-url) +(make-obsolete-variable 'browse-url-netscape-startup-arguments nil "25.1") + (defcustom browse-url-browser-display nil "The X display for running the browser, if not same as Emacs's." :type '(choice string (const :tag "Default" nil)) @@ -363,11 +280,15 @@ Defaults to the value of `browse-url-firefox-arguments' at the time :type 'string :group 'browse-url) +(make-obsolete-variable 'browse-url-galeon-program nil "25.1") + (defcustom browse-url-galeon-arguments nil "A list of strings to pass to Galeon as arguments." :type '(repeat (string :tag "Argument")) :group 'browse-url) +(make-obsolete-variable 'browse-url-galeon-arguments nil "25.1") + (defcustom browse-url-galeon-startup-arguments browse-url-galeon-arguments "A list of strings to pass to Galeon when it starts up. Defaults to the value of `browse-url-galeon-arguments' at the time @@ -375,6 +296,8 @@ Defaults to the value of `browse-url-galeon-arguments' at the time :type '(repeat (string :tag "Argument")) :group 'browse-url) +(make-obsolete-variable 'browse-url-galeon-startup-arguments nil "25.1") + (defcustom browse-url-epiphany-program "epiphany" "The name by which to invoke Epiphany." :type 'string @@ -395,12 +318,16 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time ;; GNOME means of invoking either Mozilla or Netscape. (defvar browse-url-gnome-moz-program "gnome-moz-remote") +(make-obsolete-variable 'browse-url-gnome-moz-program nil "25.1") + (defcustom browse-url-gnome-moz-arguments '() "A list of strings passed to the GNOME mozilla viewer as arguments." :version "21.1" :type '(repeat (string :tag "Argument")) :group 'browse-url) +(make-obsolete-variable 'browse-url-gnome-moz-arguments nil "25.1") + (defcustom browse-url-mozilla-new-window-is-tab nil "Whether to open up new windows in a tab or a new window. If non-nil, then open the URL in a new tab rather than a new window if @@ -432,6 +359,8 @@ If non-nil, then open the URL in a new tab rather than a new window if :type 'boolean :group 'browse-url) +(make-obsolete-variable 'browse-url-galeon-new-window-is-tab nil "25.1") + (defcustom browse-url-epiphany-new-window-is-tab nil "Whether to open up new windows in a tab or a new window. If non-nil, then open the URL in a new tab rather than a new window if @@ -447,11 +376,12 @@ window." :type 'boolean :group 'browse-url) +(make-obsolete-variable 'browse-url-netscape-new-window-is-tab nil "25.1") + (defcustom browse-url-new-window-flag nil "Non-nil means always open a new browser window with appropriate browsers. Passing an interactive argument to \\[browse-url], or specific browser -commands reverses the effect of this variable. Requires Netscape version -1.1N or later or XMosaic version 2.5 or later if using those browsers." +commands reverses the effect of this variable." :type 'boolean :group 'browse-url) @@ -461,16 +391,22 @@ commands reverses the effect of this variable. Requires Netscape version :version "20.3" :group 'browse-url) +(make-obsolete-variable 'browse-url-mosaic-program nil "25.1") + (defcustom browse-url-mosaic-arguments nil "A list of strings to pass to Mosaic as arguments." :type '(repeat (string :tag "Argument")) :group 'browse-url) +(make-obsolete-variable 'browse-url-mosaic-arguments nil "25.1") + (defcustom browse-url-mosaic-pidfile "~/.mosaicpid" "The name of the pidfile created by Mosaic." :type 'string :group 'browse-url) +(make-obsolete-variable 'browse-url-mosaic-pidfile nil "25.1") + (defcustom browse-url-conkeror-program "conkeror" "The name by which to invoke Conkeror." :type 'string @@ -521,12 +457,8 @@ Used by the `browse-url-of-file' command." :group 'browse-url) (defcustom browse-url-of-file-hook nil - "Run after `browse-url-of-file' has asked a browser to load a file. - -Set this to `browse-url-netscape-reload' to force Netscape to load the -file rather than displaying a cached copy." + "Hook run after `browse-url-of-file' has asked a browser to load a file." :type 'hook - :options '(browse-url-netscape-reload) :group 'browse-url) (defcustom browse-url-CCI-port 3003 @@ -536,6 +468,8 @@ the value set in the browser." :type 'integer :group 'browse-url) +(make-obsolete-variable 'browse-url-CCI-port nil "25.1") + (defcustom browse-url-CCI-host "localhost" "Host to access XMosaic via CCI. This should be the host name of the machine running XMosaic with CCI @@ -543,6 +477,8 @@ enabled. The port number should be set in `browse-url-CCI-port'." :type 'string :group 'browse-url) +(make-obsolete-variable 'browse-url-CCI-host nil "25.1") + (defvar browse-url-temp-file-name nil) (make-variable-buffer-local 'browse-url-temp-file-name) @@ -594,6 +530,8 @@ incompatibly at version 4." :type 'number :group 'browse-url) +(make-obsolete-variable 'browse-url-netscape-version nil "25.1") + (defcustom browse-url-text-browser "lynx" "The name of the text browser to invoke." :type 'string @@ -946,14 +884,14 @@ used instead of `browse-url-new-window-flag'." ((memq system-type '(darwin)) 'browse-url-default-macosx-browser) ((browse-url-can-use-xdg-open) 'browse-url-xdg-open) - ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) +;;; ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) ((executable-find browse-url-firefox-program) 'browse-url-firefox) ((executable-find browse-url-chromium-program) 'browse-url-chromium) - ((executable-find browse-url-galeon-program) 'browse-url-galeon) +;;; ((executable-find browse-url-galeon-program) 'browse-url-galeon) ((executable-find browse-url-kde-program) 'browse-url-kde) - ((executable-find browse-url-netscape-program) 'browse-url-netscape) - ((executable-find browse-url-mosaic-program) 'browse-url-mosaic) +;;; ((executable-find browse-url-netscape-program) 'browse-url-netscape) +;;; ((executable-find browse-url-mosaic-program) 'browse-url-mosaic) ((executable-find browse-url-conkeror-program) 'browse-url-conkeror) ((executable-find browse-url-xterm-program) 'browse-url-text-xterm) ((locate-library "w3") 'browse-url-w3) @@ -1019,6 +957,7 @@ is loaded in a new tab in an existing window instead. When called non-interactively, optional second argument NEW-WINDOW is used instead of `browse-url-new-window-flag'." + (declare (obsolete nil "25.1")) (interactive (browse-url-interactive-arg "URL: ")) (setq url (browse-url-encode-url url)) (let* ((process-environment (browse-url-process-environment)) @@ -1046,6 +985,7 @@ used instead of `browse-url-new-window-flag'." (defun browse-url-netscape-sentinel (process url) "Handle a change to the process communicating with Netscape." + (declare (obsolete nil "25.1")) (or (eq (process-exit-status process) 0) (let* ((process-environment (browse-url-process-environment))) ;; Netscape not running - start it @@ -1057,6 +997,7 @@ used instead of `browse-url-new-window-flag'." (defun browse-url-netscape-reload () "Ask Netscape to reload its current document. How depends on `browse-url-netscape-version'." + (declare (obsolete nil "25.1")) (interactive) ;; Backwards incompatibility reported by ;; . @@ -1066,6 +1007,7 @@ How depends on `browse-url-netscape-version'." (defun browse-url-netscape-send (command) "Send a remote control command to Netscape." + (declare (obsolete nil "25.1")) (let* ((process-environment (browse-url-process-environment))) (apply 'start-process "netscape" nil browse-url-netscape-program @@ -1184,6 +1126,7 @@ new tab in an existing window instead. When called non-interactively, optional second argument NEW-WINDOW is used instead of `browse-url-new-window-flag'." + (declare (obsolete nil "25.1")) (interactive (browse-url-interactive-arg "URL: ")) (setq url (browse-url-encode-url url)) (let* ((process-environment (browse-url-process-environment)) @@ -1205,6 +1148,7 @@ used instead of `browse-url-new-window-flag'." (defun browse-url-galeon-sentinel (process url) "Handle a change to the process communicating with Galeon." + (declare (obsolete nil "25.1")) (or (eq (process-exit-status process) 0) (let* ((process-environment (browse-url-process-environment))) ;; Galeon is not running - start it @@ -1287,6 +1231,7 @@ effect of `browse-url-new-window-flag'. When called non-interactively, optional second argument NEW-WINDOW is used instead of `browse-url-new-window-flag'." + (declare (obsolete nil "25.1")) (interactive (browse-url-interactive-arg "URL: ")) (apply 'start-process (concat "gnome-moz-remote " url) nil @@ -1315,6 +1260,7 @@ the effect of `browse-url-new-window-flag'. When called non-interactively, optional second argument NEW-WINDOW is used instead of `browse-url-new-window-flag'." + (declare (obsolete nil "25.1")) (interactive (browse-url-interactive-arg "Mosaic URL: ")) (let ((pidfile (expand-file-name browse-url-mosaic-pidfile)) pid) @@ -1365,6 +1311,7 @@ the effect of `browse-url-new-window-flag'. When called non-interactively, optional second argument NEW-WINDOW is used instead of `browse-url-new-window-flag'." + (declare (obsolete nil "25.1")) (interactive (browse-url-interactive-arg "Mosaic URL: ")) (open-network-stream "browse-url" " *browse-url*" browse-url-CCI-host browse-url-CCI-port) @@ -1443,6 +1390,7 @@ used instead of `browse-url-new-window-flag'." "Ask another Emacs running gnuserv to load the URL using the W3 browser. The `browse-url-gnudoit-program' program is used with options given by `browse-url-gnudoit-args'. Default to the URL around or before point." + (declare (obsolete nil "25.1")) (interactive (browse-url-interactive-arg "W3 URL: ")) (apply 'start-process (concat "gnudoit:" url) nil browse-url-gnudoit-program diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 52630132..b99db48 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -217,10 +217,10 @@ WINDOW is the window where the drop happened. ACTION is ignored. DATA is the moz-url, which is formatted as two strings separated by \\r\\n. The first string is the URL, the second string is the title of that URL. DATA is encoded in utf-16. Decode the URL and call `x-dnd-handle-uri-list'." - ;; Mozilla and applications based on it (Galeon for example) uses - ;; text/unicode, but it is impossible to tell if it is le or be. Use what - ;; the machine Emacs runs on use. This loses if dropping between machines - ;; with different endian, but it is the best we can do. + ;; Mozilla and applications based on it use text/unicode, but it is + ;; impossible to tell if it is le or be. Use what the machine Emacs + ;; runs on uses. This loses if dropping between machines + ;; with different endian-ness, but it is the best we can do. (let* ((coding (if (eq (byteorder) ?B) 'utf-16be 'utf-16le)) (string (decode-coding-string data coding)) (strings (split-string string "[\r\n]" t)) commit c2385c6f36d346d6524a4119109f52d4fd975244 Author: Olaf Rogalsky Date: Tue Mar 24 21:04:00 2015 -0400 * lisp/xt-mouse.el: Add mouse-tracking support. Fixes: debbugs:19416 * lisp/xt-mouse.el: Add mouse-tracking support. (xterm-mouse-translate-1): Handle mouse-movement events. (xterm-mouse--read-event-sequence-1000) (xterm-mouse--read-event-sequence-1006): Delete functions. (xterm-mouse--read-event-sequence): New function that handles both at the same time. Handle mouse-movements. (xterm-mouse--read-utf8-char, xterm-mouse--read-number-from-terminal): New functions. (xterm-mouse-event): Simplify. (xterm-mouse-tracking-enable-sequence) (xterm-mouse-tracking-disable-sequence): Enable mouse tracking. * lisp/mouse.el (mouse-drag-line): Also ignore `vertical-line' prefix events. diff --git a/etc/NEWS b/etc/NEWS index cb31934..5a19fc3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -217,6 +217,8 @@ Unicode standards. * Changes in Specialized Modes and Packages in Emacs 25.1 +** xterm-mouse-mode now supports mouse-tracking (if your xterm supports it). + ** package.el *** `package-install-from-buffer' and `package-install-file' work on directories. This follows the same rules as installing from a .tar file, except the diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3b8fa7d..0d2f592 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2015-03-25 Olaf Rogalsky + + * xt-mouse.el: Add mouse-tracking support (bug#19416). + (xterm-mouse-translate-1): Handle mouse-movement events. + (xterm-mouse--read-event-sequence-1000) + (xterm-mouse--read-event-sequence-1006): Delete functions. + (xterm-mouse--read-event-sequence): New function that handles both at + the same time. Handle mouse-movements. + (xterm-mouse--read-utf8-char, xterm-mouse--read-number-from-terminal): + New functions. + (xterm-mouse-event): Simplify. + (xterm-mouse-tracking-enable-sequence) + (xterm-mouse-tracking-disable-sequence): Enable mouse tracking. + + * mouse.el (mouse-drag-line): Also ignore `vertical-line' prefix events. + 2015-03-24 Michael Albinus * net/tramp-sh.el (tramp-do-file-attributes-with-ls) diff --git a/lisp/mouse.el b/lisp/mouse.el index c50913f..5f3fa5d 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -486,9 +486,10 @@ must be one of the symbols `header', `mode', or `vertical'." `(menu-item "" ,(lambda () (interactive) (funcall exitfun)) :filter ,(lambda (cmd) (if dragged cmd))))) ;; Some of the events will of course end up looked up - ;; with a mode-line or header-line prefix ... + ;; with a mode-line, header-line or vertical-line prefix ... (define-key map [mode-line] map) (define-key map [header-line] map) + (define-key map [vertical-line] map) ;; ... and some maybe even with a right- or bottom-divider ;; prefix. (define-key map [right-divider] map) diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index b87c1a2..7f1e722 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -60,6 +60,7 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." (ev-data (nth 1 event)) (ev-where (nth 1 ev-data)) (vec (vector event)) + (is-move (eq 'mouse-movement ev-command)) (is-down (string-match "down-" (symbol-name ev-command)))) ;; Mouse events symbols must have an 'event-kind property with @@ -71,6 +72,7 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." (is-down (setf (terminal-parameter nil 'xterm-mouse-last-down) event) vec) + (is-move vec) (t (let* ((down (terminal-parameter nil 'xterm-mouse-last-down)) (down-data (nth 1 down)) @@ -132,65 +134,89 @@ http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)." (fdiff (- f (* 1.0 maxwrap dbig)))) (+ (truncate fdiff) (* maxwrap dbig)))))) -;; Normal terminal mouse click reporting: expect three bytes, of the -;; form . Return a list (EVENT-TYPE X Y). -(defun xterm-mouse--read-event-sequence-1000 () - (let* ((code (- (read-event) 32)) - (type - ;; For buttons > 3, the release-event looks differently - ;; (see xc/programs/xterm/button.c, function EditorButton), - ;; and come in a release-event only, no down-event. - (cond ((>= code 64) - (format "mouse-%d" (- code 60))) - ((memq code '(8 9 10)) - (format "M-down-mouse-%d" (- code 7))) - ((memq code '(3 11)) - (let ((down (car (terminal-parameter - nil 'xterm-mouse-last-down)))) - (when (and down (string-match "[0-9]" (symbol-name down))) - (format (if (eq code 3) "mouse-%s" "M-mouse-%s") - (match-string 0 (symbol-name down)))))) - ((memq code '(0 1 2)) - (format "down-mouse-%d" (+ 1 code))))) - (x (- (read-event) 33)) - (y (- (read-event) 33))) - (and type (wholenump x) (wholenump y) - (list (intern type) x y)))) - -;; XTerm's 1006-mode terminal mouse click reporting has the form -;;