Mercurial > emacs
changeset 112351:176503f61eb1
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 20:41:41 -0800 |
| parents | aee2f052ef17 (current diff) d89c2a0d1b12 (diff) |
| children | 19348bd13f81 |
| files | |
| diffstat | 10 files changed, 99 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/bzrmerge.el Mon Jan 17 14:11:13 2011 -0800 +++ b/admin/bzrmerge.el Mon Jan 17 20:41:41 2011 -0800 @@ -281,7 +281,7 @@ ;; are conflicts. (display-warning 'bzrmerge "Resolve conflicts manually. ¡BEWARE! Important metadata is kept in this Emacs session! -Do not commit without re-running `M-x bzrmerge' first!"))) +Do not commit without re-running `M-x bzrmerge' first!")) (error "Resolve conflicts manually"))))) (cons merge skip)))))
--- a/admin/notes/bzr Mon Jan 17 14:11:13 2011 -0800 +++ b/admin/notes/bzr Mon Jan 17 20:41:41 2011 -0800 @@ -78,18 +78,39 @@ regexp in bzrmerge-missing. If there are more revisions that you know need skipping, you'll have to do that by hand. -5) It will stop if there are any conflicts. Resolve them. +5) It will stop if there are any conflicts. Resolve them. Using smerge-mode, there are menu items to skip to the next conflict, and to take either the trunk, branch, or both copies. -6) After resolving all conflicts, you might need to run the command -again if there are more revisions still to merge. -You can commit either before you do this (eg if you had a lot of -conflicts to resolve and don't want to get confused), or refrain from -committing until bzrmerge has merged all revisions. +6) After resolving all conflicts, you might need to run the bzmerge +command again if there are more revisions still to merge. + +Do not commit (or exit Emacs) until you have run bzrmerge to completion. Before committing, check bzr status and bzr diff output. +If you have run bzrmerge enough times, the "pending merge tip" in bzr +status should be the last revision from the emacs-23 branch, and +bzr status -v should show all the revisions you expect to merge. Note that ChangeLog entries are automatically merged to the top with today's date, but you still might want to check them to see that too -much is not being included. +much is not being included, or whitespace between entries is not missing. + +Notes: + +1) A lot that was in tramp.el in emacs-23 has moved to tramp-sh.el in +the trunk. If you end up with a conflict in tramp.el, the changes may +need to go to tramp-sh.el instead. Remember to update the file name in +the ChangeLog. + +2) If a file is modified in emacs-23, and deleted in the trunk, you +get a "contents conflict". Assuming the changes don't need to be in +the trunk at all, use `bzr resolve path/to/file --take-this' to keep the +trunk version. Prior to bzr 2.2.3, this may fail. You can just +delete the .OTHER etc files by hand and use bzr resolve path/to/file. + +3) Conflicts in autoload md5sums in comments. Strictly speaking, the +right thing to do is merge everything else, resolve the conflict by +choosing either the trunk or branch version, then run `make -C lisp +autoloads' to update the md5sums to the correct trunk value before +committing.
--- a/etc/ChangeLog Mon Jan 17 14:11:13 2011 -0800 +++ b/etc/ChangeLog Mon Jan 17 20:41:41 2011 -0800 @@ -1,3 +1,7 @@ +2011-01-18 Glenn Morris <rgm@gnu.org> + + * PROBLEMS: Add note about svn+ssh. (Bug#7791) + 2011-01-14 Glenn Morris <rgm@gnu.org> * refcards/calccard.tex, refcards/cs-dired-ref.tex:
--- a/etc/PROBLEMS Mon Jan 17 14:11:13 2011 -0800 +++ b/etc/PROBLEMS Mon Jan 17 20:41:41 2011 -0800 @@ -1660,6 +1660,19 @@ exec 2> >(exec cat >&2 2>/dev/null) exec ssh "$@" +*** GNU/Linux: Truncated svn annotate output with SSH. +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7791 + +The symptoms are: you are accessing a svn repository over SSH. +You use vc-annotate on a large (several thousand line) file, and the +result is truncated around the 1000 line mark. It works fine with +other access methods (eg http), or from outside Emacs. + +This may be a similar libc/SSH issue to the one mentioned above for CVS. +A similar workaround seems to be effective: create a script with the +same contents as the one used above for CVS_RSH, and set the SVN_SSH +environment variable to point to it. + *** GNU/Linux: On Linux-based GNU systems using libc versions 5.4.19 through 5.4.22, Emacs crashes at startup with a segmentation fault.
--- a/lisp/ChangeLog Mon Jan 17 14:11:13 2011 -0800 +++ b/lisp/ChangeLog Mon Jan 17 20:41:41 2011 -0800 @@ -1,3 +1,15 @@ +2011-01-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * textmodes/tex-mode.el (tex-font-lock-verb): Make sure \verb + highlighting doesn't spill over subsequent lines. + + * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the + keymap expression. Improve docstring. + + * electric.el (electric-indent-post-self-insert-function): + Don't auto-indent for indent-to-left-margin, it's too often + counter-productive. + 2011-01-16 Tassilo Horn <tassilo@member.fsf.org> * strokes.el (strokes-read-stroke): Re-fill strokes buffer with @@ -54,12 +66,12 @@ 2011-01-15 Kenichi Handa <handa@m17n.org> - * mail/rmailmm.el (rmail-mime-insert-header): Set - rmail-mime-coding-system to a cons whose car is the last coding + * mail/rmailmm.el (rmail-mime-insert-header): + Set rmail-mime-coding-system to a cons whose car is the last coding system used to decode the header. (rmail-mime-find-header-encoding): New function. - (rmail-mime-insert-decoded-text): Override - rmail-mime-coding-system if it is a cons. + (rmail-mime-insert-decoded-text): + Override rmail-mime-coding-system if it is a cons. (rmail-show-mime): If only a header part was decoded, find the coding system while ignoring mm-charset-override-alist. @@ -72,8 +84,8 @@ * mail/rmailmm.el (rmail-mime-next-item) (rmail-mime-previous-item): Delete them. (rmail-mime-shown-mode): Recursively call for children. - (rmail-mime-hidden-mode): Delete the 2nd arg TOP. Callers - changed. + (rmail-mime-hidden-mode): Delete the 2nd arg TOP. + Callers changed. (rmail-mime-raw-mode): Recursively call for children. (rmail-mode-map): Change mapping of tab and backtab to forward-button and backward-button respectively. @@ -82,7 +94,7 @@ (rmail-mime-update-tagline): New function. (rmail-mime-insert-text): Call rmail-mime-update-tagline if the body display is changed. - (rmail-mime-toggle-button): Renamed from rmail-mime-image. + (rmail-mime-toggle-button): Rename from rmail-mime-image. (rmail-mime-image): Delete this button type. (rmail-mime-toggle): New button type. (rmail-mime-insert-bulk): Call rmail-mime-update-tagline if the @@ -329,8 +341,8 @@ menus. Add menu item for customize-themes. * cus-theme.el (customize-themes): - * emacs-lisp/package.el (package--list-packages): Use - switch-to-buffer. + * emacs-lisp/package.el (package--list-packages): + Use switch-to-buffer. 2011-01-11 Johan Bockgård <bojohan@gnu.org>
--- a/lisp/electric.el Mon Jan 17 14:11:13 2011 -0800 +++ b/lisp/electric.el Mon Jan 17 20:41:41 2011 -0800 @@ -221,7 +221,8 @@ (let ((before (copy-marker (1- pos) t))) (save-excursion (unless (memq indent-line-function - '(indent-relative indent-relative-maybe)) + '(indent-relative indent-to-left-margin + indent-relative-maybe)) ;; Don't reindent the previous line if the indentation function ;; is not a real one. (goto-char before) @@ -235,7 +236,8 @@ ;; Remove the trailing whitespace after indentation because ;; indentation may (re)introduce the whitespace. (delete-horizontal-space t)))) - (indent-according-to-mode)))) + (unless (memq indent-line-function '(indent-to-left-margin)) + (indent-according-to-mode))))) ;;;###autoload (define-minor-mode electric-indent-mode
--- a/lisp/emacs-lisp/easy-mmode.el Mon Jan 17 14:11:13 2011 -0800 +++ b/lisp/emacs-lisp/easy-mmode.el Mon Jan 17 20:41:41 2011 -0800 @@ -94,8 +94,9 @@ Optional LIGHTER is displayed in the modeline when the mode is on. Optional KEYMAP is the default keymap bound to the mode keymap. If non-nil, it should be a variable name (whose value is a keymap), - a keymap, or a list of arguments for `easy-mmode-define-keymap'. - If KEYMAP is a keymap or list, this also defines the variable MODE-map. + or an expression that returns either a keymap or a list of + arguments for `easy-mmode-define-keymap'. If KEYMAP is not a symbol, + this also defines the variable MODE-map. BODY contains code to execute each time the mode is enabled or disabled. It is executed after toggling the mode, and before running MODE-hook. @@ -274,7 +275,7 @@ (let ((m ,keymap)) (cond ((keymapp m) m) ((listp m) (easy-mmode-define-keymap m)) - (t (error "Invalid keymap %S" ,keymap)))) + (t (error "Invalid keymap %S" m)))) ,(format "Keymap for `%s'." mode-name))) ,(if (not (symbolp mode))
--- a/lisp/textmodes/tex-mode.el Mon Jan 17 14:11:13 2011 -0800 +++ b/lisp/textmodes/tex-mode.el Mon Jan 17 20:41:41 2011 -0800 @@ -791,20 +791,23 @@ (defun tex-font-lock-verb (start delim) "Place syntax table properties on the \verb construct. START is the position of the \\ and DELIM is the delimiter char." - ;; Do nothing if the \verb construct is itself inside a comment or - ;; verbatim env. + ;; Do nothing if the \verb construct is itself inside a comment or + ;; verbatim env. (unless (nth 8 (save-excursion (syntax-ppss start))) - ;; Let's find the end and mark it. - ;; This may span more than a single line, but we don't bother - ;; placing a syntax-multiline property since such multiline verbs aren't - ;; valid anyway. - (skip-chars-forward (string ?^ delim)) - (unless (eobp) - (when (eq (char-syntax (preceding-char)) ?/) - (put-text-property (1- (point)) (point) - 'syntax-table (string-to-syntax "."))) - (put-text-property (point) (1+ (point)) - 'syntax-table (string-to-syntax "\""))))) + ;; Let's find the end and mark it. + (let ((afterdelim (point))) + (skip-chars-forward (string ?^ delim) (line-end-position)) + (if (eolp) + ;; "LaTeX Error: \verb ended by end of line." + ;; Remove the syntax-table property we've just put on the + ;; start-delimiter, so it doesn't spill over subsequent lines. + (put-text-property (1- afterdelim) afterdelim + 'syntax-table nil) + (when (eq (char-syntax (preceding-char)) ?/) + (put-text-property (1- (point)) (point) + 'syntax-table (string-to-syntax "."))) + (put-text-property (point) (1+ (point)) + 'syntax-table (string-to-syntax "\"")))))) ;; Use string syntax but math face for $...$. (defun tex-font-lock-syntactic-face-function (state)
--- a/src/ChangeLog Mon Jan 17 14:11:13 2011 -0800 +++ b/src/ChangeLog Mon Jan 17 20:41:41 2011 -0800 @@ -1,3 +1,7 @@ +2011-01-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * image.c (syms_of_image): Don't access XSYMBOL's internals directly. + 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
--- a/src/image.c Mon Jan 17 14:11:13 2011 -0800 +++ b/src/image.c Mon Jan 17 20:41:41 2011 -0800 @@ -8801,11 +8801,13 @@ #ifdef HAVE_NTGUI Qlibpng_version = intern_c_string ("libpng-version"); staticpro (&Qlibpng_version); + Fset (Qlibpng_version, #if HAVE_PNG - SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (PNG_LIBPNG_VER)); + make_number (PNG_LIBPNG_VER) #else - SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (-1)); + make_number (-1) #endif + ); #endif #if defined (HAVE_XPM) || defined (HAVE_NS)