Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103892. ------------------------------------------------------------ revno: 103892 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-04-11 21:02:38 -0700 message: cal-hebrew fix for diary-hebrew-rosh-hodesh. * lisp/calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh): Don't try to cons a mark onto an empty element. Recipe showing the problem: ~/diary: &%%(diary-rosh-hodesh) &%%(diary-parasha) emacs -Q --eval "(progn (add-hook 'diary-nongregorian-listing-hook 'diary-hebrew-list-entries) (setq cal-tex-diary t))" -f calendar Move to Jan 2011, press `t m', latex the generated file. [Port to 23.4] diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-11 03:44:54 +0000 +++ lisp/ChangeLog 2011-04-12 04:02:38 +0000 @@ -1,3 +1,8 @@ +2011-04-12 Glenn Morris + + * calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh): + Don't try to cons a mark onto an empty element. + 2011-04-11 Leo Liu * ido.el (ido-buffer-internal): Allow method 'kill for virtual === modified file 'lisp/calendar/cal-hebrew.el' --- lisp/calendar/cal-hebrew.el 2011-03-07 07:48:32 +0000 +++ lisp/calendar/cal-hebrew.el 2011-04-12 04:02:38 +0000 @@ -954,16 +954,17 @@ (format "%s (second day)" this-month) this-month)))) (if (= (% d 7) 6) ; Saturday--check for Shabbat Mevarchim - (cons mark - (cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day)) + (cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day)) + (cons mark (format "Mevarchim Rosh Hodesh %s (%s)" (aref h-month-names (if (= h-month (calendar-hebrew-last-month-of-year h-year)) 0 h-month)) - (aref calendar-day-name-array (- 29 h-day)))) - ((and (< h-day 30) (> h-day 22) (= 30 last-day)) + (aref calendar-day-name-array (- 29 h-day))))) + ((and (< h-day 30) (> h-day 22) (= 30 last-day)) + (cons mark (format "Mevarchim Rosh Hodesh %s (%s-%s)" (aref h-month-names h-month) (if (= h-day 29) ------------------------------------------------------------ revno: 103891 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-04-11 20:55:07 -0700 message: ImageMagick fix for bug#7955. * configure.in: Require ImageMagick >= 6.2.8. (Bug#7955) * etc/NEWS: Mention ImageMagick version. diff: === modified file 'ChangeLog' --- ChangeLog 2011-04-09 18:42:31 +0000 +++ ChangeLog 2011-04-12 03:55:07 +0000 @@ -1,3 +1,7 @@ +2011-04-12 Glenn Morris + + * configure.in: Require ImageMagick >= 6.2.8. (Bug#7955) + 2011-04-09 Paul Eggert * lib/allocator.c: New file, automatically generated by gnulib. === modified file 'configure.in' --- configure.in 2011-04-05 19:59:08 +0000 +++ configure.in 2011-04-12 03:55:07 +0000 @@ -1805,7 +1805,10 @@ HAVE_IMAGEMAGICK=no if test "${HAVE_X11}" = "yes"; then if test "${with_imagemagick}" != "no"; then - IMAGEMAGICK_MODULE="Wand" + ## 6.2.8 is the earliest version known to work, but earlier versions + ## might work - let us know if you find one. + ## 6.0.7 does not work. See bug#7955. + IMAGEMAGICK_MODULE="Wand >= 6.2.8" PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) AC_SUBST(IMAGEMAGICK_CFLAGS) AC_SUBST(IMAGEMAGICK_LIBS) === modified file 'etc/NEWS' --- etc/NEWS 2011-04-06 20:10:51 +0000 +++ etc/NEWS 2011-04-12 03:55:07 +0000 @@ -131,8 +131,10 @@ ** ImageMagick support. It is now possible to use the ImageMagick library to load many new image formats in Emacs. By default, Emacs links with the ImageMagick -libraries if they are present at build time. To disable this, use -the configure option `--without-imagemagick'. +libraries if they are present at build time. This needs ImageMagick +6.2.8 or newer (versions newer than 6.0.7 _may_ work but have not been +tested). To disable ImageMagick support, use the configure option +`--without-imagemagick'. The new function `imagemagick-types' returns a list of image file extensions that your installation of ImageMagick supports. The ------------------------------------------------------------ revno: 103890 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-04-11 22:17:30 +0000 message: gnus-registry.el (gnus-registry-action): Remove properties and simplify subject in `gnus-registry-handle-action'. (gnus-registry-spool-action): Get subject and sender from message if they are not passed in. (gnus-registry-handle-action): Remove properties and simplify subject consistently. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-04-11 01:18:19 +0000 +++ lisp/gnus/ChangeLog 2011-04-11 22:17:30 +0000 @@ -1,3 +1,12 @@ +2011-04-11 Teodor Zlatanov + + * gnus-registry.el (gnus-registry-action): Remove properties and + simplify subject in `gnus-registry-handle-action'. + (gnus-registry-spool-action): Get subject and sender from message if + they are not passed in. + (gnus-registry-handle-action): Remove properties and simplify subject + consistently. + 2011-04-11 Stefan Monnier * registry.el: Require CL before using defmacro*. === modified file 'lisp/gnus/gnus-registry.el' --- lisp/gnus/gnus-registry.el 2011-04-07 22:48:21 +0000 +++ lisp/gnus/gnus-registry.el 2011-04-11 22:17:30 +0000 @@ -294,11 +294,8 @@ ;; article move/copy/spool/delete actions (defun gnus-registry-action (action data-header from &optional to method) (let* ((id (mail-header-id data-header)) - (subject (gnus-string-remove-all-properties - (gnus-registry-simplify-subject - (mail-header-subject data-header)))) - (sender (gnus-string-remove-all-properties - (mail-header-from data-header))) + (subject (mail-header-subject data-header)) + (sender (mail-header-from data-header)) (from (gnus-group-guess-full-name-from-command-method from)) (to (if to (gnus-group-guess-full-name-from-command-method to) nil)) (to-name (if to to "the Bit Bucket"))) @@ -312,7 +309,9 @@ to subject sender))) (defun gnus-registry-spool-action (id group &optional subject sender) - (let ((to (gnus-group-guess-full-name-from-command-method group))) + (let ((to (gnus-group-guess-full-name-from-command-method group)) + (subject (or subject (message-fetch-field "subject"))) + (sender (or sender (message-fetch-field "from")))) (when (and (stringp id) (string-match "\r$" id)) (setq id (substring id 0 -1))) (gnus-message 7 "Gnus registry: article %s spooled to %s" @@ -326,7 +325,10 @@ "gnus-registry-handle-action %S" (list id from to subject sender)) (let ((db gnus-registry-db) ;; safe if not found - (entry (gnus-registry-get-or-make-entry id))) + (entry (gnus-registry-get-or-make-entry id)) + (subject (gnus-string-remove-all-properties + (gnus-registry-simplify-subject subject))) + (sender (gnus-string-remove-all-properties sender))) ;; this could be done by calling `gnus-registry-set-id-key' ;; several times but it's better to bunch the transactions ------------------------------------------------------------ revno: 103889 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2011-04-11 19:39:09 +0300 message: Fix bug #8468 with redisplay and scroll-margin > 0. src/xdisp.c (redisplay_window): Don't try to determine the character position of the scroll margin if the window start point w->startp is outside the buffer's accessible region. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-04-10 20:43:08 +0000 +++ src/ChangeLog 2011-04-11 16:39:09 +0000 @@ -1,3 +1,9 @@ +2011-04-11 Eli Zaretskii + + * xdisp.c (redisplay_window): Don't try to determine the character + position of the scroll margin if the window start point w->startp + is outside the buffer's accessible region. (Bug#8468) + 2011-04-10 Eli Zaretskii Fix write-region and its subroutines for buffers > 2GB. === modified file 'src/xdisp.c' --- src/xdisp.c 2011-04-10 19:47:49 +0000 +++ src/xdisp.c 2011-04-11 16:39:09 +0000 @@ -14252,7 +14252,14 @@ /* If there is a scroll margin at the top of the window, find its character position. */ - if (margin) + if (margin + /* Cannot call start_display if startp is not in the + accessible region of the buffer. This can happen when we + have just switched to a different buffer and/or changed + its restriction. In that case, startp is initialized to + the character position 1 (BEG) because we did not yet + have chance to display the buffer even once. */ + && BEGV <= CHARPOS (startp) && CHARPOS (startp) <= ZV) { struct it it1; ------------------------------------------------------------ revno: 103888 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-04-11 06:18:22 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2011-04-06 10:18:29 +0000 +++ autogen/Makefile.in 2011-04-11 10:18:22 +0000 @@ -78,7 +78,8 @@ ARFLAGS = cru libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = -am_libgnu_a_OBJECTS = careadlinkat.$(OBJEXT) dtoastr.$(OBJEXT) +am_libgnu_a_OBJECTS = allocator.$(OBJEXT) careadlinkat.$(OBJEXT) \ + dtoastr.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -692,10 +693,10 @@ BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) $(STDBOOL_H) \ $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h sys/stat.h time.h \ unistd.h warn-on-use.h -EXTRA_DIST = $(top_srcdir)/./arg-nonnull.h $(top_srcdir)/./c++defs.h \ - allocator.h careadlinkat.h md5.c md5.h dosname.h ftoastr.c \ - ftoastr.h filemode.c filemode.h getloadavg.c getopt.c \ - getopt.in.h getopt1.c getopt_int.h intprops.h lstat.c \ +EXTRA_DIST = allocator.h $(top_srcdir)/./arg-nonnull.h \ + $(top_srcdir)/./c++defs.h careadlinkat.h md5.c md5.h dosname.h \ + ftoastr.c ftoastr.h filemode.c filemode.h getloadavg.c \ + getopt.c getopt.in.h getopt1.c getopt_int.h intprops.h lstat.c \ mktime-internal.h mktime.c readlink.c stat.c stdbool.in.h \ stddef.in.h stdint.in.h stdio.in.h stdlib.in.h strftime.c \ strftime.h symlink.c sys_stat.in.h time.in.h time_r.c \ @@ -708,7 +709,8 @@ time.h-t unistd.h unistd.h-t warn-on-use.h warn-on-use.h-t noinst_LIBRARIES = libgnu.a DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src -libgnu_a_SOURCES = careadlinkat.c dtoastr.c gettext.h ignore-value.h +libgnu_a_SOURCES = allocator.c careadlinkat.c dtoastr.c gettext.h \ + ignore-value.h libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = md5.c ftoastr.c filemode.c getloadavg.c \ @@ -766,6 +768,7 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allocator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/careadlinkat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtoastr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemode.Po@am__quote@ === modified file 'autogen/configure' --- autogen/configure 2011-04-08 18:53:26 +0000 +++ autogen/configure 2011-04-11 10:18:22 +0000 @@ -6196,6 +6196,7 @@ + # Code from module allocator: # Code from module arg-nonnull: # Code from module c++defs: # Code from module careadlinkat: @@ -15465,6 +15466,7 @@ gl_source_base='lib' + # Code from module allocator: # Code from module arg-nonnull: # Code from module c++defs: # Code from module careadlinkat: ------------------------------------------------------------ revno: 103887 committer: Leo Liu branch nick: trunk timestamp: Mon 2011-04-11 11:44:54 +0800 message: Enable ido to kill virtual buffers diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-10 21:31:14 +0000 +++ lisp/ChangeLog 2011-04-11 03:44:54 +0000 @@ -1,3 +1,9 @@ +2011-04-11 Leo Liu + + * ido.el (ido-buffer-internal): Allow method 'kill for virtual + buffers. + (ido-kill-buffer-at-head): Support killing virtual buffers. + 2011-04-10 Chong Yidong * minibuffer.el (completion-show-inline-help): New var. === modified file 'lisp/ido.el' --- lisp/ido.el 2011-03-29 08:25:31 +0000 +++ lisp/ido.el 2011-04-11 03:44:54 +0000 @@ -2176,9 +2176,7 @@ (ido-current-directory nil) (ido-directory-nonreadable nil) (ido-directory-too-big nil) - (ido-use-virtual-buffers (if (eq method 'kill) - nil ;; Don't consider virtual buffers for killing - ido-use-virtual-buffers)) + (ido-use-virtual-buffers ido-use-virtual-buffers) (require-match (confirm-nonexistent-file-or-buffer)) (buf (ido-read-internal 'buffer (or prompt "Buffer: ") 'ido-buffer-history default require-match initial)) @@ -3917,10 +3915,10 @@ (let ((enable-recursive-minibuffers t) (buf (ido-name (car ido-matches))) (nextbuf (cadr ido-matches))) - (when (get-buffer buf) + (cond + ((get-buffer buf) ;; If next match names a buffer use the buffer object; buffer - ;; name may be changed by packages such as uniquify; mindful - ;; of virtual buffers. + ;; name may be changed by packages such as uniquify. (when (and nextbuf (get-buffer nextbuf)) (setq nextbuf (get-buffer nextbuf))) (if (null (kill-buffer buf)) @@ -3934,7 +3932,13 @@ (setq ido-default-item nextbuf ido-text-init ido-text ido-exit 'refresh) - (exit-minibuffer)))))) + (exit-minibuffer))) + ;; Handle virtual buffers + ((assoc buf ido-virtual-buffers) + (setq recentf-list + (delete (cdr (assoc buf ido-virtual-buffers)) recentf-list)) + (setq ido-cur-list (delete buf ido-cur-list)) + (setq ido-rescan t)))))) ;;; DELETE CURRENT FILE (defun ido-delete-file-at-head () ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.