Mercurial > hg > xemacs-beta
diff lisp/hyperbole/kotl/klabel.el @ 70:131b0175ea99 r20-0b30
Import from CVS: tag r20-0b30
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:02:59 +0200 |
parents | c53a95d3c46d |
children | 8619ce7e4c50 |
line wrap: on
line diff
--- a/lisp/hyperbole/kotl/klabel.el Mon Aug 13 09:00:04 2007 +0200 +++ b/lisp/hyperbole/kotl/klabel.el Mon Aug 13 09:02:59 2007 +0200 @@ -8,8 +8,7 @@ ;; AUTHOR: Bob Weiner & Kellie Clark ;; ;; ORIG-DATE: 17-Apr-94 -;; LAST-MOD: 6-Mar-97 at 01:19:02 by Bob Weiner - +;; LAST-MOD: 1-Nov-95 at 02:33:23 by Bob Weiner ;;; ************************************************************************ ;;; Public variables ;;; ************************************************************************ @@ -48,7 +47,7 @@ ((eq label-type 'partial-alpha) (error "(klabel:level): Can't compute the level of a partial-alpha label")) - (t (error "(klabel:level): Invalid label type setting: `%s'" + (t (error "(klabel:level): Invalid label type setting: '%s'" label-type))))) (defun klabel:parent (label) @@ -70,7 +69,7 @@ (error "(klabel:child-id): Can't compute child of idstamp label")))) (t (error - "(klabel-type:child): Invalid label type setting: `%s'" + "(klabel-type:child): Invalid label type setting: '%s'" label-type)))) (defun klabel-type:increment (label-type) @@ -97,7 +96,7 @@ (error "(klabel:increment-no): 0 cell cannot have a sibling") (error "(klabel:increment-id): Can't compute sibling of idstamp label"))))) (t (error - "(klabel:increment): Invalid label type setting: `%s'" + "(klabel:increment): Invalid label type setting: '%s'" label-type)))) (defun klabel-type:parent (label-type) @@ -128,7 +127,7 @@ (error "(klabel:parent-id): Can't compute parent of idstamp label")))) (t (error - "(klabel-type:parent): Invalid label type setting: `%s'" + "(klabel-type:parent): Invalid label type setting: '%s'" label-type)))) ;;; @@ -212,7 +211,7 @@ (concat (substring label 0 (match-beginning 0)) (int-to-string (1+ (string-to-int (substring label (match-beginning 0))))))) - (t (error "(klabel:increment-legal): Invalid label, `%s'" label)))) + (t (error "(klabel:increment-legal): Invalid label, '%s'" label)))) (defun klabel:level-legal (label) "Return outline level as an integer of legal-style LABEL. @@ -244,10 +243,10 @@ ;; It must be one of the following symbols: ;; no for no labels, ;; id for permanent idstamp labels, e.g. 001, 002, etc. -;; alpha for `1a2' full alphanumeric labels -;; legal for `1.1.2' labels -;; partial-alpha for partial alphanumeric labels, e.g. `2' for node `1a2' -;; star for multi-star labeling, e.g. `***'. +;; alpha for '1a2' full alphanumeric labels +;; legal for '1.1.2' labels +;; partial-alpha for partial alphanumeric labels, e.g. '2' for node '1a2' +;; star for multi-star labeling, e.g. '***'. ;; ;; Functions to compute sibling and child labels for particular label types. @@ -353,7 +352,7 @@ (if (re-search-backward "\\(\\`\\|[\n\r][\n\r]\\)[ \t]*0[0-9]+" nil t) (goto-char (match-end 0))))))))) - (error "(kview:to-label-end): Invalid label type: `%s'" label-type))) + (error "(kview:to-label-end): Invalid label type: '%s'" label-type))) (defun klabel-type:star-label (prev-label &optional child-p) "Return full star label, e.g. ***, for cell following PREV-LABEL's cell. @@ -380,7 +379,7 @@ ((eq label-type 'no) "") ((eq label-type 'star) "*") (t (error - "(klabel-type:set-labels): Invalid label type: `%s'" + "(klabel-type:set-labels): Invalid label type: '%s'" label-type)))) (let ((klabel-type:changing-flag t)) (klabel-type:update-labels-from-point label-type first-label))))) @@ -604,7 +603,7 @@ is signaled." (if (not (kotl-label:is-p label)) (error - "(kotl-label:increment): First arg, `%s', must be a kotl-label." + "(kotl-label:increment): First arg, '%s', must be a kotl-label." label)) (let ((int-p) (val 0)) (if (or (setq int-p (kotl-label:integer-p label)) @@ -614,13 +613,13 @@ (progn (setq int-p (string-to-int label)) (if (> (setq val (+ int-p n)) 0) (kotl-label:create val) - (error "(kotl-label:increment): Decrement of `%s' by `%d' is less than 1." label n))) + (error "(kotl-label:increment): Decrement of '%s' by '%d' is less than 1." label n))) ;; alpha-p (if (<= 0 (setq val (+ n (kotl-label:alpha-to-int label)))) (kotl-label:create (kotl-label:int-to-alpha val)) - (error "(kotl-label:increment): Decrement of `%s' by `%d' is illegal." label n))) - (error "(kotl-label:increment): label, `%s', must be all digits or alpha characters" label)))) + (error "(kotl-label:increment): Decrement of '%s' by '%d' is illegal." label n))) + (error "(kotl-label:increment): label, '%s', must be all digits or alpha characters" label)))) (defun kotl-label:increment-alpha (label) "Return alphabetic LABEL incremented by 1. @@ -695,7 +694,7 @@ For example, the full label \"1a2\" has kotl-label \"2\", as does \"1.1.2\"." (if (string-match "[0-9]+$\\|[a-zA-Z]+$" label) (substring label (match-beginning 0)) - (error "(klabel:to-kotl-label): Invalid label, `%s'" label))) + (error "(klabel:to-kotl-label): Invalid label, '%s'" label))) (defun klabel-type:update-labels-from-point (label-type first-label) (let ((label-sep-len (kview:label-separator-length kview)))