lisp/ChangeLog: Fix last log entry.

Fix and document display of glyphless characters.

 src/xdisp.c (set_cursor_from_row): Fix cursor positioning on
 zero-width characters.
 (syms_of_xdisp) <glyphless-char-display>: Doc fix.
 src/.gdbinit (pgx): Adapt to latest changes in `struct glyph'.
 src/w32term.c (x_draw_glyphless_glyph_string_foreground): Draw the
 box before drawing the glyphs inside it.
 src/dispextern.h (enum glyphless_display_method): Rename
 GLYPHLESS_DISPLAY_HEXA_CODE to GLYPHLESS_DISPLAY_HEX_CODE.  All
 users changed.
 src/term.c (append_glyphless_glyph, produce_glyphless_glyph): Fix
 comments.
 (produce_glyphless_glyph): Enclose "U+nnnn" and "empty box"
 whitespace in "[]", to simulate a box.  Don't use uninitialized
 variable `width'.
 lisp/international/characters.el (glyphless-char-display-control):
 Renamed from glyphless-char-control; all users changed.  Doc fix.
 Signal an error if display method is not one of the recognized
 symbols.
 doc/emacs/rmail.texi (Rmail Coding): Characters with no fonts are not
 necessarily displayed as empty boxes.
 doc/emacs/mule.texi (Language Environments, Fontsets): Characters with no
 fonts are not necessarily displayed as empty boxes.
 doc/emacs/display.texi (Text Display): Document display of glyphless
 characters.
 doc/lispref/display.texi (Usual Display): Characters with no fonts are not
 necessarily displayed as empty boxes.
 etc/NEWS: Document display of glyphless characters.

* net/tramp-compat.el (tramp-compat-line-beginning-position)
(tramp-compat-line-end-position): Remove them.

* net/tramp.el (tramp-parse-rhosts-group)
(tramp-parse-shosts-group, tramp-parse-sconfig-group)
(tramp-parse-hosts-group, tramp-parse-passwd-group)
(tramp-parse-netrc-group, tramp-parse-putty-group)
* net/tramp-cmds.el (tramp-append-tramp-buffers)
* net/tramp-sh.el (tramp-do-file-attributes-with-ls)
(tramp-sh-handle-file-selinux-context)
(tramp-sh-handle-file-name-all-completions)
(tramp-sh-handle-insert-directory)
(tramp-sh-handle-expand-file-name, tramp-find-executable)
(tramp-wait-for-output, tramp-send-command-and-read)
* net/tramp-smb.el (tramp-smb-read-file-entry)
(tramp-smb-get-cifs-capabilities): Use `point-at-eol'.

* net/tramp-sh.el (tramp-sh-handle-insert-directory) Use
`point-at-bol'.
(tramp-remote-coding-commands): Add an alternative using "base64
-d -i".  This is needed for older base64 versions from GNU
coreutils.  Reported by Klaus Reichl
<Klaus.Reichl@thalesgroup.com>.

Document count-words-region.

* doc/emacs/basic.texi (Position Info): Add M-x count-words-region.

* doc/lispintro/emacs-lisp-intro.texi: Rename the `count-words-region' example,
since there is now a standard command of that name.

* etc/NEWS: Mention it.

* lisp/simple.el (count-words-region): New function.

From: http://lists.gnu.org/archive/html/emacs-devel/2006-09/msg01029.html

ChangeLog whitespace.

Standardize some file headers.

ChangeLog fixes.

Remove autoload for org-capture-templates

* lisp/shell.el (shell-dir-cookie-re): New custom variable.
(shell-dir-cookie-watcher): New function.

* lisp/vc/vc.el (vc-deduce-backend): Use default-directory in shell-mode
and compilation-mode.

Fixes: debbugs:7350

* lisp/vc/smerge-mode.el (smerge-refine): Choose better default part to
highlight when one of them is empty.

* lisp/skeleton.el (skeleton-newline): New function.
(skeleton-internal-1): Use it.
(skeleton-read): Don't use `newline' since it may strip trailing space.

* lisp/simple.el (open-line): `newline' may strip trailing space.

* lisp/international/mule-cmds.el (princ-list): Use mapc.

Apply XAtom revork patches from Julien Danjou.

* xsettings.c (init_xsettings): Use already fetch atoms.

* xsmfns.c (create_client_leader_window): Use SM_CLIENT_ID atom
from dpyinfo.

* xselect.c (Fx_send_client_event): Split and create
x_send_client_event.

* lisp.h: Do not EXFUN Fx_send_client_event.

* xterm.c (x_set_frame_alpha): Use _NET_WM_WINDOW_OPACITY atom
from dpyinfo.
(wm_supports): Use atoms from dpyinfo.
(do_ewmh_fullscreen): Use atoms from dpyinfo.
(x_ewmh_activate_frame): Use atoms from dpyinfo.
(xembed_set_info): Use atoms from dpyinfo.
(x_term_init): Fetch _XEMBED_INFO, _NET_SUPPORTED,
_NET_SUPPORTING_WM_CHECK, _NET_WM_WINDOW_OPACITY and
_NET_ACTIVE_WINDOW, XSETTINGS  atoms.
Get all atoms in one round-trip.
(set_wm_state): Use x_send_client_event rather than
Fx_send_client_event, using Atom directly.
(x_ewmh_activate_frame): Ditto.
(x_set_sticky): Pass atoms to set_wm_state.
(do_ewmh_fullscreen): Ditto.

* xterm.h (x_display_info): Add Xatom_net_supported,
Xatom_net_supporting_wm_check, Xatom_net_active_window,
Xatom_net_wm_window_opacity, Xatom_XEMBED_INFO, SM_CLIENT_ID.

* xfns.c (Fx_show_tip): Fix typo in docstring.

xfns.c (Fx_show_tip): Fix typo in docstring.

Fix last change.

gnus-art.el (article-treat-non-ascii): Keep text properties.
gnus.texi (Article Washing): Fix typo.

Fix ob-lisp.el expectation that slime would be available

Install org-mode version 7.3

* lisp/cedet/semantic/wisent/comp.el: Remove unnecessary eval-when-compiles.

bytecomp trivia.

* lisp/emacs-lisp/bytecomp.el (byte-compile-log-buffer): New constant.
Use it to replace all instances of "*Compile-Log*"

smime.el (smime-decrypt-region): Doc fix.

* lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Add debug and
indentation specs.

Make mm-dissect-buffer pass sender's mail address to smime-decrypt-region.

mm-decode.el (mm-dissect-buffer): Pass sender's mail address to smime-decrypt-region using function argument.
mm-decode.el (mm-possibly-verify-or-decrypt, mm-dissect-multipart): Relay it.
mm-view.el (mm-view-pkcs7, mm-view-pkcs7-decrypt): Relay it.
smime.el (smime-decrypt-region): Catch it.

* lisp/gnus/smime.el (smime-mode): Use define-derived-mode.
(smime-mode-map): Move initialization into declaration.
(gnus-run-mode-hooks): Don't autoload.

* src/cmds.c (Fself_insert_command): Don't call XFASTINT without checking
it's not negative.

* lisp/progmodes/modula2.el: Use SMIE and skeleton.
(m2-mode-syntax-table): (*..*) can be nested.
Add //...\n.  Fix paren syntax.
(m2-mode-map): Remove LF and TAB bindings.
(m2-indent): Add safety property.
(m2-smie-grammar): New var.
(m2-smie-refine-colon, m2-smie-refine-of, m2-smie-backward-token)
(m2-smie-forward-token, m2-smie-refine-semi, m2-smie-rules): New funs.
(m2-mode): Use define-derived-mode.
(m2-newline, m2-tab): Remove.
(m2-begin, m2-case, m2-definition, m2-else, m2-for, m2-header)
(m2-if, m2-loop, m2-module, m2-or, m2-procedure, m2-with, m2-record)
(m2-stdio, m2-type, m2-until, m2-var, m2-while, m2-export)
(m2-import): Use define-skeleton.
* test/indent/modula2.mod: New file.

* doc/misc/msdog.texi (ls in Lisp): Update for ls-lisp.el changes.

ls-lisp: get rid of the dreaded "no effect until you restart Emacs".

* lisp/ls-lisp.el (ls-lisp-set-options): New function.
(ls-lisp-emulation): Use ls-lisp-set-options for custom :set.  Doc fix.

esh-opt comments.

mailheader.el comments.

Regenerate tpu-edt autoloads.

* lisp/gnus/smime.el (from): Restrict declaration to XEmacs.

* lisp/gnus/nnir.el (gnus-group-topic-name): Autoload.

shr.el (shr-insert): Fix last change.

Minor ls-lisp changes.
* lisp/ls-lisp.el (ls-lisp-ignore-case, ls-lisp-dirs-first)
(ls-lisp-verbosity): Add custom :set-after property.
(ls-lisp-verbosity, ls-lisp-use-localized-time-format): Doc fixes.
(ls-lisp-format, ls-lisp-format-time): Don't take `now' as an argument.
(ls-lisp-insert-directory): Update caller.

Remove odd code from kandmark, gomoku.
* lisp/play/landmark.el (lm-prompt-for-move):
* lisp/play/gomoku.el (gomoku-prompt-for-move): Remove nonsensical code.

* lisp/obsolete/lucid.el: Don't warn about any CL functions in this file.

Silence idlw*.el compilation.

* lisp/progmodes/idlw-complete-structtag.el: Remove unused dec `name'.

* lisp/progmodes/idlwave.el (idlwave-routine-entry-compare-twins)
(idlwave-study-twins): Prefix dynamic local variable `name'.
(idlwave-routine-twin-compare): Update for above change.

* lisp/progmodes/idlw-help.el (idlwave-do-mouse-completion-help):
Prefix dynamic local variables `name', `kwd', and `link'.
* lisp/progmodes/idlw-shell.el (idlwave-shell-complete-execcomm-help):
* lisp/progmodes/idlw-complete-structtag.el
(idlwave-complete-structure-tag-help):
* lisp/progmodes/idlwave.el (idlwave-complete-sysvar-help)
(idlwave-complete-sysvar-tag-help)
(idlwave-complete-class-structure-tag-help):
Update for above name changes.

shr.el (shr-insert): Don't break long line if it is because of kinsoku-bol characters in the line end.

* lisp/erc/erc-lang.el (erc-cmd-LANG): Fix what may have been a typo.

lisp/gnus/ChangeLog: Cosmetic fix.

nnir.el (nnir-request-move-article): fix to provide original group and subject.
nnir.el (nnir-warp-to-article): don't fail on articles whose headers haven't been retrieved.
gnus-sum.el (gnus-summary-move-article): use original group and subject for virtual articles such as those in an nnir summary buffer.

gnus-art.el (article-treat-non-ascii): Make it work for XEmacs (at least 21.5).
smime.el (from): Declare it again for XEmacs.

lisp/gnus/ChangeLog (2010-11-10): Fix wording.

nnimap.el (nnimap-update-info): Fix problem with `g' chopping of low-numbered articles.
message.el (message-resend): Don't disable encoding unless it's already encoded.

* net/browse-url.el (browse-url-browser-function): Change the
default to use `browse-url-mail' on mailto: URLs.

Minor fix to package-archive-contents recalculation.

lisp/emacs-lisp/package.el (package-read-all-archive-contents): Reset
package-archive-contents to nil before re-reading.

lisp/Changelog: Fix 2010-11-10T10:54:43Z!agustin.martin@hispalinux.es entry to use correct format with real submitter.

flyspell.el (flyspell-word): Do not re-check known misspellings.

Avoid re-checking words already found as misspellings by
(flyspell-large-region), just do highlighting.

Patch by Brandon Craig Rhodes (bug#7322)

Fix syntax error in previous commit.

Add const to array elements of font filter properties.

* font.c (font_filter_properties): Add const to array elements of properties args.
* font.h (font_filter_properties): Likewise.
* ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array elements.
* w32font.c (w32font_booleans, w32font_non_booleans): Likewise.

* dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
(XD_BASIC_DBUS_TYPE, xd_symbol_to_dbus_type, xd_signature)
(xd_append_arg, xd_retrieve_arg): Support DBUS_TYPE_UNIX_FD.
(Fdbus_call_method): Add DBUS_TYPE_UNIX_FD type mapping to doc string.
(syms_of_dbusbind): Initialize QCdbus_type_unix_fd).

* dbus.texi (Type Conversion): Introduce `:unix-fd' type mapping.

* lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change.

* lisp/textmodes/texnfo-upd.el (texinfo-pointer-name): Fix typo.

rfc2047.el (rfc2047-syntax-table): Simplify.

gnus-art.el (article-treat-non-ascii): Use put-char-table instead of set-char-table-range for XEmacs.

Minor edt.el simplification.

* lisp/emulation/edt.el (edt-with-position): New macro.
(edt-find-forward, edt-find-backward, edt-find-next-forward)
(edt-find-next-backward, edt-sentence-forward, edt-sentence-backward)
(edt-paragraph-forward, edt-paragraph-backward): Use it.

tpu-extras.el simplifiation.

* lisp/emulation/tpu-extras.el (tpu-with-position): New macro.
(tpu-paragraph, tpu-page, tpu-search-internal): Use it.

Use line-beginning-position in some texinfo.el files.

* lisp/textmodes/texnfo-upd.el (texinfo-all-menus-update)
(texinfo-menu-copy-old-description, texinfo-start-menu-description)
(texinfo-master-menu, texinfo-insert-node-lines)
(texinfo-multiple-files-update):
* lisp/textmodes/texinfmt.el (texinfo-append-refill, texinfo-copying):
Use line-beginning-position.

Silence skeleton.el compilation.

* lisp/skeleton.el (skeleton-internal-list, skeleton-internal-1):
Prefix dynamic local variable `skeleton'.

Remove ls-lisp time-related functions that duplicate standard functions.

* lisp/ls-lisp.el (ls-lisp-time-lessp, ls-lisp-time-to-seconds): Remove.
(ls-lisp-handle-switches): Use time-less-p.
(ls-lisp-format-time): Use float-time.

system-type related trivia.

* lisp/cedet/semantic/bovine/c.el: Test system-type with memq.

* lisp/progmodes/cperl-mode.el (cperl-find-pods-heres, cperl-write-tags):
No recent Emacs supports system-type `emx'.

* lisp/progmodes/ada-xref.el (is-windows): Rename to ada-on-ms-windows.
(ada-command-separator, ada-default-prj-properties)
(ada-find-any-references): Update for above name change.

* lisp/dirtrack.el (dirtrack-directory-function)
(dirtrack-canonicalize-function):
* lisp/filecache.el (file-cache-completion-ignore-case)
(file-cache-case-fold-search, file-cache-ignore-case):
* lisp/term.el (serial-port-is-file-p): Cosmetic change.

* lisp/emulation/viper-init.el (viper-ms-style-os-p): Doc fix.
Remove non-existent `windows-95' system-type.
* lisp/dired.el (dired-chown-program): Remove non-existent `linux'
system-type.

* lisp/locate.el: Comment.

net-utils system-type trivia.

* lisp/net/net-utils.el (net-utils-remove-ctl-m): Use memq for system-types.
(ping-program-options): Remove non-existent `linux' system-type.

* lisp/startup.el (package-initialize): Update declaration.

* lisp/gnus/smime.el (from): Remove unused declaration.

time-to-seconds related simplifications.

* lisp/gnus/gnus-util.el (with-no-warnings): Remove compat stub, now unused.
(gnus-float-time): On Emacs, always an alias.

* lisp/gnus/ecomplete.el (with-no-warnings): Remove compat stub, now unused.
(ecomplete-add-item): Use float-time on Emacs, else gnus-float-time.

* lisp/textmodes/remember.el (remember-time-to-seconds): Remove.
(remember-store-in-mailbox): Use float-time.

* lisp/calendar/timeclock.el (timeclock-time-to-seconds): Make it an alias.

* lisp/calendar/time-date.el (time-to-seconds): Always an alias on Emacs,
never a real function.
(with-no-warnings): Remove compat stub, now unused.
(time-less-p): Doc fix.
(time-to-number-of-days): Simplify.

Replace some eshell functions that duplicate standard functions.

* lisp/eshell/esh-util.el (eshell-time-less-p, eshell-time-to-seconds): Remove.
(eshell-read-passwd, eshell-read-hosts): Use time-less-p.
* lisp/eshell/esh-test.el (eshell-test, eshell-show-usage-metrics):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time, eshell/time):
* lisp/eshell/em-pred.el (eshell-pred-file-time): Use float-time.
* lisp/eshell/em-ls.el (eshell-ls-sort-entries): Use time-less-p.

Silence compilation of some shell files.

* lisp/eshell/em-unix.el (eshell-remove-entries, eshell/rm)
(eshell-shuffle-files, eshell-shorthand-tar-command)
(eshell-mvcpln-template, eshell/mv, eshell/cp, eshell/ln):
Prefix dynamic locals `interactive', `preview', `recursive', `verbose'.
* lisp/eshell/em-glob.el (eshell-extended-glob, eshell-glob-entries):
Prefix dynamic local variable `matches'.

* src/emacs.c (syms_of_emacs) <system-type>: Doc fix.

ChangeLog fix.

gnus-art.el (org-entities): Bind it.

net/browse-url.el (browse-url-mail): Insert body part of mailto url in mail buffer; make yank-action always a command that yanks original buffer.

Merge changes made in Gnus trunk.

message.el (message-mailto): New function.
message.el (message-mailto): Should accept other parameters.
message.el (message-mailto): Remove since it duplicates browse-url-mailto functionality.
shr.el (shr-browse-url): Call browse-url-mailto for mailto: links.
message.el (message-subject-trailing-was-ask-regexp): A ] in a [] regexp doesn't need quoting.
gnus-art.el (article-treat-non-ascii): New command and keystroke.
shr.el (browse-url-mailto): Autoload.
gnus.texi (Article Washing): Document gnus-article-treat-non-ascii.

Merge from emacs-23

xfns.c (x_real_positions): Fix declaration-after-statement problem.

message.el (message-subject-trailing-was-ask-regexp, message-subject-trailing-was-regexp): Match was: in addition to was.

* lisp/progmodes/meta-mode.el: (meta-indent-line): Simplify.

* lisp/progmodes/meta-mode.el: Remove leading `*' from defcustom docs.

* lisp/progmodes/tcl.el (tcl-hairy-scan-for-comment): Doc fix.

Replace still more end-of-line etc with line-end-position, etc.

* lisp/gnus/nnbabyl.el (nnbabyl-request-move-article, nnbabyl-delete-mail)
(nnbabyl-check-mbox): Use point-at-bol.

* lisp/cedet/semantic/lex.el (semantic-lex-ignore-comments, semantic-flex):
* lisp/cedet/semantic/grammar.el (semantic-grammar-epilogue):
* lisp/cedet/ede/speedbar.el (ede-find-nearest-file-line):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/ede/autoconf-edit.el (autoconf-delete-parameter):
Use point-at-bol and point-at-eol.

* lisp/vc/emerge.el (emerge-line-number-in-buf):
* lisp/textmodes/ispell.el (ispell-region):
* lisp/textmodes/fill.el (current-fill-column):
* lisp/progmodes/xscheme.el (xscheme-send-current-line):
* lisp/progmodes/vhdl-mode.el (vhdl-current-line, vhdl-line-copy):
* lisp/progmodes/tcl.el (tcl-hairy-scan-for-comment):
* lisp/progmodes/sh-script.el (sh-handle-prev-do):
* lisp/progmodes/meta-mode.el (meta-indent-line):
* lisp/progmodes/idlwave.el (idlwave-goto-comment, idlwave-fill-paragraph)
(idlwave-in-quote):
* lisp/progmodes/idlw-shell.el (idlwave-shell-current-frame)
(idlwave-shell-update-bp-overlays, idlwave-shell-sources-filter):
* lisp/progmodes/fortran.el (fortran-looking-at-if-then):
* lisp/progmodes/etags.el (find-tag-in-order, etags-snarf-tag):
* lisp/progmodes/cperl-mode.el (cperl-sniff-for-indent)
(cperl-find-pods-heres):
* lisp/progmodes/ada-mode.el (ada-get-current-indent, ada-narrow-to-defun):
* lisp/net/quickurl.el (quickurl-list-insert):
* lisp/net/ldap.el (ldap-search-internal):
* lisp/net/eudc.el (eudc-expand-inline):
* lisp/mail/sendmail.el (sendmail-send-it):
* lisp/mail/mspools.el (mspools-visit-spool, mspools-get-spool-name):
* lisp/emulation/viper-cmd.el (viper-paren-match, viper-backward-indent)
(viper-brac-function):
* lisp/calc/calc-yank.el (calc-do-grab-region):
* lisp/calc/calc-keypd.el (calc-keypad-press):
* lisp/term.el (term-move-columns, term-insert-spaces):
* lisp/speedbar.el (speedbar-highlight-one-tag-line):
* lisp/simple.el (current-word):
* lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
* lisp/info.el (Info-find-node-in-buffer-1, Info-follow-reference)
(Info-scroll-down):
* lisp/hippie-exp.el (he-line-beg):
* lisp/epa.el (epa--marked-keys):
* lisp/dired-aux.el (dired-kill-line, dired-do-kill-lines)
(dired-update-file-line, dired-add-entry, dired-remove-entry)
(dired-relist-entry):
* lisp/buff-menu.el (Buffer-menu-buffer):
* lisp/array.el (current-line):
* lisp/allout.el (allout-resolve-xref)
(allout-latex-verbatim-quote-curr-line):
Replace yet more uses of end-of-line etc with line-end-position.

ChangeLog fix.

Bump version to 23.2.90.
Regenerate AUTHORS, configure, and ldefs-boot.el.

message.el (message-subject-trailing-was-regexp): Fix default value.

* .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.

* lisp/minibuffer.el (minibuffer-completion-help): Specify the end of the
completion field.

Fixes: debbugs:7211

* lisp/emacs-lisp/checkdoc.el (checkdoc-display-status-buffer)
(checkdoc-interactive-loop, checkdoc-recursive-edit): Avoid princ-list.
(checkdoc-syntax-table): Initialize in the declaration.
(emacs-lisp-mode-hook): Use just checkdoc-minor-mode now that it turns
the mode on unconditionally.

* lisp/emacs-lisp/cl-macs.el (extent-data, extent-face, extent-priority)
(extent-end-position, extent-start-position): Remove setf method for
non-existing functions.

Fixes: debbugs:7319

* lisp/progmodes/python.el (python-font-lock-syntactic-keywords):
Fix handling of backslash escapes.
(python-quote-syntax): Adjust accordingly.

Fixes: debbugs:7322

* lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
(vc-mtn-workfile-branch): Adjust to new output format.

* lisp/international/mule-cmds.el (princ-list): Mark as obsolete.

gnus-group.el (gnus-group-read-ephemeral-group, gnus-group-make-group): Remove superfluous ": " from the prompt.
gnus-start.el (gnus-get-unread-articles, gnus-read-active-file): Ignore totally non-existent methods.

* lisp/emacs-lisp/smie.el: New package.

* lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
(smie-precs->prec2): Rename from smie-precs-precedence-table.
(smie-bnf->prec2): Rename from smie-bnf-precedence-table.
(smie-prec2->grammar): Rename from smie-prec2-levels.
(smie-grammar): Rename from smie-op-levels.
(smie-indent--hanging-p): Rename from smie-hanging-p.
(smie-rule-hanging-p): New alias.
(smie-indent--bolp): Rename from smie-bolp.
(smie-indent--hanging-p): New alias.
(smie--token): New dynamically bound variable.
(smie-indent--parent): New function.
(smie-rule-parent-p): Use it; rename from smie-parent-p.
(smie-rule-next-p): Rename from smie-next-p.
(smie-rule-prev-p): Rename from smie-prev-p.
(smie-rule-sibling-p, smie-rule-parent)
(smie-indent--separator-outdent, smie-rule-separator): New functions.
(smie-rule-separator-outdent): New var.
(smie-indent--rule): Merge with smie-indent--column.
(smie-indent-forward-token, smie-indent-backward-token):
Also recognize close parens.
(smie-indent-keyword): Don't use smie-indent--column any more.
(smie-indent-after-keyword): Ignore closers by default.
(smie-indent-line): Use with-demoted-errors.
* lisp/progmodes/octave-mod.el (octave-smie-grammar):
Rename from octave-smie-op-levels.
(octave-smie-rules): Adjust to new behavior.
* lisp/progmodes/prolog.el (prolog-smie-grammar):
Rename from prolog-smie-op-levels.

* src/xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE.

* src/xdisp.c (note_mode_line_or_margin_highlight): Initialize
Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also.

Fix misleading Changelog entry.