bug#23985: Emacs 25.0.94: FEATURE ADDITION: Texinfo environment movement commands

[Robert Weiner <rsw@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 879 bytes --]

The attached patch adds movement commands for texinfo-mode that move
between the start and end of single-level environments (things that
end with an @end line), e.g. @table.

    (define-key map "\C-c."        'texinfo-to-environment-bounds) -
when within an environment, moves between the start and end lines

    (define-key map "\C-c\C-c\C-f" 'texinfo-next-environment-end) -
from anywhere, moves to the next end line of an environment

    (define-key map "\C-c\C-c\C-b" 'texinfo-previous-environment-end)
- from anywhere, moves to the previous end line of an environment

    (define-key map "\C-c\C-c\C-n" 'texinfo-next-environment-start) -
from anywhere, moves to the next start line of an environment

    (define-key map "\C-c\C-c\C-p"
'texinfo-previous-environment-start) - from anywhere, moves to the
previous start line of an environment

See attached for the patch.

[-- Attachment #2: texinfo.el.patch --]
[-- Type: application/octet-stream, Size: 3508 bytes --]

*** texinfo-orig.el	2016-07-14 12:06:08.000000000 -0400
--- texinfo.el		2016-07-14 12:06:08.000000000 -0400
***************
*** 480,485 ****
--- 480,492 ----
      (define-key map "\C-c\C-ce"    'texinfo-insert-@end)
      (define-key map "\C-c\C-cd"    'texinfo-insert-@dfn)
      (define-key map "\C-c\C-cc"    'texinfo-insert-@code)
+ 
+     ;; bindings for environment movement
+     (define-key map "\C-c."        'texinfo-to-environment-bounds)
+     (define-key map "\C-c\C-c\C-f" 'texinfo-next-environment-end)
+     (define-key map "\C-c\C-c\C-b" 'texinfo-previous-environment-end)
+     (define-key map "\C-c\C-c\C-n" 'texinfo-next-environment-start)
+     (define-key map "\C-c\C-c\C-p" 'texinfo-previous-environment-start)
      map))
  
  (easy-menu-define texinfo-mode-menu
***************
*** 1032,1037 ****
--- 1039,1111 ----
    ;;               job-number"\n"))
    (tex-recenter-output-buffer nil))
  
+ ;;; Texinfo environment, e.g. @table, movement commands
+ ;; Author: Bob Weiner <rsw@gnu.org>, Orig-Date: 7/14/2016
+ ;; Copyright (C) 2016  Free Software Foundation, Inc.
+ 
+ (defun texinfo-to-environment-bounds ()
+   "If within a Texinfo environment with an @end, move point first to its starting line and then to its ending line.
+ Do nothing when outside of an environment; this does not handle nested environments."
+   (interactive)
+   (cond ((save-excursion
+ 	   (forward-line 0)
+ 	   (looking-at texinfo-environment-regexp))
+ 	 (if (save-excursion
+ 	       (forward-line 0)
+ 	       (looking-at "^@end"))
+ 	     (texinfo-previous-environment-start)
+ 	   (texinfo-next-environment-end)))
+ 	((save-excursion
+ 	   (and (re-search-backward texinfo-environment-regexp nil t)
+ 		(not (looking-at "^@end"))))
+ 	 (texinfo-previous-environment-start))
+ 	;; Otherwise, point is outside of an environment, so do nothing.
+ 	))
+ 
+ (defun texinfo-next-environment-start ()
+   "Move forward to the beginning of a Texinfo environment that ends with an @end."
+   (interactive)
+   (if (looking-at texinfo-environment-regexp)
+       (forward-line 1))
+   (while (and (re-search-forward texinfo-environment-regexp nil t)
+ 	      (save-excursion
+ 		(goto-char (match-beginning 0))
+ 		(looking-at "@end"))))
+   (if (save-excursion
+ 	(forward-line 0)
+ 	(looking-at texinfo-environment-regexp))
+       (forward-line 0)))
+ 
+ (defun texinfo-previous-environment-start ()
+   "Move back to the beginning of the previous Texinfo environment that ends with an @end."
+   (interactive)
+   (while (and (re-search-backward texinfo-environment-regexp nil t)
+ 	      (save-excursion
+ 		(goto-char (match-beginning 0))
+ 		(looking-at "@end")))))
+ 
+ (defun texinfo-next-environment-end ()
+   "Move forward to the beginning of the next @end line of a Texinfo environment."
+   (interactive)
+   (if (looking-at "^@end")
+       (forward-line 1))
+   (while (and (re-search-forward texinfo-environment-regexp nil t)
+ 	      (save-excursion
+ 		(goto-char (match-beginning 0))
+ 		(not (looking-at "^@end")))))
+   (if (save-excursion
+ 	(forward-line 0)
+ 	(looking-at "^@end"))
+       (forward-line 0)))
+ 
+ (defun texinfo-previous-environment-end ()
+   "Move backward to the beginning of the next @end line of a Texinfo environment."
+   (interactive)
+   (while (and (re-search-backward texinfo-environment-regexp nil t)
+ 	      (save-excursion
+ 		(goto-char (match-beginning 0))
+ 		(not (looking-at "@end"))))))
+ 
  (provide 'texinfo)
  
  ;;; texinfo.el ends here