merge from trunk

2 files changed, 4 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d3b09c3449..b47258330f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-08-23  Glenn Morris  <rgm@gnu.org>
 
+        * files.el (auto-mode-alist): Use sh-mode for .bash_history.
+
         * files.el (interpreter-mode-alist): Use tcl-mode for expect scripts.
 
         * files.el (create-file-buffer): If the result would begin with
diff --git a/lisp/files.el b/lisp/files.el
index 04ea47fa6ef..f9ff3c936bd 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2275,8 +2275,8 @@ since only a single case-insensitive search through the alist is made."
      ("\\.scm\\.[0-9]*\\'" . scheme-mode)
      ("\\.[ck]?sh\\'\\|\\.shar\\'\\|/\\.z?profile\\'" . sh-mode)
      ("\\.bash\\'" . sh-mode)
-     ("\\(/\\|\\`\\)\\.\\(bash_profile\\|z?login\\|bash_login\\|z?logout\\)\\'" . sh-mode)
-     ("\\(/\\|\\`\\)\\.\\(bash_logout\\|shrc\\|[kz]shrc\\|bashrc\\|t?cshrc\\|esrc\\)\\'" . sh-mode)
+     ("\\(/\\|\\`\\)\\.\\(bash_\\(profile\\|history\\|log\\(in\\|out\\)\\)\\|z?log\\(in\\|out\\)\\)\\'" . sh-mode)
+     ("\\(/\\|\\`\\)\\.\\(shrc\\|[kz]shrc\\|bashrc\\|t?cshrc\\|esrc\\)\\'" . sh-mode)
      ("\\(/\\|\\`\\)\\.\\([kz]shenv\\|xinitrc\\|startxrc\\|xsession\\)\\'" . sh-mode)
      ("\\.m?spec\\'" . sh-mode)
      ("\\.m[mes]\\'" . nroff-mode)