------------------------------------------------------------ revno: 118107 committer: Jan D. branch nick: trunk timestamp: Tue 2014-10-14 07:07:21 +0200 message: * configure.ac: apple-darwin powerpc is unported. diff: === modified file 'ChangeLog' --- ChangeLog 2014-10-12 22:56:45 +0000 +++ ChangeLog 2014-10-14 05:07:21 +0000 @@ -1,3 +1,7 @@ +2014-10-14 Jan Djärv + + * configure.ac: apple-darwin powerpc is unported. + 2014-10-12 Ken Brown * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [CYGWIN]: Set stack size === modified file 'configure.ac' --- configure.ac 2014-10-12 22:56:45 +0000 +++ configure.ac 2014-10-14 05:07:21 +0000 @@ -557,7 +557,7 @@ *-apple-darwin* ) case "${canonical}" in i[3456]86-* ) ;; - powerpc-* ) ;; + powerpc-* ) unported=yes ;; x86_64-* ) ;; * ) unported=yes ;; esac ------------------------------------------------------------ revno: 118106 [merge] committer: Glenn Morris branch nick: trunk timestamp: Mon 2014-10-13 16:55:41 -0400 message: Merge from emacs-24; up to r117581 diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-10-12 06:09:50 +0000 +++ admin/ChangeLog 2014-10-13 20:55:41 +0000 @@ -1,3 +1,11 @@ +2014-10-13 Glenn Morris + + * authors.el (authors-aliases, authors-fixed-case) + (authors-obsolete-files-regexps): Additions. + (authors-no-scan-regexps): New constant. + (authors-no-scan-file-p): New function. + (authors): Respect authors-no-scan-file-p. + 2014-10-12 Paul Eggert Fix putenv race conditions with undefined behavior (Bug#8705). === modified file 'admin/authors.el' --- admin/authors.el 2014-10-04 19:07:05 +0000 +++ admin/authors.el 2014-10-13 20:55:41 +0000 @@ -121,6 +121,7 @@ ("Mikio Nakajima" "Nakajima Mikio") ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira") ("Noorul Islam" "Noorul Islam K M") +;;; ("Tetsurou Okazaki" "OKAZAKI Tetsurou") ; FIXME? ("Paul Eggert" "Paul R\\. Eggert") ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik") ("Pavel Kobiakov" "Pavel Kobyakov") @@ -143,6 +144,7 @@ ("Sam Steingold" "Sam Shteingold") ("Satyaki Das" "Indexed search by Satyaki Das") ("Sébastien Vauban" "Sebastien Vauban") + ("Sergey Litvinov" "Litvinov Sergey") ;; There are other Stefans. ;;; ("Stefan Monnier" "Stefan") ("Steven L. Baur" "SL Baur" "Steven L Baur") @@ -178,11 +180,13 @@ ;; FIXME seems it would be less fragile to check for O', Mc, etc. (defconst authors-fixed-case - '("Brian van den Broek" + '("Barry O'Reilly" + "Brian van den Broek" "Bryan O'Sullivan" "Christian von Roques" "Christophe de Dinechin" "Craig McDaniel" + "Daniel LaLiberte" "David J. MacKenzie" "David McCabe" "David O'Toole" @@ -190,12 +194,16 @@ "Dominique de Waleffe" "Edward O'Connor" "Exal de Jesus Garcia Carrillo" + "George McNinch" "Greg McGary" "Hans de Graaff" + "Ivan Vilata i Balaguer" + "Jae-hyeon Park" "James TD Smith" "Jay McCarthy" "Joel N. Weber II" "Matt McClure" + "Mike McLean" "Michael McNamara" "Mike McEwan" "Nelson Jose dos Santos Ferreira" @@ -203,10 +211,13 @@ "Peter O'Gorman" "Piet van Oostrum" "Roland McGrath" + "Santiago Payà i Miralta" "Sean O'Halpin" "Sean O'Rourke" + "Shun-ichi Goto" "Thomas DeWeese" - "Tijs van Bakel") + "Tijs van Bakel" + "Yu-ji Hosokawa") "List of authors whose names cannot be simply capitalized.") (defvar authors-public-domain-files @@ -231,6 +242,7 @@ '(".*loaddefs.el$" ; not obsolete, but auto-generated "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting "\\.arch-inventory$" + "automated/data/" ; not interesting ;; TODO lib/? Matches other things? "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'" "preferences\\.\\(nib\\|gorm\\)" @@ -240,6 +252,11 @@ "List of regexps matching obsolete files. Changes to files matching one of the regexps in this list are not listed.") +(defconst authors-no-scan-regexps + '("etc/nxml/" + "automated/data/") + "Lists of regexps matching files not to scan for authorship.") + (defconst authors-ignored-files '("external-lisp" "lock" "share-lib" "local-lisp" @@ -1069,6 +1086,15 @@ regexps (cdr regexps))) obsolete-p)) +(defun authors-no-scan-file-p (file) + "Return non-nil if FILE should not be scanned. +FILE is not scanned if it matches any of `authors-no-scan-regexps'." + (let (no-scan-p + (regexps authors-no-scan-regexps)) + (while (and regexps (not no-scan-p)) + (setq no-scan-p (string-match-p (car regexps) file) + regexps (cdr regexps))) + no-scan-p)) (defun authors-add (author file action table) "Record that AUTHOR worked on FILE. @@ -1300,8 +1326,9 @@ (authors-scan-change-log log table))) (let ((els (process-lines find-program root "-name" "*.el"))) (dolist (file els) - (message "Scanning %s..." file) - (authors-scan-el file table))) + (unless (authors-no-scan-file-p file) + (message "Scanning %s..." file) + (authors-scan-el file table)))) (message "Generating buffer %s..." buffer-name) (set-buffer (get-buffer-create buffer-name)) (erase-buffer) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2014-10-12 22:56:45 +0000 +++ lisp/org/ChangeLog 2014-10-13 20:55:41 +0000 @@ -1,3 +1,18 @@ +2014-10-12 Marco Wahl + + * org-agenda.el (org-get-entries-from-diary): Use + `diary-fancy-display' instead of the obsolete + `diary-display-hook'. + +2014-10-12 Nicolas Goaziou + + * ox.el (org-export-async-start): Limit first argument to lambda + expressions. + + * ox-publish.el (org-publish, org-publish-all) + (org-publish-current-file): Replace `ignore', per limit stated + above. + 2014-10-12 Christopher Schmidt * org.el (orgstruct-make-binding): Do not use loop in interpreted code. @@ -1268,7 +1283,7 @@ * org-habit.el (org-habit-parse-todo): Match all TODO keywords, not just "TODO". -2013-01-07 U-usuario (tiny change) +2013-01-07 Miguel Ruiz (tiny change) * ob-gnuplot.el (org-babel-gnuplot-quote-tsv-field): Fix code typo. ------------------------------------------------------------ revno: 118105 fixes bug: http://debbugs.gnu.org/18699 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-10-13 15:44:03 +0300 message: Fix bug #18699 with startup aborts of 32-bit MinGW64 build. src/w32term.h (ALIGN_STACK): Use _WIN64, not _W64, to distinguish between 32-bit and 64-bit MinGW builds. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-10-12 22:56:45 +0000 +++ src/ChangeLog 2014-10-13 12:44:03 +0000 @@ -1,3 +1,8 @@ +2014-10-13 Eli Zaretskii + + * w32term.h (ALIGN_STACK): Use _WIN64, not _W64, to distinguish + between 32-bit and 64-bit MinGW builds. (Bug#18699) + 2014-10-12 Paul Eggert Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666). === modified file 'src/w32term.h' --- src/w32term.h 2014-09-26 07:06:35 +0000 +++ src/w32term.h 2014-10-13 12:44:03 +0000 @@ -30,7 +30,7 @@ re-align the stack at function entry. Further details about this can be found in http://www.peterstock.co.uk/games/mingw_sse/. */ #ifdef __GNUC__ -# if USE_STACK_LISP_OBJECTS && !defined _W64 && !defined __x86_64__ \ +# if USE_STACK_LISP_OBJECTS && !defined _WIN64 && !defined __x86_64__ \ && __GNUC__ + (__GNUC_MINOR__ > 1) >= 5 # define ALIGN_STACK __attribute__((force_align_arg_pointer)) # else ------------------------------------------------------------ revno: 118104 committer: Jan Dj?rv branch nick: trunk timestamp: Mon 2014-10-13 08:09:05 +0200 message: * NEWS: Move and clarify OSX >= 10.6. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-10-12 08:35:50 +0000 +++ etc/ChangeLog 2014-10-13 06:09:05 +0000 @@ -1,3 +1,7 @@ +2014-10-13 Jan Djärv + + * NEWS: Move and clarify OSX >= 10.6. + 2014-10-12 Jan Djärv * NEWS: OSX required is 10.6 or newer. === modified file 'etc/NEWS' --- etc/NEWS 2014-10-12 08:35:50 +0000 +++ etc/NEWS 2014-10-13 06:09:05 +0000 @@ -36,9 +36,6 @@ undumping code to GCC under IRIX, or by configuring --with-wide-int, or by sticking with Emacs 24.4. -** Building Emacs on OSX now requires 10.6 or newer. -That also means that PowerPC is not supported. - --- ** The configure option `--with-pkg-config-prog' has been removed. Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to. @@ -376,6 +373,8 @@ or Windows Server 2003. The built binaries still run on all versions of Windows starting with Windows 9X. +** Building Emacs on OSX with Coca (--with-ns) now requires 10.6 or newer. +PowerPC on OSX is not supported. ---------------------------------------------------------------------- ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.