Leo Liu [Wed, 23 Mar 2011 11:56:34 +0000 (19:56 +0800)]
Tweak regexp in help-mode-finish
Without this fix, "This special-form is advised." won't be correctly
fontified.
Julien Danjou [Wed, 23 Mar 2011 10:06:57 +0000 (11:06 +0100)]
Use Frun_hooks rather than calling Vrun_hooks manually
Glenn Morris [Wed, 23 Mar 2011 07:58:05 +0000 (00:58 -0700)]
* autogen/update_autogen (msg): Remove function; use `exec' instead.
Glenn Morris [Wed, 23 Mar 2011 06:40:56 +0000 (23:40 -0700)]
* autogen/update_autogen: Fix typo.
Glenn Morris [Wed, 23 Mar 2011 04:09:49 +0000 (00:09 -0400)]
Auto-commit of generated files.
Glenn Morris [Wed, 23 Mar 2011 03:38:15 +0000 (20:38 -0700)]
* admin/notes/copyright: Remove comments about deleted files in src/{m,s}.
Files that were merged into other files have been kept.
Glenn Morris [Wed, 23 Mar 2011 03:32:55 +0000 (20:32 -0700)]
Fix ChangeLog typo.
Glenn Morris [Wed, 23 Mar 2011 03:09:55 +0000 (20:09 -0700)]
Replace mkinstalldirs with `install-sh -d', as automake recommends.
* Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs.
(sync-from-gnulib): Don't sync mkinstalldirs.
* make-dist: Don't distribute mkinstalldirs.
* leim/Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
Use `install-sh -d' rather than mkinstalldirs.
* configure.in, doc/emacs/Makefile.in: Update comments.
* admin/notes/copyright: Remove mkinstalldirs.
Glenn Morris [Wed, 23 Mar 2011 02:57:57 +0000 (19:57 -0700)]
* admin/notes/bzr: Update bzr changelog_merge plugin details.
Glenn Morris [Wed, 23 Mar 2011 02:52:52 +0000 (19:52 -0700)]
esh-opt trivia.
* lisp/eshell/esh-opt.el (eshell-eval-using-options):
Do not bind unused local variable `eshell-option-stub'.
Glenn Morris [Wed, 23 Mar 2011 02:50:28 +0000 (19:50 -0700)]
* lisp/progmodes/gdb-mi.el (gdb): Fix typo in previous change.
Paul Eggert [Wed, 23 Mar 2011 01:01:59 +0000 (18:01 -0700)]
Fix more problems found by GCC 4.5.2's static checks.
Paul Eggert [Wed, 23 Mar 2011 00:53:37 +0000 (17:53 -0700)]
Merge removals from trunk.
Paul Eggert [Wed, 23 Mar 2011 00:24:09 +0000 (17:24 -0700)]
Merge from mainline.
Juanma Barranquero [Tue, 22 Mar 2011 20:58:27 +0000 (21:58 +0100)]
lisp/emacs-lisp/derived.el: Don't warn about keymaps already `defconst'ed.
Sebastian Hermida [Tue, 22 Mar 2011 18:59:50 +0000 (14:59 -0400)]
* etc/themes/misterioso-theme.el: New file.
Chong Yidong [Tue, 22 Mar 2011 18:15:52 +0000 (14:15 -0400)]
Remove an apparently unnecessary XClearWindow call.
* src/xterm.c (x_clear_frame): Remove XClearWindow call. This appears
not to be necessary, and produces flickering.
Paul Eggert [Tue, 22 Mar 2011 17:33:16 +0000 (10:33 -0700)]
Merge from mainline.
Paul Eggert [Tue, 22 Mar 2011 16:43:12 +0000 (09:43 -0700)]
Add Bug#
Paul Eggert [Tue, 22 Mar 2011 16:20:45 +0000 (09:20 -0700)]
* coding.c (encode_coding_raw_text): Avoid unnecessary test
the first time through the loop, since we know p0 < p1 then.
This also avoids a gcc -Wstrict-overflow warning.
Leo Liu [Tue, 22 Mar 2011 15:38:40 +0000 (23:38 +0800)]
Use utf-8 if safe for writing to abbrev file
and fall back on emacs-mule or utf-8-emacs.
Juanma Barranquero [Tue, 22 Mar 2011 15:15:21 +0000 (16:15 +0100)]
lisp/simple.el: Avoid warning about `delete-backward-char'.
Julien Danjou [Tue, 22 Mar 2011 13:40:41 +0000 (13:40 +0000)]
mm-view.el (mm-display-inline-fontify): Make mode optional, and call normal-mode if not set. Set temp buffer unmodified to avoid kill-buffer query.
(mm-inline-text): Render normal text with fontification whenever possible.
gnus-sum.el (gnus-summary-save-parts-1):
gnus-art.el (gnus-article-browse-html-save-cid-content)
(gnus-article-browse-html-parts, gnus-mime-delete-part)
(gnus-mime-copy-part, gnus-mime-inline-part, gnus-insert-mime-button):
Use `mm-handle-filename'.
mm-util.el (mm-handle-filename): New function, return the filename of an handle.
Juanma Barranquero [Tue, 22 Mar 2011 13:10:43 +0000 (14:10 +0100)]
lisp/image.el: Avoid some warnings.
* image.el (image-type-file-name-regexps): Make it variable.
`imagemagick-register-types' modifies it, and the user may want
to add new extensions for known image types.
(imagemagick-register-types): Throw error if not using ImageMagick.
Leo Liu [Tue, 22 Mar 2011 11:51:48 +0000 (19:51 +0800)]
New variable rcirc-user-authenticated to pacify compiler
Leo Liu [Tue, 22 Mar 2011 11:30:05 +0000 (19:30 +0800)]
Handle the case when re-search-backward errs
because point is not located after rcirc-prompt-end-marker.
Andreas Schwab [Tue, 22 Mar 2011 09:37:37 +0000 (10:37 +0100)]
.gitignore: Add aclocal.m4, configure, lib/Makefile.in, src/config.in.
Paul Eggert [Tue, 22 Mar 2011 09:08:11 +0000 (02:08 -0700)]
* lisp.h (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Avoid 'int' overflow
leading to a memory leak, possible in functions like
load_charset_map_from_file that can allocate an unbounded number
of objects.
Paul Eggert [Tue, 22 Mar 2011 08:59:50 +0000 (01:59 -0700)]
* xmenu.c (set_frame_menubar): Use EMACS_UINT, not int, for indexes
that could (at least in theory) be that large.
Paul Eggert [Tue, 22 Mar 2011 08:15:43 +0000 (01:15 -0700)]
* xdisp.c (pint2hrstr): Simplify and tune code slightly.
This also avoids a (bogus) GCC warning with gcc -Wstrict-overflow.
Paul Eggert [Tue, 22 Mar 2011 08:10:11 +0000 (01:10 -0700)]
* xdisp.c (message_log_check_duplicate): Return unsigned long, not int.
This is less likely to overflow, and avoids undefined behavior if
overflow does occur. All callers changed. Use strtoul to scan
for the unsigned long integer.
Paul Eggert [Tue, 22 Mar 2011 07:48:10 +0000 (00:48 -0700)]
* scroll.c (do_scrolling): Work around GCC bug 48228.
See <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48228>.
Glenn Morris [Tue, 22 Mar 2011 03:28:41 +0000 (20:28 -0700)]
copy_autogen tweaks.
* autogen/copy_autogen: Work from ./ or ../.
Fix time-stamps.
* autogen.sh: Doc fix.
Chong Yidong [Tue, 22 Mar 2011 00:30:23 +0000 (20:30 -0400)]
Special handling of the `custom-enabled-themes' custom variable.
* lisp/custom.el (custom--inhibit-theme-enable): Make it affect only
custom-theme-set-variables and custom-theme-set-faces.
(provide-theme): Ignore custom--inhibit-theme-enable.
(load-theme): Enable the theme explicitly if NO-ENABLE is non-nil.
(custom-enabling-themes): Delete variable.
(enable-theme): Accept only loaded themes as arguments. Ignore
the special custom-enabled-themes variable.
(custom-enabled-themes): Forbid themes from setting this.
Eliminate use of custom-enabling-themes.
(custom-push-theme): Quote "changed" custom var entry.
Chong Yidong [Mon, 21 Mar 2011 22:09:52 +0000 (18:09 -0400)]
* lisp/custom.el (custom-push-theme): Quote "changed" custom var entry.
Paul Eggert [Mon, 21 Mar 2011 18:12:38 +0000 (11:12 -0700)]
* frame.c (validate_x_resource_name): Simplify count usage.
This also avoids a warning with gcc -Wstrict-overflow.
Paul Eggert [Mon, 21 Mar 2011 18:11:03 +0000 (11:11 -0700)]
Better version of previous patch.
Paul Eggert [Mon, 21 Mar 2011 18:09:45 +0000 (11:09 -0700)]
* frame.c (Fmodify_frame_parameters): Simplify loop counter.
This also avoids a warning with gcc -Wstrict-overflow.
Paul Eggert [Mon, 21 Mar 2011 18:03:15 +0000 (11:03 -0700)]
* ebrowse.c: Use size_t, not int, for sizes.
This avoids a warning with gcc -Wstrict-overflow, and works
better for very large objects.
(inbuffer_size): Now size_t. All uses changed.
(xmalloc, xrealloc, operator_name, process_file): Use size_t for
sizes. Don't bother testing whether a size_t value can be negative.
Leo Liu [Mon, 21 Mar 2011 17:48:36 +0000 (01:48 +0800)]
Fix history adding in ido-read-internal
Assume, for example, the head of matches is "RSS" and user input is
"rs". If the user hit RET, "RSS" is selected but "rs" is added to the
history. This commit fixes this inconsistency.
Paul Eggert [Mon, 21 Mar 2011 16:41:03 +0000 (09:41 -0700)]
* etags.c (Ada_funcs): Redo slightly to avoid overflow warning.
Paul Eggert [Mon, 21 Mar 2011 16:40:05 +0000 (09:40 -0700)]
etags: In Prolog functions, don't assume int fits in size_t.
This avoids a warning with gcc -Wstrict-overflow.
* etags.c (Prolog_functions, prolog_pr, prolog_atom): Use size_t,
not int, to store sizes.
(prolog_atom): Return 0, not -1, on error. All callers changed.
Stefan Monnier [Mon, 21 Mar 2011 16:34:16 +0000 (12:34 -0400)]
* subr.el (deferred-action-list, deferred-action-function): Mark obsolete.
Paul Eggert [Mon, 21 Mar 2011 16:26:05 +0000 (09:26 -0700)]
Merge from gnulib.
Paul Eggert [Mon, 21 Mar 2011 16:22:16 +0000 (09:22 -0700)]
Add Bug#.
Leo Liu [Mon, 21 Mar 2011 15:26:05 +0000 (23:26 +0800)]
Remove leftover (require 'wid-edit)
Leo Liu [Mon, 21 Mar 2011 14:55:00 +0000 (22:55 +0800)]
Default read-file-name-function to a non-nil value
See discussion thread:
http://thread.gmane.org/gmane.emacs.devel/134000
Paul Eggert [Mon, 21 Mar 2011 07:46:53 +0000 (00:46 -0700)]
update-game-score: fix bug with -r
* update-game-score.c (main): Don't set 'scores' to garbage when
-r is specified and scorecount != MAX_SCORES. This bug was
introduced in the 2002-04-10 change, and was found with gcc
-Wstrict-overflow (GCC 4.5.2, x86-64).
Glenn Morris [Mon, 21 Mar 2011 06:42:23 +0000 (23:42 -0700)]
* eshell/esh-opt.el (eshell-eval-using-options, eshell-process-args): Doc fixes.
Paul Eggert [Mon, 21 Mar 2011 05:50:24 +0000 (22:50 -0700)]
Add Bug#.
Paul Eggert [Mon, 21 Mar 2011 05:34:48 +0000 (22:34 -0700)]
Merge from trunk and from gnulib stdio.
Paul Eggert [Mon, 21 Mar 2011 05:06:47 +0000 (22:06 -0700)]
Autogenerate.
Paul Eggert [Mon, 21 Mar 2011 05:05:49 +0000 (22:05 -0700)]
* .bzrignore: Add lib/stdio.h.
Paul Eggert [Mon, 21 Mar 2011 05:04:41 +0000 (22:04 -0700)]
[ChangeLog]
fakemail: Remove dependency on ignore-value.
* Makefile.in (GNULIB_MODULES): Add stdio.
* lib/stdio.in.h, m4/stdio_h.m4: New files, automatically
imported from gnulib.
[lib-src/ChangeLog]
fakemail: Remove dependency on ignore-value.
This undoes some of the recent fakemail-related changes.
It is made possible due to recent changes to gnulib's stdio module.
* Makefile.in (fakemail${EXEEXT}): Do not depend on ignore-value.h.
* fakemail.c: Do not include ignore-value.h.
(put_line): Do not use ignore_value.
Chong Yidong [Mon, 21 Mar 2011 04:30:55 +0000 (00:30 -0400)]
Several fixes to cus-theme.el.
* lisp/cus-theme.el: Add missing provide statement.
(customize-create-theme): Extract theme value correctly.
(custom-theme-visit-theme): Autoload.
(customize-create-theme): Prompt before inserting default faces.
Paul Eggert [Mon, 21 Mar 2011 02:40:27 +0000 (19:40 -0700)]
* fileio.c (Fcopy_file): Report error if fchown or fchmod fail.
Glenn Morris [Mon, 21 Mar 2011 00:28:18 +0000 (17:28 -0700)]
Fix typo in a README.
Glenn Morris [Mon, 21 Mar 2011 00:20:24 +0000 (17:20 -0700)]
Fix date of merged entry.
Glenn Morris [Mon, 21 Mar 2011 00:08:01 +0000 (17:08 -0700)]
* autogen/update_autogen: Make bzr commit respect -q option.
Glenn Morris [Mon, 21 Mar 2011 00:03:58 +0000 (20:03 -0400)]
Auto-commit of generated files.
Glenn Morris [Sun, 20 Mar 2011 23:58:23 +0000 (16:58 -0700)]
(Re)move autotools generated files from the repository.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00225.html
* autogen/: New directory, to be excluded from releases.
* autogen/copy_autogen, autogen/update_autogen: New scripts.
* autogen/README: New file.
* autogen/aclocal.m4, autogen/config.in, autogen/configure:
* autogen/Makefile.in: Add auto-updated generated files.
* autogen.sh: No longer a no-op, now it tests for autotools
and runs them as necessary.
* configure.in: Defaule maintainer-mode to on.
* aclocal.m4, configure, lib/Makefile.in: Remove files.
* src/config.in: Remove file.
* INSTALL.BZR, admin/make-tarball.txt: Update instructions.
Paul Eggert [Sun, 20 Mar 2011 23:56:23 +0000 (16:56 -0700)]
Add Bug#.
Paul Eggert [Sun, 20 Mar 2011 21:03:44 +0000 (14:03 -0700)]
* emacs.c (Fdaemon_initialized): Do not ignore I/O errors.
Jay Belanger [Sun, 20 Mar 2011 20:59:29 +0000 (15:59 -0500)]
* calc/calc-menu.el (calc-units-menu): Add entries for logarithmic
units and musical notes.
Paul Eggert [Sun, 20 Mar 2011 16:55:33 +0000 (09:55 -0700)]
Merge: Use socklen_t, not int, for socket lengths.
Paul Eggert [Sun, 20 Mar 2011 16:28:22 +0000 (09:28 -0700)]
Merge from gnulib, for socklen_t.
Juanma Barranquero [Sun, 20 Mar 2011 13:57:22 +0000 (14:57 +0100)]
src/minibuf.c: Fix previous change.
* minibuf.c (Vcompleting_read_function): Don't declare, global variables
are now in src/globals.h.
(syms_of_minibuf): Remove spurious & from previous change.
Leo Liu [Sun, 20 Mar 2011 10:35:27 +0000 (18:35 +0800)]
New variable completing-read-function to customize completing-read
Christian Ohler [Sun, 20 Mar 2011 10:17:10 +0000 (21:17 +1100)]
* emacs-lisp/ert.el (ert-run-tests-batch): Remove unused variable.
(ert-delete-all-tests): Use `called-interactively-p' rather than
`interactive-p'.
(ert--make-xrefs-region): Respect END.
Paul Eggert [Sun, 20 Mar 2011 05:15:59 +0000 (22:15 -0700)]
Add Bug#8298.
Paul Eggert [Sun, 20 Mar 2011 03:07:54 +0000 (20:07 -0700)]
* process.c (create_process): Use 'volatile' to avoid vfork clobbering.
Paul Eggert [Sun, 20 Mar 2011 02:48:50 +0000 (19:48 -0700)]
* process.c (FIRST_PROC_DESC, IF_NON_BLOCKING_CONNECT): Remove unused macros.
Paul Eggert [Sun, 20 Mar 2011 02:45:19 +0000 (19:45 -0700)]
* process.c (process_send_signal): Add cast to avoid pointer signedness problem.
Paul Eggert [Sun, 20 Mar 2011 02:42:34 +0000 (19:42 -0700)]
* process.c (Fnetwork_interface_info): Fix pointer signedness.
Paul Eggert [Sun, 20 Mar 2011 02:41:23 +0000 (19:41 -0700)]
* process.c (Fmake_network_process): Define label "retry_connect" only if needed.
Paul Eggert [Sun, 20 Mar 2011 02:40:14 +0000 (19:40 -0700)]
* process.c: Rename or move locals to avoid shadowing.
(list_processes_1, Fmake_network_process):
(read_process_output_error_handler, exec_sentinel_error_handler):
Rename or move locals.
Paul Eggert [Sat, 19 Mar 2011 22:46:50 +0000 (15:46 -0700)]
Make tparam.h and terminfo.c consistent.
* cm.c (tputs, tgoto, BC, UP): Remove extern decls. Include
tparam.h instead, since it declares them.
* cm.h (PC): Remove extern decl; tparam.h now does this.
* deps.mk (cm.o, terminfo.o): Depend on tparam.h.
* terminfo.c: Include tparam.h, to check interfaces.
(tparm): Make 1st arg a const pointer in decl. Put it at top level.
(tparam): Adjust signature to match interface in tparam.h;
this removes some undefined behavior. Check that outstring and len
are zero, which they always are with Emacs.
* tparam.h (PC, BC, UP): New extern decls.
Chong Yidong [Sat, 19 Mar 2011 22:07:41 +0000 (18:07 -0400)]
Add error for dired-create-directory on existing file (Bug#8246).
* lisp/dired-aux.el (dired-create-directory): Signal an error if the
directory already exists.
Chong Yidong [Sat, 19 Mar 2011 21:37:21 +0000 (17:37 -0400)]
Fix facemenu to populate buffer inside the with-help-window call.
See http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg01193.html
* facemenu.el (list-colors-display): Call list-faces-display from
inside with-help-window.
(list-colors-print): Use display property to align the final
column, instead of checking window-width.
Chong Yidong [Sat, 19 Mar 2011 18:49:31 +0000 (14:49 -0400)]
Merge changes from emacs-23 branch
Chong Yidong [Sat, 19 Mar 2011 18:27:55 +0000 (14:27 -0400)]
Fix tar package handling, and clean up package-subdirectory-regexp usage.
* lisp/startup.el (package-subdirectory-regexp): Move from package.el.
Omit \\` and \\', and let callers add them.
* lisp/emacs-lisp/package.el (package-strip-version)
(package-load-all-descriptors): Add \\` and \\' to
package-subdirectory-regexp before using it.
(package-untar-buffer): New arg DIR; ensure that file untars only
into this expected directory. Remove superfluous delete-region.
(package-unpack): Caller changed.
(package-tar-file-info): Use package-subdirectory-regexp.
Chong Yidong [Sat, 19 Mar 2011 16:42:53 +0000 (12:42 -0400)]
Backport fix for Bug#8219 from trunk.
* buffer.h (BUF_BEGV, BUF_BEGV_BYTE, BUF_ZV, BUF_ZV_BYTE, BUF_PT)
(BUF_PT_BYTE): Rewrite to handle indirect buffers (Bug#8219).
These macros can no longer be used for assignment.
* buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Assign
struct members directly, instead of using BUF_BEGV etc.
(record_buffer_markers, fetch_buffer_markers): New functions for
recording and fetching special buffer markers.
(set_buffer_internal_1, set_buffer_temp): Use them.
* lread.c (unreadchar): Use SET_BUF_PT_BOTH.
* insdel.c (adjust_point): Use SET_BUF_PT_BOTH.
* intervals.c (temp_set_point_both): Use SET_BUF_PT_BOTH.
(get_local_map): Use SET_BUF_BEGV_BOTH and SET_BUF_ZV_BOTH.
* xdisp.c (hscroll_window_tree):
(reconsider_clip_changes): Use PT instead of BUF_PT.
Eli Zaretskii [Sat, 19 Mar 2011 09:30:56 +0000 (11:30 +0200)]
Fix emerge.el on MS-Windows and MS-DOS.
lisp/emerge.el (emerge-metachars): Separate value for ms-dos and
windows-nt systems.
(emerge-protect-metachars): Quote correctly for ms-dos and
windows-nt systems.
Paul Eggert [Sat, 19 Mar 2011 05:07:42 +0000 (22:07 -0700)]
* xftfont.c (xftfont_open): Rename locals to avoid shadowing.
Paul Eggert [Sat, 19 Mar 2011 05:05:19 +0000 (22:05 -0700)]
* xftfont.c (xftfont_shape): Now static, and defined only if needed.
Paul Eggert [Sat, 19 Mar 2011 05:03:30 +0000 (22:03 -0700)]
* ftfont.c: (get_adstyle_property, ftfont_pattern_entity):
(ftfont_lookup_cache, ftfont_open, ftfont_anchor_point):
Rename locals to avoid shadowing.
Paul Eggert [Sat, 19 Mar 2011 04:57:02 +0000 (21:57 -0700)]
* ftfont.c (ftfont_list): Remove unused local.
Paul Eggert [Sat, 19 Mar 2011 04:56:15 +0000 (21:56 -0700)]
* ftfont.c (ftfont_otf_capability, ftfont_shape): Omit decls if not needed.
(OTF_TAG_SYM): Omit macro if not needed.
Juanma Barranquero [Sat, 19 Mar 2011 03:58:45 +0000 (04:58 +0100)]
Fix typos.
Juanma Barranquero [Sat, 19 Mar 2011 03:22:14 +0000 (04:22 +0100)]
src/makefile.w32-in: Update dependencies.
Paul Eggert [Sat, 19 Mar 2011 02:49:10 +0000 (19:49 -0700)]
* ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.
Paul Eggert [Sat, 19 Mar 2011 02:45:11 +0000 (19:45 -0700)]
* xfont.c (xfont_list_family): Mark var as initialized.
Paul Eggert [Sat, 19 Mar 2011 02:43:47 +0000 (19:43 -0700)]
* xml.c (make_dom): Now static.
Paul Eggert [Sat, 19 Mar 2011 02:42:49 +0000 (19:42 -0700)]
Add Bug#.
Paul Eggert [Sat, 19 Mar 2011 01:02:49 +0000 (18:02 -0700)]
* composite.c (find_automatic_composition): Mark vars as initialized, with a FIXME.
Paul Eggert [Sat, 19 Mar 2011 00:58:10 +0000 (17:58 -0700)]
* composite.c (composition_update_it): Mark var as initialized.
Julien Danjou [Sat, 19 Mar 2011 00:48:04 +0000 (00:48 +0000)]
gnus-util.el (gnus-buffer-live-p): Simplify gnus-buffer-live-p.
(gnus-buffer-live-p): Check that buffer is not nil.
Paul Eggert [Sat, 19 Mar 2011 00:18:31 +0000 (17:18 -0700)]
* composite.c (composition_reseat_it): Remove unused locals.
(find_automatic_composition, composition_adjust_point): Likewise.
Paul Eggert [Sat, 19 Mar 2011 00:16:45 +0000 (17:16 -0700)]
* composite.c (composition_compute_stop_pos): Rename local to
avoid shadowing.
Paul Eggert [Sat, 19 Mar 2011 00:12:53 +0000 (17:12 -0700)]
character.h: Rename locals to avoid shadowing.
* character.h (PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE):
(FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE, FETCH_CHAR_ADVANCE):
(FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, BUF_INC_POS):
(BUF_DEC_POS): Be more systematic about renaming local temporaries
to avoid shadowing.