* net/tramp-smb.el (tramp-smb-maybe-open-connection): Fix an error
introduced on 2013-09-08, which results in an infinite loop
requesting a password.
Remove port-specific display name lists to avoid extra
complexity and data duplication with display info lists.
* xterm.h (x_display_name_list): Remove declaration.
* xterm.c (x_display_name_list): Remove.
(x_term_init, x_delete_display, syms_of_xterm): Adjust users.
* xfns.c (x_display_info_for_name, Fx_display_list):
Likewise.  Use x_display_list where appropriate.
* w32term.h (w32_display_name_list): Remove declaration.
* w32term.c (w32_display_name_list): Remove.
(w32_initialize_display_info, x_delete_display, syms_of_w32term):
Adjust users.
* w32fns.c (x_display_info_for_name, Fx_display_list):
Likewise.  Use x_display_list where appropriate.
* nsterm.h (ns_display_name_list): Remove declaration.
* nsterm.m (ns_display_name_list): Remove.
(ns_term_init, syms_of_nsterm): Adjust users.
* nsfns.m (ns_display_info_for_name, Fx_display_list):
Likewise.  Use x_display_list where appropriate.
* termhooks.h (TERMINAL_FONT_CACHE): New macro.
* alloc.c (toplevel) [HAVE_WINDOW_SYSTEM]: Include TERM_HEADER.
(mark_terminals): Mark per-terminal font cache.
Fix clicks on the menu bar when GPM mouse is in use.

 src/keyboard.c (make_lispy_event): Remove GPM-specific code that
 handles mouse clicks.  Instead, let GPM use the same code as all
 the other mice use.  See the discussion starting at
 http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00521.html
 for the details of the problem with the menu bar this fixes.
* doc/lispref/display.texi (Line Height): Add an index for line height.
Another index for line height.
* lisp/ido.el (dired-other-frame): Only list directories.
ffap.el: handle "/usr/include/c++/<version>" directories.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00387.html

* lisp/ffap.el (ffap-alist): Use ffap-c++-mode for c++-mode.
(ffap-c++-path): New variable.
(ffap-c++-mode): New function.
* menu-bar.el: Don't make Services menu.
Fix TTY menus when they lead to a minibuffer prompt.

 lisp/menu-bar.el (tty-menu-navigation-map): Bind mouse-N to perform
 TTY menu actions and down-mouse-N to tty-menu-ignore.  This solves
 the problem whereby selecting a menu item that leads to a
 minibuffer prompt moves the cursor out of the minibuffer window,
 making it hard to type at the prompt.  Suggested by Stefan Monnier
 <monnier@iro.umontreal.ca>.
Add indexes for the ‘:box’ face attribute.

* doc/lispref/display.texi (Face Attributes): Add indexes for the ‘:box’ face attribute.
Fix fontification bugs with constructors and const.

* progmodes/cc-engine.el (c-forward-decl-or-cast-1): (Just after
CASE 2) Remove the check for the absence of a suffix construct
after a function declaration with only types (no identifiers) in
the parentheses.  Also, accept a function declaration with just a
type inside the parentheses, if this type can be positively
recognised as such, or if a prefix keyword like "explicit" nails
down the construct as a declaration.
* lisp/icomplete.el (icomplete-with-completion-tables): Add :version.
NEWS fix.
* lisp/simple.el (newline): Only run post-self-insert-hook when
called interactively.
Fix GNUStep specific menu items.

* lisp/menu-bar.el: Move GNUStep specific menus...

* lisp/term/ns-win.el (ns-initialize-window-system): ... to here.

* src/nsterm.m (Qcocoa, Qgnustep): New variables.
(syms_of_nsterm): Defsym Qcocoa, Qgnustep.  Fprovide appropriate one.
Make Info menu for GNUStep only for GUI.

* menu-bar.el: Put help-menu in menu-bar-final-items unconditionally.
Move Info menu item creation to ns-win.el.

* term/ns-win.el (ns-initialize-window-system): Rename Help to Info
in menu bar.
* lisp/cedet/semantic/db-mode.el (global-semanticdb-minor-mode): Remove hooks
correctly.
(semanticdb-toggle-global-mode): Pass `toggle' to minor mode function.
* src/nsterm.m (ns_get_color): Make selection color work for GNUStep also.
* lisp/progmodes/verilog-mode.el (verilog-mode): Don't set
comment-indent-function globally.
* lisp/startup.el (default-frame-background-mode): Remove unused
defvar.