Mercurial > hg > xemacs-beta
view netinstall/netio.cc @ 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 | 3078fd1074e8 |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program 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 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* The purpose of this file is to coordinate the various access methods known to setup. To add a new method, create a pair of nio-*.[ch] files and add the logic to NetIO::open here */ #include "win32.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include "resource.h" #include "state.h" #include "msg.h" #include "netio.h" #include "nio-file.h" #include "nio-ie5.h" #include "nio-http.h" #include "nio-ftp.h" #include "dialog.h" #include "log.h" #include "port.h" NetIO::NetIO (char *Purl) { set_url (Purl); } NetIO::~NetIO () { if (url) free (url); if (proto) free (proto); if (host) free (host); if (path) free (path); } void NetIO::set_url (char *Purl) { char *bp, *ep, c; file_size = 0; url = _strdup (Purl); proto = 0; host = 0; port = 0; path = 0; bp = url; ep = strstr (bp, "://"); if (!ep) { path = url; return; } *ep = 0; proto = _strdup (bp); *ep = ':'; bp = ep+3; ep = bp + strcspn (bp, ":/"); c = *ep; *ep = 0; host = _strdup (bp); *ep = c; if (*ep == ':') { port = atoi (ep+1); ep = strchr (ep, '/'); } if (*ep) path = _strdup (ep); } int NetIO::ok () { return 0; } int NetIO::read (char *buf, int nbytes) { return 0; } NetIO * NetIO::open (char *url) { NetIO *rv = 0; enum {http, ftp, file} proto; if (strncmp (url, "http://", 7) == 0) proto = http; else if (strncmp (url, "ftp://", 6) == 0) proto = ftp; else proto = file; if (proto == file) rv = new NetIO_File (url); else if (net_method == IDC_NET_IE5) rv = new NetIO_IE5 (url); else if (net_method == IDC_NET_PROXY) rv = new NetIO_HTTP (url); else if (net_method == IDC_NET_DIRECT) { switch (proto) { case http: rv = new NetIO_HTTP (url); break; case ftp: rv = new NetIO_FTP (url); break; } } if (!rv->ok ()) { delete rv; return 0; } return rv; } static char **user, **passwd; static int loading = 0; static void check_if_enable_ok (HWND h) { int e = 0; if (*user && *passwd) e = 1; EnableWindow (GetDlgItem (h, IDOK), e); } static void load_dialog (HWND h) { loading = 1; eset (h, IDC_NET_USER, *user); eset (h, IDC_NET_PASSWD, *passwd); check_if_enable_ok (h); loading = 0; } static void save_dialog (HWND h) { *user = eget (h, IDC_NET_USER, *user); *passwd = eget (h, IDC_NET_PASSWD, *passwd); } static BOOL auth_cmd (HWND h, int id, HWND hwndctl, UINT code) { switch (id) { case IDC_NET_USER: case IDC_NET_PASSWD: if (code == EN_CHANGE && !loading) { save_dialog (h); check_if_enable_ok (h); } break; case IDOK: save_dialog (h); EndDialog (h, 0); break; case IDCANCEL: EndDialog (h, 1); exit_setup (1); break; } return FALSE; } static BOOL CALLBACK auth_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_INITDIALOG: load_dialog (h); return FALSE; case WM_COMMAND: return HANDLE_WM_COMMAND (h, wParam, lParam, auth_cmd); } return FALSE; } static int auth_common (HINSTANCE h, int id) { return DialogBox (h, MAKEINTRESOURCE (id), 0, auth_proc); } int NetIO::get_auth () { user = &net_user; passwd = &net_passwd; return auth_common (hinstance, IDD_NET_AUTH); } int NetIO::get_proxy_auth () { user = &net_proxy_user; passwd = &net_proxy_passwd; return auth_common (hinstance, IDD_PROXY_AUTH); }