* textmodes/bibtex.el: Remove support for hideshow minor mode as

it duplicates the bibtex support in progmodes/hideshow.el.
* progmodes/hideshow.el (hs-special-modes-alist): Allow bibtex
entry that do not start at the beginning of a line.

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index dcda521f146e4d3438187e1ad140f9a5f36d8b68..48a32761c276ac244394f14b886748af4925911f 100644 (file)
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -273,7 +273,7 @@ This has effect only if `search-invisible' is set to `open'."
 (defvar hs-special-modes-alist
   '((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning)
     (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning)
-    (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1))
+    (bibtex-mode ("@\\S(*\\(\\s(\\)" 1))
     (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning))
   "*Alist for initializing the hideshow variables for different modes.
 Each element has the form

diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 02139bd37d9424cf3a4c07ad7491599cbba5310f..21d854ce3a60ff8aed9541d1489c1b75a409353f 100644 (file)
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1290,19 +1290,6 @@ The CDRs of the elements are t for header keys and nil for crossref keys.")
 Auto-generated from `bibtex-sort-entry-class'.
 Used when `bibtex-maintain-sorted-entries' is `entry-class'.")
 
-\f
-;; Support for hideshow minor mode
-(defun bibtex-hs-forward-sexp (arg)
-  "Replacement for `forward-sexp' to be used by `hs-minor-mode'.
-ARG is ignored."
-  (if (looking-at "@\\S(*\\s(")
-      (goto-char (1- (match-end 0))))
-  (forward-sexp 1))
-
-(add-to-list
- 'hs-special-modes-alist
- '(bibtex-mode "@\\S(*\\s(" "\\s)" nil bibtex-hs-forward-sexp nil))
-
 \f
 (defun bibtex-parse-association (parse-lhs parse-rhs)
   "Parse a string of the format <left-hand-side = right-hand-side>.