Merge from origin/emacs-25

96ac0c3 Yet another fix for using pointers into buffer text
1047496 Another fix for using pointer to buffer text
3121992 Fix Bug#24478

diff --cc lisp/net/tramp-sh.el
index 0e21a81f52746a41ee784864e38ae2541e07fb0e,2983d402fa3ac96b1f72f7223d5ddcb035fd048a..6a190b0e9fe917f6b3844d76cd5d60bd1905e737
--- 1/lisp/net/tramp-sh.el
--- 2/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@@ -65,35 -64,28 +65,34 @@@ Because Tramp wants to parse the outpu
  confused by ANSI color escape sequences and suchlike.  Often, shell init
  files conditionalize this setup based on the TERM environment variable."
    :group 'tramp
 -  :type 'string)
 +  :type 'string
 +  :require 'tramp)
  
  ;;;###tramp-autoload
- (defcustom tramp-histfile-override ".tramp_history"
+ (defcustom tramp-histfile-override "~/.tramp_history"
    "When invoking a shell, override the HISTFILE with this value.
  When setting to a string, it redirects the shell history to that
  file.  Be careful when setting to \"/dev/null\"; this might
  result in undesired results when using \"bash\" as shell.
  
- The value t, the default value, unsets any setting of HISTFILE,
- and sets both HISTFILESIZE and HISTSIZE to 0.  If you set this
- variable to nil, however, the *override* is disabled, so the
- history will go to the default storage location,
- e.g. \"$HOME/.sh_history\"."
+ The value t unsets any setting of HISTFILE, and sets both
+ HISTFILESIZE and HISTSIZE to 0.  If you set this variable to nil,
+ however, the *override* is disabled, so the history will go to
+ the default storage location, e.g. \"$HOME/.sh_history\"."
    :group 'tramp
-   :version "25.1"
+   :version "25.2"
    :type '(choice (const :tag "Do not override HISTFILE" nil)
                   (const :tag "Unset HISTFILE" t)
 -                 (string :tag "Redirect to a file")))
 +                 (string :tag "Redirect to a file"))
 +  :require 'tramp)
  
  ;;;###tramp-autoload
 -(defconst tramp-color-escape-sequence-regexp "\e[[;0-9]+m"
 -  "Escape sequences produced by the \"ls\" command.")
 +(defconst tramp-display-escape-sequence-regexp "\e[[;0-9]+m"
 +  "Terminal control escape sequences for display attributes.")
 +
 +;;;###tramp-autoload
 +(defconst tramp-device-escape-sequence-regexp "\e[[0-9]+n"
 +  "Terminal control escape sequences for device status.")
  
  ;; ksh on OpenBSD 4.5 requires that $PS1 contains a `#' character for
  ;; root users.  It uses the `$' character for other users.  In order

diff --cc src/search.c
Simple merge