(hs-match-data): Delete alias.

(hs-hide-block-at-point, hs-find-block-beginning)
(hs-show-block): Use `match-data' directly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5e430a5bc56f832a5c96ba4e4aa4e1af33d7a90..9ea9d69c1903c347d830b70242e482b28720be17 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-24  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+       * progmodes/hideshow.el (hs-match-data): Delete alias.
+       (hs-hide-block-at-point, hs-find-block-beginning)
+       (hs-show-block): Use `match-data' directly.
+
 2007-08-24  Martin Rudalics  <rudalics@gmx.at>
 
        * format.el (format-alist): Fix typo in doc-string.

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 83167ba5a40385d841ff1201a23fad9db1668a61..85d26427a3f455d8c4537a037e766567b76f5ebe 100644 (file)
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -406,11 +406,6 @@ to the variable `mode-line-format'.  For example,
 
 Note that `mode-line-format' is buffer-local.")
 
-;;---------------------------------------------------------------------------
-;; system dependency
-
-(defalias 'hs-match-data 'match-data)
-
 ;;---------------------------------------------------------------------------
 ;; support functions
 
@@ -526,7 +521,7 @@ and then further adjusted to be at the end of the line."
   (if comment-reg
       (hs-hide-comment-region (car comment-reg) (cadr comment-reg) end)
     (when (looking-at hs-block-start-regexp)
-      (let* ((mdata (hs-match-data t))
+      (let* ((mdata (match-data t))
              (pure-p (match-end 0))
              (p
               ;; `p' is the point at the end of the block beginning,
@@ -651,7 +646,7 @@ Return point, or nil if original point was not in a block."
       (while (and (re-search-backward hs-block-start-regexp nil t)
                   (not (setq done
                              (< here (save-excursion
-                                       (hs-forward-sexp (hs-match-data t) 1)
+                                       (hs-forward-sexp (match-data t) 1)
                                        (point)))))))
       (if done
           (point)
@@ -825,7 +820,7 @@ See documentation for functions `hs-hide-block' and `run-hooks'."
                   ;; ugh, fresh match-data
                   (looking-at hs-block-start-regexp))
              (setq p (point)
-                   q (progn (hs-forward-sexp (hs-match-data t) 1) (point)))))
+                   q (progn (hs-forward-sexp (match-data t) 1) (point)))))
       (when (and p q)
         (hs-discard-overlays p q)
         (goto-char (if end q (1+ p)))))