/[emacs]/emacs/lisp/simple.el
ViewVC logotype

Diff of /emacs/lisp/simple.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.591 by rms, Tue Feb 4 10:41:10 2003 UTC revision 1.592 by lektu, Tue Feb 4 12:04:38 2003 UTC
# Line 955  as an argument limits undo to changes wi Line 955  as an argument limits undo to changes wi
955    (let ((modified (buffer-modified-p))    (let ((modified (buffer-modified-p))
956          (recent-save (recent-auto-save-p)))          (recent-save (recent-auto-save-p)))
957      (or (eq (selected-window) (minibuffer-window))      (or (eq (selected-window) (minibuffer-window))
958          (message (if (and transient-mark-mode mark-active)          (message (if (and transient-mark-mode mark-active)
959                       "Undo in region!"                       "Undo in region!"
960                     "Undo!")))                     "Undo!")))
961      (unless (eq last-command 'undo)      (unless (eq last-command 'undo)
# Line 1004  Some change-hooks test this variable to Line 1004  Some change-hooks test this variable to
1004  Call `undo-start' to get ready to undo recent changes,  Call `undo-start' to get ready to undo recent changes,
1005  then call `undo-more' one or more times to undo them."  then call `undo-more' one or more times to undo them."
1006    (or pending-undo-list    (or pending-undo-list
1007        (error (format "No further undo information%s"        (error (format "No further undo information%s"
1008                       (if (and transient-mark-mode mark-active)                       (if (and transient-mark-mode mark-active)
1009                           " for region" ""))))                           " for region" ""))))
1010    (let ((undo-in-progress t))    (let ((undo-in-progress t))
1011      (setq pending-undo-list (primitive-undo count pending-undo-list))))      (setq pending-undo-list (primitive-undo count pending-undo-list))))
# Line 1528  specifies the value of ERROR-BUFFER." Line 1528  specifies the value of ERROR-BUFFER."
1528                                           nil shell-command-switch command)))                                           nil shell-command-switch command)))
1529            ;; Report the output.            ;; Report the output.
1530            (with-current-buffer buffer            (with-current-buffer buffer
1531              (setq mode-line-process              (setq mode-line-process
1532                    (cond ((null exit-status)                    (cond ((null exit-status)
1533                           " - Error")                           " - Error")
1534                          ((stringp exit-status)                          ((stringp exit-status)
# Line 1765  Optional second argument REPLACE non-nil Line 1765  Optional second argument REPLACE non-nil
1765  the front of the kill ring, rather than being added to the list.  the front of the kill ring, rather than being added to the list.
1766    
1767  Optional third arguments YANK-HANDLER controls how the STRING is later  Optional third arguments YANK-HANDLER controls how the STRING is later
1768  inserted into a buffer; see `insert-for-yank' for details.    inserted into a buffer; see `insert-for-yank' for details.
1769  When a yank handler is specified, STRING must be non-empty (the yank  When a yank handler is specified, STRING must be non-empty (the yank
1770  handler is stored as a `yank-handler'text property on STRING).  handler is stored as a `yank-handler'text property on STRING).
1771    
# Line 1774  argument is not used by `insert-for-yank Line 1774  argument is not used by `insert-for-yank
1774  may access and use elements from the kill-ring directly, the STRING  may access and use elements from the kill-ring directly, the STRING
1775  argument should still be a \"useful\" string for such uses."  argument should still be a \"useful\" string for such uses."
1776    (if (> (length string) 0)    (if (> (length string) 0)
1777        (if yank-handler        (if yank-handler
1778            (put-text-property 0 1 'yank-handler yank-handler string)            (put-text-property 0 1 'yank-handler yank-handler string)
1779          (remove-list-of-text-properties 0 1 '(yank-handler) string))          (remove-list-of-text-properties 0 1 '(yank-handler) string))
1780      (if yank-handler      (if yank-handler
1781          (signal 'args-out-of-range          (signal 'args-out-of-range
1782                  (list string "yank-handler specified for empty string"))))                  (list string "yank-handler specified for empty string"))))
1783    (if (fboundp 'menu-bar-update-yank-menu)    (if (fboundp 'menu-bar-update-yank-menu)
1784        (menu-bar-update-yank-menu string (and replace (car kill-ring))))        (menu-bar-update-yank-menu string (and replace (car kill-ring))))
# Line 1798  Optional third argument YANK-HANDLER spe Line 1798  Optional third argument YANK-HANDLER spe
1798  property to be set on the combined kill ring string.  If the specified  property to be set on the combined kill ring string.  If the specified
1799  yank-handler arg differs from the yank-handler property of the latest  yank-handler arg differs from the yank-handler property of the latest
1800  kill string, STRING is added as a new kill ring element instead of  kill string, STRING is added as a new kill ring element instead of
1801  being appending to the last kill.  being appending to the last kill.
1802  If `interprogram-cut-function' is set, pass the resulting kill to it."  If `interprogram-cut-function' is set, pass the resulting kill to it."
1803    (let* ((cur (car kill-ring)))    (let* ((cur (car kill-ring)))
1804      (kill-new (if before-p (concat string cur) (concat cur string))      (kill-new (if before-p (concat string cur) (concat cur string))
# Line 1868  the text killed this time appends to the Line 1868  the text killed this time appends to the
1868  to make one entry in the kill ring.  to make one entry in the kill ring.
1869    
1870  In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler  In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler
1871  text property to be set on the killed text.  See `insert-for-yank'."  text property to be set on the killed text.  See `insert-for-yank'."
1872    (interactive "r")    (interactive "r")
1873    (condition-case nil    (condition-case nil
1874        (let ((string (delete-and-extract-region beg end)))        (let ((string (delete-and-extract-region beg end)))
# Line 2537  and it reactivates the mark. Line 2537  and it reactivates the mark.
2537  With prefix arg, `transient-mark-mode' is enabled temporarily."  With prefix arg, `transient-mark-mode' is enabled temporarily."
2538    (interactive "P")    (interactive "P")
2539    (if arg    (if arg
2540        (if mark-active        (if mark-active
2541            (if (null transient-mark-mode)            (if (null transient-mark-mode)
2542                (setq transient-mark-mode 'lambda))                (setq transient-mark-mode 'lambda))
2543          (setq arg nil)))          (setq arg nil)))
# Line 3152  Setting this variable automatically make Line 3152  Setting this variable automatically make
3152                 (not (and fill-indent-according-to-mode                 (not (and fill-indent-according-to-mode
3153                           (string-match "\\`[ \t]*\\'" prefix)))                           (string-match "\\`[ \t]*\\'" prefix)))
3154                 (setq fill-prefix prefix))))                 (setq fill-prefix prefix))))
3155          
3156        (while (and (not give-up) (> (current-column) fc))        (while (and (not give-up) (> (current-column) fc))
3157          ;; Determine where to split the line.          ;; Determine where to split the line.
3158          (let* (after-prefix          (let* (after-prefix
# Line 3740  With a prefix argument, set VARIABLE to Line 3740  With a prefix argument, set VARIABLE to
3740    
3741    (if make-local    (if make-local
3742        (make-local-variable var))        (make-local-variable var))
3743            
3744    (set var val)    (set var val)
3745    
3746    ;; Force a thorough redisplay for the case that the variable    ;; Force a thorough redisplay for the case that the variable
# Line 3908  to decide what to delete." Line 3908  to decide what to delete."
3908                   (not (equal buffer                   (not (equal buffer
3909                               (window-buffer (active-minibuffer-window))))))                               (window-buffer (active-minibuffer-window))))))
3910          (error "Minibuffer is not active for completion")          (error "Minibuffer is not active for completion")
3911        (unless (run-hook-with-args-until-success        (unless (run-hook-with-args-until-success
3912                 'choose-completion-string-functions                 'choose-completion-string-functions
3913                 choice buffer mini-p base-size)                 choice buffer mini-p base-size)
3914          ;; Insert the completion into the buffer where it was requested.          ;; Insert the completion into the buffer where it was requested.
# Line 4405  See also `normal-erase-is-backspace'." Line 4405  See also `normal-erase-is-backspace'."
4405  ;    (message "You cannot modify the prompt")))  ;    (message "You cannot modify the prompt")))
4406  ;  ;
4407  ;  ;
4408  ;(setq minibuffer-prompt-properties  ;(setq minibuffer-prompt-properties
4409  ;  (list 'modification-hooks '(minibuffer-prompt-modification)  ;  (list 'modification-hooks '(minibuffer-prompt-modification)
4410  ;       'insert-in-front-hooks '(minibuffer-prompt-insertion)))  ;       'insert-in-front-hooks '(minibuffer-prompt-insertion)))
4411  ;    ;
4412    
4413  (provide 'simple)  (provide 'simple)
4414  ;;; simple.el ends here  ;;; simple.el ends here

Legend:
Removed from v.1.591  
changed lines
  Added in v.1.592

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26