diff options
author | wiz <wiz@pkgsrc.org> | 2015-04-11 08:51:05 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-04-11 08:51:05 +0000 |
commit | 78b6097087222e8f8604d31ace8b40ba76fd748e (patch) | |
tree | 07e8fc482e4d529601c7eb8b8bb3125aca38fb91 /editors | |
parent | 962afe7bf2e02da249ca4a2433e4916b8e2e2d00 (diff) | |
download | pkgsrc-78b6097087222e8f8604d31ace8b40ba76fd748e.tar.gz |
Update emacs24 to 24.5:
* Changes in Emacs 24.5
** This is mainly a bug-fix release, but there are some other changes.
** The default value of `history-length' has increased to 100.
** The variable `redisplay-dont-pause' is obsolete.
* Changes in Specialized Modes and Packages in Emacs 24.5
** `call-process-shell-command' and `process-file-shell-command' no longer
take "&rest args".
** The option `browse-url-firefox-startup-arguments' no longer has an effect.
** ERC
*** New option `erc-rename-buffers'.
*** New faces `erc-my-nick-prefix-face' and `erc-nick-prefix-face'.
*** `erc-format-@nick' displays all user modes instead of only op and voice.
*** The display of irc commands in the current buffer has been disabled.
*** `erc-version' now follows the Emacs version.
** Obsolete packages
*** cc-compat.el
*** crisp.el (moved to elpa.gnu.org)
*** tpu-edt.el, ws-mode.el
These emulations of old editors are believed to be no longer relevant
- contact emacs-devel@gnu.org if you disagree.
*** vi.el, vip.el (try M-x viper instead)
Diffstat (limited to 'editors')
-rw-r--r-- | editors/emacs24-nox11/Makefile | 3 | ||||
-rw-r--r-- | editors/emacs24/Makefile | 4 | ||||
-rw-r--r-- | editors/emacs24/PLIST | 36 | ||||
-rw-r--r-- | editors/emacs24/distinfo | 9 | ||||
-rw-r--r-- | editors/emacs24/patches/patch-lisp_net_browse-url.el | 110 | ||||
-rw-r--r-- | editors/emacs24/version.mk | 6 |
6 files changed, 28 insertions, 140 deletions
diff --git a/editors/emacs24-nox11/Makefile b/editors/emacs24-nox11/Makefile index 7b3742f1b2f..932e0914f0c 100644 --- a/editors/emacs24-nox11/Makefile +++ b/editors/emacs24-nox11/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2015/01/10 16:15:30 gdt Exp $ +# $NetBSD: Makefile,v 1.9 2015/04/11 08:51:05 wiz Exp $ PKGNAME= ${DISTNAME:S/emacs/emacs24/:S/-/-nox11-/} -PKGREVISION= 1 CONFLICTS+= emacs24-[0-9]* diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile index 12ab9efb899..944641ad41c 100644 --- a/editors/emacs24/Makefile +++ b/editors/emacs24/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2015/04/06 08:17:27 adam Exp $ - -PKGREVISION= 4 +# $NetBSD: Makefile,v 1.35 2015/04/11 08:51:05 wiz Exp $ CONFLICTS+= emacs24-nox11-[0-9]* diff --git a/editors/emacs24/PLIST b/editors/emacs24/PLIST index c1500796531..04f28ad72ab 100644 --- a/editors/emacs24/PLIST +++ b/editors/emacs24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/10/28 12:43:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/04/11 08:51:05 wiz Exp $ bin/ctags bin/ebrowse bin/emacs @@ -1706,8 +1706,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/warnings.el.gz share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/warnings.elc share/emacs/${EMACS_VERSION}/lisp/emacs-lock.el.gz share/emacs/${EMACS_VERSION}/lisp/emacs-lock.elc -share/emacs/${EMACS_VERSION}/lisp/emulation/crisp.el.gz -share/emacs/${EMACS_VERSION}/lisp/emulation/crisp.elc share/emacs/${EMACS_VERSION}/lisp/emulation/cua-base.el.gz share/emacs/${EMACS_VERSION}/lisp/emulation/cua-base.elc share/emacs/${EMACS_VERSION}/lisp/emulation/cua-gmrk.el.gz @@ -1726,16 +1724,6 @@ share/emacs/${EMACS_VERSION}/lisp/emulation/edt.el.gz share/emacs/${EMACS_VERSION}/lisp/emulation/edt.elc share/emacs/${EMACS_VERSION}/lisp/emulation/keypad.el.gz share/emacs/${EMACS_VERSION}/lisp/emulation/keypad.elc -share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-edt.el.gz -share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-edt.elc -share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-extras.el.gz -share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-extras.elc -share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-mapper.el.gz -share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-mapper.elc -share/emacs/${EMACS_VERSION}/lisp/emulation/vi.el.gz -share/emacs/${EMACS_VERSION}/lisp/emulation/vi.elc -share/emacs/${EMACS_VERSION}/lisp/emulation/vip.el.gz -share/emacs/${EMACS_VERSION}/lisp/emulation/vip.elc share/emacs/${EMACS_VERSION}/lisp/emulation/viper-cmd.el.gz share/emacs/${EMACS_VERSION}/lisp/emulation/viper-cmd.elc share/emacs/${EMACS_VERSION}/lisp/emulation/viper-ex.el.gz @@ -1752,8 +1740,6 @@ share/emacs/${EMACS_VERSION}/lisp/emulation/viper-util.el.gz share/emacs/${EMACS_VERSION}/lisp/emulation/viper-util.elc share/emacs/${EMACS_VERSION}/lisp/emulation/viper.el.gz share/emacs/${EMACS_VERSION}/lisp/emulation/viper.elc -share/emacs/${EMACS_VERSION}/lisp/emulation/ws-mode.el.gz -share/emacs/${EMACS_VERSION}/lisp/emulation/ws-mode.elc share/emacs/${EMACS_VERSION}/lisp/env.el.gz share/emacs/${EMACS_VERSION}/lisp/env.elc share/emacs/${EMACS_VERSION}/lisp/epa-dired.el.gz @@ -2328,6 +2314,7 @@ share/emacs/${EMACS_VERSION}/lisp/international/titdic-cnv.elc share/emacs/${EMACS_VERSION}/lisp/international/ucs-normalize.el.gz share/emacs/${EMACS_VERSION}/lisp/international/ucs-normalize.elc share/emacs/${EMACS_VERSION}/lisp/international/uni-bidi.el +share/emacs/${EMACS_VERSION}/lisp/international/uni-brackets.el share/emacs/${EMACS_VERSION}/lisp/international/uni-category.el share/emacs/${EMACS_VERSION}/lisp/international/uni-combining.el share/emacs/${EMACS_VERSION}/lisp/international/uni-comment.el @@ -2906,10 +2893,14 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/assoc.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/bruce.el +share/emacs/${EMACS_VERSION}/lisp/obsolete/cc-compat.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/cc-compat.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/cl-compat.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/cl-compat.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/complete.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/complete.elc +share/emacs/${EMACS_VERSION}/lisp/obsolete/crisp.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/crisp.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/cust-print.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/cust-print.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/erc-hecomplete.el.gz @@ -2988,8 +2979,20 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/sym-comp.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/sym-comp.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/terminal.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/terminal.elc +share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-edt.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-edt.elc +share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-extras.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-extras.elc +share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-mapper.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-mapper.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.elc +share/emacs/${EMACS_VERSION}/lisp/obsolete/vi.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/vi.elc +share/emacs/${EMACS_VERSION}/lisp/obsolete/vip.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/vip.elc +share/emacs/${EMACS_VERSION}/lisp/obsolete/ws-mode.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/ws-mode.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/xesam.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/xesam.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/yow.el.gz @@ -3309,8 +3312,6 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-bytecomp.el.gz share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-bytecomp.elc share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-cmds.el.gz share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-cmds.elc -share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-compat.el.gz -share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-compat.elc share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-defs.el.gz share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-defs.elc share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-engine.el.gz @@ -3910,3 +3911,4 @@ share/icons/hicolor/32x32/apps/emacs.png share/icons/hicolor/48x48/apps/emacs.png share/icons/hicolor/scalable/apps/emacs.svg share/icons/hicolor/scalable/mimetypes/emacs-document.svg +@pkgdir share/emacs/${EMACS_VERSION}/lisp/emacs-parallel diff --git a/editors/emacs24/distinfo b/editors/emacs24/distinfo index d73a3ce835c..3c631e0e645 100644 --- a/editors/emacs24/distinfo +++ b/editors/emacs24/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.18 2015/03/03 13:47:14 ryoon Exp $ +$NetBSD: distinfo,v 1.19 2015/04/11 08:51:05 wiz Exp $ -SHA1 (emacs-24.4.tar.gz) = df540d889a685a3ccaae94682b3ff131968e2706 -RMD160 (emacs-24.4.tar.gz) = 52bec18c5f8e4ee7ea3b765620c0f19d2ee524c9 -Size (emacs-24.4.tar.gz) = 59020082 bytes +SHA1 (emacs-24.5.tar.gz) = 806e80eefa2ca89d2f8c0917f8b61c5c87af4f2d +RMD160 (emacs-24.5.tar.gz) = 50a778a959db89b127970c1173dbe351671eb48b +Size (emacs-24.5.tar.gz) = 59216034 bytes SHA1 (patch-gnu_readlinkat.c) = 9252c92290ccf1d4094bbd3972d8309ebf9e57d6 -SHA1 (patch-lisp_net_browse-url.el) = 89f41e36df2fb875d22efa38d9b586aea46d7f9e SHA1 (patch-src_inotify.c) = 9dfddb9db39e84f376cad1d5a5a32861e7838cac diff --git a/editors/emacs24/patches/patch-lisp_net_browse-url.el b/editors/emacs24/patches/patch-lisp_net_browse-url.el deleted file mode 100644 index 6b62ff0580c..00000000000 --- a/editors/emacs24/patches/patch-lisp_net_browse-url.el +++ /dev/null @@ -1,110 +0,0 @@ -$NetBSD: patch-lisp_net_browse-url.el,v 1.2 2015/03/03 13:47:14 ryoon Exp $ - -* Support firefox 36.0 or later. - https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19921 - ---- lisp/net/browse-url.el.orig 2014-05-14 02:59:18.000000000 +0000 -+++ lisp/net/browse-url.el -@@ -337,6 +337,9 @@ Defaults to the value of `browse-url-fir - :type '(repeat (string :tag "Argument")) - :group 'browse-url) - -+(make-obsolete-variable 'browse-url-firefox-startup-arguments -+ "it no longer has any effect." "24.5") -+ - (defcustom browse-url-chromium-program - (let ((candidates '("chromium" "chromium-browser"))) - (while (and candidates (not (executable-find (car candidates)))) -@@ -1102,68 +1105,39 @@ used instead of `browse-url-new-window-f - ;;;###autoload - (defun browse-url-firefox (url &optional new-window) - "Ask the Firefox WWW browser to load URL. --Default to the URL around or before point. The strings in --variable `browse-url-firefox-arguments' are also passed to --Firefox. -+Defaults to the URL around or before point. Passes the strings -+in the variable `browse-url-firefox-arguments' to Firefox. - --When called interactively, if variable --`browse-url-new-window-flag' is non-nil, load the document in a --new Firefox window, otherwise use a random existing one. A --non-nil interactive prefix argument reverses the effect of --`browse-url-new-window-flag'. -+Interactively, if the variable `browse-url-new-window-flag' is non-nil, -+loads the document in a new Firefox window. A non-nil prefix argument -+reverses the effect of `browse-url-new-window-flag'. - - If `browse-url-firefox-new-window-is-tab' is non-nil, then - whenever a document would otherwise be loaded in a new window, it - 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'. -+Non-interactively, this uses the optional second argument NEW-WINDOW -+instead of `browse-url-new-window-flag'. - --On MS-Windows systems the optional `new-window' parameter is --ignored. Firefox for Windows does not support the \"-remote\" --command line parameter. Therefore, the --`browse-url-new-window-flag' and `browse-url-firefox-new-window-is-tab' --are ignored as well. Firefox on Windows will always open the requested --URL in a new window." -+On MS Windows, this ignores `browse-url-new-window-flag' and -+`browse-url-firefox-new-window-is-tab', as well as the NEW-WINDOW argument. -+It always uses a new window." - (interactive (browse-url-interactive-arg "URL: ")) - (setq url (browse-url-encode-url url)) -- (let* ((process-environment (browse-url-process-environment)) -- (use-remote -- (not (memq system-type '(windows-nt ms-dos)))) -- (process -- (apply 'start-process -- (concat "firefox " url) nil -- browse-url-firefox-program -- (append -- browse-url-firefox-arguments -- (if use-remote -- (list "-remote" -- (concat -- "openURL(" -- url -- (if (browse-url-maybe-new-window new-window) -- (if browse-url-firefox-new-window-is-tab -- ",new-tab" -- ",new-window")) -- ")")) -- (list url)))))) -- ;; If we use -remote, the process exits with status code 2 if -- ;; Firefox is not already running. The sentinel runs firefox -- ;; directly if that happens. -- (when use-remote -- (set-process-sentinel process -- `(lambda (process change) -- (browse-url-firefox-sentinel process ,url)))))) -- --(defun browse-url-firefox-sentinel (process url) -- "Handle a change to the process communicating with Firefox." -- (or (eq (process-exit-status process) 0) -- (let* ((process-environment (browse-url-process-environment))) -- ;; Firefox is not running - start it -- (message "Starting Firefox...") -- (apply 'start-process (concat "firefox " url) nil -- browse-url-firefox-program -- (append browse-url-firefox-startup-arguments (list url)))))) -+ (let* ((process-environment (browse-url-process-environment))) -+ (apply 'start-process -+ (concat "firefox " url) nil -+ browse-url-firefox-program -+ (append -+ browse-url-firefox-arguments -+ ;; FIXME someone should check if this limitation -+ ;; still applies. -+ (unless (memq system-type '(windows-nt ms-dos)) -+ (if (browse-url-maybe-new-window new-window) -+ (if browse-url-firefox-new-window-is-tab -+ '("-new-tab") -+ '("-new-window")))) -+ (list url))))) - - ;;;###autoload - (defun browse-url-chromium (url &optional _new-window) diff --git a/editors/emacs24/version.mk b/editors/emacs24/version.mk index 6f5cfda5277..150b9922430 100644 --- a/editors/emacs24/version.mk +++ b/editors/emacs24/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.7 2014/10/28 12:43:21 wiz Exp $ +# $NetBSD: version.mk,v 1.8 2015/04/11 08:51:05 wiz Exp $ _EMACS_FLAVOR= emacs -_EMACS_REQD= emacs24>=24.1<24.4.50 +_EMACS_REQD= emacs24>=24.1<24.5.50 _EMACS_VERSION_MAJOR= 24 -_EMACS_VERSION_MINOR= 4 +_EMACS_VERSION_MINOR= 5 |