GitLab

* objects.texi (Symbol Type):
* text.texi (Near Point):
* help.texi (Help Functions):
* functions.texi (Mapping Functions): Use string instead of
char-to-string in examples.

* nonascii.texi (Converting Representations): Document
byte-to-string.

* strings.texi (Creating Strings): Don't mention semi-obsolete
function char-to-string.
(String Conversion): Shorten discussion of semi-obsolete function
string-to-char.  Link to Converting Representations.

* progmodes/python.el: Add Ipython support (Bug#5390).
(python-shell-prompt-alist)
(python-shell-continuation-prompt-alist): New options.
(python--set-prompt-regexp): New function.
(inferior-python-mode, run-python, python-shell): Require
ansi-color.  Use python--set-prompt-regexp to set the comint
prompt based on the Python interpreter.
(python--prompt-regexp): New var.
(python-check-comint-prompt)
(python-comint-output-filter-function): Use it.
(run-python): Use a pipe (Bug#5694).

* progmodes/python.el (run-python): Doc fix.
(python-keep-current-directory-in-path): New var (Bug#7454).

Suggested by Štěpán Němec.

* maintaining.texi (Version Control): Say "commit", not "check in".
(Version Control Systems): Simplify descriptions.
(VCS Merging, VCS Changesets, VCS Repositories): New nodes, split from
VCS Concepts.
(VC Mode Line): Update example.
(Old Revisions): Document revert-buffer for vc-diff.
(Log Buffer): Promote to a subsection.  Document header lines.

* emacs.texi (Top): Update node listing.

* lpr.el (lpr-buffer, print-buffer, lpr-region, print-region):
Prompt user before actually printing.

* doc/emacs/macos.texi (Mac / GNUstep Basics): Document
ns-right-alternate-modifier.

* doc/lispref/numbers.texi (Float Basics): Document float-e and float-pi.

* doc/lispref/symbols.texi (Creating Symbols): Using unintern without an
obarray arg is now obsolete.

* doc/lispref/text.texi (Kill Functions, Kill Functions)
(Low-Level Kill Ring, Low-Level Kill Ring): Remove obsolete
YANK-HANDLER args.

* doc/lispref/variables.texi (Defining Variables): Change "pi" example to
"float-pi".

NOTE: When merging to trunk: xg_height_changed is xg_height_or_width_changed
      in trunk.

* src/gtkutil.c (menubar_map_cb): New function.
(xg_update_frame_menubar): Connect signal map to menubar_map_cb.
Use 23 as menubar height if 0. (Bug#7425).

* simple.el (kill-new, kill-append, kill-region):
* comint.el (comint-kill-region): Make the yank-handler argument obsolete.

that are both openers (resp. closers) and something else.
(smie-grammar): Loosen definition of valid values.
(smie-next-sexp, smie-down-list, smie-blink-matching-open)
(smie-indent--parent, smie-rule-parent, smie-indent-keyword)
(smie-indent-after-keyword): Adjust users.
(smie-indent-keyword): Don't indent empty lines.

Suggested by Norman Gray <norman@astro.gla.ac.uk>.
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Use it.

* lisp/emacs-lisp/autoload.el (autoload-find-destination): The
function coding-system-eol-type may return non-numeric values.

Forgot to save ChangeLog for previous change.

* configure.in (HAVE_GCONF): Check for g_type_init if GConf is found.

* src/config.in (HAVE_G_TYPE_INIT): New symbol.

* src/xsettings.c (init_gconf): Check HAVE_G_TYPE_INIT.

* lisp/textmodes/picture.el (picture-mouse-set-point): Don't use
posn-col-row; explicitly compute the motion based on the posn at
the window-start (Bug#7390).

Fix alloca definition when using gcc on non-gnu systems.
* configure.in: Use the code sequence indicated by "info autoconf"
for alloca (bug#6170).

using "base64 -d -i".  This is needed for older base64 versions
from GNU coreutils.  Reported by Klaus Reichl
<Klaus.Reichl@thalesgroup.com>.

This must not be merged with the trunk.

 src/lread.c (Fload): Mention `load-in-progress' and `load-file-name'.
 doc/lispref/loading.texi (How Programs Do Loading): Document `load-file-name'.

* lisp/calendar/calendar.el (diary-iso-date-forms): Make elements
mutually exclusive.

when filling the remaining "unconstrained" values.

* lisp/emacs-lisp/bytecomp.el (byte-compile-warnings): Simplify the
safety predicate.

Use smie-indent-virtual when indenting relative to an opener.
(smie-rule-separator): Use smie-rule-parent.
(smie-indent-keyword): Consult rules, even for openers at bol.
(smie-indent-comment-close): Try to align closer's content.

* lisp/ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.