Now on revision 111942. ------------------------------------------------------------ revno: 111942 fixes bug: http://debbugs.gnu.org/13250 committer: Dmitry Gutov branch nick: trunk timestamp: Tue 2013-03-05 11:38:16 +0400 message: Keep pre-existing highlighting in completion candidates. * lisp/minibuffer.el (completions-first-difference): State that the face is "added" in the docstring. (completions-common-part): Same. And don't inherit from default. (completion-hilit-commonality): Prepend 'completions-common-part and 'completion-first-difference faces to the 'face property, instead of replacing the value(s). (completion--insert-strings): Same with 'completions-annotations face. (completion-hilit-commonality): Use 'face instead of 'font-lock-face, because it gets priority if the completion strings already have 'face set. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-04 19:33:23 +0000 +++ lisp/ChangeLog 2013-03-05 07:38:16 +0000 @@ -1,3 +1,17 @@ +2013-03-05 Dmitry Gutov + + Keep pre-existing highlighting in completion candidates (Bug#13250). + * minibuffer.el (completions-first-difference): State that the + face is "added" in the docstring. + (completions-common-part): Same. And don't inherit from default. + (completion-hilit-commonality): Prepend 'completions-common-part + and 'completion-first-difference faces to the 'face property, + instead of replacing the value(s). + (completion--insert-strings): Same with 'completions-annotations face. + (completion-hilit-commonality): Use 'face instead of + 'font-lock-face, because it gets priority if the completion + strings already have 'face set. + 2013-03-04 Alan Mackenzie Replace `last-command-event' by `last-command-char' in XEmacs. === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2013-02-09 05:52:20 +0000 +++ lisp/minibuffer.el 2013-03-05 07:38:16 +0000 @@ -1458,9 +1458,11 @@ 'mouse-face 'highlight) (put-text-property (point) (progn (insert (car str)) (point)) 'mouse-face 'highlight) - (add-text-properties (point) (progn (insert (cadr str)) (point)) - '(mouse-face nil - face completions-annotations))) + (let ((beg (point)) + (end (progn (insert (cadr str)) (point)))) + (put-text-property beg end 'mouse-face nil) + (font-lock-prepend-text-property beg end 'face + 'completions-annotations))) (cond ((eq completions-format 'vertical) ;; Vertical format @@ -1487,12 +1489,11 @@ (defface completions-first-difference '((t (:inherit bold))) - "Face put on the first uncommon character in completions in *Completions* buffer." + "Face added on the first uncommon character in completions in *Completions* buffer." :group 'completion) -(defface completions-common-part - '((t (:inherit default))) - "Face put on the common prefix substring in completions in *Completions* buffer. +(defface completions-common-part '((t nil)) + "Face added on the common prefix substring in completions in *Completions* buffer. The idea of `completions-common-part' is that you can use it to make the common parts less visible than normal, so that the rest of the differing parts is, by contrast, slightly highlighted." @@ -1513,17 +1514,18 @@ (car (setq elem (cons (copy-sequence (car elem)) (cdr elem)))) (setq elem (copy-sequence elem))))) - (put-text-property 0 - ;; If completion-boundaries returns incorrect - ;; values, all-completions may return strings - ;; that don't contain the prefix. - (min com-str-len (length str)) - 'font-lock-face 'completions-common-part - str) + (font-lock-prepend-text-property + 0 + ;; If completion-boundaries returns incorrect + ;; values, all-completions may return strings + ;; that don't contain the prefix. + (min com-str-len (length str)) + 'face 'completions-common-part str) (if (> (length str) com-str-len) - (put-text-property com-str-len (1+ com-str-len) - 'font-lock-face 'completions-first-difference - str))) + (font-lock-prepend-text-property com-str-len (1+ com-str-len) + 'face + 'completions-first-difference + str))) elem) completions) base-size)))) ------------------------------------------------------------ revno: 111941 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-03-04 23:10:55 -0800 message: Remove stray character from license URL. diff: === modified file 'src/xgselect.c' --- src/xgselect.c 2013-01-01 09:11:05 +0000 +++ src/xgselect.c 2013-03-05 07:10:55 +0000 @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ +along with GNU Emacs. If not, see . */ #include ------------------------------------------------------------ revno: 111940 [merge] committer: Glenn Morris branch nick: trunk timestamp: Mon 2013-03-04 19:59:35 -0800 message: Merge from emacs-24; up to r111320 diff: === modified file 'ChangeLog' --- ChangeLog 2013-03-03 02:43:30 +0000 +++ ChangeLog 2013-03-05 03:59:35 +0000 @@ -1,3 +1,7 @@ +2013-03-05 Glenn Morris + + * Makefile.in (install-man): Ignore gzip exit status. + 2013-03-03 Glenn Morris * make-dist: Remove lzma (it's replaced by xz). === modified file 'Makefile.in' --- Makefile.in 2013-02-21 22:42:56 +0000 +++ Makefile.in 2013-03-05 03:59:35 +0000 @@ -624,6 +624,12 @@ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ done) +## "gzip || true" is because some gzips exit with non-zero status +## if compression would not reduce the file size. Eg, the gzip in +## OpenBSD 4.9 seems to do this (2013/03). In Emacs, this can +## only happen with the tiny ctags.1 manpage. We don't really care if +## ctags.1 is compressed or not. "gzip -f" is another option here, +## but not sure if portable. install-man: umask 022; ${MKDIR_P} $(DESTDIR)${man1dir} thisdir=`/bin/pwd`; \ @@ -634,7 +640,7 @@ ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \ ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \ - ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \ + ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \ done ## Install those items from etc/ that need to end up elsewhere. === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-03-03 02:39:57 +0000 +++ doc/lispintro/ChangeLog 2013-03-05 03:59:35 +0000 @@ -1,7 +1,7 @@ 2013-03-03 Glenn Morris * emacs-lisp-intro.texi (Digression into C): Update example. - (defcustom): Fix typo. + (defcustom, Simple Extension): Fix typos. 2012-12-22 Glenn Morris === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2013-03-03 02:39:57 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2013-03-05 03:59:35 +0000 @@ -17811,7 +17811,7 @@ @exdent Or nowadays, using an even more sophisticated set of options, -emacs -Q - D +emacs -Q -D @end smallexample }: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-05 01:48:30 +0000 +++ src/ChangeLog 2013-03-05 03:59:35 +0000 @@ -1,3 +1,13 @@ +2013-03-05 Paul Eggert + + Fix a build failure on OpenBSD 4.x and MirBSD. + * sysdep.c (KERN_PROC, kinfo_proc) + [BSD_SYSTEM && (!KERN_PROC || __MirBSD__)]: + Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9 and MirBSD. + list-system-processes still returns nil, but at least it doesn't crash. + Problem reported by Nelson H. F. Beebe in + . + 2013-03-05 Dmitry Antipov * composite.c (get_composition_id, fill_gstring_header): === modified file 'src/sysdep.c' --- src/sysdep.c 2013-02-13 02:10:36 +0000 +++ src/sysdep.c 2013-03-05 03:59:35 +0000 @@ -2543,6 +2543,14 @@ #elif defined BSD_SYSTEM +/* OpenBSD 4.9 and earlier do not have KERN_PROC. Approximate it with + KERN_PROC2. MirBSD's KERN_PROC seems to be busted. */ +# if !defined KERN_PROC || defined __MirBSD__ +# undef KERN_PROC +# define KERN_PROC KERN_PROC2 +# define kinfo_proc kinfo_proc2 +# endif + Lisp_Object list_system_processes (void) { ------------------------------------------------------------ revno: 111939 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2013-03-05 05:48:30 +0400 message: * composite.c (get_composition_id, fill_gstring_header): Use make_uninit_vector where appropriate. * font.c (Ffont_get_glyphs, build_style_table): Likewise. * xselect.c (clean_local_selection_data): Likewise. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-04 17:35:29 +0000 +++ src/ChangeLog 2013-03-05 01:48:30 +0000 @@ -1,3 +1,10 @@ +2013-03-05 Dmitry Antipov + + * composite.c (get_composition_id, fill_gstring_header): + Use make_uninit_vector where appropriate. + * font.c (Ffont_get_glyphs, build_style_table): Likewise. + * xselect.c (clean_local_selection_data): Likewise. + 2013-03-04 Paul Eggert Fix misuse of ImageMagick that caused core dump (Bug#13846). === modified file 'src/composite.c' --- src/composite.c 2013-02-15 12:26:42 +0000 +++ src/composite.c 2013-03-05 01:48:30 +0000 @@ -234,7 +234,7 @@ key = components; else if (NILP (components)) { - key = Fmake_vector (make_number (nchars), Qnil); + key = make_uninit_vector (nchars); if (STRINGP (string)) for (i = 0; i < nchars; i++) { @@ -828,7 +828,7 @@ if (len <= 8) header = AREF (gstring_work_headers, len - 1); else - header = Fmake_vector (make_number (len + 1), Qnil); + header = make_uninit_vector (len + 1); } ASET (header, 0, font_object); === modified file 'src/font.c' --- src/font.c 2013-03-04 07:41:01 +0000 +++ src/font.c 2013-03-05 01:48:30 +0000 @@ -4705,7 +4705,7 @@ chars = aref_addr (object, XFASTINT (from)); } - vec = Fmake_vector (make_number (len), Qnil); + vec = make_uninit_vector (len); for (i = 0; i < len; i++) { Lisp_Object g; @@ -4715,7 +4715,10 @@ code = font->driver->encode_char (font, c); if (code == FONT_INVALID_CODE) - continue; + { + ASET (vec, i, Qnil); + continue; + } g = LGLYPH_NEW (); LGLYPH_SET_FROM (g, i); LGLYPH_SET_TO (g, i); @@ -4898,7 +4901,7 @@ int i, j; Lisp_Object table, elt; - table = Fmake_vector (make_number (nelement), Qnil); + table = make_uninit_vector (nelement); for (i = 0; i < nelement; i++) { for (j = 0; entry[i].names[j]; j++); === modified file 'src/xselect.c' --- src/xselect.c 2013-02-08 05:28:52 +0000 +++ src/xselect.c 2013-03-05 01:48:30 +0000 @@ -1903,7 +1903,7 @@ Lisp_Object copy; if (size == 1) return clean_local_selection_data (AREF (obj, 0)); - copy = Fmake_vector (make_number (size), Qnil); + copy = make_uninit_vector (size); for (i = 0; i < size; i++) ASET (copy, i, clean_local_selection_data (AREF (obj, i))); return copy; ------------------------------------------------------------ revno: 111938 committer: Alan Mackenzie branch nick: trunk timestamp: Mon 2013-03-04 19:33:23 +0000 message: Replace `last-command-event' by `last-command-char' in XEmacs. progmodes/cc-defs.el (c-last-command-char): New macro. progmodes/cc-align.el (c-semi&comma-inside-parenlist) (c-semi&comma-no-newlines-before-nonblanks) (c-semi&comma-no-newlines-for-oneline-inliners): Use the new macro in place of `last-command-event'. progmodes/cc-cmds.el (c-electric-pound, c-electric-brace) (c-electric-slash, c-electric-semi&comma, c-electric-lt-gt) (c-electric-paren, c-electric-continued-statement): Use the new macro in place of `last-command-event'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-04 07:37:30 +0000 +++ lisp/ChangeLog 2013-03-04 19:33:23 +0000 @@ -1,3 +1,16 @@ +2013-03-04 Alan Mackenzie + + Replace `last-command-event' by `last-command-char' in XEmacs. + * progmodes/cc-defs.el (c-last-command-char): New macro. + * progmodes/cc-align.el (c-semi&comma-inside-parenlist) + (c-semi&comma-no-newlines-before-nonblanks) + (c-semi&comma-no-newlines-for-oneline-inliners): Use the new macro + in place of `last-command-event'. + * progmodes/cc-cmds.el (c-electric-pound, c-electric-brace) + (c-electric-slash, c-electric-semi&comma, c-electric-lt-gt) + (c-electric-paren, c-electric-continued-statement): Use the new + macro in place of `last-command-event'. + 2013-03-04 Glenn Morris * files.el (inhibit-local-variables-regexps): === modified file 'lisp/progmodes/cc-align.el' --- lisp/progmodes/cc-align.el 2013-02-12 17:36:54 +0000 +++ lisp/progmodes/cc-align.el 2013-03-04 19:33:23 +0000 @@ -1284,7 +1284,7 @@ exactly the old newline insertion behavior." ;; newline only after semicolon, but only if that semicolon is not ;; inside a parenthesis list (e.g. a for loop statement) - (if (not (eq last-command-event ?\;)) + (if (not (eq (c-last-command-char) ?\;)) nil ; continue checking (if (condition-case nil (save-excursion @@ -1301,7 +1301,7 @@ inserted, and the following line is not blank, no newline is inserted. Otherwise, no determination is made." (save-excursion - (if (and (= last-command-event ?\;) + (if (and (= (c-last-command-char) ?\;) ;;(/= (point-max) ;; (save-excursion (skip-syntax-forward " ") (point)) (zerop (forward-line 1)) @@ -1318,13 +1318,13 @@ For other semicolon contexts, no determination is made." (let ((syntax (c-guess-basic-syntax)) (bol (save-excursion - (if (c-safe (up-list -1) t) - (c-point 'bol) - -1)))) - (if (and (eq last-command-event ?\;) - (eq (car (car syntax)) 'inclass) - (eq (car (car (cdr syntax))) 'topmost-intro) - (= (c-point 'bol) bol)) + (if (c-safe (up-list -1) t) + (c-point 'bol) + -1)))) + (if (and (eq (c-last-command-char) ?\;) + (eq (car (car syntax)) 'inclass) + (eq (car (car (cdr syntax))) 'topmost-intro) + (= (c-point 'bol) bol)) 'stop nil))) === modified file 'lisp/progmodes/cc-cmds.el' --- lisp/progmodes/cc-cmds.el 2013-01-01 09:11:05 +0000 +++ lisp/progmodes/cc-cmds.el 2013-03-04 19:33:23 +0000 @@ -475,7 +475,7 @@ (bolp (bolp))) (beginning-of-line) (delete-horizontal-space) - (insert last-command-event) + (insert (c-last-command-char)) (and (not bolp) (goto-char (- (point-max) pos))) ))) @@ -737,7 +737,7 @@ ;; `}': clean up empty defun braces (when (c-save-buffer-state () (and (memq 'empty-defun-braces c-cleanup-list) - (eq last-command-event ?\}) + (eq (c-last-command-char) ?\}) (c-intersect-lists '(defun-close class-close inline-close) syntax) (progn @@ -753,14 +753,14 @@ ;; `}': compact to a one-liner defun? (save-match-data (when - (and (eq last-command-event ?\}) + (and (eq (c-last-command-char) ?\}) (memq 'one-liner-defun c-cleanup-list) (c-intersect-lists '(defun-close) syntax) (c-try-one-liner)) (setq here (- (point-max) pos)))) ;; `{': clean up brace-else-brace and brace-elseif-brace - (when (eq last-command-event ?\{) + (when (eq (c-last-command-char) ?\{) (cond ((and (memq 'brace-else-brace c-cleanup-list) (re-search-backward @@ -814,7 +814,7 @@ )))) ;; blink the paren - (and (eq last-command-event ?\}) + (and (eq (c-last-command-char) ?\}) (not executing-kbd-macro) old-blink-paren (save-excursion @@ -851,7 +851,7 @@ (when (and (not arg) (eq literal 'c) (memq 'comment-close-slash c-cleanup-list) - (eq last-command-event ?/) + (eq (c-last-command-char) ?/) (looking-at (concat "[ \t]*\\(" (regexp-quote comment-end) "\\)?$")) ; (eq c-block-comment-ender "*/") ; C-style comments ALWAYS end in */ @@ -867,7 +867,7 @@ (setq indentp (and (not arg) c-syntactic-indentation c-electric-flag - (eq last-command-event ?/) + (eq (c-last-command-char) ?/) (eq (char-before) (if literal ?* ?/)))) (self-insert-command (prefix-numeric-value arg)) (if indentp @@ -941,10 +941,10 @@ (let ((pos (- (point-max) (point)))) (if (c-save-buffer-state () (and (or (and - (eq last-command-event ?,) + (eq (c-last-command-char) ?,) (memq 'list-close-comma c-cleanup-list)) (and - (eq last-command-event ?\;) + (eq (c-last-command-char) ?\;) (memq 'defun-close-semi c-cleanup-list))) (progn (forward-char -1) @@ -1101,7 +1101,7 @@ ;; Indent the line if appropriate. (when (and c-electric-flag c-syntactic-indentation c-recognize-<>-arglists) (setq found-delim - (if (eq last-command-event ?<) + (if (eq (c-last-command-char) ?<) ;; If a <, basically see if it's got "template" before it ..... (or (and (progn (backward-char) @@ -1195,7 +1195,7 @@ ;; clean up brace-elseif-brace (when (and (memq 'brace-elseif-brace c-cleanup-list) - (eq last-command-event ?\() + (eq (c-last-command-char) ?\() (re-search-backward (concat "}" "\\([ \t\n]\\|\\\\\n\\)*" @@ -1213,7 +1213,7 @@ ;; clean up brace-catch-brace (when (and (memq 'brace-catch-brace c-cleanup-list) - (eq last-command-event ?\() + (eq (c-last-command-char) ?\() (re-search-backward (concat "}" "\\([ \t\n]\\|\\\\\n\\)*" @@ -1234,7 +1234,7 @@ ;; space-before-funcall clean-up? ((and (memq 'space-before-funcall c-cleanup-list) - (eq last-command-event ?\() + (eq (c-last-command-char) ?\() (save-excursion (backward-char) (skip-chars-backward " \t") @@ -1252,7 +1252,7 @@ ;; compact-empty-funcall clean-up? ((c-save-buffer-state () (and (memq 'compact-empty-funcall c-cleanup-list) - (eq last-command-event ?\)) + (eq (c-last-command-char) ?\)) (save-excursion (c-safe (backward-char 2)) (when (looking-at "()") @@ -1281,7 +1281,7 @@ (when (c-save-buffer-state () (and c-electric-flag c-syntactic-indentation - (not (eq last-command-event ?_)) + (not (eq (c-last-command-char) ?_)) (= (save-excursion (skip-syntax-backward "w") (point)) === modified file 'lisp/progmodes/cc-defs.el' --- lisp/progmodes/cc-defs.el 2013-01-01 09:11:05 +0000 +++ lisp/progmodes/cc-defs.el 2013-03-04 19:33:23 +0000 @@ -376,6 +376,13 @@ `(int-to-char ,integer) integer)) +(defmacro c-last-command-char () + ;; The last character just typed. Note that `last-command-event' exists in + ;; both Emacs and XEmacs, but with confusingly different meanings. + (if (featurep 'xemacs) + 'last-command-char + 'last-command-event)) + (defmacro c-sentence-end () ;; Get the regular expression `sentence-end'. (if (cc-bytecomp-fboundp 'sentence-end) ------------------------------------------------------------ revno: 111937 fixes bug: http://debbugs.gnu.org/13846 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-03-04 09:35:29 -0800 message: Fix misuse of ImageMagick that caused core dump. * image.c (imagemagick_load_image): Calculate height and width after flattening the image, not before. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-04 07:41:01 +0000 +++ src/ChangeLog 2013-03-04 17:35:29 +0000 @@ -1,3 +1,9 @@ +2013-03-04 Paul Eggert + + Fix misuse of ImageMagick that caused core dump (Bug#13846). + * image.c (imagemagick_load_image): Calculate height and width + after flattening the image, not before. + 2013-03-04 Dmitry Antipov * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW. === modified file 'src/image.c' --- src/image.c 2013-01-02 16:13:04 +0000 +++ src/image.c 2013-03-04 17:35:29 +0000 @@ -7792,11 +7792,6 @@ } } - /* Finally we are done manipulating the image. Figure out the - resulting width/height and transfer ownership to Emacs. */ - height = MagickGetImageHeight (image_wand); - width = MagickGetImageWidth (image_wand); - /* Set the canvas background color to the frame or specified background, and flatten the image. Note: as of ImageMagick 6.6.0, SVG image transparency is not handled properly @@ -7813,6 +7808,11 @@ image_wand = new_wand; } + /* Finally we are done manipulating the image. Figure out the + resulting width/height and transfer ownership to Emacs. */ + height = MagickGetImageHeight (image_wand); + width = MagickGetImageWidth (image_wand); + if (! (width <= INT_MAX && height <= INT_MAX && check_image_size (f, width, height))) { ------------------------------------------------------------ revno: 111936 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2013-03-04 18:14:08 +0100 message: nt/config.nt: Sync with autogen/config.in. (DATA_START, ORDINARY_LINK): Remove. (HAVE_DATA_START, HAVE__PUTENV): New macros. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-02-25 17:36:03 +0000 +++ nt/ChangeLog 2013-03-04 17:14:08 +0000 @@ -1,3 +1,9 @@ +2013-03-04 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (DATA_START, ORDINARY_LINK): Remove. + (HAVE_DATA_START, HAVE__PUTENV): New macros. + 2013-02-25 Eli Zaretskii * inc/ms-w32.h (BOOT_TIME_FILE): Define. === modified file 'nt/config.nt' --- nt/config.nt 2013-02-25 17:36:03 +0000 +++ nt/config.nt 2013-03-04 17:14:08 +0000 @@ -97,9 +97,6 @@ /* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */ #undef DATA_SEG_BITS -/* Address of the start of the data segment. */ -#undef DATA_START - /* Name of the default sound device. */ #undef DEFAULT_SOUND_DEVICE @@ -265,6 +262,10 @@ /* Define to 1 if you have the `copysign' function. */ #undef HAVE_COPYSIGN +/* Define to 1 if data_start is the address of the start of the main data + segment. */ +#undef HAVE_DATA_START + /* Define to 1 if using D-Bus. */ #undef HAVE_DBUS @@ -1136,6 +1137,9 @@ /* Define to 1 if you have the `_ftime' function. */ #undef HAVE__FTIME +/* Define to 1 if you have the `_putenv' function. */ +#undef HAVE__PUTENV + /* Define to 1 if _setjmp and _longjmp work. */ #define HAVE__SETJMP 1 @@ -1234,9 +1238,6 @@ /* Define to 1 if the nlist n_name member is a pointer */ #undef N_NAME_POINTER -/* Define if the C compiler is the linker. */ -#define ORDINARY_LINK 1 - /* Name of package */ #define PACKAGE "emacs" @@ -1578,13 +1579,16 @@ _GL_INLINE_HEADER_END contains useful stuff to put in the same include file, after uses of _GL_INLINE. + Suppress extern inline with HP-UX cc, as it appears to be broken; see + . + Suppress the use of extern inline on Apple's platforms, as Libc-825.25 (2012-09-19) is incompatible with it; see . Perhaps Apple will fix this some day. */ #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : 199901L <= __STDC_VERSION__) \ + : 199901L <= __STDC_VERSION__ && !defined __HP_cc) \ && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline ------------------------------------------------------------ revno: 111935 author: Ted Phelps committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2013-03-04 10:27:33 +0000 message: lisp/gnus/shr.el: Make all the overlays set the `evaporate' property so that they're removed properly diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-02-25 22:47:31 +0000 +++ lisp/gnus/ChangeLog 2013-03-04 10:27:33 +0000 @@ -1,3 +1,8 @@ +2013-03-03 Ted Phelps + + * shr.el: Make all the overlays set the `evaporate' property so that + they're removed properly. + 2013-02-25 Adam Sjøgren * mml2015-el (mml2015-epg-key-image): Wrap epg-gpg-program in === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2013-02-17 00:38:03 +0000 +++ lisp/gnus/shr.el 2013-03-04 10:27:33 +0000 @@ -520,6 +520,11 @@ (dolist (type types) (shr-add-font (or shr-start (point)) (point) type)))) +(defun shr-make-overlay (beg end &optional buffer front-advance rear-advance) + (let ((overlay (make-overlay beg end buffer front-advance rear-advance))) + (overlay-put overlay 'evaporate t) + overlay)) + ;; Add an overlay in the region, but avoid putting the font properties ;; on blank text at the start of the line, and the newline at the end, ;; to avoid ugliness. @@ -529,7 +534,7 @@ (while (< (point) end) (when (bolp) (skip-chars-forward " ")) - (let ((overlay (make-overlay (point) (min (line-end-position) end)))) + (let ((overlay (shr-make-overlay (point) (min (line-end-position) end)))) (overlay-put overlay 'face type)) (if (< (line-end-position) end) (forward-line 1) @@ -790,7 +795,7 @@ (when (and (< (setq column (current-column)) width) (< (setq column (shr-previous-newline-padding-width column)) width)) - (let ((overlay (make-overlay (point) (1+ (point))))) + (let ((overlay (shr-make-overlay (point) (1+ (point))))) (overlay-put overlay 'before-string (concat (mapconcat @@ -1238,8 +1243,8 @@ (end-of-line) (insert line shr-table-vertical-line) (dolist (overlay overlay-line) - (let ((o (make-overlay (- (point) (nth 0 overlay) 1) - (- (point) (nth 1 overlay) 1))) + (let ((o (shr-make-overlay (- (point) (nth 0 overlay) 1) + (- (point) (nth 1 overlay) 1))) (properties (nth 2 overlay))) (while properties (overlay-put o (pop properties) (pop properties))))) @@ -1340,8 +1345,8 @@ (let ((end (length (car cache)))) (dolist (overlay (cadr cache)) (let ((new-overlay - (make-overlay (1+ (- end (nth 0 overlay))) - (1+ (- end (nth 1 overlay))))) + (shr-make-overlay (1+ (- end (nth 0 overlay))) + (1+ (- end (nth 1 overlay))))) (properties (nth 2 overlay))) (while properties (overlay-put new-overlay ------------------------------------------------------------ revno: 111934 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-03-04 00:45:03 -0800 message: Prefer UTF-8 for documentation. With GNU Texinfo 5.0, this generates nicer-looking info files, since they can use curly quotes. With older Texinfo it doesn't matter. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-02-28 06:30:48 +0000 +++ doc/emacs/ChangeLog 2013-03-04 08:45:03 +0000 @@ -1,3 +1,11 @@ +2013-03-04 Paul Eggert + + Prefer UTF-8 for documentation. + With GNU Texinfo 5.0, this generates nicer-looking info files, + since they can use curly quotes. With older Texinfo it doesn't matter. + * ack.texi, cal-xtra.texi, calendar.texi, emacs-xtra.texi, emacs.texi: + Switch from Latin-1 to UTF-8. + 2013-02-28 Bastien Guerry * xresources.texi (GTK resources): Fix broken link. === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2013-02-22 17:13:05 +0000 +++ doc/emacs/ack.texi 2013-03-04 08:45:03 +0000 @@ -1,4 +1,4 @@ -@c -*- coding: iso-latin-1 -*- +@c -*- coding: utf-8 -*- @c This is part of the Emacs manual. @c Copyright (C) 1994-1997, 1999-2013 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @@ -53,7 +53,7 @@ D-Bus message bus protocol; @file{zeroconf.el}, a mode for browsing Avahi services; @file{xesam.el}, a Xesam-based search engine interface; and @file{secrets.el}, an interface to keyring daemons for -storing confidential data. He and Kai Großjohann wrote the Tramp package, which +storing confidential data. He and Kai Großjohann wrote the Tramp package, which provides transparent remote file editing using rcp, ssh, ftp, and other network protocols. He and Daniel Pittman wrote @file{tramp-cache.el}. @@ -68,7 +68,7 @@ implemented support for X11. @item -Emil Åström, Milan Zamaza, and Stefan Bruda wrote @file{prolog.el}, +Emil Ã…ström, Milan Zamaza, and Stefan Bruda wrote @file{prolog.el}, a mode for editing Prolog (and Mercury) code. @item @@ -260,7 +260,7 @@ Eric Ding wrote @file{goto-addr.el}, @item -Jan Djärv added support for the GTK+ toolkit and X drag-and-drop. +Jan Djärv added support for the GTK+ toolkit and X drag-and-drop. He also wrote @file{dynamic-setting.el}. @item @@ -268,7 +268,7 @@ cross-references in @LaTeX{} documents; and co-wrote IDLWAVE mode (q.v.). He was the original author of Org mode, for maintaining notes, todo lists, and project planning. Bastien Guerry subsequently took -over maintainership. Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böcker, Lennart +over maintainership. Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böcker, Lennart Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S. Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip Jackson, Martyn Jago, Thorsten Jolitz, Jambunathan K, Tokuya Kameshima, Sergey Litvinov, David Maus, Ross Patterson, Juan Pechiar, Sebastian Rose, Eric Schulte, Paul Sexton, Ulf Stegemann, Andy Stewart, Christopher Suckling, David O'Toole, John Wiegley, Zhang Weize, @@ -303,7 +303,7 @@ for incremental reading and completion of buffer names. @item -Torbjörn Einarsson wrote @file{f90.el}, a mode for Fortran 90 files. +Torbjörn Einarsson wrote @file{f90.el}, a mode for Fortran 90 files. @item Tsugutomo Enami co-wrote the support for international character sets. @@ -365,7 +365,7 @@ flow control. @item -Fabián E. Gallina rewrote @file{python.el}, the major mode for the +Fabián E. Gallina rewrote @file{python.el}, the major mode for the Python programming language used in Emacs 24.3 onwards. @item @@ -373,7 +373,7 @@ @file{w32-win.el}, support functions for the MS-Windows window system. @item -Juan León Lahoz García wrote @file{wdired.el}, a package for +Juan León Lahoz García wrote @file{wdired.el}, a package for performing file operations by directly editing Dired buffers. @item @@ -510,9 +510,9 @@ @file{url-queue.el}, for controlling parallel downloads of URLs; and implemented libxml2 support. Components of Gnus have also been written by: Nagy Andras, David -Blacka, Scott Byer, Ludovic Courtès, Julien Danjou, Kevin Greiner, Kai -Großjohann, Joe Hildebrand, Paul Jarc, Simon Josefsson, Sascha -Lüdecke, David Moore, Jim Radford, Benjamin Rutt, Raymond Scholz, +Blacka, Scott Byer, Ludovic Courtès, Julien Danjou, Kevin Greiner, Kai +Großjohann, Joe Hildebrand, Paul Jarc, Simon Josefsson, Sascha +Lüdecke, David Moore, Jim Radford, Benjamin Rutt, Raymond Scholz, Thomas Steffen, Reiner Steib, Didier Verna, Ilja Weis, Katsumi Yamaoka, Teodor Zlatanov, and others (@pxref{Contributors,,,gnus, the Gnus Manual}). @@ -553,7 +553,7 @@ for the Transport Layer Security protocol. @item -Arne Jørgensen wrote @file{latexenc.el}, a package to +Arne Jørgensen wrote @file{latexenc.el}, a package to automatically guess the correct coding system in @LaTeX{} files. @item @@ -605,7 +605,7 @@ Emacs. @item -Karel Klí@v{c} contributed SELinux support, for preserving the +Karel Klí@v{c} contributed SELinux support, for preserving the Security-Enhanced Linux context of files on backup and copy. @item @@ -694,7 +694,7 @@ creates a virtual Info manual of package keywords. @item -Károly L@H{o}rentey wrote the ``multi-terminal'' code, which allows +Károly L@H{o}rentey wrote the ``multi-terminal'' code, which allows Emacs to run on graphical and text terminals simultaneously. @item @@ -960,7 +960,7 @@ widgets. @item -François Pinard, Greg McGary, and Bruno Haible wrote @file{po.el}, +François Pinard, Greg McGary, and Bruno Haible wrote @file{po.el}, support for PO translation files. @item @@ -1345,7 +1345,7 @@ John Wiegley wrote @file{align.el}, a set of commands for aligning text according to regular-expression based rules; @file{isearchb.el} for fast buffer switching; @file{timeclock.el}, a package for keeping track of -time spent on projects; the Bahá'í calendar support; +time spent on projects; the Bahá'í calendar support; @file{pcomplete.el}, a programmable completion facility; @file{remember.el}, a mode for jotting down things to remember; @file{eudcb-mab.el}, an address book backend for the Emacs Unified === modified file 'doc/emacs/cal-xtra.texi' --- doc/emacs/cal-xtra.texi 2013-01-01 09:11:05 +0000 +++ doc/emacs/cal-xtra.texi 2013-03-04 08:45:03 +0000 @@ -1,4 +1,4 @@ -@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*- +@c This is part of the Emacs manual. -*- coding: utf-8 -*- @c Copyright (C) 2004-2013 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @@ -203,7 +203,7 @@ @minus{}1 the last occurrence, @minus{}2 the second-to-last occurrence, and so on). - You can specify holidays that occur on fixed days of the Bahá'í, + You can specify holidays that occur on fixed days of the Bahá'í, Chinese, Hebrew, Islamic, and Julian calendars too. For example, @smallexample @@ -420,7 +420,7 @@ @subsection Diary Entries Using non-Gregorian Calendars As well as entries based on the standard Gregorian calendar, your -diary can have entries based on Bahá'í, Hebrew, or Islamic dates. +diary can have entries based on Bahá'í, Hebrew, or Islamic dates. Recognition of such entries can be time-consuming, however, and since most people don't use them, you must explicitly enable their use. If you want the diary to recognize Hebrew-date diary entries, for example, @@ -440,7 +440,7 @@ @end smallexample @noindent -Similarly, for Islamic and Bahá'í entries, add +Similarly, for Islamic and Bahá'í entries, add @code{diary-islamic-list-entries} and @code{diary-islamic-mark-entries}, or @code{diary-bahai-list-entries} and @code{diary-bahai-mark-entries}. @@ -449,7 +449,7 @@ @vindex diary-islamic-entry-symbol These diary entries have the same formats as Gregorian-date diary entries; except that @code{diary-bahai-entry-symbol} (default @samp{B}) -must precede a Bahá'í date, @code{diary-hebrew-entry-symbol} (default +must precede a Bahá'í date, @code{diary-hebrew-entry-symbol} (default @samp{H}) a Hebrew date, and @code{diary-islamic-entry-symbol} (default @samp{I}) an Islamic date. Moreover, non-Gregorian month names may not be abbreviated (because the first three letters are often not unique). @@ -476,7 +476,7 @@ Here is a table of commands used in the calendar to create diary entries that match the selected date and other dates that are similar in -the Bahá'í, Hebrew, or Islamic calendars: +the Bahá'í, Hebrew, or Islamic calendars: @table @kbd @item i h d @@ -851,7 +851,7 @@ @item %%(diary-astro-day-number) Make a diary entry with today's equivalent astronomical (Julian) day number. @item %%(diary-bahai-date) -Make a diary entry with today's equivalent Bahá'í calendar date. +Make a diary entry with today's equivalent Bahá'í calendar date. @item %%(diary-chinese-date) Make a diary entry with today's equivalent Chinese calendar date. @item %%(diary-coptic-date) === modified file 'doc/emacs/calendar.texi' --- doc/emacs/calendar.texi 2013-01-01 09:11:05 +0000 +++ doc/emacs/calendar.texi 2013-03-04 08:45:03 +0000 @@ -1,4 +1,4 @@ -@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*- +@c This is part of the Emacs manual. -*- coding: utf-8 -*- @c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @@ -522,7 +522,7 @@ holidays}, which prompts for the month and year. The holidays known to Emacs include United States holidays and the -major Bahá'í, Chinese, Christian, Islamic, and Jewish holidays; also the +major Bahá'í, Chinese, Christian, Islamic, and Jewish holidays; also the solstices and equinoxes. @findex list-holidays @@ -760,8 +760,8 @@ twelve ``terrestrial branches'' for a total of sixty names that are repeated in a cycle of sixty. -@cindex Bahá'í calendar - The Bahá'í calendar system is based on a solar cycle of 19 months with +@cindex Bahá'í calendar + The Bahá'í calendar system is based on a solar cycle of 19 months with 19 days each. The four remaining ``intercalary'' days are placed between the 18th and 19th months. @@ -801,7 +801,7 @@ (@code{calendar-french-print-date}). @findex calendar-bahai-print-date @item p b -Display Bahá'í date for selected day +Display Bahá'í date for selected day (@code{calendar-bahai-print-date}). @findex calendar-chinese-print-date @item p C @@ -869,7 +869,7 @@ Move to a date specified with an astronomical (Julian) day number (@code{calendar-astro-goto-day-number}). @item g b -Move to a date specified in the Bahá'í calendar +Move to a date specified in the Bahá'í calendar (@code{calendar-bahai-goto-date}). @item g h Move to a date specified in the Hebrew calendar === modified file 'doc/emacs/emacs-xtra.texi' --- doc/emacs/emacs-xtra.texi 2013-01-01 09:11:05 +0000 +++ doc/emacs/emacs-xtra.texi 2013-03-04 08:45:03 +0000 @@ -26,7 +26,7 @@ @end quotation @end copying -@documentencoding ISO-8859-1 +@documentencoding UTF-8 @dircategory Emacs @direntry === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2013-02-22 17:10:58 +0000 +++ doc/emacs/emacs.texi 2013-03-04 08:45:03 +0000 @@ -1,4 +1,4 @@ -\input texinfo @c -*- coding: iso-latin-1 -*- +\input texinfo @c -*- coding: utf-8 -*- @setfilename ../../info/emacs @settitle GNU Emacs Manual @@ -44,7 +44,7 @@ @end quotation @end copying -@documentencoding ISO-8859-1 +@documentencoding UTF-8 @dircategory Emacs @direntry @@ -1351,35 +1351,35 @@ Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas Abrahamsson, Jay K. Adams, Alon Albert, Michael Albinus, Nagy -Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil Åström, +Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil Ã…ström, Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas Baumann, Steven L. Baur, Jay Belanger, Alexander L. Belikoff, Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl Berry, Anna M. Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan -Bockgård, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner, +BockgÃ¥rd, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner, Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Stefan Bruda, Georges Brun-Cottan, Joe Buehler, Scott Byer, W@l{}odek Bzyl, Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James Clark, Mike Clarkson, Glynn Clements, Andrew Cohen, Daniel Colascione, -Edward O'Connor, Christoph Conrad, Ludovic Courtès, Andrew Csillag, +Edward O'Connor, Christoph Conrad, Ludovic Courtès, Andrew Csillag, Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte, Gary Delp, Nachum Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eri -Ding, Jan Djärv, Lawrence R. Dodd, Carsten Dominik, Scott Draves, +Ding, Jan Djärv, Lawrence R. Dodd, Carsten Dominik, Scott Draves, Benjamin Drieu, Viktor Dukhovni, Jacques Duthen, Dmitry Dzhus, John Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen -Eglen, Christian Egli, Torbjörn Einarsson, Tsugutomo Enami, David +Eglen, Christian Egli, Torbjörn Einarsson, Tsugutomo Enami, David Engster, Hans Henrik Eriksen, Michael Ernst, Ata Etemadi, Frederick Farnbach, Oscar Figueiredo, Fred Fish, Steve Fisk, Karl Fogel, Gary Foster, Eric S. Fraga, Romain Francoise, Noah Friedman, Andreas Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S. -Galbraith, Kevin Gallagher, Fabián E. Gallina, Kevin Gallo, Juan León Lahoz García, +Galbraith, Kevin Gallagher, Fabián E. Gallina, Kevin Gallo, Juan León Lahoz García, Howard Gayle, Daniel German, Stephen Gildea, Julien Gilles, David Gillespie, Bob Glickstein, Deepak Goel, David De La Harpe Golden, Boris Goldowsky, David Goodger, Chris Gray, Kevin Greiner, Michelangelo Grigni, Odd -Gripenstam, Kai Großjohann, Michael Gschwind, Bastien Guerry, Henry +Gripenstam, Kai Großjohann, Michael Gschwind, Bastien Guerry, Henry Guillaume, Doug Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris Hanson, Jesper Harder, Alexandru Harsanyi, K. Shane Hartman, John Heidemann, Jon K. Hellan, Magnus Henoch, Markus Heritsch, Dirk @@ -1388,19 +1388,19 @@ Hove, Denis Howe, Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue, Philip Jackson, Martyn Jago, Pavel Janik, Paul Jarc, Ulf Jasper, Thorsten Jolitz, Michael K. Johnson, Kyle Jones, Terry Jones, Simon -Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani, +Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani, Brewster Kahle, Tokuya Kameshima, Lute Kamstra, Ivan Kanis, David Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, Taro Kawagishi, Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel -Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K. Kolodney, David +Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K. Kolodney, David M. Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer, -Ryszard Kubiak, Igor Kuzmin, David Kågedal, Daniel LaLiberte, Karl +Ryszard Kubiak, Igor Kuzmin, David KÃ¥gedal, Daniel LaLiberte, Karl Landstrom, Mario Lang, Aaron Larson, James R. Larus, Vinicius Jose Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, Juri Linkov, Francis Litterio, Sergey Litvinov, Emilio C. Lopes, -Martin Lorentzon, Dave Love, Eric Ludlam, Károly L@H{o}rentey, Sascha -Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie, +Martin Lorentzon, Dave Love, Eric Ludlam, Károly L@H{o}rentey, Sascha +Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie, Christopher J. Madsen, Neil M. Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin, Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David @@ -1415,7 +1415,7 @@ Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar, Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L. -Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian +Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian Plaunt, Alexander Pohoyda, David Ponce, Francesco A. Potorti, Michael D. Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-03-03 02:39:57 +0000 +++ doc/lispref/ChangeLog 2013-03-04 08:45:03 +0000 @@ -1,3 +1,7 @@ +2013-03-04 Paul Eggert + + * elisp.texi, intro.texi: Switch from Latin-1 to UTF-8. + 2013-03-03 Glenn Morris * objects.texi (Symbol Type): Fix typo. === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2013-02-20 08:34:28 +0000 +++ doc/lispref/elisp.texi 2013-03-04 08:45:03 +0000 @@ -115,7 +115,7 @@ @end quotation @end copying -@documentencoding ISO-8859-1 +@documentencoding UTF-8 @dircategory GNU Emacs Lisp @direntry === modified file 'doc/lispref/intro.texi' --- doc/lispref/intro.texi 2013-01-01 09:11:05 +0000 +++ doc/lispref/intro.texi 2013-03-04 08:45:03 +0000 @@ -1,4 +1,4 @@ -@c -*-coding: iso-latin-1-*- +@c -*-coding: utf-8-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990-1994, 2001-2013 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @@ -547,7 +547,7 @@ K. Richard Magill, Brian Marick, Roland McGrath, Stefan Monnier, Skip Montanaro, John Gardiner Myers, Thomas A. Peterson, Francesco Potorti, Friedrich Pukelsheim, Arnold D. Robbins, Raul Rockwell, Jason Rumney, -Per Starbäck, Shinichirou Sugou, Kimmo Suominen, Edward Tharp, Bill +Per Starbäck, Shinichirou Sugou, Kimmo Suominen, Edward Tharp, Bill Trost, Rickard Westman, Jean White, Eduard Wiebe, Matthew Wilding, Carl Witty, Dale Worley, Rusty Wright, and David D. Zuhn. === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-03-03 11:47:20 +0000 +++ doc/misc/ChangeLog 2013-03-04 08:45:03 +0000 @@ -1,3 +1,8 @@ +2013-03-04 Paul Eggert + + * emacs-mime.texi, htmlfontify.texi, mairix-el.texi, mh-e.texi: + * ses.texi: Switch from Latin-1 to UTF-8. + 2013-03-03 Michael Albinus * tramp.texi (External methods): Tramp does not connect Android === modified file 'doc/misc/emacs-mime.texi' --- doc/misc/emacs-mime.texi 2013-02-12 17:36:54 +0000 +++ doc/misc/emacs-mime.texi 2013-03-04 08:45:03 +0000 @@ -26,8 +26,8 @@ @end quotation @end copying -@c Node ``Interface Functions'' uses Latin-1 characters -@documentencoding ISO-8859-1 +@c Node ``Interface Functions'' uses non-ASCII characters +@documentencoding UTF-8 @dircategory Emacs lisp libraries @direntry === modified file 'doc/misc/htmlfontify.texi' --- doc/misc/htmlfontify.texi 2013-01-09 08:30:21 +0000 +++ doc/misc/htmlfontify.texi 2013-03-04 08:45:03 +0000 @@ -123,8 +123,8 @@ entities, so you should even be able to do html-within-html fontified display. -You should, however, note that random control or eight-bit characters -such as ^L (\x0c) or ¤ (\xa4) won't get mapped yet. +You should, however, note that random control or non-ASCII characters +such as ^L (\x0c) or ¤ (\xa4) won't get mapped yet. If the @var{srcdir} and @var{file} arguments are set, lookup etags derived entries in the @ref{hfy-tags-cache} and add html anchors === modified file 'doc/misc/mairix-el.texi' --- doc/misc/mairix-el.texi 2013-01-01 09:11:05 +0000 +++ doc/misc/mairix-el.texi 2013-03-04 08:45:03 +0000 @@ -3,7 +3,7 @@ @setfilename ../../info/mairix-el @settitle Emacs Interface for Mairix -@documentencoding ISO-8859-1 +@documentencoding UTF-8 @copying Copyright @copyright{} 2008--2013 Free Software Foundation, Inc. === modified file 'doc/misc/mh-e.texi' --- doc/misc/mh-e.texi 2013-03-02 23:20:11 +0000 +++ doc/misc/mh-e.texi 2013-03-04 08:45:03 +0000 @@ -1,4 +1,4 @@ -\input texinfo @c -*-texinfo-*- +\input texinfo @c -*- mode: texinfo; coding: utf-8; -*- @c @c Note: This document requires makeinfo version 4.6 or greater to build. @c @@ -4968,7 +4968,7 @@ The attribution consists of the sender's name and email address followed by the content of the option @code{mh-extract-from-attribution-verb}. This option can be set to -@samp{wrote:}, @samp{a écrit:}, and @samp{schrieb:}. You can also use +@samp{wrote:}, @samp{a écrit:}, and @samp{schrieb:}. You can also use the @samp{Custom String} menu item to enter your own verb. @vindex mail-citation-hook === modified file 'doc/misc/ses.texi' --- doc/misc/ses.texi 2013-02-13 04:31:09 +0000 +++ doc/misc/ses.texi 2013-03-04 08:45:03 +0000 @@ -1,4 +1,4 @@ -\input texinfo @c -*-texinfo-*- +\input texinfo @c -*- mode: texinfo; coding: utf-8; -*- @c %**start of header @setfilename ../../info/ses @settitle @acronym{SES}: Simple Emacs Spreadsheet @@ -1022,9 +1022,9 @@ Juri Linkov @email{juri@@jurta.org}@* Harald Maier @email{maierh@@myself.com}@* Alan Nash @email{anash@@san.rr.com}@* -François Pinard @email{pinard@@iro.umontreal.ca}@* +François Pinard @email{pinard@@iro.umontreal.ca}@* Pedro Pinto @email{ppinto@@cs.cmu.edu}@* -Stefan Reichör @email{xsteve@@riic.at}@* +Stefan Reichör @email{xsteve@@riic.at}@* Oliver Scholz @email{epameinondas@@gmx.de}@* Richard M. Stallman @email{rms@@gnu.org}@* Luc Teirlinck @email{teirllm@@dms.auburn.edu}@* ------------------------------------------------------------ revno: 111933 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2013-03-04 11:41:01 +0400 message: * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW. * ftfont.c (ftfont_shape_by_flt): Likewise. * w32uniscribe.c (uniscribe_shape): Likewise. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-02 21:05:52 +0000 +++ src/ChangeLog 2013-03-04 07:41:01 +0000 @@ -1,3 +1,9 @@ +2013-03-04 Dmitry Antipov + + * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW. + * ftfont.c (ftfont_shape_by_flt): Likewise. + * w32uniscribe.c (uniscribe_shape): Likewise. + 2013-03-02 Paul Eggert The lock for FILE is now .#FILE or .#-FILE (Bug#13807). @@ -208,6 +214,7 @@ of dumping Emacs. Explain why. 2013-02-20 Dmitry Antipov + * search.c (find_newline): Return byte position in bytepos. Adjust comment. (find_next_newline_no_quit, find_before_next_newline): === modified file 'src/font.c' --- src/font.c 2013-02-13 07:14:38 +0000 +++ src/font.c 2013-03-04 07:41:01 +0000 @@ -4716,7 +4716,7 @@ code = font->driver->encode_char (font, c); if (code == FONT_INVALID_CODE) continue; - g = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); + g = LGLYPH_NEW (); LGLYPH_SET_FROM (g, i); LGLYPH_SET_TO (g, i); LGLYPH_SET_CHAR (g, c); === modified file 'src/ftfont.c' --- src/ftfont.c 2013-02-08 05:28:52 +0000 +++ src/ftfont.c 2013-03-04 07:41:01 +0000 @@ -2541,7 +2541,7 @@ if (NILP (lglyph)) { - lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); + lglyph = LGLYPH_NEW (); LGSTRING_SET_GLYPH (lgstring, i, lglyph); } LGLYPH_SET_FROM (lglyph, g->from); === modified file 'src/w32uniscribe.c' --- src/w32uniscribe.c 2013-02-08 05:28:52 +0000 +++ src/w32uniscribe.c 2013-03-04 07:41:01 +0000 @@ -333,7 +333,7 @@ if (NILP (lglyph)) { - lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil); + lglyph = LGLYPH_NEW (); LGSTRING_SET_GLYPH (lgstring, lglyph_index, lglyph); } /* Copy to a 32-bit data type to shut up the ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.