phracek pushed to emacs (f21). "New upstream version 24.5 (#1210919) (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 17 12:41:58 UTC 2015
>From 66dfd86fa5ba2a2edae861cd6b592b41cdf9d61b Mon Sep 17 00:00:00 2001
From: Petr Hracek <phracek at redhat.com>
Date: Fri, 17 Apr 2015 14:40:14 +0200
Subject: New upstream version 24.5 (#1210919)
Signed-off-by: Petr Hracek <phracek at redhat.com>
diff --git a/emacs-adds-extra-spaces.patch b/emacs-adds-extra-spaces.patch
deleted file mode 100644
index 50b3058..0000000
--- a/emacs-adds-extra-spaces.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
-index d5617ed..bdde43f 100644
---- a/doc/lispref/frames.texi
-+++ b/doc/lispref/frames.texi
-@@ -1393,6 +1393,18 @@ terminal. @xref{DEL Does Not Delete,,, emacs, The Emacs Manual}.
- @item terminal-initted
- After the terminal is initialized, this is set to the
- terminal-specific initialization function.
-+ at item tty-mode-set-strings
-+When present, a list of strings containing escape sequences that Emacs
-+will output while configuring a tty for rendering. Emacs emits these
-+strings only when configuring a terminal: if you want to enable a mode
-+on a terminal that is already active (for example, while in
-+ at code{tty-setup-hook}), explicitly output the necessary escape
-+sequence using @code{send-string-to-terminal} in addition to adding
-+the sequence to @code{tty-mode-set-strings}.
-+ at item tty-mode-reset-strings
-+When present, a list of strings that undo the effects of the strings
-+in @code{tty-mode-set-strings}. Emacs emits these strings when
-+exiting, deleting a terminal, or suspending itself.
- @end table
-
- @node Frame Titles
-diff --git a/lisp/term/screen.el b/lisp/term/screen.el
-index d37a695..1731f5a 100644
---- a/lisp/term/screen.el
-+++ b/lisp/term/screen.el
-@@ -1,12 +1,9 @@
--;; Treat a screen terminal similar to an xterm.
--(load "term/xterm")
--
--(declare-function xterm-register-default-colors "xterm" ())
-+;;; screen.el --- terminal initialization for screen and tmux -*- lexical-binding: t -*-
-+;; Copyright (C) 1995, 2001-2014 Free Software Foundation, Inc.
-
- (defun terminal-init-screen ()
- "Terminal initialization function for screen."
-- ;; Use the xterm color initialization code.
-- (xterm-register-default-colors)
-- (tty-set-up-initial-frame-faces))
-+ ;; Treat a screen terminal similar to an xterm.
-+ (tty-run-terminal-initialization (selected-frame) "xterm"))
-
- ;; screen.el ends here
-diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
-index ba017e9..a267f93 100644
---- a/lisp/term/xterm.el
-+++ b/lisp/term/xterm.el
-@@ -43,10 +43,35 @@ The relevant features are:
- :type '(choice (const :tag "No" nil)
- (const :tag "Check" check)
- ;; NOTE: If you add entries here, make sure to update
-- ;; `tocheck-capabilities' in `terminal-init-xterm' as well.
-+ ;; `terminal-init-xterm' as well.
- (set (const :tag "modifyOtherKeys support" modifyOtherKeys)
- (const :tag "report background" reportBackground))))
-
-+(defconst xterm-paste-ending-sequence "\e[201~"
-+ "Characters send by the terminal to end a bracketed paste.")
-+
-+(defun xterm-paste ()
-+ "Handle the start of a terminal paste operation."
-+ (interactive)
-+ (let* ((end-marker-length (length xterm-paste-ending-sequence))
-+ (pasted-text (with-temp-buffer
-+ (set-buffer-multibyte nil)
-+ (while (not (search-backward
-+ xterm-paste-ending-sequence
-+ (- (point) end-marker-length) t))
-+ (let ((event (read-event)))
-+ (when (eql event ?\r)
-+ (setf event ?\n))
-+ (insert event)))
-+ (let ((last-coding-system-used))
-+ (decode-coding-region
-+ (point-min) (point)
-+ (keyboard-coding-system) t))))
-+ (interprogram-paste-function (lambda () pasted-text)))
-+ (yank)))
-+
-+(define-key global-map [xterm-paste] #'xterm-paste)
-+
- (defvar xterm-function-map
- (let ((map (make-sparse-keymap)))
-
-@@ -394,6 +419,11 @@ The relevant features are:
- (define-key map "\e[12~" [f2])
- (define-key map "\e[13~" [f3])
- (define-key map "\e[14~" [f4])
-+
-+ ;; Recognize the start of a bracketed paste sequence. The handler
-+ ;; internally recognizes the end.
-+ (define-key map "\e[200~" [xterm-paste])
-+
- map)
- "Function key map overrides for xterm.")
-
-@@ -463,9 +493,6 @@ The relevant features are:
- map)
- "Keymap of possible alternative meanings for some keys.")
-
--;; List of terminals for which modify-other-keys has been turned on.
--(defvar xterm-modify-other-keys-terminal-list nil)
--
- (defun xterm--report-background-handler ()
- (let ((str "")
- chr)
-@@ -605,21 +632,23 @@ We run the first FUNCTION whose STRING matches the input events."
- (when (memq 'modifyOtherKeys xterm-extra-capabilities)
- (terminal-init-xterm-modify-other-keys)))
-
-+ ;; Unconditionally enable bracketed paste mode: terminals that don't
-+ ;; support it just ignore the sequence.
-+ (terminal-init-xterm-bracketed-paste-mode)
-+
- (run-hooks 'terminal-init-xterm-hook))
-
- (defun terminal-init-xterm-modify-other-keys ()
- "Terminal initialization for xterm's modifyOtherKeys support."
-- ;; Make sure that the modifyOtherKeys state is restored when
-- ;; suspending, resuming and exiting.
-- (add-hook 'suspend-hook 'xterm-turn-off-modify-other-keys)
-- (add-hook 'suspend-resume-hook 'xterm-turn-on-modify-other-keys)
-- (add-hook 'kill-emacs-hook 'xterm-remove-modify-other-keys)
-- (add-hook 'delete-terminal-functions 'xterm-remove-modify-other-keys)
-- ;; Add the selected frame to the list of frames that
-- ;; need to deal with modify-other-keys.
-- (push (frame-terminal)
-- xterm-modify-other-keys-terminal-list)
-- (xterm-turn-on-modify-other-keys))
-+ (send-string-to-terminal "\e[>4;1m")
-+ (push "\e[>4m" (terminal-parameter nil 'tty-mode-reset-strings))
-+ (push "\e[>4;1m" (terminal-parameter nil 'tty-mode-set-strings)))
-+
-+(defun terminal-init-xterm-bracketed-paste-mode ()
-+ "Terminal initialization for bracketed paste mode."
-+ (send-string-to-terminal "\e[?2004h")
-+ (push "\e[?2004l" (terminal-parameter nil 'tty-mode-reset-strings))
-+ (push "\e[?2004h" (terminal-parameter nil 'tty-mode-set-strings)))
-
- ;; Set up colors, for those versions of xterm that support it.
- (defvar xterm-standard-colors
-@@ -737,29 +766,6 @@ versions of xterm."
- ;; right colors, so clear them.
- (clear-face-cache)))
-
--(defun xterm-turn-on-modify-other-keys ()
-- "Turn the modifyOtherKeys feature of xterm back on."
-- (let ((terminal (frame-terminal)))
-- (when (and (terminal-live-p terminal)
-- (memq terminal xterm-modify-other-keys-terminal-list))
-- (send-string-to-terminal "\e[>4;1m" terminal))))
--
--(defun xterm-turn-off-modify-other-keys (&optional frame)
-- "Temporarily turn off the modifyOtherKeys feature of xterm."
-- (let ((terminal (when frame (frame-terminal frame))))
-- (when (and (terminal-live-p terminal)
-- (memq terminal xterm-modify-other-keys-terminal-list))
-- (send-string-to-terminal "\e[>4m" terminal))))
--
--(defun xterm-remove-modify-other-keys (&optional terminal)
-- "Turn off the modifyOtherKeys feature of xterm for good."
-- (setq terminal (or terminal (frame-terminal)))
-- (when (and (terminal-live-p terminal)
-- (memq terminal xterm-modify-other-keys-terminal-list))
-- (setq xterm-modify-other-keys-terminal-list
-- (delq terminal xterm-modify-other-keys-terminal-list))
-- (send-string-to-terminal "\e[>4m" terminal)))
--
- (defun xterm-maybe-set-dark-background-mode (redc greenc bluec)
- ;; Use the heuristic in `frame-set-background-mode' to decide if a
- ;; frame is dark.
-diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
-index 59ed68a..371ad6b 100644
---- a/lisp/xt-mouse.el
-+++ b/lisp/xt-mouse.el
-@@ -267,36 +267,27 @@ single clicks are supported. When turned on, the normal xterm
- mouse functionality for such clicks is still available by holding
- down the SHIFT key while pressing the mouse button."
- :global t :group 'mouse
-- (let ((do-hook (if xterm-mouse-mode 'add-hook 'remove-hook)))
-- (funcall do-hook 'terminal-init-xterm-hook
-- 'turn-on-xterm-mouse-tracking-on-terminal)
-- (funcall do-hook 'delete-terminal-functions
-- 'turn-off-xterm-mouse-tracking-on-terminal)
-- (funcall do-hook 'suspend-tty-functions
-- 'turn-off-xterm-mouse-tracking-on-terminal)
-- (funcall do-hook 'resume-tty-functions
-- 'turn-on-xterm-mouse-tracking-on-terminal)
-- (funcall do-hook 'suspend-hook 'turn-off-xterm-mouse-tracking)
-- (funcall do-hook 'suspend-resume-hook 'turn-on-xterm-mouse-tracking)
-- (funcall do-hook 'kill-emacs-hook 'turn-off-xterm-mouse-tracking))
-+ (funcall (if xterm-mouse-mode 'add-hook 'remove-hook)
-+ 'terminal-init-xterm-hook
-+ 'turn-on-xterm-mouse-tracking-on-terminal)
- (if xterm-mouse-mode
- ;; Turn it on
- (progn
- (setq mouse-position-function #'xterm-mouse-position-function)
-- (turn-on-xterm-mouse-tracking))
-+ (mapc #'turn-on-xterm-mouse-tracking-on-terminal (terminal-list)))
- ;; Turn it off
-- (turn-off-xterm-mouse-tracking 'force)
-+ (mapc #'turn-off-xterm-mouse-tracking-on-terminal (terminal-list))
- (setq mouse-position-function nil)))
-
--(defun turn-on-xterm-mouse-tracking ()
-- "Enable Emacs mouse tracking in xterm."
-- (dolist (terminal (terminal-list))
-- (turn-on-xterm-mouse-tracking-on-terminal terminal)))
-+(defconst xterm-mouse-tracking-enable-sequence
-+ "\e[?1000h\e[?1006h"
-+ "Control sequence to enable xterm mouse tracking.
-+Enables basic tracking, then extended tracking on
-+terminals that support it.")
-
--(defun turn-off-xterm-mouse-tracking (&optional _force)
-- "Disable Emacs mouse tracking in xterm."
-- (dolist (terminal (terminal-list))
-- (turn-off-xterm-mouse-tracking-on-terminal terminal)))
-+(defconst xterm-mouse-tracking-disable-sequence
-+ "\e[?1006l\e[?1000l"
-+ "Reset the modes set by `xterm-mouse-tracking-enable-sequence'.")
-
- (defun turn-on-xterm-mouse-tracking-on-terminal (&optional terminal)
- "Enable xterm mouse tracking on TERMINAL."
-@@ -306,30 +297,36 @@ down the SHIFT key while pressing the mouse button."
- (not (string= (terminal-name terminal) "initial_terminal")))
- (unless (terminal-parameter terminal 'xterm-mouse-mode)
- ;; Simulate selecting a terminal by selecting one of its frames
-+ ;; so that we can set the terminal-local `input-decode-map'.
- (with-selected-frame (car (frames-on-display-list terminal))
- (define-key input-decode-map "\e[M" 'xterm-mouse-translate)
- (define-key input-decode-map "\e[<" 'xterm-mouse-translate-extended))
-- (set-terminal-parameter terminal 'xterm-mouse-mode t))
-- (send-string-to-terminal "\e[?1000h" terminal)
-- ;; Request extended mouse support, if available (xterm >= 277).
-- (send-string-to-terminal "\e[?1006h" terminal)))
-+ (send-string-to-terminal xterm-mouse-tracking-enable-sequence terminal)
-+ (push xterm-mouse-tracking-enable-sequence
-+ (terminal-parameter nil 'tty-mode-set-strings))
-+ (push xterm-mouse-tracking-disable-sequence
-+ (terminal-parameter nil 'tty-mode-reset-strings))
-+ (set-terminal-parameter terminal 'xterm-mouse-mode t))))
-
- (defun turn-off-xterm-mouse-tracking-on-terminal (terminal)
- "Disable xterm mouse tracking on TERMINAL."
- ;; Only send the disable command to those terminals to which we've already
- ;; sent the enable command.
- (when (and (terminal-parameter terminal 'xterm-mouse-mode)
-- (eq t (terminal-live-p terminal))
-- ;; Avoid the initial terminal which is not a termcap device.
-- ;; FIXME: is there more elegant way to detect the initial terminal?
-- (not (string= (terminal-name terminal) "initial_terminal")))
-+ (eq t (terminal-live-p terminal)))
- ;; We could remove the key-binding and unset the `xterm-mouse-mode'
- ;; terminal parameter, but it seems less harmful to send this escape
- ;; command too many times (or to catch an unintended key sequence), than
- ;; to send it too few times (or to fail to let xterm-mouse events
- ;; pass by untranslated).
-- (send-string-to-terminal "\e[?1000l" terminal)
-- (send-string-to-terminal "\e[?1006l" terminal)))
-+ (send-string-to-terminal xterm-mouse-tracking-disable-sequence terminal)
-+ (setf (terminal-parameter nil 'tty-mode-set-strings)
-+ (remq xterm-mouse-tracking-enable-sequence
-+ (terminal-parameter nil 'tty-mode-set-strings)))
-+ (setf (terminal-parameter nil 'tty-mode-reset-strings)
-+ (remq xterm-mouse-tracking-disable-sequence
-+ (terminal-parameter nil 'tty-mode-reset-strings)))
-+ (set-terminal-parameter terminal 'xterm-mouse-mode nil)))
-
- (provide 'xt-mouse)
-
-diff --git a/src/term.c b/src/term.c
-index 8661cba..59f630c 100644
---- a/src/term.c
-+++ b/src/term.c
-@@ -131,6 +131,9 @@ enum no_color_bit
-
- static int max_frame_cols;
-
-+static Lisp_Object Qtty_mode_set_strings;
-+static Lisp_Object Qtty_mode_reset_strings;
-+
-
-
- #ifdef HAVE_GPM
-@@ -162,6 +165,29 @@ tty_ring_bell (struct frame *f)
- /* Set up termcap modes for Emacs. */
-
- static void
-+tty_send_additional_strings (struct terminal* terminal, Lisp_Object sym)
-+{
-+ Lisp_Object lisp_terminal;
-+ Lisp_Object extra_codes;
-+ struct tty_display_info *tty = terminal->display_info.tty;
-+
-+ XSETTERMINAL (lisp_terminal, terminal);
-+ for (extra_codes = Fterminal_parameter (lisp_terminal, sym);
-+ CONSP (extra_codes);
-+ extra_codes = XCDR (extra_codes))
-+ {
-+ Lisp_Object string = XCAR (extra_codes);
-+ if (STRINGP (string))
-+ {
-+ fwrite (SDATA (string), 1, SBYTES (string), tty->output);
-+ fflush (tty->output);
-+ if (tty->termscript)
-+ fwrite (SDATA (string), 1, SBYTES (string), tty->termscript);
-+ }
-+ }
-+}
-+
-+static void
- tty_set_terminal_modes (struct terminal *terminal)
- {
- struct tty_display_info *tty = terminal->display_info.tty;
-@@ -184,6 +210,7 @@ tty_set_terminal_modes (struct terminal *terminal)
- OUTPUT_IF (tty, tty->TS_keypad_mode);
- losecursor (tty);
- fflush (tty->output);
-+ tty_send_additional_strings (terminal, Qtty_mode_set_strings);
- }
- }
-
-@@ -196,6 +223,7 @@ tty_reset_terminal_modes (struct terminal *terminal)
-
- if (tty->output)
- {
-+ tty_send_additional_strings(terminal, Qtty_mode_reset_strings);
- tty_turn_off_highlight (tty);
- tty_turn_off_insert (tty);
- OUTPUT_IF (tty, tty->TS_end_keypad_mode);
-@@ -4577,6 +4605,9 @@ bigger, or it may make it blink, or it may do nothing at all. */);
- encode_terminal_src = NULL;
- encode_terminal_dst = NULL;
-
-+ DEFSYM (Qtty_mode_set_strings, "tty-mode-set-strings");
-+ DEFSYM (Qtty_mode_reset_strings, "tty-mode-reset-strings");
-+
- #ifndef MSDOS
- DEFSYM (Qtty_menu_next_item, "tty-menu-next-item");
- DEFSYM (Qtty_menu_prev_item, "tty-menu-prev-item");
diff --git a/emacs-grep-deprecated.patch b/emacs-grep-deprecated.patch
deleted file mode 100644
index 7aa44b1..0000000
--- a/emacs-grep-deprecated.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
-index 9962945..763f906 100644
---- a/lisp/progmodes/grep.el
-+++ b/lisp/progmodes/grep.el
-@@ -77,11 +77,10 @@ in grep buffers, so if you have globally disabled font-lock-mode,
- you will not get highlighting.
-
- This option sets the environment variable GREP_COLORS to specify
--markers for highlighting and GREP_OPTIONS to add the --color
--option in front of any explicit grep options before starting
--the grep.
-+markers for highlighting and adds the --color option in front of
-+any explicit grep options before starting the grep.
-
--When this option is `auto', grep uses `--color=auto' to highlight
-+When this option is `auto', grep uses `--color' to highlight
- matches only when it outputs to a terminal (when `grep' is the last
- command in the pipe), thus avoiding the use of any potentially-harmful
- escape sequences when standard output goes to a file or pipe.
-@@ -97,7 +96,7 @@ To change the default value, use Customize or call the function
- :type '(choice (const :tag "Do not highlight matches with grep markers" nil)
- (const :tag "Highlight matches with grep markers" t)
- (const :tag "Use --color=always" always)
-- (const :tag "Use --color=auto" auto)
-+ (const :tag "Use --color" auto)
- (other :tag "Not Set" auto-detect))
- :set 'grep-apply-setting
- :version "22.1"
-@@ -467,10 +466,6 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
- ;; `setenv' modifies `process-environment' let-bound in `compilation-start'
- ;; Any TERM except "dumb" allows GNU grep to use `--color=auto'
- (setenv "TERM" "emacs-grep")
-- (setenv "GREP_OPTIONS"
-- (concat (getenv "GREP_OPTIONS")
-- " --color=" (if (eq grep-highlight-matches 'always)
-- "always" "auto")))
- ;; GREP_COLOR is used in GNU grep 2.5.1, but deprecated in later versions
- (setenv "GREP_COLOR" "01;31")
- ;; GREP_COLORS is used in GNU grep 2.5.2 and later versions
-@@ -570,7 +565,13 @@ This function is called from `compilation-filter-hook'."
- (unless (and grep-command grep-find-command
- grep-template grep-find-template)
- (let ((grep-options
-- (concat (if grep-use-null-device "-n" "-nH")
-+ (concat (and grep-highlight-matches
-+ (grep-probe grep-program
-+ `(nil nil nil "--color" "x" ,null-device)
-+ nil 1)
-+ (if (eq grep-highlight-matches 'always)
-+ "--color=always " "--color "))
-+ (if grep-use-null-device "-n" "-nH")
- (if (grep-probe grep-program
- `(nil nil nil "-e" "foo" ,null-device)
- nil 1)
diff --git a/emacs-no-bitmap-icon.patch b/emacs-no-bitmap-icon.patch
deleted file mode 100644
index c683e94..0000000
--- a/emacs-no-bitmap-icon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/frame.h b/src/frame.h
-index ff696df..fc19768 100644
---- a/src/frame.h
-+++ b/src/frame.h
-@@ -1349,7 +1349,7 @@ x_set_bitmap_icon (struct frame *f)
- {
- Lisp_Object obj = assq_no_quit (Qicon_type, f->param_alist);
-
-- if (CONSP (obj))
-+ if (CONSP (obj) && !NILP (XCDR (obj)))
- x_bitmap_icon (f, XCDR (obj));
- }
-
diff --git a/emacs.spec b/emacs.spec
index 70dece6..65a7bca 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -2,8 +2,8 @@
Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
-Version: 24.4
-Release: 6%{?dist}
+Version: 24.5
+Release: 1%{?dist}
License: GPLv3+ and CC0-1.0
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -23,9 +23,6 @@ Patch1: emacs-spellchecker.patch
# Fix for default PDF viewer bug #971162
Patch2: emacs-pdf-default.patch
-Patch3: emacs-adds-extra-spaces.patch
-Patch4: emacs-no-bitmap-icon.patch
-Patch5: emacs-grep-deprecated.patch
BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel
@@ -151,9 +148,6 @@ packages that add functionality to Emacs.
%patch1 -p1 -b .spellchecker
%patch2 -p1 -b .pdf-default.patch
-%patch3 -p1 -b .add-extra-spaces
-%patch4 -p1 -b .no-bitmap-icon
-%patch5 -p1 -b .grep-deprecated
# We prefer our emacs.desktop file
cp %SOURCE1 etc/emacs.desktop
@@ -437,6 +431,9 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog
+* Fri Apr 17 2015 Petr Hracek <phracek at redhat.com> - 1:24.5-1
+- New upstream version 24.5 (#1210919)
+
* Tue Apr 7 2015 Petr Hracek <phracek at redhat.com> - 1:24.4-6
- emacs grep warns 'GREP_OPTIONS is deprecated' (#1176547)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/emacs.git/commit/?h=f21&id=66dfd86fa5ba2a2edae861cd6b592b41cdf9d61b
More information about the scm-commits
mailing list