Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99646. ------------------------------------------------------------ revno: 99646 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-03-11 19:13:01 -0800 message: Regenerate configure. diff: === modified file 'configure' --- configure 2010-02-27 03:09:45 +0000 +++ configure 2010-03-12 03:13:01 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for emacs 23.1.93. +# Generated by GNU Autoconf 2.62 for emacs 24.0.50. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='23.1.93' -PACKAGE_STRING='emacs 23.1.93' +PACKAGE_VERSION='24.0.50' +PACKAGE_STRING='emacs 24.0.50' PACKAGE_BUGREPORT='' ac_unique_file="src/lisp.h" @@ -1371,7 +1371,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures emacs 23.1.93 to adapt to many kinds of systems. +\`configure' configures emacs 24.0.50 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1445,7 +1445,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 23.1.93:";; + short | recursive ) echo "Configuration of emacs 24.0.50:";; esac cat <<\_ACEOF @@ -1588,7 +1588,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 23.1.93 +emacs configure 24.0.50 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1602,7 +1602,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by emacs $as_me 23.1.93, which was +It was created by emacs $as_me 24.0.50, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -26259,7 +26259,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by emacs $as_me 23.1.93, which was +This file was extended by emacs $as_me 24.0.50, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26312,7 +26312,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -emacs config.status 23.1.93 +emacs config.status 24.0.50 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ------------------------------------------------------------ revno: 99645 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-03-11 17:29:30 -0800 message: Add support for shelving snapshots and for showing shelves. * vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point) (vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot): New functions. (vc-bzr-shelve-map, vc-bzr-shelve-menu-map) (vc-bzr-extra-menu-map): Map them. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-03-11 20:42:19 +0000 +++ etc/NEWS 2010-03-12 01:29:30 +0000 @@ -36,6 +36,10 @@ * Changes in Specialized Modes and Packages in Emacs 24.1 +** VC and related modes + +*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots. + * New Modes and Packages in Emacs 24.1 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-11 06:20:24 +0000 +++ lisp/ChangeLog 2010-03-12 01:29:30 +0000 @@ -1,3 +1,12 @@ +2010-03-12 Dan Nicolaescu + + Add support for shelving snapshots and for showing shelves. + * vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point) + (vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot): + New functions. + (vc-bzr-shelve-map, vc-bzr-shelve-menu-map) + (vc-bzr-extra-menu-map): Map them. + 2010-03-11 Glenn Morris * cus-edit.el (customize-changed-options-previous-release): === modified file 'lisp/files.el' --- lisp/files.el 2010-02-28 01:11:15 +0000 +++ lisp/files.el 2010-03-12 01:29:30 +0000 @@ -2269,7 +2269,7 @@ ("\\.dtd\\'" . sgml-mode) ("\\.ds\\(ss\\)?l\\'" . dsssl-mode) ("\\.js\\'" . js-mode) ; javascript-mode would be better - ("\\.[ds]?v\\'" . verilog-mode) + ("\\.[ds]?vh?\\'" . verilog-mode) ;; .emacs or .gnus or .viper following a directory delimiter in ;; Unix, MSDOG or VMS syntax. ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) === modified file 'lisp/vc-bzr.el' --- lisp/vc-bzr.el 2010-02-17 21:39:21 +0000 +++ lisp/vc-bzr.el 2010-03-12 01:29:30 +0000 @@ -758,9 +758,11 @@ (define-key map [down-mouse-3] 'vc-bzr-shelve-menu) (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point) - ;; (define-key map "=" 'vc-bzr-shelve-show-at-point) - ;; (define-key map "\C-m" 'vc-bzr-shelve-show-at-point) + (define-key map "=" 'vc-bzr-shelve-show-at-point) + (define-key map "\C-m" 'vc-bzr-shelve-show-at-point) + (define-key map "A" 'vc-bzr-shelve-apply-and-keep-at-point) (define-key map "P" 'vc-bzr-shelve-apply-at-point) + (define-key map "S" 'vc-bzr-shelve-snapshot) map)) (defvar vc-bzr-shelve-menu-map @@ -768,16 +770,22 @@ (define-key map [de] '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point :help "Delete the current shelf")) + (define-key map [ap] + '(menu-item "Apply and keep shelf" vc-bzr-shelve-apply-and-keep-at-point + :help "Apply the current shelf and keep it")) (define-key map [po] '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point :help "Apply the current shelf and remove it")) - ;; (define-key map [sh] - ;; '(menu-item "Show shelve" vc-bzr-shelve-show-at-point - ;; :help "Show the contents of the current shelve")) + (define-key map [sh] + '(menu-item "Show shelve" vc-bzr-shelve-show-at-point + :help "Show the contents of the current shelve")) map)) (defvar vc-bzr-extra-menu-map (let ((map (make-sparse-keymap))) + (define-key map [bzr-sn] + '(menu-item "Shelve a snapshot" vc-bzr-shelve-snapshot + :help "Shelve the current state of the tree and keep the current state")) (define-key map [bzr-sh] '(menu-item "Shelve..." vc-bzr-shelve :help "Shelve changes")) @@ -864,16 +872,16 @@ (vc-bzr-command "shelve" nil 0 nil "--all" "-m" name) (vc-resynch-buffer root t t)))) -;; (defun vc-bzr-shelve-show (name) -;; "Show the contents of shelve NAME." -;; (interactive "sShelve name: ") -;; (vc-setup-buffer "*vc-bzr-shelve*") -;; ;; FIXME: how can you show the contents of a shelf? -;; (vc-bzr-command "shelve" "*vc-bzr-shelve*" 'async nil name) -;; (set-buffer "*vc-bzr-shelve*") -;; (diff-mode) -;; (setq buffer-read-only t) -;; (pop-to-buffer (current-buffer))) +(defun vc-bzr-shelve-show (name) + "Show the contents of shelve NAME." + (interactive "sShelve name: ") + (vc-setup-buffer "*vc-bzr-shelve*") + ;; FIXME: how can you show the contents of a shelf? + (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 'async nil "--preview" name) + (set-buffer "*vc-bzr-shelve*") + (diff-mode) + (setq buffer-read-only t) + (pop-to-buffer (current-buffer))) (defun vc-bzr-shelve-apply (name) "Apply shelve NAME and remove it afterwards." @@ -881,6 +889,23 @@ (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name) (vc-resynch-buffer (vc-bzr-root default-directory) t t)) +(defun vc-bzr-shelve-apply-and-keep (name) + "Apply shelve NAME and keep it afterwards." + (interactive "sApply (and keep) shelf: ") + (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" "--keep" name) + (vc-resynch-buffer (vc-bzr-root default-directory) t t)) + +(defun vc-bzr-shelve-snapshot () + "Create a stash with the current tree state." + (interactive) + (vc-bzr-command "shelve" nil 0 nil "--all" "-m" + (let ((ct (current-time))) + (concat + (format-time-string "Snapshot on %Y-%m-%d" ct) + (format-time-string " at %H:%M" ct)))) + (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" "--keep") + (vc-resynch-buffer (vc-bzr-root default-directory) t t)) + (defun vc-bzr-shelve-list () (with-temp-buffer (vc-bzr-command "shelve" (current-buffer) 1 nil "--list" "-q") @@ -905,14 +930,18 @@ (vc-bzr-command "unshelve" nil 0 nil "--delete-only" shelve) (vc-dir-refresh)))) -;; (defun vc-bzr-shelve-show-at-point () -;; (interactive) -;; (vc-bzr-shelve-show (vc-bzr-shelve-get-at-point (point)))) +(defun vc-bzr-shelve-show-at-point () + (interactive) + (vc-bzr-shelve-show (vc-bzr-shelve-get-at-point (point)))) (defun vc-bzr-shelve-apply-at-point () (interactive) (vc-bzr-shelve-apply (vc-bzr-shelve-get-at-point (point)))) +(defun vc-bzr-shelve-apply-and-keep-at-point () + (interactive) + (vc-bzr-shelve-apply-and-keep (vc-bzr-shelve-get-at-point (point)))) + (defun vc-bzr-shelve-menu (e) (interactive "e") (vc-dir-at-event e (popup-menu vc-bzr-shelve-menu-map e))) ------------------------------------------------------------ revno: 99644 committer: Juri Linkov branch nick: trunk timestamp: Thu 2010-03-11 22:42:19 +0200 message: Add a NEWS entry for animated image API. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-03-11 06:17:08 +0000 +++ etc/NEWS 2010-03-11 20:42:19 +0000 @@ -36,8 +36,6 @@ * Changes in Specialized Modes and Packages in Emacs 24.1 -** FIXME animated image API - * New Modes and Packages in Emacs 24.1 @@ -47,6 +45,15 @@ * Lisp changes in Emacs 24.1 +** Image API + +*** When the image type is one of listed in `image-animated-types' +and the number of sub-images in the image is more then one, then the +new function `create-animated-image' creates an animated image where +sub-images are displayed successively with the duration defined by +`image-animate-max-time' and the delay between sub-images defined +by the Graphic Control Extension of the image. + * Changes in Emacs 24.1 on non-free operating systems ------------------------------------------------------------ revno: 99643 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-03-10 22:20:24 -0800 message: * cus-edit.el (customize-changed-options-previous-release): Bump to 23.1. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-11 06:17:08 +0000 +++ lisp/ChangeLog 2010-03-11 06:20:24 +0000 @@ -1,5 +1,8 @@ 2010-03-11 Glenn Morris + * cus-edit.el (customize-changed-options-previous-release): + Bump to 23.1. + * image.el (image-animate-max-time): Fix :version tag. 2010-03-10 Chong Yidong === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2010-02-16 14:35:45 +0000 +++ lisp/cus-edit.el 2010-03-11 06:20:24 +0000 @@ -1136,7 +1136,7 @@ (unless (eq symbol basevar) (message "`%s' is an alias for `%s'" symbol basevar)))) -(defvar customize-changed-options-previous-release "22.1" +(defvar customize-changed-options-previous-release "23.1" "Version for `customize-changed-options' to refer back to by default.") ;; Packages will update this variable, so make it available.