diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2003-02-04 13:24:35 +0000 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2003-02-04 13:24:35 +0000 |
commit | a1506d2977a8c2eb982ad0b59416009cdfaa6f51 (patch) | |
tree | 3cbb868ad6eb3b188d5064389538c490c124d8be /lisp/obsolete | |
parent | f1180544bb5ff44cdb45b8734734294b0a2fa7a4 (diff) | |
download | emacs-a1506d2977a8c2eb982ad0b59416009cdfaa6f51.tar.gz |
Trailing whitepace deleted.
Diffstat (limited to 'lisp/obsolete')
-rw-r--r-- | lisp/obsolete/auto-show.el | 4 | ||||
-rw-r--r-- | lisp/obsolete/hilit19.el | 92 | ||||
-rw-r--r-- | lisp/obsolete/hscroll.el | 10 | ||||
-rw-r--r-- | lisp/obsolete/ooutline.el | 10 | ||||
-rw-r--r-- | lisp/obsolete/rnews.el | 14 | ||||
-rw-r--r-- | lisp/obsolete/rnewspost.el | 8 | ||||
-rw-r--r-- | lisp/obsolete/sun-curs.el | 16 | ||||
-rw-r--r-- | lisp/obsolete/sun-fns.el | 24 |
8 files changed, 89 insertions, 89 deletions
diff --git a/lisp/obsolete/auto-show.el b/lisp/obsolete/auto-show.el index 9a813374551..342a3499409 100644 --- a/lisp/obsolete/auto-show.el +++ b/lisp/obsolete/auto-show.el @@ -27,7 +27,7 @@ to auto-show from your init file and code." :type 'boolean :group 'auto-show) -(defcustom auto-show-shift-amount 8 +(defcustom auto-show-shift-amount 8 "*Obsolete." :type 'integer :group 'auto-show) @@ -41,7 +41,7 @@ to auto-show from your init file and code." (defun auto-show-mode (arg) "This command is obsolete." (interactive "P")) - + (defun auto-show-make-point-visible (&optional ignore-arg) "This command is obsolete." (interactive)) diff --git a/lisp/obsolete/hilit19.el b/lisp/obsolete/hilit19.el index bc06583c694..d81955ff8cb 100644 --- a/lisp/obsolete/hilit19.el +++ b/lisp/obsolete/hilit19.el @@ -30,7 +30,7 @@ ;; not only source code highlighting, but also Info, RMAIL, VM, gnus... ;; Hilit19 knows (or thinks it knows) how to highlight emacs buffers in ;; about 25 different modes. -;; +;; ;; WHERE TO GET THE LATEST VERSIONS OF HILIT19.EL (beta and release): ;; ;; http://hackvan.com/pub/stig/src/elisp/ @@ -55,7 +55,7 @@ ;; GENERAL OVERVIEW ;; ;; This package installs numerous hooks to colorfully highlight your -;; source code buffers as well as mail and news buffers. Most +;; source code buffers as well as mail and news buffers. Most ;; programming languages have predefined highlighting patterns. ;; Just load hilit19 and files will be automatically highlighted as ;; they're loaded. @@ -69,27 +69,27 @@ ;; ;; Hilit19 can build faces by examining the names that you give to them ;; For example, green/black-bold-italic-underline would be created as -;; a face with a green foreground, and a black background, using a +;; a face with a green foreground, and a black background, using a ;; bold-italic font...with underlining for good measure. ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; SETUP -- In your .emacs: ;; -;; +;; ;; (cond (window-system ;; (setq hilit-mode-enable-list '(not text-mode) ;; hilit-background-mode 'light ;; hilit-inhibit-hooks nil ;; hilit-inhibit-rebinding nil) -;; +;; ;; (require 'hilit19) ;; )) -;; +;; ;; If you like font-lock-mode and want to use both packages, then you can ;; disable hilit for the modes in which you want to use font-lock by listing ;; said modes in hilit-mode-enable-list. -;; +;; ;; (hilit-translate type 'RoyalBlue ; enable highlighting in C/C++ ;; string nil) ; disable string highlighting ;; @@ -293,7 +293,7 @@ ;; ;;;;;; AND THIS CAN BE APPLIED TO VM 5.33L_19 -;; +;; ;; *** ../site/vm5.33L_19/vm-summary.el Fri Jun 4 22:17:11 1993 ;; --- ./vm-summary.el Tue Jun 22 16:39:30 1993 ;; *************** @@ -303,7 +303,7 @@ ;; (forward-char -2) ;; ! (and w vm-auto-center-summary (vm-auto-center-summary)))) ;; (and old-window (select-window old-window))))))) -;; +;; ;; (defun vm-mark-for-display-update (message) ;; --- 152,159 ---- ;; (insert "->") @@ -312,9 +312,9 @@ ;; ! (and w vm-auto-center-summary (vm-auto-center-summary)) ;; ! (run-hooks 'vm-summary-pointer-hook))) ;; (and old-window (select-window old-window))))))) -;; +;; ;; (defun vm-mark-for-display-update (message) -;; +;; ;;;;;; ;;; Code: @@ -468,16 +468,16 @@ your init file.") (keyword RoyalBlue cyan bold-italic) (label red-underline orange-underlined underline) (string grey40 orange underline) - + ;; some further faces for Ada (struct black-bold white-bold bold) (glob-struct magenta Plum1 default-bold-underline) (named-param DarkGoldenrod Goldenrod underline) - + ;; and another one for LaTeX (crossref DarkGoldenrod Goldenrod underline) (formula Goldenrod DarkGoldenrod underline) - + ;; compilation buffers (active-error default/pink-bold default/DeepPink-bold default-underline) (error red-bold yellow bold) @@ -485,7 +485,7 @@ your init file.") ;; Makefiles (some faces borrowed from C/C++ too) (rule blue-bold-underline cyan-underline default-bold-underline) - + ;; VM, GNUS and Text mode (msg-subject blue-bold yellow bold) (msg-from purple-bold green bold) @@ -512,7 +512,7 @@ your init file.") (dired-ignored ForestGreen moccasin nil) (dired-deleted red-bold-italic orange bold-italic) (dired-marked purple Plum1 nil) - + ;; Info-mode, and jargon-mode.el and prep.ai.mit.edu:/pub/gnu/jargon* (jargon-entry blue-bold cyan bold) (jargon-xref purple-bold Plum1 italic) @@ -557,9 +557,9 @@ See the documentation for hilit-lookup-face-create for names of valid faces." cmdl))) (cons 'progn cmdl))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; This function actually translates and then creates the faces... -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defun hilit-lookup-face-create (face &optional force) "Get a FACE, or create it if it doesn't exist. In order for it to @@ -589,7 +589,7 @@ See the documentation for hilit-translate and hilit-face-translation-table." (basefont (cdr (assq 'font (frame-parameters frame)))) error fgcolor bgcolor) (cond - ((or (null face) + ((or (null face) (memq face hilit-predefined-face-list)) ;; do nothing if the face is nil or if it's predefined. ) @@ -616,10 +616,10 @@ See the documentation for hilit-translate and hilit-face-translation-table." (and (match-beginning 1) "#") (substring fn (match-beginning 2) (match-end 2))) fn (substring fn (match-end 0)))) - + (and (string= "default" fgcolor) (setq fgcolor nil)) (and (string= "default" bgcolor) (setq bgcolor nil)) - + ;; catch errors if we can't allocate the color(s) (condition-case nil (progn (and fgcolor (set-face-foreground 'scratch-face fgcolor)) @@ -705,7 +705,7 @@ non-nil." (cond ((null patterns) (setq patterns (cdr (assq major-mode hilit-patterns-alist)))) ((symbolp patterns) - (setq patterns (cdr (assq patterns hilit-patterns-alist))))) + (setq patterns (cdr (assq patterns hilit-patterns-alist))))) ;; txt prop: (setq patterns (reverse patterns)) (let ((case-fold-search (car patterns)) (prio (1- (length patterns))) @@ -725,11 +725,11 @@ non-nil." (if (not face) ; skipped if nil nil (or quietly hilit-quietly - (message "highlighting %d: %s%s" prio pstart + (message "highlighting %d: %s%s" prio pstart (if (stringp pend) (concat " ... " pend) ""))) (goto-char (point-min)) (condition-case msg - (cond + (cond ((symbolp pstart) ;; inner loop -- special function to find pattern (let (region) @@ -799,7 +799,7 @@ non-nil." ;; Well, I want to remove this function...there's one sure way to find out if ;; anyone uses it or not...and that's to comment it out. -;; +;; ;; (defun hilit-toggle-highlight (arg) ;; "Locally toggle highlighting. With arg, forces highlighting off." ;; (interactive "P") @@ -835,7 +835,7 @@ prefix argument if that is specified. \t^U \\[hilit-repaint-command]\trepaint entire buffer \t^U - \\[hilit-repaint-command]\trepaint visible portion of buffer \t^U n \\[hilit-repaint-command]\trepaint n lines to either side of point" - (interactive "P") + (interactive "P") (let (st en quietly) (or arg (setq arg hilit-auto-rehighlight)) (cond ((or (eq arg 'visible) (eq arg '-)) @@ -878,7 +878,7 @@ the entire buffer is forced." ;;; this line highlighting stuff is untested. play with it only if you feel ;;; adventurous...don't ask me to fix it...though you're welcome to. -- Stig -;; +;; ;; (defun hilit-rehighlight-line-quietly (&rest args) ;; "Quietly rehighlight just this line. ;; Useful as an after change hook in VM/gnus summary buffers and dired buffers. @@ -887,7 +887,7 @@ the entire buffer is forced." ;; (push-mark nil t) ;; (hilit-rehighlight-yank-region) ;; (and orig-achange-function (apply orig-achange-function args)))) -;; +;; ;; (defun hilit-install-line-hooks () ;; (make-variable-buffer-local 'after-change-function) ;; (make-local-variable 'orig-achange-function) @@ -897,11 +897,11 @@ the entire buffer is forced." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Wysiwyg Stuff... take it away and build a whole package around it! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; +;; ;; ; For the Jargon-impaired, WYSIWYG === What You See Is What You Get ;; ; Sure, it sucks to type. Oh, well. ;; (defun hilit-wysiwyg-replace () -;; "Replace overstruck text with normal text that's been overlaid with the +;; "Replace overstruck text with normal text that's been overlaid with the ;; appropriate text attribute. Suitable for a find-file hook." ;; (save-excursion ;; (goto-char (point-min)) @@ -918,7 +918,7 @@ the entire buffer is forced." ;; (replace-match "") (forward-char)) ;; )) ;; (set-buffer-modified-p bmod)))) -;; +;; ;; ; is this more appropriate as a write-file-hook or a write-contents-hook? ;; (defun hilit-wysiwyg-write-repair () ;; "Replace wysiwyg overlays with overstrike text." @@ -942,11 +942,11 @@ the entire buffer is forced." ;; nil) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Initialization. +;; Initialization. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (and (not hilit-inhibit-rebinding) - (progn + (progn (substitute-key-definition 'yank 'hilit-yank (current-global-map)) (substitute-key-definition 'yank-pop 'hilit-yank-pop @@ -977,7 +977,7 @@ the entire buffer is forced." vm-show-message-hook rmail-show-message-hook - mail-setup-hook + mail-setup-hook mh-show-mode-hook dired-after-readin-hook @@ -994,7 +994,7 @@ the entire buffer is forced." ;;; inappropriate, but I don't know why I wanted hilit-patterns-alist to be ;;; reset on every reload... -(setq hilit-patterns-alist nil) +(setq hilit-patterns-alist nil) (defun hilit-associate (alist key val) "creates, or destructively replaces, the pair (key . val) in alist" @@ -1002,7 +1002,7 @@ the entire buffer is forced." (if oldentry (setcdr oldentry val) (set alist (cons (cons key val) (eval alist)))))) - + (defun hilit-set-mode-patterns (modelist patterns &optional parse-fn case-fold) "Sets the default highlighting patterns for MODE to PATTERNS. @@ -1016,7 +1016,7 @@ Takes optional arguments PARSE-FN and CASE-FOLD." (setcar (cdr p) 0)))) patterns) (setq patterns (cons case-fold patterns)) - + (or (consp modelist) (setq modelist (list modelist))) (let (ok (flip (eq (car hilit-mode-enable-list) 'not))) (mapcar (function @@ -1046,7 +1046,7 @@ Optionally, place the new pattern first in the pattern list" (hilit-set-mode-patterns mode (list new-pat))) (first (setcdr old-patterns (cons new-pat (cdr old-patterns)))) - (t + (t (nconc old-patterns (list new-pat))))) (and (interactive-p) (hilit-rehighlight-buffer))) @@ -1066,17 +1066,17 @@ number of backslashes." (skip-chars-backward "\\\\") (forward-char 1) (not (zerop (% (- en (point)) 2)))))) - (and en (cons st en)))) + (and en (cons st en)))) ;; return types on same line... ;; ("^[a-zA-z].*\\(\\w\\|[$_]\\)+\\s *\\(\\(\\w\\|[$_]\\)+\\s *((\\|(\\)[^)]*)+" nil defun) ;; On another note, a working pattern for grabbing function definitions for C is -;; +;; ;; ("^[a-zA-Z_]+.*[;{]$" nil ForestGreen) ; global defns ( start at col 1 ) ;; ("^[a-zA-Z_]+.*(" ")" defun) ;; ; defuns assumed to start at col 1, not with # or { -;; +;; ;; this will make external declarations/definitions green, and function ;; definitions the defun face. Hmmm - seems to work for me anyway. @@ -1179,7 +1179,7 @@ number of backslashes." ("\\(^[ \t]*[0-9]+\\|[ \t]continue[ \t\n]\\|format\\)" nil define) ("[ \t]\\(do\\|do[ \t]*[0-9]+\\|go[ \t]*to[ \t]*[0-9]+\\|end[ \t]*do\\|if\\|else[ \t]*if\\|then\\|else\\|end[ \t]*if\\)[ \t\n(]" nil define) ("[ \t]\\(call\\|program\\|subroutine\\|function\\|stop\\|return\\|end\\|include\\)[ \t\n]" nil include) - ("[ \t]\\(parameter[\t\n ]*([^)]*)\\|data\\|save\\|common[ \t\n]*/[^/]*/\\)" + ("[ \t]\\(parameter[\t\n ]*([^)]*)\\|data\\|save\\|common[ \t\n]*/[^/]*/\\)" nil decl) ("^ ." nil type) ("implicit[ \t]*none" nil decl) @@ -1249,7 +1249,7 @@ number of backslashes." ("[^\\]\\\\(" "\\\\)" formula) ; \( \) ("[^\\]\\\\\\[" "\\\\\\]" formula) ; \[ \] ("[^\\$]\\(\\$\\(\\$[^$]*\\$\\|[^$]*\\)\\$\\)" 1 formula) ; '$...$' or '$$...$$' - + ;; things that bring in external files ("\\\\\\(include\\|input\\|bibliography\\){" "}" include) @@ -1334,7 +1334,7 @@ number of backslashes." '( (";.*" nil comment) -;;; This almost works...but I think I'll stick with the parser function +;;; This almost works...but I think I'll stick with the parser function ;;;("[^?]\\(\"\\(\"\\||\\([^\"]+\\|[\\]\\([\\][\\]\\)*\"\\)*\"\\)\\)" 1 string) (hilit-string-find ?\\ string) @@ -1352,7 +1352,7 @@ number of backslashes." '( (";.*" nil comment) ("#|" "|#" comment) -;;; This almost works...but I think I'll stick with the parser function +;;; This almost works...but I think I'll stick with the parser function ;;;("[^?]\\(\"\\(\"\\||\\([^\"]+\\|[\\]\\([\\][\\]\\)*\"\\)*\"\\)\\)" 1 string) (hilit-string-find ?\\ string) @@ -1490,7 +1490,7 @@ number of backslashes." ;; Pascal, strings are delimited with ' and an embedded quote is doubled, ;; thus string syntax would be extremely simple. However, if a string ;; occurs within a comment, the following text is considered a string. -;; +;; ;; In Icon, strings are similar to C ones, but there are also charsets, ;; delimited with simple quotes. I could not manage to use both regexps at ;; the same time. diff --git a/lisp/obsolete/hscroll.el b/lisp/obsolete/hscroll.el index 996cd07c5e4..07a5f525720 100644 --- a/lisp/obsolete/hscroll.el +++ b/lisp/obsolete/hscroll.el @@ -28,9 +28,9 @@ ;;; Code: -;;; +;;; ;;; PUBLIC VARIABLES -;;; +;;; (defvar hscroll-version "0.0") @@ -48,7 +48,7 @@ to hscroll from your init file and code." :require 'hscroll :version "20.3") -(defcustom hscroll-margin 5 +(defcustom hscroll-margin 5 "*Obsolete." :group 'hscroll :type 'integer) @@ -68,9 +68,9 @@ to hscroll from your init file and code." :group 'hscroll :type 'string) -;;; +;;; ;;; PUBLIC COMMANDS -;;; +;;; ;;;###autoload (defun turn-on-hscroll () diff --git a/lisp/obsolete/ooutline.el b/lisp/obsolete/ooutline.el index ea7ac542031..55d6dafbdbe 100644 --- a/lisp/obsolete/ooutline.el +++ b/lisp/obsolete/ooutline.el @@ -50,7 +50,7 @@ in the file it applies to. See also outline-heading-end-regexp." ;; already assigned a local value to it. (or (default-value 'outline-regexp) (setq-default outline-regexp "[*\^L]+")) - + (defcustom outline-heading-end-regexp "[\n\^M]" "*Regular expression to match the end of a heading line. You can assume that point is at the beginning of a heading when this @@ -166,10 +166,10 @@ in the file it applies to." (defun outline-mode () "Set major mode for editing outlines with selective display. Headings are lines which start with asterisks: one for major headings, -two for subheadings, etc. Lines not starting with asterisks are body lines. +two for subheadings, etc. Lines not starting with asterisks are body lines. Body text or subheadings under a heading can be made temporarily -invisible, or visible again. Invisible lines are attached to the end +invisible, or visible again. Invisible lines are attached to the end of the heading, so they move with it, if the line is killed and yanked back. A heading with text hidden under it is marked with an ellipsis (...). @@ -533,7 +533,7 @@ Stop at the first and last subheadings of a superior heading." (outline-back-to-heading) (while (> arg 0) (let ((point-to-move-to (save-excursion - (outline-get-next-sibling)))) + (outline-get-next-sibling)))) (if point-to-move-to (progn (goto-char point-to-move-to) @@ -552,7 +552,7 @@ Stop at the first and last subheadings of a superior heading." (if (< (funcall outline-level) level) nil (point)))) - + (defun outline-backward-same-level (arg) "Move backward to the ARG'th subheading at same level as this one. Stop at the first and last subheadings of a superior heading." diff --git a/lisp/obsolete/rnews.el b/lisp/obsolete/rnews.el index 03f99ff9098..46b3f8c730f 100644 --- a/lisp/obsolete/rnews.el +++ b/lisp/obsolete/rnews.el @@ -105,7 +105,7 @@ if its GROUP-REGEXP matches the current newsgroup name.") (defvar news-mode-map nil) (defvar news-read-first-time-p t) -;; Contains the (dotified) news groups of which you are a member. +;; Contains the (dotified) news groups of which you are a member. (defvar news-user-group-list nil) (defvar news-current-news-group nil) @@ -133,7 +133,7 @@ Not currently used.") ;; association list in which we store lists of the form ;; (pointified-group-name (first last old-last)) (defvar news-group-article-assoc nil) - + (defvar news-current-message-number 0 "Displayed Article Number") (defvar news-total-current-group 0 "Total no of messages in group") @@ -337,7 +337,7 @@ C-c C-r caesar rotate all letters by 13 places in the article's body (rot13). g get new USENET news. f post a reply article to USENET. a post an original news article. -A add a newsgroup. +A add a newsgroup. o save the current article in the named file (append if file exists). C-o output this message to a Unix-format mail file (append it). c \"copy\" (actually link) current or prefix-arg msg to file. @@ -435,14 +435,14 @@ to a list (a . b)" (buffer-substring end endofline)))) (if (assoc tem news-group-article-assoc) (message "You are subscribed twice to %s; I ignore second" - tem) + tem) (setq temp-user-groups (cons tem temp-user-groups) news-group-article-assoc (cons (list tem (list (car range) (cdr range) (cdr range))) news-group-article-assoc))))) - (kill-buffer newsrcbuf))) + (kill-buffer newsrcbuf))) (setq temp-user-groups (nreverse temp-user-groups)) (message "Prefrobnicating...") (switch-to-buffer news-buffer) @@ -528,7 +528,7 @@ to a list (a . b)" (let ((file (concat news-path (string-subst-char ?/ ?. news-current-news-group) "/" arg))) - (if (= arg + (if (= arg (or (news-cadr (memq (news-cdar news-point-pdl) news-list-of-files)) 0)) (setcdr (car news-point-pdl) arg)) @@ -552,7 +552,7 @@ Negative ARG moves backward. If ARG is 1 or -1, moves to next or previous newsgroup if at end." (interactive "p") (let ((no (+ arg news-current-message-number))) - (if (or (< no news-current-group-begin) + (if (or (< no news-current-group-begin) (> no news-current-group-end)) (cond ((= arg 1) (news-set-current-group-certification) diff --git a/lisp/obsolete/rnewspost.el b/lisp/obsolete/rnewspost.el index 546195e37bd..9907f6df052 100644 --- a/lisp/obsolete/rnewspost.el +++ b/lisp/obsolete/rnewspost.el @@ -221,7 +221,7 @@ summary (abstract) of the message." ;; Avoid inserting a signature. (mail-signature)) (if (null to) - ;; this hack is needed so that inews wont be confused by + ;; this hack is needed so that inews wont be confused by ;; the fcc: and bcc: fields (let ((mail-self-blind nil) (mail-archive-file-name nil)) @@ -250,7 +250,7 @@ summary (abstract) of the message." (setq paragraph-separate (concat "^" actual-header-separator "$\\|" paragraph-separate))) (run-hooks 'news-setup-hook))) - + (defun news-inews () "Send a news message using inews." (interactive) @@ -271,8 +271,8 @@ summary (abstract) of the message." (insert ?\n)) (message "Posting to USENET...") (unwind-protect - (if (not (eq 0 - (call-process-region (point-min) (point-max) + (if (not (eq 0 + (call-process-region (point-min) (point-max) news-inews-program nil 0 nil "-h"))) ; take all header lines! ;@@ setting of subject and newsgroups still needed? diff --git a/lisp/obsolete/sun-curs.el b/lisp/obsolete/sun-curs.el index 3eedae9a8b8..2e9a4b220b0 100644 --- a/lisp/obsolete/sun-curs.el +++ b/lisp/obsolete/sun-curs.el @@ -39,7 +39,7 @@ (defvar sc::cursors nil "List of known cursors")) (defmacro defcursor (name x y string) - (if (not (memq name sc::cursors)) + (if (not (memq name sc::cursors)) (setq sc::cursors (cons name sc::cursors))) (list 'defconst name (list 'vector x y string))) @@ -108,20 +108,20 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" (delete-char -1) (insert char) (sc::goto-hotspot)) - + (defun sc::menu-function (window x y) (sun-menu-evaluate window (1+ x) y sc::menu)) (defmenu sc::menu ("Cursor Menu") ("Pack & Use" sc::pack-buffer-to-cursor) - ("Pack to Icon" sc::pack-buffer-to-icon + ("Pack to Icon" sc::pack-buffer-to-icon (sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*)) ("New Icon" call-interactively 'sc::make-cursor) - ("Edit Icon" sc:edit-cursor + ("Edit Icon" sc:edit-cursor (sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*)) ("Set Cursor" sc:set-cursor - (sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*)) + (sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*)) ("Reset Cursor" sc:set-cursor nil) ("Help" sc::edit-icon-help-menu) ("Quit" sc::quit-edit) @@ -153,7 +153,7 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" (defun sc::menu-choose-cursor (window x y) "Presents a menu of cursor names, and returns one or nil" - (let ((curs sc::cursors) + (let ((curs sc::cursors) (items)) (while curs (push (sc::menu-item-for-cursor (car curs)) items) @@ -200,7 +200,7 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" (aset icon 2 (mapconcat 'sc::pack-one-line "1234567890123456" "")) (sc::goto-hotspot) ) - + (defun sc::pack-one-line (dummy) (let* (char chr1 chr2) (setq char 0 chr1 (mapconcat 'sc::pack-one-char "12345678" "") chr1 char) @@ -212,7 +212,7 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" (defun sc::pack-one-char (dummy) "pack following char into char, unless eolp" (if (or (eolp) (char-equal (following-char) 32)) - (setq char (lsh char 1)) + (setq char (lsh char 1)) (setq char (1+ (lsh char 1)))) (if (not (eolp))(forward-char))) diff --git a/lisp/obsolete/sun-fns.el b/lisp/obsolete/sun-fns.el index 21b5146da55..df596563446 100644 --- a/lisp/obsolete/sun-fns.el +++ b/lisp/obsolete/sun-fns.el @@ -47,7 +47,7 @@ ;; These functions follow the sun-mouse-handler convention of being called ;; with three arguments: (window x-pos y-pos) ;; This makes it easy for a mouse executed command to know where the mouse is. -;; Use the macro "eval-in-window" to execute a function +;; Use the macro "eval-in-window" to execute a function ;; in a temporarily selected window. ;; ;; If you have a function that must be called with other arguments @@ -157,8 +157,8 @@ and put the region in the stuff buffer." (defun mouse-mark-thing (window x y) "Set point and mark to text object using syntax table. The resulting region is put in the sun-window stuff buffer. -Left or right Paren syntax marks an s-expression. -Clicking at the end of a line marks the line including a trailing newline. +Left or right Paren syntax marks an s-expression. +Clicking at the end of a line marks the line including a trailing newline. If it doesn't recognize one of these it marks the character at point." (mouse-move-point window x y) (if (eobp) (open-line 1)) @@ -197,7 +197,7 @@ If it doesn't recognize one of these it marks the character at point." (defun mouse-kill-thing-there (window x y) "Kill thing at mouse, leave point where it was. See mouse-mark-thing for a description of the objects recognized." - (eval-in-window window + (eval-in-window window (save-excursion (mouse-mark-thing window x y) (kill-region (region-beginning) (region-end)))) @@ -319,7 +319,7 @@ this command is insensitive to mouse location." (defun mouse-scroll-proportional (window x y) "Scrolls the window proportionally corresponding to window relative X divided by window width." - (eval-in-window window + (eval-in-window window (if (>= x (1- (window-width))) ;; When x is maximum (equal to or 1 less than window width), ;; goto end of buffer. We check for this special case @@ -382,7 +382,7 @@ relative X divided by window width." ("Minibuffer" mouse-help-region *menu-window* *menu-x* *menu-y* 'minibuffer) ) - + (defmenu emacs-quit-menu ("Suspend" suspend-emacstool) ("Quit" save-buffers-kill-emacs)) @@ -419,7 +419,7 @@ relative X divided by window width." ;;; ;;; minibuffer menu ;;; -(defmenu minibuffer-menu +(defmenu minibuffer-menu ("Minibuffer" message "Just some miscellaneous minibuffer commands") ("Stuff" sun-yank-selection) ("Do-It" exit-minibuffer) @@ -439,13 +439,13 @@ relative X divided by window width." (mouse-set-mark-and-stuff window (- x 6) 0)) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Buffer-mode Mouse commands -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defun Buffer-at-mouse (w x y) "Calls Buffer-menu-buffer from mouse click." - (save-window-excursion + (save-window-excursion (mouse-move-point w x y) (beginning-of-line) (Buffer-menu-buffer t))) @@ -474,7 +474,7 @@ relative X divided by window width." (mouse-move-point w x y) (Buffer-menu-execute) )) - + (defun enable-mouse-in-buffer-list () "Call this to enable mouse selections in *Buffer List* LEFT puts the indicated buffer in the selected window. @@ -486,7 +486,7 @@ To unmark a buffer marked for deletion, select it with LEFT." (list-buffers) ; Initialize *Buffer List* (set-buffer "*Buffer List*") (local-set-mouse '(text middle) 'mouse-buffer-bury) - (local-set-mouse '(text left) 'mouse-buffer-select) + (local-set-mouse '(text left) 'mouse-buffer-select) (local-set-mouse '(text right) 'mouse-buffer-delete) (local-set-mouse '(text middle right) 'mouse-buffer-execute) ) |