[Emacs-diffs] Changes to emacs/lisp/progmodes/hideshow.el

[Thien-Thi Nguyen]

Index: emacs/lisp/progmodes/hideshow.el
diff -c emacs/lisp/progmodes/hideshow.el:1.49 
emacs/lisp/progmodes/hideshow.el:1.50
*** emacs/lisp/progmodes/hideshow.el:1.49       Fri Dec 24 01:57:47 2004
--- emacs/lisp/progmodes/hideshow.el    Fri Dec 24 02:05:30 2004
***************
*** 5,11 ****
  ;; Author: Thien-Thi Nguyen <address@hidden>
  ;;      Dan Nicolaescu <address@hidden>
  ;; Keywords: C C++ java lisp tools editing comments blocks hiding outlines
! ;; Maintainer-Version: n/a (presently)
  ;; Time-of-Day-Author-Most-Likely-to-be-Recalcitrant: early morning
  
  ;; This file is part of GNU Emacs.
--- 5,11 ----
  ;; Author: Thien-Thi Nguyen <address@hidden>
  ;;      Dan Nicolaescu <address@hidden>
  ;; Keywords: C C++ java lisp tools editing comments blocks hiding outlines
! ;; Maintainer-Version: 5.39.2.8
  ;; Time-of-Day-Author-Most-Likely-to-be-Recalcitrant: early morning
  
  ;; This file is part of GNU Emacs.
***************
*** 220,225 ****
--- 220,226 ----
  ;;; Code:
  
  (require 'easymenu)
+ (eval-when-compile (require 'cl))
  
  ;;---------------------------------------------------------------------------
  ;; user-configurable variables
***************
*** 374,401 ****
  ;;---------------------------------------------------------------------------
  ;; system dependency
  
- ; ;; xemacs compatibility
- ; (when (string-match "xemacs\\|lucid" emacs-version)
- ;   ;; use pre-packaged compatiblity layer
- ;   (require 'overlay))
- ;
- ; ;; xemacs and emacs-19 compatibility
- ; (when (or (not (fboundp 'add-to-invisibility-spec))
- ;           (not (fboundp 'remove-from-invisibility-spec)))
- ;   ;; `buffer-invisibility-spec' mutators snarfed from Emacs 20.3 
lisp/subr.el
- ;   (defun add-to-invisibility-spec (arg)
- ;     (cond
- ;      ((or (null buffer-invisibility-spec) (eq buffer-invisibility-spec t))
- ;       (setq buffer-invisibility-spec (list arg)))
- ;      (t
- ;       (setq buffer-invisibility-spec
- ;             (cons arg buffer-invisibility-spec)))))
- ;   (defun remove-from-invisibility-spec (arg)
- ;     (when buffer-invisibility-spec
- ;       (setq buffer-invisibility-spec
- ;             (delete arg buffer-invisibility-spec)))))
- 
- ;; hs-match-data
  (defalias 'hs-match-data 'match-data)
  
  ;;---------------------------------------------------------------------------
--- 375,380 ----
***************
*** 405,416 ****
    "Delete hideshow overlays in region defined by FROM and TO."
    (when (< to from)
      (setq from (prog1 to (setq to from))))
!   (let ((ovs (overlays-in from to)))
!     (while ovs
!       (let ((ov (car ovs)))
!         (when (overlay-get ov 'hs)
!           (delete-overlay ov)))
!       (setq ovs (cdr ovs)))))
  
  (defun hs-isearch-show (ov)
    "Delete overlay OV, and set `hs-headline' to nil.
--- 384,392 ----
    "Delete hideshow overlays in region defined by FROM and TO."
    (when (< to from)
      (setq from (prog1 to (setq to from))))
!   (dolist (ov (overlays-in from to))
!     (when (overlay-get ov 'hs)
!       (delete-overlay ov))))
  
  (defun hs-isearch-show (ov)
    "Delete overlay OV, and set `hs-headline' to nil.
***************
*** 773,790 ****
     (or
      ;; first see if we have something at the end of the line
      (catch 'eol-begins-hidden-region-p
!       (let ((here (point))
!             (ovs (save-excursion (end-of-line) (overlays-at (point)))))
!         (while ovs
!           (let ((ov (car ovs)))
!             (when (overlay-get ov 'hs)
!               (goto-char
!                (cond (end (overlay-end ov))
!                      ((eq 'comment (overlay-get ov 'hs)) here)
!                      (t (+ (overlay-start ov) (overlay-get ov 'hs-ofs)))))
!               (delete-overlay ov)
!               (throw 'eol-begins-hidden-region-p t)))
!           (setq ovs (cdr ovs)))
          nil))
      ;; not immediately obvious, look for a suitable block
      (let ((c-reg (hs-inside-comment-p))
--- 749,763 ----
     (or
      ;; first see if we have something at the end of the line
      (catch 'eol-begins-hidden-region-p
!       (let ((here (point)))
!         (dolist (ov (save-excursion (end-of-line) (overlays-at (point))))
!           (when (overlay-get ov 'hs)
!             (goto-char
!              (cond (end (overlay-end ov))
!                    ((eq 'comment (overlay-get ov 'hs)) here)
!                    (t (+ (overlay-start ov) (overlay-get ov 'hs-ofs)))))
!             (delete-overlay ov)
!             (throw 'eol-begins-hidden-region-p t)))
          nil))
      ;; not immediately obvious, look for a suitable block
      (let ((c-reg (hs-inside-comment-p))
***************
*** 913,939 ****
               )))))
  
  ;; some housekeeping
! (or (assq 'hs-minor-mode minor-mode-map-alist)
!     (setq minor-mode-map-alist
!           (cons (cons 'hs-minor-mode hs-minor-mode-map)
!                 minor-mode-map-alist)))
! (or (assq 'hs-minor-mode minor-mode-alist)
!     (setq minor-mode-alist (append minor-mode-alist
!                                    (list '(hs-minor-mode " hs")))))
  
  ;; make some variables permanently buffer-local
! (let ((vars '(hs-minor-mode
!               hs-c-start-regexp
!               hs-block-start-regexp
!               hs-block-start-mdata-select
!               hs-block-end-regexp
!               hs-forward-sexp-func
!               hs-adjust-block-beginning)))
!   (while vars
!     (let ((var (car vars)))
!       (make-variable-buffer-local var)
!       (put var 'permanent-local t))
!     (setq vars (cdr vars))))
  
  ;;---------------------------------------------------------------------------
  ;; that's it
--- 886,904 ----
               )))))
  
  ;; some housekeeping
! (add-to-list 'minor-mode-map-alist (cons 'hs-minor-mode hs-minor-mode-map))
! (add-to-list 'minor-mode-alist '(hs-minor-mode " hs") t)
  
  ;; make some variables permanently buffer-local
! (dolist (var '(hs-minor-mode
!                hs-c-start-regexp
!                hs-block-start-regexp
!                hs-block-start-mdata-select
!                hs-block-end-regexp
!                hs-forward-sexp-func
!                hs-adjust-block-beginning))
!   (make-variable-buffer-local var)
!   (put var 'permanent-local t))
  
  ;;---------------------------------------------------------------------------
  ;; that's it