Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2016-12-03 18:25:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2016-09-17 14:39:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2016-12-03 18:25:05.000000000 +0100 @@ -1,0 +2,76 @@ +Fri Nov 11 09:01:36 UTC 2016 - [email protected] + +- Avoid address space randomization during emacs build +- Check for active Execution Shield as this breaks emacs + +------------------------------------------------------------------- +Wed Sep 21 06:31:44 UTC 2016 - [email protected] + +- Diable experimental cairo support as it cause trouble with spacemacs + as well as with the w3 mode + +------------------------------------------------------------------- +Mon Sep 19 15:01:07 UTC 2016 - [email protected] + +- Update to emacs version 25.1 + * Next major release + * Xwidgets: a new feature for embedding native widgets inside Emacs buffers. + * Emacs can now load shared/dynamic libraries (modules). + * Network security (TLS/SSL certificate validity and the like) + * 'C-h l' now also lists the commands that were run. + * New option 'switch-to-buffer-in-dedicated-window' + * The option 'even-window-heights' has been renamed to 'even-window-sizes' + * 'terpri' gets an optional arg ENSURE to conditionally output a newline. + * 'insert-register' now leaves point after the inserted text + * The new variable 'term-file-aliases' replaces some files from lisp/term. + * New variable 'system-configuration-features', listing some of the main + features that Emacs was compiled with. + * A password is now hidden also when typed in batch mode. + * The Emacs pseudo-random number generator can be securely seeded. + * New input methods: 'tamil-dvorak', 'programmer-dvorak' and 'probhat'. + * 'M-x' suggests shorthands and ignores obsolete commands for completion. + * Changes in undo + * New command 'comment-line' bound to 'C-x C-;'. + * New and improved facilities for inserting Unicode characters + * New minor mode 'global-eldoc-mode' is enabled by default. + * Emacs now uses "bracketed paste mode" on text terminals that support it. + * Emacs now supports the latest version of the UBA. + * You can access 'mouse-buffer-menu' ('C-down-mouse-1') using 'C-f10'. + * New buffer-local 'electric-pair-local-mode'. + * New variable 'fast-but-imprecise-scrolling' inhibits fontification + during full screen scrolling operations. + * New documentation command 'describe-symbol'. + * New function 'custom-prompt-customize-unsaved-options' checks for + unsaved customizations and prompts user to customize (if found). + * The old 'C-x w' bindings in 'hi-lock-mode' are officially deprecated + * New function 'bookmark-set-no-overwrite' bound to 'C-x r M'. + * Many other details, see /usr/share/emacs/25.1/etc/NEWS +- Patch emacs-24.4.dif renamed to emacs-25.1.dif +- Patches removed as now upstream or fixed otherwise + debbugs16737.patch + emacs-24-0010-ELF-unexec-Correct-section-header-index.patch + emacs-24-0011-ELF-unexec-Tidy-code.patch + emacs-24-0012-ELF-unexec-Merge-Alpha-and-MIPS-COFF-debug-handling.patch + emacs-24-0013-ELF-unexec-Symbol-table-patching.patch + emacs-24-0014-ELF-unexec-_OBJC_-symbols-in-bss-sections.patch + emacs-24-0015-ELF-unexec-R_-_NONE-relocs.patch + emacs-24-0016-ELF-unexec-Drive-from-PT_LOAD-header-rather-than-sec.patch + emacs-24-0017-ELF-unexec-Don-t-insert-a-new-section.patch + emacs-24-0018-src-unexelf.c-NEW_PROGRAM_H-Remove-unused-macro-Bug-.patch + emacs-24-0019-ELF-unexec-align-section-header.patch + emacs-24-fix-missing-gtk-icons.patch + emacs-24.4-bzr118021.patch + emacs24-primarysel2.patch + gmalloc.patch +- Patches forwarded to 25.1 + emacs-24.1-ps-mule.patch + emacs-24.3-asian-print.patch + emacs-24.3-iconic.patch + emacs-24.3-x11r7.patch + emacs-24.4-flyspell.patch + emacs-24.4-glibc.patch + emacs-24.4-nonvoid.patch + emacs-24.4-ps-bdf.patch + emacs-24.4-xim.patch + +------------------------------------------------------------------- Old: ---- debbugs16737.patch emacs-24-0010-ELF-unexec-Correct-section-header-index.patch emacs-24-0011-ELF-unexec-Tidy-code.patch emacs-24-0012-ELF-unexec-Merge-Alpha-and-MIPS-COFF-debug-handling.patch emacs-24-0013-ELF-unexec-Symbol-table-patching.patch emacs-24-0014-ELF-unexec-_OBJC_-symbols-in-bss-sections.patch emacs-24-0015-ELF-unexec-R_-_NONE-relocs.patch emacs-24-0016-ELF-unexec-Drive-from-PT_LOAD-header-rather-than-sec.patch emacs-24-0017-ELF-unexec-Don-t-insert-a-new-section.patch emacs-24-0018-src-unexelf.c-NEW_PROGRAM_H-Remove-unused-macro-Bug-.patch emacs-24-0019-ELF-unexec-align-section-header.patch emacs-24-fix-missing-gtk-icons.patch emacs-24.4-bzr118021.patch emacs-24.4.dif emacs-24.5.tar.xz emacs24-primarysel2.patch gmalloc.patch New: ---- emacs-25.1.dif emacs-25.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ ++++ 1374 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/emacs/emacs.spec ++++ and /work/SRC/openSUSE:Factory/.emacs.new/emacs.spec ++++++ check-build.sh ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -16,5 +16,13 @@ ;; esac +exec_shield=0 +if test -e /proc/sys/kernel/exec-shield; then + read -t 1 exec_shield < /proc/sys/kernel/exec-shield +fi +if test $exec_shield -ne 0 ; then + echo Sorry, Execution Shield exists and is enabled 1>&2 + exit 1 +fi exit 0 ++++++ emacs-24.1-ps-mule.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -1,5 +1,10 @@ +--- + lisp/ps-mule.el | 2 ++ + lisp/textmodes/ispell.el | 14 +++++++++++--- + 2 files changed, 13 insertions(+), 3 deletions(-) + --- lisp/ps-mule.el -+++ lisp/ps-mule.el 2009-08-11 12:41:44.000000000 +0000 ++++ lisp/ps-mule.el 2016-09-19 09:01:56.930605125 +0000 @@ -182,6 +182,8 @@ See also the variable `ps-font-info-data (defconst ps-mule-font-info-database-latin @@ -10,8 +15,8 @@ "Sample setting of `ps-mule-font-info-database' to use latin fonts.") --- lisp/textmodes/ispell.el -+++ lisp/textmodes/ispell.el 2012-06-26 16:37:56.424010429 +0000 -@@ -1339,10 +1339,18 @@ Protects against bogus binding of `enabl ++++ lisp/textmodes/ispell.el 2016-09-19 09:01:56.930605125 +0000 +@@ -1709,10 +1709,18 @@ Protects against bogus binding of `enabl nil ;; in pipe mode. Disable extended-char-mode (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist) (assoc ispell-current-dictionary ispell-dictionary-alist))))) ++++++ emacs-24.3-asian-print.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -1,6 +1,10 @@ +--- + lisp/ps-mule.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- lisp/ps-mule.el -+++ lisp/ps-mule.el 2009-08-10 16:18:24.585901695 +0000 -@@ -239,7 +239,7 @@ Currently, data for Japanese and Korean ++++ lisp/ps-mule.el 2016-09-19 08:57:28.807664990 +0000 +@@ -264,7 +264,7 @@ Currently, data for Japanese and Korean (japanese-jisx0208 (normal bdf "jiskan24.bdf")) (korean-ksc5601 ++++++ emacs-24.3-iconic.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -1,12 +1,16 @@ +--- + lisp/startup.el | 3 +++ + 1 file changed, 3 insertions(+) + --- lisp/startup.el -+++ lisp/startup.el 2008-03-31 10:23:04.503065574 +0000 -@@ -2171,6 +2171,9 @@ A fancy display is used on graphic displ - ((equal argi "-no-splash") - (setq inhibit-startup-screen t)) ++++ lisp/startup.el 2016-09-19 09:15:26.871345783 +0000 +@@ -2349,6 +2349,9 @@ nil default-directory" name) + ((equal argi "-no-splash") + (setq inhibit-startup-screen t)) -+ ((equal argi "-iconic") -+ (setq inhibit-startup-message t)) ++ ((equal argi "-iconic") ++ (setq inhibit-startup-message t)) + - ((member argi '("-f" ; what the manual claims - "-funcall" - "-e")) ; what the source used to say + ((member argi '("-f" ; what the manual claims + "-funcall" + "-e")) ; what the source used to say ++++++ emacs-24.3-x11r7.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -1,5 +1,9 @@ +--- + src/xrdb.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + --- src/xrdb.c -+++ src/xrdb.c 2007-05-15 16:01:41.439517668 +0000 ++++ src/xrdb.c 2016-09-19 09:10:35.504833294 +0000 @@ -39,6 +39,9 @@ along with GNU Emacs. If not, see <http #include <X11/X.h> #include <X11/Xutil.h> @@ -10,7 +14,7 @@ #ifdef HAVE_PWD_H #include <pwd.h> #endif -@@ -539,6 +542,15 @@ x_load_resources (Display *display, cons +@@ -496,6 +499,15 @@ x_load_resources (Display *display, cons XrmPutLineResource (&rdb, line); #endif /* not USE_MOTIF */ @@ -26,7 +30,7 @@ user_database = get_user_db (display); -@@ -580,6 +592,10 @@ x_load_resources (Display *display, cons +@@ -537,6 +549,10 @@ x_load_resources (Display *display, cons XrmMergeDatabases (db, &rdb); } ++++++ emacs-24.4-flyspell.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -3,8 +3,8 @@ 1 file changed, 8 insertions(+), 3 deletions(-) --- lisp/textmodes/flyspell.el -+++ lisp/textmodes/flyspell.el 2014-10-21 14:14:59.191838679 +0000 -@@ -286,6 +286,12 @@ If this variable is nil, all regions are ++++ lisp/textmodes/flyspell.el 2016-09-19 09:22:48.535025631 +0000 +@@ -287,6 +287,12 @@ If this variable is nil, all regions are :type 'key-sequence :group 'flyspell) @@ -17,25 +17,25 @@ ;;*---------------------------------------------------------------------*/ ;;* Mode specific options */ ;;* ------------------------------------------------------------- */ -@@ -309,7 +315,6 @@ property of the major mode name.") +@@ -310,7 +316,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) -(defvar message-signature-separator) (defun mail-mode-flyspell-verify () "Function used for `flyspell-generic-check-word-predicate' in Mail mode." - (let ((header-end (save-excursion -@@ -321,11 +326,11 @@ property of the major mode name.") - nil t) - (point))) - (signature-begin -- (if (not (boundp 'message-signature-separator)) -+ (if (not (boundp 'flyspell-signature-separator)) - (point-max) - (save-excursion - (goto-char (point-max)) -- (re-search-backward message-signature-separator nil t) -+ (re-search-backward flyspell-signature-separator nil t) - (point))))) + (let* ((header-end (save-excursion +@@ -322,11 +327,11 @@ property of the major mode name.") + nil t) + (point))) + (signature-begin +- (if (not (boundp 'message-signature-separator)) ++ (if (not (boundp 'flyspell-signature-separator)) + (point-max) + (save-excursion + (goto-char (point-max)) +- (re-search-backward message-signature-separator ++ (re-search-backward flyspell-signature-separator + (max header-end (- (point) 4000)) t) + (point))))) (cond ((< (point) header-end) - (and (save-excursion (beginning-of-line) ++++++ emacs-24.4-glibc.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -1,30 +1,25 @@ --- - configure | 2 ++ - configure.ac | 2 ++ - lib-src/Makefile.in | 6 ++++-- - 3 files changed, 8 insertions(+), 2 deletions(-) + configure | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -10951,6 +10951,7 @@ fi +--- configure.ac ++++ configure.ac 2016-09-19 08:54:17.383277267 +0000 +@@ -2203,6 +2203,7 @@ fi use_mmap_for_buffers=no case "$opsys" in - cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;; + cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;; + gnu-linux) use_mmap_for_buffers=yes ;; esac - -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -2048,6 +2048,7 @@ fi + AC_FUNC_MMAP +--- configure ++++ configure 2016-09-19 08:54:30.971020865 +0000 +@@ -11572,6 +11572,7 @@ fi use_mmap_for_buffers=no case "$opsys" in - cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;; + cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;; + gnu-linux) use_mmap_for_buffers=yes ;; esac - AC_FUNC_MMAP + ++++++ emacs-24.4-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -1,10 +1,11 @@ --- - src/xmenu.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/emacs-module.c | 1 + + src/xmenu.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) --- src/xmenu.c -+++ src/xmenu.c 2014-10-21 14:06:22.923837970 +0000 -@@ -2031,8 +2031,8 @@ Lisp_Object ++++ src/xmenu.c 2016-09-19 09:01:56.930605125 +0000 +@@ -1922,8 +1922,8 @@ Lisp_Object xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) { Lisp_Object title; @@ -15,3 +16,13 @@ ptrdiff_t specpdl_count = SPECPDL_INDEX (); check_window_system (f); +--- src/emacs-module.c ++++ src/emacs-module.c 2016-09-20 09:36:52.881778063 +0000 +@@ -787,6 +787,7 @@ usage: (module-call ENVOBJ &rest ARGLIST + default: + eassume (false); + } ++ return Qnil; + } + + ++++++ emacs-24.4-ps-bdf.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -4,21 +4,21 @@ 2 files changed, 4 insertions(+), 4 deletions(-) --- lisp/ldefs-boot.el -+++ lisp/ldefs-boot.el 2015-04-30 13:03:34.058018924 +0000 -@@ -21554,9 +21554,9 @@ With prefix argument ARG, restart the Pr - ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21710 25077 708662 334000)) ++++ lisp/ldefs-boot.el 2016-09-19 09:01:36.090998408 +0000 +@@ -22107,9 +22107,9 @@ With prefix argument ARG, restart the Pr + ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22388 5707 728611 808000)) ;;; 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")) "\ +(defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/share/fonts/bdf")) "\ List of directories to search for `BDF' font files. --The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") -+The default value is '(\"/usr/share/fonts/bdf\").") +-The default value is (\"/usr/local/share/emacs/fonts/bdf\").") ++The default value is (\"/usr/share/fonts/bdf\").") (custom-autoload 'bdf-directory-list "ps-bdf" t) --- lisp/ps-bdf.el -+++ lisp/ps-bdf.el 2009-08-10 16:21:47.000000000 +0000 ++++ lisp/ps-bdf.el 2016-09-19 09:00:21.828399872 +0000 @@ -42,9 +42,9 @@ (defcustom bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) @@ -26,8 +26,8 @@ - '("/usr/local/share/emacs/fonts/bdf")) + '("/usr/share/fonts/bdf")) "List of directories to search for `BDF' font files. --The default value is '(\"/usr/local/share/emacs/fonts/bdf\")." -+The default value is '(\"/usr/share/fonts/bdf\")." +-The default value is (\"/usr/local/share/emacs/fonts/bdf\")." ++The default value is (\"/usr/share/fonts/bdf\")." :type '(repeat :tag "BDF font directory list" (directory :tag "BDF font directory")) :group 'ps-print-miscellany) ++++++ emacs-24.4-xim.patch ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -3,8 +3,8 @@ 1 file changed, 1 insertion(+), 1 deletion(-) --- src/xfns.c -+++ src/xfns.c 2014-10-21 14:09:49.520338231 +0000 -@@ -1648,8 +1648,8 @@ static XIMStyle best_xim_style (XIMStyle ++++ src/xfns.c 2016-09-19 09:10:35.504833294 +0000 +@@ -1957,8 +1957,8 @@ static XIMStyle best_xim_style (XIMStyle static const XIMStyle supported_xim_styles[] = { ++++++ emacs-24.4.dif -> emacs-25.1.dif ++++++ --- /work/SRC/openSUSE:Factory/emacs/emacs-24.4.dif 2015-12-01 10:01:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs-25.1.dif 2016-12-03 18:25:04.000000000 +0100 @@ -1,9 +1,9 @@ --- - Makefile.in | 11 +--- - configure | 4 - - configure.ac | 4 - + Makefile.in | 7 +- + configure | 6 -- + configure.ac | 6 -- doc/man/etags.1 | 20 ++++---- - lib-src/Makefile.in | 6 +- + lib-src/Makefile.in | 4 - lib-src/pop.c | 1 lisp/cmuscheme.el | 3 - lisp/international/mule-cmds.el | 1 @@ -16,35 +16,30 @@ 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(-) + 17 files changed, 445 insertions(+), 32 deletions(-) --- Makefile.in -+++ 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; \ -- if test "x${NO_BIN_LINK}" = x; then \ -- 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; \ -@@ -684,6 +680,7 @@ install-man: ++++ Makefile.in 2016-09-19 09:49:37.296950020 +0000 +@@ -493,8 +493,8 @@ install-arch-dep: src install-arch-indep + umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}" + $(MAKE) -C lib-src install + ifeq (${ns_self_contained},no) +- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" +- -chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)" ++ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACS)" ++ -chmod 755 "$(DESTDIR)${bindir}/$(EMACS)" + ifndef NO_BIN_LINK + rm -f "$(DESTDIR)${bindir}/$(EMACS)" + cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS) +@@ -683,6 +683,7 @@ install-man: umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}" thisdir=`/bin/pwd`; \ cd ${mansrcdir}; \ + cp ctags.1 gnuctags.1; \ for page in *.1; do \ + test "$$page" = ChangeLog.1 && continue; \ dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \ - (cd "$${thisdir}"; \ -@@ -770,7 +767,7 @@ uninstall: uninstall-$(NTDIR) uninstall- +@@ -771,7 +772,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; \ fi) @@ -53,34 +48,38 @@ (if cd "$(DESTDIR)${icondir}"; then \ rm -f hicolor/*x*/apps/${EMACS_NAME}.png \ hicolor/scalable/apps/${EMACS_NAME}.svg \ ---- configure.ac -+++ configure.ac 2013-05-21 16:02:45.000000000 +0000 -@@ -1595,8 +1595,8 @@ fi +--- configure ++++ configure 2016-09-19 09:53:00.097191627 +0000 +@@ -10749,10 +10749,8 @@ fi LD_SWITCH_X_SITE_RPATH= if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then -- LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` -- LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath,/g"` +- LD_SWITCH_X_SITE=-L`$as_echo "$x_libraries" | sed -e 's/:/ -L/g'` +- LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,` +- $as_echo "$x_libraries" | sed -e 's/:/ -Wl,-rpath,/g' +- ` + LD_SWITCH_X_SITE="-L ${x_libraries%%:*}" + LD_SWITCH_X_SITE_RPATH="-Wl,-rpath-link,${x_libraries%%:*}" fi x_default_search_path="" x_search_path=${x_libraries} ---- configure -+++ configure 2013-05-21 16:02:54.000000000 +0000 -@@ -10123,8 +10123,8 @@ fi +--- configure.ac ++++ configure.ac 2016-09-19 09:52:02.546258535 +0000 +@@ -1727,10 +1727,8 @@ fi LD_SWITCH_X_SITE_RPATH= if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then -- LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` -- LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath,/g"` +- LD_SWITCH_X_SITE=-L`AS_ECHO(["$x_libraries"]) | sed -e 's/:/ -L/g'` +- LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,` +- AS_ECHO(["$x_libraries"]) | sed -e 's/:/ -Wl,-rpath,/g' +- ` + LD_SWITCH_X_SITE="-L ${x_libraries%%:*}" + LD_SWITCH_X_SITE_RPATH="-Wl,-rpath-link,${x_libraries%%:*}" fi x_default_search_path="" x_search_path=${x_libraries} --- doc/man/etags.1 -+++ doc/man/etags.1 2009-08-11 12:59:38.000000000 +0000 ++++ doc/man/etags.1 2016-09-19 09:54:09.419906131 +0000 @@ -7,7 +7,7 @@ .. @@ -90,16 +89,16 @@ .SH SYNOPSIS .hy 0 .na -@@ -24,7 +24,7 @@ etags, ctags \- generate tag file for Em +@@ -25,7 +25,7 @@ etags, ctags \- generate tag file for Em [\|\-\-help\|] [\|\-\-version\|] \fIfile\fP .\|.\|. --\fBctags\fP [\|\-aCdgIRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|] -+\fBgnuctags\fP [\|\-aCdgIRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|] +-\fBctags\fP [\|\-aCdgIQRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|] ++\fBgnuctag\fP [\|\-aCdgIQRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|] .if n .br [\|\-o \fItagfile\fP\|] [\|\-r \fIregexp\fP\|] [\|\-\-parse\-stdin=\fIfile\fP\|] -@@ -43,7 +43,7 @@ etags, ctags \- generate tag file for Em +@@ -45,7 +45,7 @@ etags, ctags \- generate tag file for Em The \|\fBetags\fP\| program is used to create a tag table file, in a format understood by .BR emacs ( 1 )\c @@ -108,7 +107,7 @@ format understood by .BR vi ( 1 )\c \&. Both forms of the program understand -@@ -53,7 +53,7 @@ PHP, PostScript, Python, Prolog, Scheme +@@ -55,7 +55,7 @@ Ruby, PHP, PostScript, Python, Prolog, S most assembler\-like syntaxes. Both forms read the files specified on the command line, and write a tag table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for @@ -117,7 +116,7 @@ Files specified with relative file names will be recorded in the tag table with file names relative to the directory where the tag table resides. If the tag table is in /dev or is the standard output, -@@ -69,7 +69,7 @@ parsing of the file names following the +@@ -71,7 +71,7 @@ parsing of the file names following the language, overriding guesses based on filename extensions. .SH OPTIONS Some options make sense only for the \fBvi\fP style tag files produced @@ -126,16 +125,16 @@ \fBetags\fP does not recognize them. The programs accept unambiguous abbreviations for long option names. .TP -@@ -83,7 +83,7 @@ expression search instructions; the \fB\ - the delimiter `\|\fB?\fP\|', to search \fIbackwards\fP through files. - The default is to use the delimiter `\|\fB/\fP\|', to search \fIforwards\fP +@@ -85,7 +85,7 @@ expression search instructions; the \fB\ + the delimiter "\|\fB?\fP\|", to search \fIbackwards\fP through files. + The default is to use the delimiter "\|\fB/\fP\|", to search \fIforwards\fP through files. -Only \fBctags\fP accepts this option. -+Only \fBgnuctags\fP accepts this option. ++Only \fBgnuctag\fP accepts this option. .TP .B \-\-declarations In C and derived languages, create tags for function declarations, -@@ -158,7 +158,7 @@ the previous ones. The regexps are of o +@@ -174,7 +174,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 @@ -144,7 +143,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 -@@ -237,15 +237,15 @@ tag entries for other files in place. C +@@ -253,15 +253,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. @@ -164,8 +163,8 @@ .B \-h, \-H, \-\-help Print usage information. Followed by one or more \-\-language=LANG --- lib-src/Makefile.in -+++ lib-src/Makefile.in 2014-10-21 14:25:38.807837913 +0000 -@@ -118,7 +118,7 @@ MKDIR_P = @MKDIR_P@ ++++ lib-src/Makefile.in 2016-09-19 09:56:30.249261196 +0000 +@@ -150,7 +150,7 @@ MKDIR_P = @MKDIR_P@ CLIENTW = @CLIENTW@ # Things that a user might actually run, which should be installed in bindir. @@ -173,22 +172,18 @@ +INSTALLABLES = etags${EXEEXT} gnuctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \ ebrowse${EXEEXT} - INSTALLABLE_SCRIPTS = grep-changelog -@@ -331,10 +331,10 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${ - - ## We depend on etags to assure that parallel makes do not write two + # Things that Emacs runs internally, or during the build process, +@@ -367,7 +367,7 @@ etags${EXEEXT}: ${etags_deps} ## etags.o files on top of each other. --ctags${EXEEXT}: etags${EXEEXT} -+gnuctags${EXEEXT}: etags${EXEEXT} - $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ - -DVERSION="\"${version}\"" ${srcdir}/etags.c \ -- regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT} -+ regex.o $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT} + ## FIXME? + ## Can't we use a wrapper that calls 'etags --ctags'? +-ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps} ++gnuctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps} + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs) - profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h) - $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \ + ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \ --- lib-src/pop.c -+++ lib-src/pop.c 2011-11-28 08:38:56.000000000 +0000 ++++ lib-src/pop.c 2016-09-19 09:25:18.256204648 +0000 @@ -26,6 +26,7 @@ along with GNU Emacs. If not, see <http #ifdef MAIL_USE_POP @@ -198,7 +193,7 @@ #include "ntlib.h" #include <winsock.h> --- lisp/cmuscheme.el -+++ lisp/cmuscheme.el 2009-08-12 13:29:47.000000000 +0000 ++++ lisp/cmuscheme.el 2016-09-19 09:25:18.256204648 +0000 @@ -241,7 +241,8 @@ is run). (read-string "Run Scheme: " scheme-program-name) scheme-program-name))) @@ -210,8 +205,8 @@ (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 @@ ++++ lisp/international/mule-cmds.el 2016-09-19 09:25:18.256204648 +0000 +@@ -39,6 +39,7 @@ (defvar mule-keymap (let ((map (make-sparse-keymap))) @@ -220,8 +215,8 @@ (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 ++++ lisp/net/ange-ftp.el 2016-09-19 09:25:18.256204648 +0000 +@@ -4985,7 +4985,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) @@ -230,7 +225,7 @@ ; (save-match-data ; (string-match ange-ftp-vos-host-regexp host)))) ; -@@ -5092,7 +5092,7 @@ NEWNAME should be the name to give the n +@@ -5100,7 +5100,7 @@ NEWNAME should be the name to give the n ;; Return non-nil if HOST is running VMS. (defun ange-ftp-vms-host (host) @@ -239,7 +234,7 @@ (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 +@@ -5608,7 +5608,7 @@ Other orders of $ and _ seem to all work ;; Return non-nil if HOST is running MTS. (defun ange-ftp-mts-host (host) @@ -248,7 +243,7 @@ (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 +@@ -5806,7 +5806,7 @@ Other orders of $ and _ seem to all work ;; Return non-nil if HOST is running CMS. (defun ange-ftp-cms-host (host) @@ -258,7 +253,7 @@ (defun ange-ftp-add-cms-host (host) --- lisp/site-load.el -+++ lisp/site-load.el 2013-05-21 15:51:52.000000000 +0000 ++++ lisp/site-load.el 2016-09-19 09:25:18.256204648 +0000 @@ -0,0 +1,41 @@ +;;;; +;;; emacs20.xx/lisp/site-load.el @@ -302,8 +297,8 @@ + +;;; site-load.el ends here --- lisp/speedbar.el -+++ lisp/speedbar.el 2012-06-27 11:04:53.000000000 +0000 -@@ -806,6 +806,7 @@ If you want to change this while speedba ++++ lisp/speedbar.el 2016-09-19 09:25:18.260204572 +0000 +@@ -794,6 +794,7 @@ If you want to change this while speedba ;; Navigation. (define-key map "n" 'speedbar-next) @@ -312,7 +307,7 @@ (define-key map "\M-n" 'speedbar-restricted-next) (define-key map "\M-p" 'speedbar-restricted-prev) --- lisp/textmodes/ispell.el -+++ lisp/textmodes/ispell.el 2014-10-21 14:26:54.515839767 +0000 ++++ lisp/textmodes/ispell.el 2016-09-19 09:25:18.260204572 +0000 @@ -351,10 +351,12 @@ Must be greater than 1." :group 'ispell) @@ -330,7 +325,7 @@ "Program invoked by \\[ispell-word] and \\[ispell-region] commands." :type 'string :set (lambda (symbol value) -@@ -1473,6 +1475,56 @@ The variable `ispell-library-directory' +@@ -1525,6 +1527,56 @@ The variable `ispell-library-directory' (if ispell-menu-map-needed (progn (setq ispell-menu-map (make-sparse-keymap "Spell")) @@ -388,7 +383,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.000000000 +0000 ++++ site-lisp/term/func-keys.el 2016-09-19 09:25:18.260204572 +0000 @@ -0,0 +1,33 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/func-keys.el for site-lisp path @@ -424,7 +419,7 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von func-keys.el --- site-lisp/term/gnome.el -+++ site-lisp/term/gnome.el 2013-05-21 15:51:52.000000000 +0000 ++++ site-lisp/term/gnome.el 2016-09-19 09:25:18.260204572 +0000 @@ -0,0 +1,97 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/gnomw.el for site-lisp path @@ -524,7 +519,7 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von gnomw.el --- site-lisp/term/kvt.el -+++ site-lisp/term/kvt.el 2013-05-21 15:51:52.000000000 +0000 ++++ site-lisp/term/kvt.el 2016-09-19 09:25:18.260204572 +0000 @@ -0,0 +1,97 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/kvt.el for site-lisp path @@ -624,7 +619,7 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von kvt.el --- site-lisp/term/linux.el -+++ site-lisp/term/linux.el 2013-05-21 15:51:52.000000000 +0000 ++++ site-lisp/term/linux.el 2016-09-19 09:25:18.260204572 +0000 @@ -0,0 +1,79 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/linux.el for site-lisp path @@ -706,7 +701,7 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von linux.el --- site-lisp/term/locale.el -+++ site-lisp/term/locale.el 2013-05-21 15:51:52.000000000 +0000 ++++ site-lisp/term/locale.el 2016-09-19 09:25:18.260204572 +0000 @@ -0,0 +1,13 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/locale.el for site-lisp path @@ -721,14 +716,3 @@ +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von locale.el ---- src/lisp.mk -+++ 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 \ ++++++ emacs-24.5.tar.xz -> emacs-25.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/emacs/emacs-24.5.tar.xz /work/SRC/openSUSE:Factory/.emacs.new/emacs-25.1.tar.xz differ: char 25, line 1 ++++++ emacs.sh ++++++ --- /var/tmp/diff_new_pack.KVcp8V/_old 2016-12-03 18:25:09.000000000 +0100 +++ /var/tmp/diff_new_pack.KVcp8V/_new 2016-12-03 18:25:09.000000000 +0100 @@ -26,7 +26,9 @@ # Currently (2013/05/24) the parser of the GNOME libs # are broken that is it is not independent from locale LC_NUMERIC=POSIX - export LC_NUMERIC + XLIB_SKIP_ARGB_VISUALS=1 + GDK_RGBA=0 + export LC_NUMERIC XLIB_SKIP_ARGB_VISUALS GDK_RGBA fi arg0=$0 argv=("$@")
