diff options
| author | Glenn Morris <[email protected]> | 2007-09-07 04:38:06 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2007-09-07 04:38:06 +0000 |
| commit | 7262075dc65aad14e9ed0158e084d89651d12095 (patch) | |
| tree | 19a4557942a576a0677cfab18c2eddf1b46ecf86 /lisp | |
| parent | 8c22c51a1b7234339a02d6cc33a86a87a55ba064 (diff) | |
(emacs-version): Revert 2007-08-29 change: no need to say if multi-tty
is present.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 17 | ||||
| -rw-r--r-- | lisp/version.el | 5 |
2 files changed, 19 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 99e7af0044..2dbe0d8bba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2007-09-07 Johannes Weiner <[email protected]> + + * net/browse-url.el (browse-url-browser-function): Add elinks. + (browse-url-elinks-wrapper): New option. + (browse-url-encode-url, browse-url-elinks) + (browse-url-elinks-sentinel): New functions. + (browse-url-file-url, browse-url-netscape, browse-url-mozilla) + (browse-url-firefox, browse-url-galeon, browse-url-epiphany): Use + new function browse-url-encode-url. + +2007-09-07 Glenn Morris <[email protected]> + + * version.el (emacs-version): Revert 2007-08-29 change: no need to + say if multi-tty is present. + 2007-09-07 Stefan Monnier <[email protected]> * cus-start.el (split-window-preferred-function): Add custom info. @@ -363,6 +378,8 @@ 2007-08-29 Karoly Lorentey <[email protected]> + * version.el (emacs-version): Show if multi-tty is present. + * loadup.el: Delay loading env; mule-conf gets confused by cl during bootstrap. Also load termdev and term/x-win. diff --git a/lisp/version.el b/lisp/version.el index f583ccbbf3..6d82b194ff 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -58,8 +58,8 @@ to the system configuration; look at `system-configuration' instead." (interactive "P") (let ((version-string (format (if (not (interactive-p)) - "GNU Emacs %s (%s%s%s%s)\n of %s on %s" - "GNU Emacs %s (%s%s%s%s) of %s on %s") + "GNU Emacs %s (%s%s%s)\n of %s on %s" + "GNU Emacs %s (%s%s%s) of %s on %s") emacs-version system-configuration (cond ((featurep 'motif) @@ -75,7 +75,6 @@ to the system configuration; look at `system-configuration' instead." (format ", %s scroll bars" (capitalize (symbol-name x-toolkit-scroll-bars))) "") - (if (featurep 'multi-tty) ", multi-tty" "") (format-time-string "%Y-%m-%d" emacs-build-time) emacs-build-system))) (if here |