Mercurial > hg > xemacs-beta
view lisp/gtk-password-dialog.el @ 4697:0d6d0edf1253
lisp beginning-end-of-defun-function Changelog entry
hg diff
diff -r ecc468b62551 lisp/ChangeLog
--- a/lisp/ChangeLog Mon Sep 21 21:40:35 2009 +0200
+++ b/lisp/ChangeLog Tue Sep 22 21:11:51 2009 +0200
@@ -1,3 +1,12 @@ 2009-09-20 Aidan Kehoe <kehoea@parhasa
+2009-09-22 Andreas Roehler <andreas.roehler@online.de>
+
+ * lisp.el (beginning-of-defun-raw):
+ new variable: beginning-of-defun-function,
+ beginning-of-defun may call FUNCTION determining start position
+ * lisp.el (end-of-defun):
+ new variable: end-of-defun-function,
+ end-of-defun may call FUNCTION determining the end position
+
;;;;;;;;;;;;;;;;;;;;;;;;
hg diff -p -r 4695 -r 4696
diff -r fee33ab25966 -r ecc468b62551 lisp/lisp.el
--- a/lisp/lisp.el Sun Sep 20 23:50:05 2009 +0100
+++ b/lisp/lisp.el Mon Sep 21 21:40:35 2009 +0200
@@ -155,6 +155,21 @@ Negative arg -N means kill N sexps after
(interactive "p")
(kill-sexp (- (or arg 1))))
+
+;; derived stuff from GNU Emacs
+(defvar beginning-of-defun-function nil
+ "If non-nil, function for `beginning-of-defun-raw' to call.
+This is used to find the beginning of the defun instead of using the
+normal recipe (see `beginning-of-defun'). Modes can define this
+if defining `defun-prompt-regexp' is not sufficient to handle the mode's
+needs.")
+
+(defvar end-of-defun-function nil
+ "If non-nil, function for `end-of-defun' to call.
+This is used to find the end of the defun instead of using the normal
+recipe (see `end-of-defun'). Modes can define this if the
+normal method is not appropriate.")
+
(defun beginning-of-defun (&optional arg)
"Move backward to the beginning of a defun.
With argument, do it that many times. Negative arg -N
@@ -175,13 +190,17 @@ This is identical to beginning-of-defun,
This is identical to beginning-of-defun, except that point does not move
to the beginning of the line when `defun-prompt-regexp' is non-nil."
(interactive "p")
- (and arg (< arg 0) (not (eobp)) (forward-char 1))
- (and (re-search-backward (if defun-prompt-regexp
- (concat "^\\s(\\|"
- "\\(" defun-prompt-regexp "\\)\\s(")
- "^\\s(")
- nil 'move (or arg 1))
- (progn (goto-char (1- (match-end 0)))) t))
+ ;; (and arg (< arg 0) (not (eobp)) (forward-char 1))
+ (unless arg (setq arg 1))
+ (cond
+ (beginning-of-defun-function
+ (funcall beginning-of-defun-function arg))
+ (t (re-search-backward (if defun-prompt-regexp
+ (concat "^\\s(\\|"
+ "\\(" defun-prompt-regexp "\\)\\s(")
+ "^\\s(")
+ nil 'move (or arg 1))
+ (progn (goto-char (1- (match-end 0)))) t)))
;; XEmacs change (optional buffer parameter)
(defun buffer-end (arg &optional buffer)
@@ -198,6 +217,10 @@ the open-parenthesis that starts a defun
;; XEmacs change (for zmacs regions)
(interactive "_p")
(if (or (null arg) (= arg 0)) (setq arg 1))
+ (if end-of-defun-function
+ (if (> arg 0)
+ (dotimes (i arg)
+ (funcall end-of-defun-function)))
(let ((first t))
(while (and (> arg 0) (< (point) (point-max)))
(let ((pos (point))) ; XEmacs -- remove unused npos.
@@ -229,7 +252,7 @@ the open-parenthesis that starts a defun
(if (looking-at "\\s<\\|\n")
(forward-line 1)))
(goto-char (point-min)))))
- (setq arg (1+ arg)))))
+ (setq arg (1+ arg))))))
(defun mark-defun ()
"Put mark at end of this defun, point at beginning.
| author | Andreas Roehler <andreas.roehler@online.de> |
|---|---|
| date | Tue, 22 Sep 2009 21:14:03 +0200 |
| parents | 7039e6323819 |
| children | 308d34e9f07d |
line wrap: on
line source
;;; gtk-password-dialog.el --- Reading passwords in a dialog ;; Copyright (C) 2000 Free Software Foundation, Inc. ;; Maintainer: William M. Perry <wmperry@gnu.org> ;; Keywords: extensions, internal ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. (globally-declare-fboundp '(gtk-dialog-new gtk-dialog-vbox gtk-dialog-action-area gtk-window-set-title gtk-button-new-with-label gtk-container-add gtk-signal-connect gtk-entry-get-text gtk-widget-destroy gtk-container-set-border-width gtk-label-new gtk-misc-set-alignment gtk-entry-new gtk-widget-set-sensitive gtk-entry-set-text gtk-entry-select-region)) (defun gtk-password-dialog-ok-button (dlg) (get dlg 'x-ok-button)) (defun gtk-password-dialog-cancel-button (dlg) (get dlg 'x-cancel-button)) (defun gtk-password-dialog-entry-widget (dlg) (get dlg 'x-initial-entry)) (defun gtk-password-dialog-confirmation-widget (dlg) (get dlg 'x-verify-entry)) (defun gtk-password-dialog-new (&rest keywords) ;; Format is (:keyword value ...) ;; Allowed keywords are: ;; ;; :callback function ;; :default string ;; :title string :; :prompt string ;; :default string ;; :verify boolean ;; :verify-prompt string (let* ((callback (plist-get keywords :callback 'ignore)) (dialog (gtk-dialog-new)) (vbox (gtk-dialog-vbox dialog)) (button-area (gtk-dialog-action-area dialog)) (default (plist-get keywords :default)) (widget nil)) (gtk-window-set-title dialog (plist-get keywords :title "Enter password...")) ;; Make us modal... (put dialog 'type 'dialog) ;; Put the buttons in the bottom (setq widget (gtk-button-new-with-label "OK")) (gtk-container-add button-area widget) (gtk-signal-connect widget 'clicked (lambda (button data) (funcall (car data) (gtk-entry-get-text (get (cdr data) 'x-initial-entry)))) (cons callback dialog)) (put dialog 'x-ok-button widget) (setq widget (gtk-button-new-with-label "Cancel")) (gtk-container-add button-area widget) (gtk-signal-connect widget 'clicked (lambda (button dialog) (gtk-widget-destroy dialog)) dialog) (put dialog 'x-cancel-button widget) ;; Now the entry area... (gtk-container-set-border-width vbox 5) (setq widget (gtk-label-new (plist-get keywords :prompt "Password:"))) (gtk-misc-set-alignment widget 0.0 0.5) (gtk-container-add vbox widget) (setq widget (gtk-entry-new)) (put widget 'visibility nil) (gtk-container-add vbox widget) (put dialog 'x-initial-entry widget) (if (plist-get keywords :verify) (let ((changed-cb (lambda (editable dialog) (gtk-widget-set-sensitive (get dialog 'x-ok-button) (equal (gtk-entry-get-text (get dialog 'x-initial-entry)) (gtk-entry-get-text (get dialog 'x-verify-entry))))))) (gtk-container-set-border-width vbox 5) (setq widget (gtk-label-new (plist-get keywords :verify-prompt "Verify:"))) (gtk-misc-set-alignment widget 0.0 0.5) (gtk-container-add vbox widget) (setq widget (gtk-entry-new)) (put widget 'visibility nil) (gtk-container-add vbox widget) (put dialog 'x-verify-entry widget) (gtk-signal-connect (get dialog 'x-initial-entry) 'changed changed-cb dialog) (gtk-signal-connect (get dialog 'x-verify-entry) 'changed changed-cb dialog) (gtk-widget-set-sensitive (get dialog 'x-ok-button) nil))) (if default (progn (gtk-entry-set-text (get dialog 'x-initial-entry) default) (gtk-entry-select-region (get dialog 'x-initial-entry) 0 (length default)))) dialog)) (provide 'gtk-password-dialog)