xemacs-beta: lisp/hyperbole/kotl/kotl-mode.el comparison

comparison lisp/hyperbole/kotl/kotl-mode.el @ 114:8619ce7e4c50 r20-1b9

Import from CVS: tag r20-1b9

author	cvs
date	Mon, 13 Aug 2007 09:21:54 +0200
parents	4be1180a9e89
children

comparison

equal deleted inserted replaced

-:2ec2fe4a4c89
+:8619ce7e4c50
 ;; KEYWORDS:     data, hypermedia, outlines, wp
 ;;
 ;; AUTHOR:       Bob Weiner & Kellie Clark
 ;;
 ;; ORIG-DATE:    6/30/93
-;; LAST-MOD:      5-Dec-96 at 18:55:22 by Bob Weiner
+;; LAST-MOD:      6-Mar-97 at 01:15:42 by Bob Weiner
 ;;
 ;; This file is part of Hyperbole.
 ;; Available for use and distribution under the same terms as GNU Emacs.
 ;;
 ;; Copyright (C) 1993, 1994, 1995  Free Software Foundation, Inc.
 (setq zmacs-region-stays t) ;; Maintain region highlight for XEmacs.
 (let ((indent (kcell-view:indent))
 	(opoint (point-marker))
 	(bocp)
 	start)
-(setq start (kotl-mode:beginning-of-line))
+(setq start (kotl-mode:start-of-line))
 (if (setq bocp (kotl-mode:bocp))
 	(progn
 	  ;; Add a temporary fill-prefix since this is the 1st line of the cell
 	  ;; where label could interfere with centering.
 	  (insert "\n\n") (insert-char ?\  indent)))
 ((integerp val)
 (princ val (current-buffer)))
 ((and (markerp val) (marker-position val))
 (princ (marker-position val) (current-buffer)))
 (t
-(error "Register '%c' does not contain text" register))))
+(error "Register `%c' does not contain text" register))))
 (if (not arg) (exchange-point-and-mark)))
 (defun kotl-mode:just-one-space ()
 "Delete all spaces and tabs around point and leave one space."
 (interactive "*")
 "Move point to beginning of current or ARGth - 1 prior cell and return point."
 (interactive "p")
 (setq zmacs-region-stays t) ;; Maintain region highlight for XEmacs.
 (or arg (setq arg 1))
 (or (integer-or-marker-p arg)
-(error "(kotl-mode:beginning-of-cell): Wrong type arg, integer-or-marker, '%s'" arg))
+(error "(kotl-mode:beginning-of-cell): Wrong type arg, integer-or-marker, `%s'" arg))
 (if (= arg 1)
 (goto-char (kcell-view:start))
 (kotl-mode:backward-cell (1- arg)))
 (point))
 "Move point to beginning of current or ARGth - 1 line and return point."
 (interactive "p")
 (setq zmacs-region-stays t) ;; Maintain region highlight for XEmacs.
 (or arg (setq arg 1))
 (or (integer-or-marker-p arg)
-(error "(kotl-mode:start-of-line): Wrong type arg, integer-or-marker, '%s'" arg))
+(error "(kotl-mode:start-of-line): Wrong type arg, integer-or-marker, `%s'" arg))
 (forward-line (1- arg))
 (if (eolp)
 nil
 (forward-char (prog1 (kcell-view:indent)
 		    (beginning-of-line))))
 (point))
-(defalias 'kotl-mode:beginning-of-line 'kotl-mode:start-of-line)
+;;; This ensures that the key bound to `beginning-of-line' is replaced in
+;;; kotl-mode.
+(fset 'kotl-mode:beginning-of-line 'kotl-mode:start-of-line)
 (defun kotl-mode:beginning-of-tree ()
 "Move point to the level 1 root of the current cell's tree.
 Leave point at the start of the cell."
 (interactive)
 "Move point to end of current or ARGth - 1 succeeding cell and return point."
 (interactive "p")
 (setq zmacs-region-stays t) ;; Maintain region highlight for XEmacs.
 (or arg (setq arg 1))
 (or (integer-or-marker-p arg)
-(error "(kotl-mode:end-of-cell): Wrong type arg, integer-or-marker, '%s'" arg))
+(error "(kotl-mode:end-of-cell): Wrong type arg, integer-or-marker, `%s'" arg))
 (if (= arg 1)
 (goto-char (kcell-view:end-contents))
 (kotl-mode:forward-cell (1- arg)))
 (point))
 "Move point to end of current or ARGth - 1 line and return point."
 (interactive "p")
 (setq zmacs-region-stays t) ;; Maintain region highlight for XEmacs.
 (or arg (setq arg 1))
 (or (integer-or-marker-p arg)
-(error "(kotl-mode:finish-of-line): Wrong type arg, integer-or-marker, '%s'" arg))
+(error "(kotl-mode:finish-of-line): Wrong type arg, integer-or-marker, `%s'" arg))
 (forward-line (1- arg))
 (end-of-line)
 ;; May have to move backwards to before label if support labels
 ;; at end of cells.
 (point))
 	    (setq arg (1- arg))))
 (kotl-mode:backward-word (- arg)))
 (point))
 (defun kotl-mode:goto-cell (cell-ref &optional error-p)
-"Move point to start of cell given by CELL-REF.  (See 'kcell:ref-to-id'.)
+"Move point to start of cell given by CELL-REF.  (See `kcell:ref-to-id'.)
 Return point iff CELL-REF is found within current view.
 With a prefix argument, CELL-REF is assigned the argument value for use
 as an idstamp.
 Optional second arg, ERROR-P, non-nil means signal an error if CELL-REF is
 (list (if current-prefix-arg
 	     (format "0%d" (prefix-numeric-value current-prefix-arg))
 	   (read-string "Goto cell label or id: "))))
 (setq cell-ref
 	(or (kcell:ref-to-id cell-ref)
-	    (error "(kotl-mode:goto-cell): Invalid cell reference, '%s'" cell-ref)))
+	    (error "(kotl-mode:goto-cell): Invalid cell reference, `%s'" cell-ref)))
 (let* ((opoint (point))
 	 (found)
 	 cell-id kvspec)
 (if (= ?| (aref cell-ref 0))
 	;; This is a standalone view spec, not a cell reference.
 	     (setq found (point)))
 	    ;; no match
 	    (t (goto-char opoint)
 	       nil))
 (if (and (not found) (or error-p (interactive-p)))
-	  (error "(kotl-mode:goto-cell): No '%s' cell in this view" cell-ref)
+	  (error "(kotl-mode:goto-cell): No `%s' cell in this view" cell-ref)
 	;; Activate any viewspec associated with cell-ref.
 	(if kvspec (kvspec:activate kvspec))))
 found))
 (defun kotl-mode:head-cell ()
 						  existing-attributes))))))
 (beep))
 (setq attribute (intern attribute)
 	   value (kcell-view:get-attr attribute))
 (if value
-	 (setq value (read-expression
+	 (setq value (read-minibuffer
 		      (format "Change value of \"%s\" to: " attribute)
 		      (prin1-to-string value)))
-(setq value (read-expression
+(setq value (read-minibuffer
 		    (format "Set value of \"%s\" to: " attribute))))
 (list attribute value nil)))
 (kcell-view:set-attr attribute value pos)
 ;; Note that buffer needs to be saved to store new attribute value.
 (set-buffer-modified-p t)
 	(let ((bol (kotl-mode:start-of-line))
 	      (eol (kotl-mode:finish-of-line)))
 	  (prog1
 	      (buffer-substring bol eol)
 	    (delete-region bol eol)))
-(error "(kotl-mode:delete-line): Invalid position, '%d'" (point)))))
+(error "(kotl-mode:delete-line): Invalid position, `%d'" (point)))))
 (defun kotl-mode:indent-line (arg)
 ;; Disallow the indent-line command.
 (error "(kotl-mode:indent-line): Insert spaces to indent each line."))
 (move-to-column (or goal-column temporary-goal-column))
 nil)
 (defun kotl-mode:print-attributes (kview)
 "Print to the `standard-output' stream the attributes of the current visible kcell.
-Takes argument KVIEW (so it can be used with 'kview:map-tree' and so that
+Takes argument KVIEW (so it can be used with `kview:map-tree' and so that
 KVIEW is bound correctly) but always operates upon the current view."
 ;; Move to start of visible cell to avoid printing attributes for an
 ;; invisible kcell which point may be over.
 ;; Print first line of cell for reference.
 (save-excursion

Mercurial > hg > xemacs-beta

comparison lisp/hyperbole/kotl/kotl-mode.el @ 114:8619ce7e4c50 r20-1b9