merge trunk
merge trunk
merge trunk
merge trunk
merge trunk
ChangeLog fix (no need to merge to trunk)
Fix landmark, broken since Emacs 23.1

* play/landmark.el (landmark-move-down, landmark-move-up):
Fix 2007-10-20 change - preserve horizontal position.
* landmark.el: Commentary fixes.
* net/tramp-adb.el (tramp-adb-handle-process-file):
* net/tramp-sh.el (tramp-sh-handle-process-file):
* net/tramp-smb.el (tramp-smb-handle-process-file): Do not raise
the output buffer when DISPLAY is non-nil.
More tweaks of skeleton documentation wrt \n behavior at bol/eol.

 lisp/skeleton.el (skeleton-insert): Yet another fix of the doc string
 wrt behavior of \n as the first/last element of a skeleton.

 doc/misc/autotype.texi (Skeleton Language): Document the \n feature
 better.
* html2text.el (html2text-get-attr): Rewrite to handle spaces in quoted
attribute values.  (Bug#17834)
"the the", "from from" and "and and".
Simplify and cleanup character conversion stuff.
* lisp.h (multibyte_char_to_unibyte, multibyte_char_to_unibyte_safe):
Remove prototypes.
* character.c (multibyte_char_to_unibyte)
(multibyte_char_to_unibyte_safe): Remove; no longer used.
* character.h (make_char): Remove; unused.
(CHAR_TO_BYTE8, CHAR_TO_BYTE_SAFE): Simplify.
(ASCII_BYTE_P): Remove; ASCII_CHAR_P does the same thing.
* buffer.c, charset.c, charset.h, cmds.c, coding.c, editfns.c:
* fileio.c, indent.c, insdel.c, keyboard.c, lread.c, print.c:
* search.c, term.c, xdisp.c, xterm.c: Related users changed.
* calculator.el (calculator-standard-displayer): Fix bug in use of
`calculator-groupize-number'.
(calculator-funcall): Fix broken `cl-flet' use by moving it into the
`eval' code, so it works in v24.3.1 too.
(calculator-last-input): Comment to clarify purpose.

Also add back a ChangeLog blurb for previous commit 117340.
Disable implicit texi rules in doc/

* doc/emacs/Makefile.in (%.texi):
* doc/lispintro/Makefile.in (%.texi):
* doc/lispref/Makefile.in (%.texi):
* doc/misc/Makefile.in (%.texi):
Disable implicit rules.
Misc small doc/ Makefile cleanup

* emacs/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with pattern rule.
(${buildinfodir}): New rule.
($(buildinfodir)/emacs.info): Use order-only prereq for output dir.  Use $<.
(emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf): Use $<.
(%.ps): New rule.

* lispintro/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with explicit rule.
(${buildinfodir}): New rule.
(${buildinfodir}/eintr.info): Use order-only prereq for output dir.  Use $<.
(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.
(emacs-lisp-intro.ps): New rule.

* lispref/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with explicit rule.
(html): Declare as PHONY.
(${buildinfodir}): New rule.
($(buildinfodir)/elisp.info): Use order-only prereq for output dir.  Use $<.
(elisp.dvi, elisp.html, elisp.pdf): Use $<.
(elisp.ps): New rule.
* doc/misc/dired-x.texi (Omitting Files in Dired, Omitting Variables): Fix
key binding to dired-omit-mode.
Update various character- and script-related databases per Unicode 7.0.

 lisp/international/fontset.el (script-representative-chars): Add
 representative characters for scripts added in Unicode 7.0.
 (otf-script-alist): Synchronize with the latest registry of OTF
 script tags.
 lisp/international/characters.el (char-script-table): Update for
 scripts added and codepoint ranges changed in Unicode 7.0.
* lisp/simple.el (handle-shift-selection, exchange-point-and-mark)
(activate-mark): Set transient-mark-mode buffer-locally.
(transient-mark-mode): Use&set the global value.
* lisp/mouse.el (mouse-set-region-1, mouse-drag-track): Idem.
* lisp/org/org-compat.el (activate-mark): Idem.
* lisp/emulation/edt.el (edt-emulation-off): Save&restore the global
transient-mark-mode setting.
* lisp/obsolete/pc-select.el (pc-selection-mode): Use the
transient-mark-mode function.
Optionally, undo several consequential deletion in one step.

* lisp/simple.el (kill-append): Remove undo boundary depending on ...
(kill-append-merge-undo): New user option.