Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102636. ------------------------------------------------------------ revno: 102636 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-12-10 18:54:07 -0800 message: Misc vc-bzr.el. * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable state of the file matches. (Bug#7544) (vc-bzr-register, vc-bzr-checkin) (vc-bzr-annotate-extract-revision-at-line): Doc fixes. (vc-directory-exclusion-list): Remove unnecessary eval-after-load. Comment changes: Remove outdated comments about defunct upstream. Set maintainer to FSF. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-11 02:50:58 +0000 +++ lisp/ChangeLog 2010-12-11 02:54:07 +0000 @@ -1,5 +1,11 @@ 2010-12-11 Glenn Morris + * vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable + state of the file matches. (Bug#7544) + (vc-bzr-register, vc-bzr-checkin) + (vc-bzr-annotate-extract-revision-at-line): Doc fixes. + (vc-directory-exclusion-list): Remove unnecessary eval-after-load. + * textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension. 2010-12-11 Karel Klíč === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2010-11-23 15:13:43 +0000 +++ lisp/vc/vc-bzr.el 2010-12-11 02:54:07 +0000 @@ -1,13 +1,13 @@ ;;; vc-bzr.el --- VC backend for the bzr revision control system -;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Dave Love ;; Riccardo Murri +;; Maintainer: FSF ;; Keywords: vc tools ;; Created: Sept 2006 -;; Version: 2008-01-04 -;; URL: http://launchpad.net/vc-bzr ;; Package: vc ;; This file is part of GNU Emacs. @@ -27,11 +27,9 @@ ;;; Commentary: -;; See concerning bzr. See -;; for alternate development -;; branches of `vc-bzr'. +;; See concerning bzr. -;; Load this library to register bzr support in VC. +;; This library provides bzr support in VC. ;; Known bugs ;; ========== @@ -42,9 +40,6 @@ ;; (that is, the target contents) are changed. ;; See https://bugs.launchpad.net/vc-bzr/+bug/116607 -;; For an up-to-date list of bugs, please see: -;; https://bugs.launchpad.net/vc-bzr/+bugs - ;;; Properties of the backend (defun vc-bzr-revision-granularity () 'repository) @@ -104,6 +99,7 @@ ;;;###autoload (defconst vc-bzr-admin-dirname ".bzr" "Name of the directory containing Bzr repository status files.") +;; Used in the autoloaded vc-bzr-registered; see below. ;;;###autoload (defconst vc-bzr-admin-checkout-format-file (concat vc-bzr-admin-dirname "/checkout/format")) @@ -154,7 +150,7 @@ (defun vc-bzr-state-heuristic (file) "Like `vc-bzr-state' but hopefully without running Bzr." - ;; `bzr status' was excrutiatingly slow with large histories and + ;; `bzr status' was excruciatingly slow with large histories and ;; pending merges, so try to avoid using it until they fix their ;; performance problems. ;; This function tries first to parse Bzr internal file @@ -188,12 +184,16 @@ "\\([^\0]*\\)\0" ;"a/f/d", a=removed? "\\([^\0]*\\)\0" ;sha1 (empty if conflicted)? "\\([^\0]*\\)\0" ;size?p - "[^\0]*\0" ;"y/n", executable? + ;; y/n. Whether or not the current copy + ;; was executable the last time bzr checked? + "[^\0]*\0" "[^\0]*\0" ;? "\\([^\0]*\\)\0" ;"a/f/d" a=added? "\\([^\0]*\\)\0" ;sha1 again? "\\([^\0]*\\)\0" ;size again? - "[^\0]*\0" ;"y/n", executable again? + ;; y/n. Whether or not the repo thinks + ;; the file should be executable? + "\\([^\0]*\\)\0" "[^\0]*\0" ;last revid? ;; There are more fields when merges are pending. ) @@ -207,8 +207,22 @@ ((eq (char-after (match-beginning 4)) ?a) 'added) ((or (and (eq (string-to-number (match-string 3)) (nth 7 (file-attributes file))) - (equal (match-string 5) - (vc-bzr-sha1 file))) + (equal (match-string 5) + (vc-bzr-sha1 file)) + ;; For a file, does the executable state match? + ;; (Bug#7544) + (or (not + (eq (char-after (match-beginning 1)) ?f)) + (let ((exe + (memq + ?x + (mapcar + 'identity + (nth 8 (file-attributes file)))))) + (if (eq (char-after (match-beginning 7)) + ?y) + exe + (not exe))))) (and ;; It looks like for lightweight ;; checkouts \2 is empty and we need to @@ -523,7 +537,7 @@ (error "Don't know how to compute the next revision of %s" rev))) (defun vc-bzr-register (files &optional rev comment) - "Register FILE under bzr. + "Register FILES under bzr. Signal an error unless REV is nil. COMMENT is ignored." (if rev (error "Can't register explicit revision with bzr")) @@ -555,7 +569,7 @@ (declare-function log-edit-extract-headers "log-edit" (headers string)) (defun vc-bzr-checkin (files rev comment) - "Check FILE in to bzr with log message COMMENT. + "Check FILES in to bzr with log message COMMENT. REV non-nil gets an error." (if rev (error "Can't check in a specific revision with bzr")) (apply 'vc-bzr-command "commit" nil 0 @@ -744,7 +758,7 @@ (string-to-number (substring str 0 4)))))))) (defun vc-bzr-annotate-extract-revision-at-line () - "Return revision for current line of annoation buffer, or nil. + "Return revision for current line of annotation buffer, or nil. Return nil if current line isn't annotated." (save-excursion (beginning-of-line) @@ -1040,7 +1054,7 @@ (defun vc-bzr-shelve-delete-at-point () (interactive) (let ((shelve (vc-bzr-shelve-get-at-point (point)))) - (when (y-or-n-p (format "Remove shelf %s ?" shelve)) + (when (y-or-n-p (format "Remove shelf %s ? " shelve)) (vc-bzr-command "unshelve" nil 0 nil "--delete-only" shelve) (vc-dir-refresh)))) @@ -1150,9 +1164,6 @@ vc-bzr-revision-keywords)) string pred)))))) -(eval-after-load "vc" - '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t)) - (provide 'vc-bzr) -;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06 + ;;; vc-bzr.el ends here ------------------------------------------------------------ revno: 102635 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-12-10 18:50:58 -0800 message: * lisp/textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-11 02:48:23 +0000 +++ lisp/ChangeLog 2010-12-11 02:50:58 +0000 @@ -1,3 +1,7 @@ +2010-12-11 Glenn Morris + + * textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension. + 2010-12-11 Karel Klíč * files.el (auto-mode-alist): Use html-mode for *.xhtml. (Bug#7606) === modified file 'lisp/textmodes/sgml-mode.el' --- lisp/textmodes/sgml-mode.el 2010-10-24 00:21:59 +0000 +++ lisp/textmodes/sgml-mode.el 2010-12-11 02:50:58 +0000 @@ -384,6 +384,9 @@ (save-excursion (goto-char (point-min)) (or (string= "xml" (file-name-extension (or buffer-file-name ""))) + ;; Maybe the buffer-size check isn't needed, I don't know. + (and (zerop (buffer-size)) + (string= "xhtml" (file-name-extension (or buffer-file-name "")))) (looking-at "\\s-*<\\?xml") (when (re-search-forward (eval-when-compile @@ -2153,5 +2156,4 @@ (provide 'sgml-mode) -;; arch-tag: 9675da94-b7f9-4bda-ad19-73ed7b4fb401 ;;; sgml-mode.el ends here ------------------------------------------------------------ revno: 102634 author: Karel Klíc committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-12-10 18:48:23 -0800 message: * lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml. (This really only affects empty files.) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-10 20:00:25 +0000 +++ lisp/ChangeLog 2010-12-11 02:48:23 +0000 @@ -1,3 +1,7 @@ +2010-12-11 Karel Klíč + + * files.el (auto-mode-alist): Use html-mode for *.xhtml. (Bug#7606) + 2010-12-10 Stefan Monnier Derive from prog-mode, use derived-mode-p, and fix up various === modified file 'lisp/files.el' --- lisp/files.el 2010-12-10 03:47:49 +0000 +++ lisp/files.el 2010-12-11 02:48:23 +0000 @@ -2232,7 +2232,7 @@ (lambda (elt) (cons (purecopy (car elt)) (cdr elt))) `(;; do this first, so that .html.pl is Polish html, not Perl - ("\\.s?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode) + ("\\.[sx]?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode) ("\\.svgz?\\'" . image-mode) ("\\.svgz?\\'" . xml-mode) ("\\.x[bp]m\\'" . image-mode) ------------------------------------------------------------ revno: 102633 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-12-10 18:41:47 -0800 message: ChangeLog fix. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-12-08 03:45:45 +0000 +++ src/ChangeLog 2010-12-11 02:41:47 +0000 @@ -5690,7 +5690,7 @@ * s/netbsd.h (LIB_GCC): Move to configure. -2010-05-11 Karel Klic +2010-05-11 Karel Klíč * ftfont.c: Fix incorrect parentheses of #if condition for definining M17N_FLT_USE_NEW_FEATURE. ------------------------------------------------------------ revno: 102632 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-12-10 18:39:41 -0800 message: * etc/TODO: Updates; and re-fill some lines. diff: === modified file 'etc/TODO' --- etc/TODO 2010-10-12 04:01:55 +0000 +++ etc/TODO 2010-12-11 02:39:41 +0000 @@ -1,7 +1,7 @@ Emacs TODO List -*-outline-*- -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, + 2010 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -40,7 +40,6 @@ fix_submap_inheritance hack and to more cleanly express the relationship between minibuffer-local-*-map): I've had this locally for a long time, but the details of the semantics is somewhat ... delicate. -*** Derive from prog-mode in more places, close bug#5532. *** prog-mode could/should provide a better fill-paragraph default that uses syntax-tables to recognize string/comment boundaries. *** provide more completion-at-point-functions. Make existing @@ -56,8 +55,6 @@ ** Convert modes that use view-mode to be derived from special-mode instead. -** Replace some uses of the preprocessor code in Makefile.in with the equivalent autoconf. - ** Major modes should have a menu entry. Examples of modes that do not have one at the moment and probably should: text-mode, inferior-lisp-mode. @@ -206,8 +203,7 @@ ** Imenu could be extended into a file-structure browsing mechanism using code like that of customize-groups. -** Display something in the margin on lines that have compilation -errors. +** Display something in the margin on lines that have compilation errors. ** Compilation error navigation bar, parallel to the scroll bar, indicating where in the buffer there are compilation errors. @@ -325,8 +321,7 @@ ** ange-ftp *** understand sftp - This is hard to make work because sftp doesn't print status - messages. + This is hard to make work because sftp doesn't print status messages. *** Use MLS for ange-ftp-insert-directory if a list of files is specified. @@ -364,8 +359,7 @@ will then come in encoded in UTF-16. One advantage of switching to Unicode is to toss encoded-kbd usage, - which will solve the problem with binding non-ASCII keys with - modifiers. + which will solve the problem with binding non-ASCII keys with modifiers. Problem: using this on Windows 9x/ME requires installing the Microsoft Layer for Unicode (MSLU), which might not implement all @@ -391,8 +385,7 @@ ** Make desktop.el save the "frame configuration" of Emacs (in some useful sense). -** Give desktop.el a feature to switch between different named - desktops. +** Give desktop.el a feature to switch between different named desktops. ** Add a cpio mode, more or less like tar mode. @@ -447,13 +440,12 @@ ** Eliminate the storm of warnings concerning char/unsigned char mismatches that we get with GCC 4.x and proprietary compilers on - various systems. They make it difficult to spot the important - warnings. + various systems. They make it difficult to spot the important warnings. ** Fix anything necessary to use `long long' EMACS_INTs with GCC. -** Split out parts of lisp.h and generate Makefile dependencies - automatically. +** Split out parts of lisp.h [and generate Makefile dependencies automatically.] +[the last bit is done, see DEPFLAGS etc in src/Makefile.in ] ** Update the FAQ. @@ -466,8 +458,7 @@ [Do the existing -Q and -D cover this, or is more needed?] ** Improve the GC (generational, incremental). (We may be able to use - the Boehm collector.) [See the Boehm-GC branch in CVS for work on - this.] + the Boehm collector.) [See the Boehm-GC branch in CVS for work on this.] ** Check what hooks would help Emacspeak -- see the defadvising in W3. @@ -527,8 +518,7 @@ ** Reorder defcustom's in each package so that the more important options come first in the Customize buffers. This could be done by either rearranging the file (since options are shown in the order - they appear in the *.el files), or by adding a few :set-after - attributes. + they appear in the *.el files), or by adding a few :set-after attributes. ** Maybe document the features of libraries missing from the manual (or ancillary manuals, including the Lisp manual in some cases). @@ -1230,4 +1220,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . -;;; arch-tag: b0a3e40b-726a-457d-9999-ba848321b036 ------------------------------------------------------------ revno: 102631 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-12-10 18:30:29 -0800 message: * make-dist: Exclude etc/*.pyc. diff: === modified file 'ChangeLog' --- ChangeLog 2010-12-10 17:29:54 +0000 +++ ChangeLog 2010-12-11 02:30:29 +0000 @@ -1,3 +1,7 @@ +2010-12-11 Glenn Morris + + * make-dist: Exclude etc/*.pyc. + 2010-12-10 Andreas Schwab * configure.in: Don't double machfile in final message. === modified file 'make-dist' --- make-dist 2010-12-03 22:01:43 +0000 +++ make-dist 2010-12-11 02:30:29 +0000 @@ -441,7 +441,7 @@ echo "Making links to \`etc' and its subdirectories" for f in `find etc -type f`; do case $f in - etc/DOC*) continue ;; + etc/DOC*|etc/*.pyc) continue ;; esac ln $f $tempdir/$f done ------------------------------------------------------------ revno: 102630 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2010-12-11 01:27:14 +0000 message: Merge changes made in Gnus trunk. nnir.el (nnir-request-expire-articles): Only allow article deletion. message.el (message-bogus-recipient-p): Set address to "" if nil. gnus-gravatar.el (gnus-gravatar-transform-address): Fix error when email address is nil. proto-stream.el (proto-stream-open-network-only): New function to have a way to specify non-STARTTLS upgrade connections. diff: === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-12-06 23:27:17 +0000 +++ doc/misc/gnus.texi 2010-12-11 01:27:14 +0000 @@ -14445,6 +14445,9 @@ connection will be upgraded to an encrypted @acronym{STARTTLS} connection automatically. +@item network-only +The same as the above, but don't do automatic @acronym{STARTTLS} upgrades. + @findex nntp-open-tls-stream @item nntp-open-tls-stream Opens a connection to a server over a @dfn{secure} channel. To use === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-12-09 23:20:33 +0000 +++ lisp/gnus/ChangeLog 2010-12-11 01:27:14 +0000 @@ -1,3 +1,21 @@ +2010-12-10 Lars Magne Ingebrigtsen + + * proto-stream.el (proto-stream-open-network-only): New function to + have a way to specify non-STARTTLS upgrade connections. + +2010-12-10 Julien Danjou + + * gnus-gravatar.el (gnus-gravatar-transform-address): Fix error when + email address is nil. + + * message.el (message-bogus-recipient-p): Set address to "" if nil. + +2010-12-10 Andrew Cohen + + * nnir.el (nnir-request-expire-articles): Ignore expiry except for + deletion. + (nnir-run-imap): Only need to parse list once. + 2010-12-09 Lars Magne Ingebrigtsen * shr.el (shr-tag-script): Ignore