Compare commits
5 Commits
Author | SHA1 | Date |
---|---|---|
Jan Synacek | 2d93e83b0a | |
Jan Synacek | f8f9ee8fd5 | |
Jan Synacek | 7503501b30 | |
Jan Synacek | bfaaa818b2 | |
Richard Hughes | f77cf55133 |
|
@ -0,0 +1,11 @@
|
|||
--- a/lisp/net/eww.el 2016-04-11 12:30:43.233531429 +0200
|
||||
+++ b/lisp/net/eww.el 2015-04-02 09:23:06.000000000 +0200
|
||||
@@ -1001,7 +1001,7 @@
|
||||
(when (and (consp elem)
|
||||
(eq (car elem) 'hidden))
|
||||
(push (cons (plist-get (cdr elem) :name)
|
||||
- (plist-get (cdr elem) :value))
|
||||
+ (or (plist-get (cdr elem) :value) ""))
|
||||
values)))
|
||||
(if (and (stringp (cdr (assq :method form)))
|
||||
(equal (downcase (cdr (assq :method form))) "post"))
|
|
@ -0,0 +1,70 @@
|
|||
--- emacs-24.5/lisp/progmodes/gdb-mi.el 2015-04-02 09:23:06.000000000 +0200
|
||||
+++ emacs-24.5-new/lisp/progmodes/gdb-mi.el 2016-02-02 12:40:28.635711182 +0100
|
||||
@@ -2305,10 +2305,67 @@ the end of the current result or async r
|
||||
; list ==>
|
||||
; "[]" | "[" value ( "," value )* "]" | "[" result ( "," result )* "]"
|
||||
|
||||
+(defcustom gdb-mi-decode-strings nil
|
||||
+ "When non-nil, decode octal escapes in GDB output into non-ASCII text.
|
||||
+
|
||||
+If the value is a coding-system, use that coding-system to decode
|
||||
+the bytes reconstructed from octal escapes. Any other non-nil value
|
||||
+means to decode using the coding-system set for the GDB process.
|
||||
+
|
||||
+Warning: setting this non-nil might mangle strings reported by GDB
|
||||
+that have literal substrings which match the \\nnn octal escape
|
||||
+patterns, where nnn is an octal number between 200 and 377. So
|
||||
+we only recommend to set this variable non-nil if the program you
|
||||
+are debugging really reports non-ASCII text, or some of its source
|
||||
+file names include non-ASCII characters."
|
||||
+ :type '(choice
|
||||
+ (const :tag "Don't decode" nil)
|
||||
+ (const :tag "Decode using default coding-system" t)
|
||||
+ (coding-system :tag "Decode using this coding-system"))
|
||||
+ :group 'gdb
|
||||
+ :version "25.1")
|
||||
+
|
||||
+;; The idea of the following function was suggested
|
||||
+;; by Kenichi Handa <handa@gnu.org>.
|
||||
+;;
|
||||
+;; FIXME: This is fragile: it relies on the assumption that all the
|
||||
+;; non-ASCII strings output by GDB, including names of the source
|
||||
+;; files, values of string variables in the inferior, etc., are all
|
||||
+;; encoded in the same encoding. It also assumes that the \nnn
|
||||
+;; sequences are not split between chunks of output of the GDB process
|
||||
+;; due to buffering, and arrive together. Finally, if some string
|
||||
+;; included literal \nnn strings (as opposed to non-ASCII characters
|
||||
+;; converted by by GDB/MI to octal escapes), this decoding will mangle
|
||||
+;; those strings. When/if GDB acquires the ability to not
|
||||
+;; escape-protect non-ASCII characters in its MI output, this kludge
|
||||
+;; should be removed.
|
||||
+(defun gdb-mi-decode (string)
|
||||
+ "Decode octal escapes in MI output STRING into multibyte text."
|
||||
+ (let ((coding
|
||||
+ (if (coding-system-p gdb-mi-decode-strings)
|
||||
+ gdb-mi-decode-strings
|
||||
+ (with-current-buffer
|
||||
+ (gdb-get-buffer-create 'gdb-partial-output-buffer)
|
||||
+ buffer-file-coding-system))))
|
||||
+ (with-temp-buffer
|
||||
+ (set-buffer-multibyte nil)
|
||||
+ (prin1 string (current-buffer))
|
||||
+ (goto-char (point-min))
|
||||
+ ;; prin1 quotes the octal escapes as well, which interferes with
|
||||
+ ;; their interpretation by 'read' below. Remove the extra
|
||||
+ ;; backslashes to countermand that.
|
||||
+ (while (re-search-forward "\\\\\\(\\\\[2-3][0-7][0-7]\\)" nil t)
|
||||
+ (replace-match "\\1" nil nil))
|
||||
+ (goto-char (point-min))
|
||||
+ (decode-coding-string (read (current-buffer)) coding))))
|
||||
|
||||
(defun gud-gdbmi-marker-filter (string)
|
||||
"Filter GDB/MI output."
|
||||
|
||||
+ ;; If required, decode non-ASCII text encoded with octal escapes.
|
||||
+ (or (null gdb-mi-decode-strings)
|
||||
+ (setq string (gdb-mi-decode string)))
|
||||
+
|
||||
;; Record transactions if logging is enabled.
|
||||
(when gdb-enable-debug
|
||||
(push (cons 'recv string) gdb-debug-log)
|
|
@ -0,0 +1,22 @@
|
|||
--- a/lisp/vc/vc-hg.el 2015-04-02 09:23:06.000000000 +0200
|
||||
+++ b/lisp/vc/vc-hg.el 2016-02-02 10:53:23.248829159 +0100
|
||||
@@ -627,10 +627,16 @@ REV is the revision to check out into WO
|
||||
(vc-run-delayed
|
||||
(vc-hg-after-dir-status update-function)))
|
||||
|
||||
-(defun vc-hg-dir-status-files (dir files _default-state update-function)
|
||||
- (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files)
|
||||
+(defun vc-hg-dir-status-files (_dir files _default-state update-function)
|
||||
+ ;; XXX: We can't pass DIR directly to 'hg status' because that
|
||||
+ ;; returns all ignored files if FILES is non-nil (bug#22481).
|
||||
+ ;; If honoring DIR ever becomes important, try using '-I DIR/'.
|
||||
+ (vc-hg-command (current-buffer) 'async files
|
||||
+ "status"
|
||||
+ (concat "-mardu" (if files "i"))
|
||||
+ "-C")
|
||||
(vc-run-delayed
|
||||
- (vc-hg-after-dir-status update-function)))
|
||||
+ (vc-hg-after-dir-status update-function)))
|
||||
|
||||
(defun vc-hg-dir-extra-header (name &rest commands)
|
||||
(concat (propertize name 'face 'font-lock-type-face)
|
|
@ -8,6 +8,5 @@ Exec=emacs %f
|
|||
Icon=emacs
|
||||
Type=Application
|
||||
Terminal=false
|
||||
Categories=Application;Utility;TextEditor;X-Red-Hat-Base;
|
||||
Encoding=UTF-8
|
||||
Categories=Utility;TextEditor;X-Red-Hat-Base;
|
||||
StartupWMClass=Emacs
|
||||
|
|
28
emacs.spec
28
emacs.spec
|
@ -5,7 +5,7 @@ Summary: GNU Emacs text editor
|
|||
Name: emacs
|
||||
Epoch: 1
|
||||
Version: 24.5
|
||||
Release: 6%{?dist}
|
||||
Release: 10%{?dist}
|
||||
License: GPLv3+ and CC0-1.0
|
||||
URL: http://www.gnu.org/software/emacs/
|
||||
Group: Applications/Editors
|
||||
|
@ -20,7 +20,6 @@ Source6: emacs-terminal.desktop
|
|||
Source7: emacs-terminal.sh
|
||||
Source8: emacs.service
|
||||
Source9: %{name}.appdata.xml
|
||||
Source10: %{name}client.appdata.xml
|
||||
# rhbz#713600
|
||||
Patch1: emacs-spellchecker.patch
|
||||
|
||||
|
@ -29,6 +28,13 @@ Patch2: emacs-pdf-default.patch
|
|||
Patch3: emacs-grep-deprecated.patch
|
||||
Patch4: emacs-system-crypto-policies.patch
|
||||
Patch5: emacs-bbdb.patch
|
||||
# http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=06083cf41c473404d246de9b91a0116f38c5485f
|
||||
Patch6: emacs-mercurial.patch
|
||||
# http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=439f483be35a000e7a3bec6acf395ce4d54d6323
|
||||
# http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=9c86325b69d75e9b17ff468f5a2220597979635f
|
||||
Patch7: emacs-gdb-ascii.patch
|
||||
# http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=cc6340495d3ec78dea0b906dccfea90973fbeb12
|
||||
Patch8: emacs-eww-submit.patch
|
||||
|
||||
BuildRequires: atk-devel
|
||||
BuildRequires: cairo-devel
|
||||
|
@ -192,6 +198,9 @@ packages that add functionality to Emacs.
|
|||
%patch3 -p1 -b .grep-deprecated
|
||||
%patch4 -p1 -b .system-crypto-policies
|
||||
%patch5 -p1 -b .bbdb
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
autoconf
|
||||
|
||||
# We prefer our emacs.desktop file
|
||||
|
@ -355,10 +364,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
|
|||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
|
||||
%SOURCE6
|
||||
|
||||
# Merge applications into one software center item
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
|
||||
cp -a %SOURCE10 $RPM_BUILD_ROOT%{_datadir}/appdata/emacsclient.appdata.xml
|
||||
|
||||
# Byte compile emacs*.py with correct python interpreters
|
||||
%if 0%{?rhel:1}
|
||||
rm -f %{buildroot}%{_datadir}/%{name}/%{version}/etc/emacs3.py
|
||||
|
@ -442,7 +447,6 @@ update-desktop-database &> /dev/null || :
|
|||
%{_bindir}/emacs-%{version}
|
||||
%attr(0755,-,-) %ghost %{_bindir}/emacs
|
||||
%{_datadir}/applications/emacs.desktop
|
||||
%{_datadir}/appdata/emacsclient.appdata.xml
|
||||
%{_datadir}/applications/emacsclient.desktop
|
||||
%{_datadir}/appdata/%{name}.appdata.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/emacs.png
|
||||
|
@ -486,6 +490,16 @@ update-desktop-database &> /dev/null || :
|
|||
%dir %{_datadir}/emacs/site-lisp/site-start.d
|
||||
|
||||
%changelog
|
||||
* Mon Apr 11 2016 Jan Synáček <jsynacek@redhat.com> - 1:24.5-10
|
||||
- eww form submission fails in google search (#1325639)
|
||||
|
||||
* Tue Feb 2 2016 Jan Synáček <jsynacek@redhat.com> - 1:24.5-9
|
||||
- emacs "deadlocked" after using mercurial with huge amounts of ignored files in the repository (#1232422)
|
||||
- GDB interface gets confused by non-ASCII (#1283412)
|
||||
|
||||
* Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 1:24.5-7
|
||||
- Remove no longer required AppData file
|
||||
|
||||
* Fri Sep 11 2015 Petr Hracek <phracek@redhat.com> - 1:24.5-6
|
||||
- Support BBDB >= 3 (EUDC) (#1261668)
|
||||
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
|
||||
<component type="desktop">
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<id>emacsclient.desktop</id>
|
||||
<metadata>
|
||||
<value key="X-Merge-With-Parent">emacs.desktop</value>
|
||||
</metadata>
|
||||
</component>
|
Loading…
Reference in New Issue