pool/emacs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=156
This commit is contained in:
Dr. Werner Fink 2014-10-21 15:54:37 +00:00 committed by Git OBS Bridge
parent bf923c409f
commit 9b9c92bec0
18 changed files with 586 additions and 833 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
CVE-2014-3421.patch
View File

@ -1,41 +0,0 @@
Based on revno: 117066
revision-id: address@hidden
parent: address@hidden
fixes bug: http://bugs.debian.org/747100
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-05-05 20:50:51 -0700
message:
* gnus-fun.el (gnus-grab-cam-face): Do not use predictable temp-file name.
modified:
lisp/gnus/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1433
lisp/gnus/gnus-fun.el gnusfun.el-20091113204419-o5vbwnq5f7feedwu-3243
--- lisp/gnus/gnus-fun.el
+++ lisp/gnus/gnus-fun.el 2014-05-08 11:52:32.362735285 +0000
@@ -250,20 +250,21 @@ colors of the displayed X-Faces."
(interactive)
(shell-command "xawtv-remote snap ppm")
(let ((file nil)
+ (tempfile (make-temp-file "gnus-face-" nil ".ppm"))
result)
(while (null (setq file (directory-files "/tftpboot/sparky/tmp"
t "snap.*ppm")))
(sleep-for 1))
(setq file (car file))
(shell-command
- (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
- file))
+ (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm >> %s"
+ file tempfile))
(let ((gnus-convert-image-to-face-command
(format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng"
(gnus-fun-ppm-change-string))))
- (setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
+ (setq result (gnus-face-from-file tempfile)))
(delete-file file)
- ;;(delete-file "/tmp/gnus.face.ppm")
+ ;;(delete-file tempfile) ; FIXME why are we not deleting it?!
result))
(defun gnus-fun-ppm-change-string ()

135
CVE-2014-3422.patch
View File

@ -1,135 +0,0 @@
Based on revno: 117067
revision-id: address@hidden
parent: address@hidden
fixes bug: http://bugs.debian.org/747100
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-05-05 20:53:31 -0700
message:
find-gc.el misc fixes
The whole file looks obsolete and/or broken.
* lisp/emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value.
(find-gc-source-files): Update some names.
(trace-call-tree): Simplify and update. Avoid predictable temp-file names.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/emacs-lisp/find-gc.el findgc.el-20091113204419-o5vbwnq5f7feedwu-2220
--- lisp/emacs-lisp/find-gc.el
+++ lisp/emacs-lisp/find-gc.el 2014-05-08 11:53:44.738766224 +0000
@@ -23,14 +23,15 @@
;; Produce in find-gc-unsafe-list the set of all functions that may invoke GC.
;; This expects the Emacs sources to live in find-gc-source-directory.
-;; It creates a temporary working directory /tmp/esrc.
;;; Code:
(defvar find-gc-unsafe-list nil
"The list of unsafe functions is placed here by `find-gc-unsafe'.")
-(defvar find-gc-source-directory)
+(defvar find-gc-source-directory
+ (file-name-as-directory (expand-file-name "src" source-directory))
+ "Directory containing Emacs C sources.")
(defvar find-gc-subrs-callers nil
"Alist of users of subrs, from GC testing.
@@ -59,14 +60,14 @@ Each entry has the form (FUNCTION . FUNC
"indent.c" "search.c" "regex.c" "undo.c"
"alloc.c" "data.c" "doc.c" "editfns.c"
"callint.c" "eval.c" "fns.c" "print.c" "lread.c"
- "abbrev.c" "syntax.c" "unexcoff.c"
+ "syntax.c" "unexcoff.c"
"bytecode.c" "process.c" "callproc.c" "doprnt.c"
- "x11term.c" "x11fns.c"))
+ "xterm.c" "xfns.c"))
(defun find-gc-unsafe ()
"Return a list of unsafe functions--that is, which can call GC.
-Also store it in `find-gc-unsafe'."
+Also store it in `find-gc-unsafe-list'."
(trace-call-tree nil)
(trace-use-tree)
(find-unsafe-funcs 'Fgarbage_collect)
@@ -102,47 +103,38 @@ Also store it in `find-gc-unsafe'."
-(defun trace-call-tree (&optional already-setup)
+(defun trace-call-tree (&optional ignored)
(message "Setting up directories...")
- (or already-setup
- (progn
- ;; Gee, wouldn't a built-in "system" function be handy here.
- (call-process "csh" nil nil nil "-c" "rm -rf /tmp/esrc")
- (call-process "csh" nil nil nil "-c" "mkdir /tmp/esrc")
- (call-process "csh" nil nil nil "-c"
- (format "ln -s %s/*.[ch] /tmp/esrc"
- find-gc-source-directory))))
- (with-current-buffer (get-buffer-create "*Trace Call Tree*")
- (setq find-gc-subrs-called nil)
- (let ((case-fold-search nil)
- (files find-gc-source-files)
- name entry)
- (while files
- (message "Compiling %s..." (car files))
- (call-process "csh" nil nil nil "-c"
- (format "gcc -dr -c /tmp/esrc/%s -o /dev/null"
- (car files)))
- (erase-buffer)
- (insert-file-contents (concat "/tmp/esrc/" (car files) ".rtl"))
- (while (re-search-forward ";; Function \\|(call_insn " nil t)
- (if (= (char-after (- (point) 3)) ?o)
- (progn
- (looking-at "[a-zA-Z0-9_]+")
- (setq name (intern (buffer-substring (match-beginning 0)
- (match-end 0))))
- (message "%s : %s" (car files) name)
- (setq entry (list name)
- find-gc-subrs-called (cons entry find-gc-subrs-called)))
- (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
+ (setq find-gc-subrs-called nil)
+ (let ((case-fold-search nil)
+ (default-directory find-gc-source-directory)
+ (files find-gc-source-files)
+ name entry rtlfile)
+ (dolist (file files)
+ (message "Compiling %s..." file)
+ (call-process "gcc" nil nil nil "-I" "." "-I" "../lib"
+ "-fdump-rtl-expand" "-o" null-device "-c" file)
+ (setq rtlfile
+ (file-expand-wildcards (format "%s.*.expand" file) t))
+ (if (/= 1 (length rtlfile))
+ (message "Error compiling `%s'?" file)
+ (with-temp-buffer
+ (insert-file-contents (setq rtlfile (car rtlfile)))
+ (delete-file rtlfile)
+ (while (re-search-forward ";; Function \\|(call_insn " nil t)
+ (if (= (char-after (- (point) 3)) ?o)
(progn
- (setq name (intern (buffer-substring (match-beginning 1)
- (match-end 1))))
- (or (memq name (cdr entry))
- (setcdr entry (cons name (cdr entry))))))))
- (delete-file (concat "/tmp/esrc/" (car files) ".rtl"))
- (setq files (cdr files)))))
-)
-
+ (looking-at "[a-zA-Z0-9_]+")
+ (setq name (intern (match-string 0)))
+ (message "%s : %s" (car files) name)
+ (setq entry (list name)
+ find-gc-subrs-called
+ (cons entry find-gc-subrs-called)))
+ (if (looking-at ".*\n?.*\"\\([A-Za-z0-9_]+\\)\"")
+ (progn
+ (setq name (intern (match-string 1)))
+ (or (memq name (cdr entry))
+ (setcdr entry (cons name (cdr entry)))))))))))))
(defun trace-use-tree ()
(setq find-gc-subrs-callers (mapcar 'list (mapcar 'car find-gc-subrs-called)))

24
CVE-2014-3423.patch
View File

@ -1,24 +0,0 @@
Based on revno: 117068
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-05-05 20:55:54 -0700
message:
browse-url.el comment
modified:
lisp/net/browse-url.el
browseurl.el-20091113204419-o5vbwnq5f7feedwu-1785
--- lisp/net/browse-url.el
+++ lisp/net/browse-url.el 2014-05-08 11:54:48.194721113 +0000
@@ -1335,6 +1335,9 @@ used instead of `browse-url-new-window-f
(kill-buffer nil)))
(if (and pid (zerop (signal-process pid 0))) ; Mosaic running
(save-excursion
+ ;; This is a predictable temp-file name, which is bad,
+ ;; but it is what Mosaic uses/used.
+ ;; So it's not Emacs's problem. http://bugs.debian.org/747100
(find-file (format "/tmp/Mosaic.%d" pid))
(erase-buffer)
(insert (if (browse-url-maybe-new-window new-window)

84
CVE-2014-3424.patch
View File

@ -1,84 +0,0 @@
Based on revno: 117071
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-05-06 11:51:05 +0200
message:
Fix Bug#17415.
* net/tramp-sh.el (tramp-uudecode): Replace the hard-coded temporary
file name by a format specifier.
(tramp-remote-coding-commands): Enhance docstring.
(tramp-find-inline-encoding): Replace "%t" by a temporary file name.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/tramp-sh.el trampsh.el-20100913133439-a1faifh29eqoi4nh-1
--- lisp/net/tramp-sh.el
+++ lisp/net/tramp-sh.el 2014-05-08 11:56:08.770262271 +0000
@@ -605,9 +605,9 @@ This list is used for copying/renaming w
See `tramp-actions-before-shell' for more info.")
(defconst tramp-uudecode
- "(echo begin 600 /tmp/tramp.$$; tail +2) | uudecode
-cat /tmp/tramp.$$
-rm -f /tmp/tramp.$$"
+ "(echo begin 600 %t; tail -n +2) | uudecode
+cat %t
+rm -f %t"
"Shell function to implement `uudecode' to standard output.
Many systems support `uudecode -o /dev/stdout' or `uudecode -o -'
for this or `uudecode -p', but some systems don't, and for them
@@ -3938,7 +3938,7 @@ Each item is a list that looks like this
\(FORMAT ENCODING DECODING [TEST]\)
-FORMAT is symbol describing the encoding/decoding format. It can be
+FORMAT is a symbol describing the encoding/decoding format. It can be
`b64' for base64 encoding, `uu' for uu encoding, or `pack' for simple packing.
ENCODING and DECODING can be strings, giving commands, or symbols,
@@ -3948,9 +3948,11 @@ filename will be put into the command li
specifier is not present, the input should be read from standard
input.
-If they are variables, this variable is a string containing a Perl
-implementation for this functionality. This Perl program will be transferred
-to the remote host, and it is available as shell function with the same name.
+If they are variables, this variable is a string containing a
+Perl or Shell implementation for this functionality. This
+program will be transferred to the remote host, and it is
+available as shell function with the same name. A \"%t\" format
+specifier in the variable value denotes a temporary file.
The optional TEST command can be used for further tests, whether
ENCODING and DECODING are applicable.")
@@ -4025,10 +4027,25 @@ Goes through the list `tramp-local-codin
(throw 'wont-work-remote nil))
(when (not (stringp rem-dec))
- (let ((name (symbol-name rem-dec)))
+ (let ((name (symbol-name rem-dec))
+ (value (symbol-value rem-dec))
+ tmpfile)
(while (string-match (regexp-quote "-") name)
(setq name (replace-match "_" nil t name)))
- (tramp-maybe-send-script vec (symbol-value rem-dec) name)
+ (when (string-match "%t" value)
+ (setq tmpfile
+ (make-temp-name
+ (expand-file-name
+ tramp-temp-name-prefix
+ (tramp-get-remote-tmpdir vec)))
+ value
+ (format-spec
+ value
+ (format-spec-make
+ ?t
+ (tramp-file-name-handler
+ 'file-remote-p tmpfile 'localname)))))
+ (tramp-maybe-send-script vec value name)
(setq rem-dec name)))
(tramp-message
vec 5

12
emacs-24.3-decl.dif
View File

@ -1,12 +0,0 @@
--- src/frame.c
+++ src/frame.c 2013-05-21 15:13:32.849939500 +0000
@@ -22,6 +22,9 @@ along with GNU Emacs. If not, see <http
#define FRAME_INLINE EXTERN_INLINE
#include <stdio.h>
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
#include <errno.h>
#include <limits.h>

125
emacs-24.3-giflib5.patch
View File

@ -1,125 +0,0 @@
---
emacs-24.3/src/image.c | 36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)
--- emacs-24.3/src/image.c
+++ emacs-24.3/src/image.c 2014-09-03 10:07:32.000000000 +0000
@@ -7095,11 +7095,19 @@ gif_image_p (Lisp_Object object)
#endif /* HAVE_NTGUI */
+#ifndef GIFLIB_MAJOR
+# define GIFLIB_MAJOR 0
+#endif
#ifdef WINDOWSNT
/* GIF library details. */
+#if (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1))
+DEF_IMGLIB_FN (int, DGifCloseFile, (GifFileType *, int *));
+#else
DEF_IMGLIB_FN (int, DGifCloseFile, (GifFileType *));
+#define DGifCloseFile(a, b) DGifCloseFile(a)
+#endif
DEF_IMGLIB_FN (int, DGifSlurp, (GifFileType *));
DEF_IMGLIB_FN (GifFileType *, DGifOpen, (void *, InputFunc));
DEF_IMGLIB_FN (GifFileType *, DGifOpenFileName, (const char *));
@@ -7121,7 +7129,11 @@ init_gif_functions (void)
#else
-#define fn_DGifCloseFile DGifCloseFile
+#if (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1))
+#define fn_DGifCloseFile(a,b) DGifCloseFile(a,b)
+#else
+#define fn_DGifCloseFile(a,b) DGifCloseFile(a)
+#endif
#define fn_DGifSlurp DGifSlurp
#define fn_DGifOpen DGifOpen
#define fn_DGifOpenFileName DGifOpenFileName
@@ -7192,7 +7204,11 @@ gif_load (struct frame *f, struct image
}
/* Open the GIF file. */
+#if GIFLIB_MAJOR < 5
gif = fn_DGifOpenFileName (SSDATA (file));
+#else
+ gif = fn_DGifOpenFileName (SSDATA (file), NULL);
+#endif
if (gif == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
@@ -7213,7 +7229,11 @@ gif_load (struct frame *f, struct image
memsrc.len = SBYTES (specified_data);
memsrc.index = 0;
+#if GIFLIB_MAJOR < 5
gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
+#else
+ gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
+#endif
if (!gif)
{
image_error ("Cannot open memory source `%s'", img->spec, Qnil);
@@ -7225,7 +7245,7 @@ gif_load (struct frame *f, struct image
if (!check_image_size (f, gif->SWidth, gif->SHeight))
{
image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
- fn_DGifCloseFile (gif);
+ fn_DGifCloseFile (gif, NULL);
return 0;
}
@@ -7234,7 +7254,7 @@ gif_load (struct frame *f, struct image
if (rc == GIF_ERROR || gif->ImageCount <= 0)
{
image_error ("Error reading `%s'", img->spec, Qnil);
- fn_DGifCloseFile (gif);
+ fn_DGifCloseFile (gif, NULL);
return 0;
}
@@ -7246,7 +7266,7 @@ gif_load (struct frame *f, struct image
{
image_error ("Invalid image number `%s' in image `%s'",
image_number, img->spec);
- fn_DGifCloseFile (gif);
+ fn_DGifCloseFile (gif, NULL);
return 0;
}
}
@@ -7264,14 +7284,14 @@ gif_load (struct frame *f, struct image
if (!check_image_size (f, width, height))
{
image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
- fn_DGifCloseFile (gif);
+ fn_DGifCloseFile (gif, NULL);
return 0;
}
/* Create the X image and pixmap. */
if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
{
- fn_DGifCloseFile (gif);
+ fn_DGifCloseFile (gif, NULL);
return 0;
}
@@ -7370,7 +7390,7 @@ gif_load (struct frame *f, struct image
}
/* Apply the pixel values. */
- if (gif->SavedImages[j].ImageDesc.Interlace)
+ if (GIFLIB_MAJOR < 5 && gif->SavedImages[j].ImageDesc.Interlace)
{
int row, pass;
@@ -7447,7 +7467,7 @@ gif_load (struct frame *f, struct image
Fcons (make_number (gif->ImageCount),
img->lisp_data));
- fn_DGifCloseFile (gif);
+ fn_DGifCloseFile (gif, NULL);
/* Maybe fill in the background field while we have ximg handy. */
if (NILP (image_spec_value (img->spec, QCbackground, NULL)))

15
emacs-24.3-nntp-typhoon-fix.patch
View File

@ -1,15 +0,0 @@
---
lisp/gnus/nntp.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1282,7 +1282,7 @@ If SEND-IF-FORCE, only send authinfo to
"nntpd" pbuffer nntp-address nntp-port-number
:type (cadr (assoc nntp-open-connection-function map))
:end-of-command "^\\([2345]\\|[.]\\).*\n"
- :capability-command "CAPABILITIES\r\n"
+ :capability-command "HELP\r\n"
:success "^3"
:starttls-function
(lambda (capabilities)

13
emacs-24.3-nonvoid.patch
View File

@ -1,13 +0,0 @@
--- src/xmenu.c
+++ src/xmenu.c 2013-05-21 15:21:41.301439390 +0000
@@ -310,8 +310,8 @@ for instance using the window manager, t
#else
{
Lisp_Object title;
- const char *error_name;
- Lisp_Object selection;
+ const char *error_name = NULL;
+ Lisp_Object selection = Qnil;
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
/* Decode the dialog items from what was specified. */

16
emacs-24.4-decl.dif Normal file
View File

@ -0,0 +1,16 @@
---
src/frame.c | 3 +++
1 file changed, 3 insertions(+)
--- src/frame.c
+++ src/frame.c 2014-10-21 13:58:24.419838036 +0000
@@ -20,6 +20,9 @@ along with GNU Emacs. If not, see <http
#include <config.h>
#include <stdio.h>
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
#include <errno.h>
#include <limits.h>

16
emacs-24.3-flyspell.patch → emacs-24.4-flyspell.patch
View File

@ -1,19 +1,23 @@
---
lisp/textmodes/flyspell.el | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
--- lisp/textmodes/flyspell.el
+++ lisp/textmodes/flyspell.el 2009-08-11 12:54:35.749901460 +0000
@@ -284,6 +284,12 @@ If this variable is nil, all regions are
"The key binding for flyspell auto correction."
+++ lisp/textmodes/flyspell.el 2014-10-21 14:14:59.191838679 +0000
@@ -286,6 +286,12 @@ If this variable is nil, all regions are
:type 'key-sequence
:group 'flyspell)
+(defvar flyspell-signature-separator
+ (if (boundp 'message-signature-separator)
+ message-signature-separator
+ message-signature-separator
+ "^-- $")
+ "*String used to recognize .signatures.")
+
;;*---------------------------------------------------------------------*/
;;* Mode specific options */
;;* ------------------------------------------------------------- */
@@ -307,7 +313,6 @@ property of the major mode name.")
@@ -309,7 +315,6 @@ property of the major mode name.")
;;*--- mail mode -------------------------------------------------------*/
(put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
(put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
@ -21,7 +25,7 @@
(defun mail-mode-flyspell-verify ()
"Function used for `flyspell-generic-check-word-predicate' in Mail mode."
(let ((header-end (save-excursion
@@ -319,11 +324,11 @@ property of the major mode name.")
@@ -321,11 +326,11 @@ property of the major mode name.")
nil t)
(point)))
(signature-begin

52
emacs-24.3-glibc.patch → emacs-24.4-glibc.patch
View File

@ -1,14 +1,20 @@
---
configure | 2 ++
configure.ac | 2 ++
lib-src/Makefile.in | 6 ++++--
3 files changed, 8 insertions(+), 2 deletions(-)
--- configure.ac
+++ configure.ac 2013-05-21 14:16:11.589439382 +0000
@@ -1692,6 +1692,7 @@ system_malloc=no
+++ configure.ac 2014-10-21 13:50:36.287837811 +0000
@@ -1988,6 +1988,7 @@ system_malloc=$emacs_cv_sanitize_address
case "$opsys" in
## darwin ld insists on the use of malloc routines in the System framework.
darwin|sol2-10) system_malloc=yes ;;
+ gnu-linux) system_malloc=yes ;;
esac
if test "${system_malloc}" = "yes"; then
@@ -1732,6 +1733,7 @@ fi
GMALLOC_OBJ=
@@ -2045,6 +2046,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
@ -17,16 +23,16 @@
AC_FUNC_MMAP
--- configure
+++ configure 2013-05-21 13:59:14.357439665 +0000
@@ -9828,6 +9828,7 @@ system_malloc=no
+++ configure 2014-10-21 13:51:36.143837910 +0000
@@ -10862,6 +10862,7 @@ system_malloc=$emacs_cv_sanitize_address
case "$opsys" in
## darwin ld insists on the use of malloc routines in the System framework.
darwin|sol2-10) system_malloc=yes ;;
+ gnu-linux) system_malloc=yes ;;
esac
if test "${system_malloc}" = "yes"; then
@@ -9871,6 +9872,7 @@ fi
GMALLOC_OBJ=
@@ -10949,6 +10950,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
@ -35,32 +41,30 @@
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2013-05-21 14:51:33.357939393 +0000
@@ -296,14 +296,16 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
+++ lib-src/Makefile.in 2014-10-21 13:55:07.003837593 +0000
@@ -314,13 +314,15 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
../lib/libgnu.a: $(config_h)
cd ../lib && $(MAKE) libgnu.a
+REGEXPOBJ =
+#REGEXPOBJ = regex.o
+#REGEXPOBJ =
+REGEXPOBJ = regex.o
regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
${srcdir}/../src/regex.c
${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
-etags${EXEEXT}: ${srcdir}/etags.c regex.o $(config_h)
+etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPOBJ) $(config_h)
etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
-DVERSION="\"${version}\"" ${srcdir}/etags.c \
- regex.o $(LOADLIBES) -o etags
+ $(REGEXPOBJ) $(LOADLIBES) -o etags
- regex.o $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
+ $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(config_h)
$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
@@ -314,7 +316,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
$(config_h)
@@ -332,7 +334,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
ctags${EXEEXT}: etags${EXEEXT}
$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
-DVERSION="\"${version}\"" ${srcdir}/etags.c \
- regex.o $(LOADLIBES) -o ctags
+ $(REGEXPOBJ) $(LOADLIBES) -o ctags
- regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
+ $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \

17
emacs-24.4-nonvoid.patch Normal file
View File

@ -0,0 +1,17 @@
---
src/xmenu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- src/xmenu.c
+++ src/xmenu.c 2014-10-21 14:06:22.923837970 +0000
@@ -2031,8 +2031,8 @@ Lisp_Object
xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
{
Lisp_Object title;
- const char *error_name;
- Lisp_Object selection;
+ const char *error_name = NULL;
+ Lisp_Object selection = Qnil;
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
check_window_system (f);

11
emacs-24.3-ps-bdf.patch → emacs-24.4-ps-bdf.patch
View File

@ -1,7 +1,12 @@
---
lisp/ldefs-boot.el | 4 ++--
lisp/ps-bdf.el | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- lisp/ldefs-boot.el
+++ lisp/ldefs-boot.el 2012-06-26 16:26:01.900010474 +0000
@@ -21658,9 +21658,9 @@ With prefix argument ARG, restart the Pr
;;;;;; 18685 911514 0))
+++ lisp/ldefs-boot.el 2014-10-21 14:01:58.127837849 +0000
@@ -21589,9 +21589,9 @@ With prefix argument ARG, restart the Pr
;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21291 53104 431149 0))
;;; Generated autoloads from ps-bdf.el
-(defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\

10
emacs-24.3-xim.patch → emacs-24.4-xim.patch
View File

@ -1,8 +1,12 @@
---
src/xfns.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- src/xfns.c
+++ src/xfns.c 2007-05-15 16:37:13.282161551 +0000
@@ -1845,8 +1845,8 @@ static XIMStyle best_xim_style (XIMStyle
+++ src/xfns.c 2014-10-21 14:09:49.520338231 +0000
@@ -1648,8 +1648,8 @@ static XIMStyle best_xim_style (XIMStyle
static XIMStyle supported_xim_styles[] =
static const XIMStyle supported_xim_styles[] =
{
- XIMPreeditPosition | XIMStatusArea,
XIMPreeditPosition | XIMStatusNothing,

217
emacs-24.3.dif → emacs-24.4.dif
View File

@ -1,40 +1,61 @@
---
Makefile.in | 11 +---
configure | 4 -
configure.ac | 4 -
doc/man/etags.1 | 20 ++++----
lib-src/Makefile.in | 6 +-
lib-src/pop.c | 1
lisp/cmuscheme.el | 3 -
lisp/international/mule-cmds.el | 1
lisp/net/ange-ftp.el | 8 +--
lisp/site-load.el | 41 ++++++++++++++++
lisp/speedbar.el | 1
lisp/textmodes/ispell.el | 60 +++++++++++++++++++++++-
site-lisp/term/func-keys.el | 33 +++++++++++++
site-lisp/term/gnome.el | 97 ++++++++++++++++++++++++++++++++++++++++
site-lisp/term/kvt.el | 97 ++++++++++++++++++++++++++++++++++++++++
site-lisp/term/linux.el | 79 ++++++++++++++++++++++++++++++++
site-lisp/term/locale.el | 13 +++++
src/lisp.mk | 2
18 files changed, 448 insertions(+), 33 deletions(-)
--- Makefile.in
+++ Makefile.in 2013-05-21 15:58:29.533438706 +0000
@@ -444,12 +444,8 @@ install-arch-dep: src install-arch-indep
libexecdir=${libexecdir} archlibdir=${archlibdir} \
+++ Makefile.in 2014-10-21 14:24:43.751837432 +0000
@@ -490,12 +490,8 @@ install-arch-dep: src install-arch-indep
libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
INSTALL_STRIP=${INSTALL_STRIP}
if test "${ns_self_contained}" = "no"; then \
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
- chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
- chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \
- if test "x${NO_BIN_LINK}" = x; then \
- rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
- cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
- rm -f "$(DESTDIR)${bindir}/$(EMACS)" ; \
- cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS); \
- fi; \
+ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACS) || exit 1 ; \
+ chmod 1755 $(DESTDIR)${bindir}/$(EMACS) || true; \
else \
subdir=${ns_appresdir}/site-lisp; \
${write_subdir} || exit 1; \
@@ -631,6 +627,7 @@ install-man:
umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
@@ -684,6 +680,7 @@ install-man:
umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \
+ cp ctags.1 gnuctags.1; \
for page in *.1; do \
dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
(cd $${thisdir}; \
@@ -710,7 +707,7 @@ uninstall:
(cd "$${thisdir}"; \
@@ -770,7 +767,7 @@ uninstall: uninstall-$(NTDIR) uninstall-
for page in *.1; do \
rm -f $(DESTDIR)${man1dir}/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
rm -f "$(DESTDIR)${man1dir}"/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
fi)
- (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS) || true)
+ (cd $(DESTDIR)${bindir} && rm -f $(EMACS) || true)
(if cd $(DESTDIR)${icondir}; then \
- (cd "$(DESTDIR)${bindir}" && rm -f $(EMACSFULL) $(EMACS) || true)
+ (cd "$(DESTDIR)${bindir}" && rm -f $(EMACS) || true)
(if cd "$(DESTDIR)${icondir}"; then \
rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
hicolor/scalable/apps/${EMACS_NAME}.svg \
--- configure
+++ configure 2013-05-21 16:02:53.797440383 +0000
@@ -9438,8 +9438,8 @@ fi
--- configure.ac
+++ configure.ac 2013-05-21 16:02:45.000000000 +0000
@@ -1595,8 +1595,8 @@ fi
LD_SWITCH_X_SITE_RPATH=
if test "${x_libraries}" != NONE; then
if test -n "${x_libraries}"; then
@ -45,9 +66,9 @@
fi
x_default_search_path=""
x_search_path=${x_libraries}
--- configure.ac
+++ configure.ac 2013-05-21 16:02:44.821439363 +0000
@@ -1405,8 +1405,8 @@
--- configure
+++ configure 2013-05-21 16:02:54.000000000 +0000
@@ -10123,8 +10123,8 @@ fi
LD_SWITCH_X_SITE_RPATH=
if test "${x_libraries}" != NONE; then
if test -n "${x_libraries}"; then
@ -114,7 +135,7 @@
.TP
.B \-\-declarations
In C and derived languages, create tags for function declarations,
@@ -157,7 +157,7 @@ the previous ones. The regexps are of o
@@ -158,7 +158,7 @@ the previous ones. The regexps are of o
where \fItagregexp\fP is used to match the tag. It should not match
useless characters. If the match is such that more characters than
needed are unavoidably matched by \fItagregexp\fP, it may be useful to
@ -123,7 +144,7 @@
ignores regexps without a \fInameregexp\fP. The syntax of regexps is
the same as in emacs. The following character escape sequences are
supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which
@@ -236,15 +236,15 @@ tag entries for other files in place. C
@@ -237,15 +237,15 @@ tag entries for other files in place. C
by deleting the existing entries for the given files and then
rewriting the new entries at the end of the tags file. It is often
faster to simply rebuild the entire tag file than to use this.
@ -143,17 +164,17 @@
.B \-h, \-H, \-\-help
Print usage information. Followed by one or more \-\-language=LANG
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2012-06-27 10:41:38.716510300 +0000
@@ -114,7 +114,7 @@ MKDIR_P = @MKDIR_P@
# ========================== Lists of Files ===========================
+++ lib-src/Makefile.in 2014-10-21 14:25:38.807837913 +0000
@@ -118,7 +118,7 @@ MKDIR_P = @MKDIR_P@
CLIENTW = @CLIENTW@
# Things that a user might actually run, which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
+INSTALLABLES = etags${EXEEXT} gnuctags${EXEEXT} emacsclient${EXEEXT} \
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
+INSTALLABLES = etags${EXEEXT} gnuctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
ebrowse${EXEEXT}
INSTALLABLE_SCRIPTS = grep-changelog
@@ -313,10 +313,10 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
@@ -331,10 +331,10 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
## We depend on etags to assure that parallel makes do not write two
## etags.o files on top of each other.
@ -161,10 +182,10 @@
+gnuctags${EXEEXT}: etags${EXEEXT}
$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
-DVERSION="\"${version}\"" ${srcdir}/etags.c \
- $(REGEXPOBJ) $(LOADLIBES) -o ctags
+ $(REGEXPOBJ) $(LOADLIBES) -o gnuctags
- $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
+ $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT}
profile${EXEEXT}: ${srcdir}/profile.c $(config_h)
profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
--- lib-src/pop.c
+++ lib-src/pop.c 2011-11-28 08:38:56.000000000 +0000
@ -188,8 +209,56 @@
(set-buffer (apply 'make-comint "scheme" (car cmdlist)
(scheme-start-file (car cmdlist)) (cdr cmdlist)))
(inferior-scheme-mode)))
--- lisp/international/mule-cmds.el
+++ lisp/international/mule-cmds.el 2010-10-18 14:06:48.000000000 +0000
@@ -41,6 +41,7 @@
(defvar mule-keymap
(let ((map (make-sparse-keymap)))
+ (define-key map "m" 'toggle-enable-multibyte-characters)
(define-key map "f" 'set-buffer-file-coding-system)
(define-key map "r" 'revert-buffer-with-coding-system)
(define-key map "F" 'set-file-name-coding-system)
--- lisp/net/ange-ftp.el
+++ lisp/net/ange-ftp.el 2009-08-12 13:35:06.000000000 +0000
@@ -4977,7 +4977,7 @@ NEWNAME should be the name to give the n
; "If a host matches this regexp then it is assumed to be running VOS.")
;
;(defun ange-ftp-vos-host (host)
-; (and ange-ftp-vos-host-regexp
+; (and host ange-ftp-vos-host-regexp
; (save-match-data
; (string-match ange-ftp-vos-host-regexp host))))
;
@@ -5092,7 +5092,7 @@ NEWNAME should be the name to give the n
;; Return non-nil if HOST is running VMS.
(defun ange-ftp-vms-host (host)
- (and ange-ftp-vms-host-regexp
+ (and host ange-ftp-vms-host-regexp
(string-match-p ange-ftp-vms-host-regexp host)))
;; Because some VMS ftp servers convert filenames to lower case
@@ -5600,7 +5600,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running MTS.
(defun ange-ftp-mts-host (host)
- (and ange-ftp-mts-host-regexp
+ (and host ange-ftp-mts-host-regexp
(string-match-p ange-ftp-mts-host-regexp host)))
;; Parse the current buffer which is assumed to be in mts ftp dir format.
@@ -5798,7 +5798,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running CMS.
(defun ange-ftp-cms-host (host)
- (and ange-ftp-cms-host-regexp
+ (and host ange-ftp-cms-host-regexp
(string-match-p ange-ftp-cms-host-regexp host)))
(defun ange-ftp-add-cms-host (host)
--- lisp/site-load.el
+++ lisp/site-load.el 2013-05-21 15:51:51.649940239 +0000
+++ lisp/site-load.el 2013-05-21 15:51:52.000000000 +0000
@@ -0,0 +1,41 @@
+;;;;
+;;; emacs20.xx/lisp/site-load.el
@ -233,8 +302,8 @@
+
+;;; site-load.el ends here
--- lisp/speedbar.el
+++ lisp/speedbar.el 2012-06-27 11:04:52.701369888 +0000
@@ -802,6 +802,7 @@ If you want to change this while speedba
+++ lisp/speedbar.el 2012-06-27 11:04:53.000000000 +0000
@@ -806,6 +806,7 @@ If you want to change this while speedba
;; Navigation.
(define-key map "n" 'speedbar-next)
@ -242,56 +311,8 @@
(define-key map "p" 'speedbar-prev)
(define-key map "\M-n" 'speedbar-restricted-next)
(define-key map "\M-p" 'speedbar-restricted-prev)
--- lisp/international/mule-cmds.el
+++ lisp/international/mule-cmds.el 2010-10-18 14:06:48.000000000 +0000
@@ -39,6 +39,7 @@
(defvar mule-keymap
(let ((map (make-sparse-keymap)))
+ (define-key map "m" 'toggle-enable-multibyte-characters)
(define-key map "f" 'set-buffer-file-coding-system)
(define-key map "r" 'revert-buffer-with-coding-system)
(define-key map "F" 'set-file-name-coding-system)
--- lisp/net/ange-ftp.el
+++ lisp/net/ange-ftp.el 2009-08-12 13:35:06.000000000 +0000
@@ -4976,7 +4976,7 @@ NEWNAME should be the name to give the n
; "If a host matches this regexp then it is assumed to be running VOS.")
;
;(defun ange-ftp-vos-host (host)
-; (and ange-ftp-vos-host-regexp
+; (and host ange-ftp-vos-host-regexp
; (save-match-data
; (string-match ange-ftp-vos-host-regexp host))))
;
@@ -5091,7 +5091,7 @@ NEWNAME should be the name to give the n
;; Return non-nil if HOST is running VMS.
(defun ange-ftp-vms-host (host)
- (and ange-ftp-vms-host-regexp
+ (and host ange-ftp-vms-host-regexp
(string-match-p ange-ftp-vms-host-regexp host)))
;; Because some VMS ftp servers convert filenames to lower case
@@ -5599,7 +5599,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running MTS.
(defun ange-ftp-mts-host (host)
- (and ange-ftp-mts-host-regexp
+ (and host ange-ftp-mts-host-regexp
(string-match-p ange-ftp-mts-host-regexp host)))
;; Parse the current buffer which is assumed to be in mts ftp dir format.
@@ -5797,7 +5797,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running CMS.
(defun ange-ftp-cms-host (host)
- (and ange-ftp-cms-host-regexp
+ (and host ange-ftp-cms-host-regexp
(string-match-p ange-ftp-cms-host-regexp host)))
(defun ange-ftp-add-cms-host (host)
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2013-05-21 16:06:31.241439612 +0000
+++ lisp/textmodes/ispell.el 2014-10-21 14:26:54.515839767 +0000
@@ -351,10 +351,12 @@ Must be greater than 1."
:group 'ispell)
@ -301,15 +322,15 @@
- (executable-find "hunspell")
- "ispell")
+ (if (functionp 'append-ispell-dict-alist)
+ "ispell"
+ "ispell"
+ (or (executable-find "aspell")
+ (executable-find "ispell")
+ (executable-find "hunspell")
+ "ispell"))
+ (executable-find "ispell")
+ (executable-find "hunspell")
+ "ispell"))
"Program invoked by \\[ispell-word] and \\[ispell-region] commands."
:type 'string
:group 'ispell)
@@ -1182,6 +1185,56 @@ The variable `ispell-library-directory'
:set (lambda (symbol value)
@@ -1473,6 +1475,56 @@ The variable `ispell-library-directory'
(if ispell-menu-map-needed
(progn
(setq ispell-menu-map (make-sparse-keymap "Spell"))
@ -367,7 +388,7 @@
`(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
:help ,(purecopy "Supply explicit dictionary file name")))
--- site-lisp/term/func-keys.el
+++ site-lisp/term/func-keys.el 2013-05-21 15:51:52.049939078 +0000
+++ site-lisp/term/func-keys.el 2013-05-21 15:51:52.000000000 +0000
@@ -0,0 +1,33 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/func-keys.el for site-lisp path
@ -403,7 +424,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von func-keys.el
--- site-lisp/term/gnome.el
+++ site-lisp/term/gnome.el 2013-05-21 15:51:52.125559846 +0000
+++ site-lisp/term/gnome.el 2013-05-21 15:51:52.000000000 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/gnomw.el for site-lisp path
@ -503,7 +524,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von gnomw.el
--- site-lisp/term/kvt.el
+++ site-lisp/term/kvt.el 2013-05-21 15:51:52.197439092 +0000
+++ site-lisp/term/kvt.el 2013-05-21 15:51:52.000000000 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/kvt.el for site-lisp path
@ -603,7 +624,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von kvt.el
--- site-lisp/term/linux.el
+++ site-lisp/term/linux.el 2013-05-21 15:51:52.273939005 +0000
+++ site-lisp/term/linux.el 2013-05-21 15:51:52.000000000 +0000
@@ -0,0 +1,79 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/linux.el for site-lisp path
@ -685,7 +706,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von linux.el
--- site-lisp/term/locale.el
+++ site-lisp/term/locale.el 2013-05-21 15:51:52.349939373 +0000
+++ site-lisp/term/locale.el 2013-05-21 15:51:52.000000000 +0000
@@ -0,0 +1,13 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/locale.el for site-lisp path
@ -701,13 +722,13 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von locale.el
--- src/lisp.mk
+++ src/lisp.mk 2012-06-27 11:10:56.532510062 +0000
@@ -149,6 +149,8 @@ lisp = \
+++ src/lisp.mk 2014-10-21 14:27:53.832337794 +0000
@@ -151,6 +151,8 @@ lisp = \
$(lispsource)/w32-vars.elc \
$(lispsource)/term/w32-win.elc \
$(lispsource)/ls-lisp.elc \
+ $(lispsource)/lpr.elc \
+ $(lispsource)/delsel.elc \
$(lispsource)/disp-table.elc \
$(lispsource)/w32-common-fns.elc \
$(lispsource)/dos-w32.elc \
$(lispsource)/w32-fns.elc \

3
emacs-24.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd
size 39733124

110
emacs.changes
View File

@ -1,3 +1,113 @@
-------------------------------------------------------------------
Tue Oct 21 14:47:54 UTC 2014 - werner@suse.de
- Update to to emacs version 24.4
* Emacs can now be compiled with ACL (access control list) support.
* Emacs can now be compiled with file notification support.
* Emacs can now be compiled with zlib support.
* Support for ACLs (access control lists).
* Emacs preserves the ACL entries of files when backing up.
* New functions `file-acl' and `set-file-acl' get and set file ACLs.
* Support for menus on text-mode terminals.
* New option `load-prefer-newer' affects how the `load' function chooses
* Multi-monitor support
* New function `zlib-decompress-region', which decompresses gzip- and
zlib-format compressed data using built-in zlib support (if available).
* The *Messages* buffer is created in `messages-buffer-mode'
* The cursor stops blinking after 10 blinks (by default) on X and Nextstep.
* In keymaps where SPC scrolls forward, S-SPC now scrolls backward.
* The default value of `make-backup-file-name-function' is no longer nil.
* The command `apropos-variable' is renamed to `apropos-user-option'.
* The key `?' now describes prefix bindings, like `C-h'.
* The command `describe-function' has been extended for EIEIO.
* The function `quail-help' is no longer an interactive command.
Use `C-h C-\' (`describe-input-method') instead.
* New commands `toggle-frame-fullscreen' and `toggle-frame-maximized',
bound to <f11> and M-<f10>, respectively.
* New hooks `focus-in-hook', `focus-out-hook'.
These are normal hooks run when an Emacs frame gains or loses input focus.
* The function `window-in-direction' now takes additional arguments
for specifying a reference point, wrapping the selection around frame
borders, and specifying ways to select the minibuffer window.
* Emacs can now change frame sizes in units of pixels, rather than
text rows or columns.
* Emacs can now change window sizes in units of pixels.
* The functions `window-body-height' and `window-body-width' now never
count partially visible lines or columns if called with a nil PIXELWISE
argument.
* Emacs can now draw dividers between adjacent windows.
* New functions to return the pixel sizes of window components
* The new function `window-text-pixel-size' returns the size of the
text of a window's buffer in pixels.
* `fit-window-to-buffer' can now resize windows in both dimensions.
* `fit-frame-to-buffer' now fits frames in both dimensions. The new
options `fit-frame-to-buffer-margins' and `fit-frame-to-buffer-sizes'
control the size of the frame and its position on screen.
* Temp Buffer Resize Mode can now adjust the height and width of
windows and frames.
* `split-window' is now a non-interactive function, not a command.
* The functions `window-size' and `window-total-size' now have an
optional argument to return a rounded size value.
* `window-state-put' now allows you to put a window state into internal
windows too.
* New option `scroll-bar-adjust-thumb-portion'.
Available only on X, this option allows you to control over-scrolling
using the scroll bar (i.e., dragging the thumb down even when the end
of the buffer is visible).
* `display-buffer-at-bottom' chooses or creates a window at the
bottom of the selected frame.
* `display-buffer-no-window' to not display the buffer in a window.
* New display action alist entry `allow-no-window' to indicate the
caller of `display-buffer' is ready to handle the case of not displaying
the buffer in a window.
* `display-buffer-in-previous-window' is now a member of
`display-buffer-fallback-action'.
* `eval-defun' on an already defined defcustom calls the :set function,
if there is one.
* `electric-indent-mode' is now enabled by default.
* New buffer-local `electric-indent-local-mode'.
* The behavior of `C-x TAB' (`indent-rigidly') has changed.
* `tab-stop-list' is now implicitly extended to infinity by repeating
the last step. Its default value is changed to nil, which means a tab
stop every `tab-width' columns.
* Uniquify is enabled by default, with `post-forward-angle-brackets' style.
* New command `C-x SPC' (`rectangle-mark-mode') makes a rectangular region.
Most commands are still unaware of it, but kill/yank do work on the rectangle.
* New option `visual-order-cursor-movement'.
* New command `delete-duplicate-lines'.
* New command `cycle-spacing' acts like a smarter `just-one-space'.
* `blink-matching-paren' now only highlights the matching open-paren
by default, instead of moving the cursor. Set this variable to `jump' to
restore the old behavior.
* The new function `fill-single-char-nobreak-p' can stop fill from breaking
a line after a one-letter word, which is an error in some typographical
conventions. To use it, add it to the `fill-nobreak-predicate' hook.
* All interactive commands that read a register (`copy-to-register', etc.)
now display a temporary window after `register-preview-delay' seconds
that summarizes existing registers.
* New command `frameset-to-register' bound to `C-x r f', replacing
`frame-configuration-to-register'. It offers similar functionality,
plus enhancements like the ability to restore deleted frames.
(`frame-configuration-to-register' still exists, but no longer has a
key binding.)
* New command `C-x C-k x' (`kmacro-to-register') stores keyboard
macros in registers.
- Remove patches now upstream
CVE-2014-3421.patch
CVE-2014-3422.patch
CVE-2014-3423.patch
CVE-2014-3424.patch
emacs-24.3-giflib5.patch
emacs-24.3-nntp-typhoon-fix.patch
- Change patches
emacs-24.3-decl.dif becomes emacs-24.4-decl.dif
emacs-24.3-flyspell.patch becomes emacs-24.4-flyspell.patch
emacs-24.3-glibc.patch becomes emacs-24.4-glibc.patch
emacs-24.3-nonvoid.patch becomes emacs-24.4-nonvoid.patch
emacs-24.3-ps-bdf.patch becomes emacs-24.4-ps-bdf.patch
emacs-24.3-xim.patch becomes emacs-24.4-xim.patch
emacs-24.3.dif becomes emacs-24.4.dif
-------------------------------------------------------------------
Wed Sep 3 10:31:56 UTC 2014 - werner@suse.de

518
emacs.spec
View File

File diff suppressed because it is too large Load Diff