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.

/*
 * 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 download all the files we need to
   do the installation. */

#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>

#include "win32.h"

#include "resource.h"
#include "msg.h"
#include "ini.h"
#include "dialog.h"
#include "concat.h"
#include "geturl.h"
#include "state.h"
#include "mkdir.h"
#include "log.h"

static int
download_one (char *name, int expected_size)
{
  char *local = name;

  struct stat s;
  if (stat (local, &s) >= 0)
    if (s.st_size == expected_size)
      return 0;

  mkdir_p (0, local);

  if (get_url_to_file (concat (MIRROR_SITE, "/", name, 0),
		       concat (local, ".tmp", 0),
		       expected_size))
    {
      note (IDS_DOWNLOAD_FAILED, name);
      return 1;
    }
  else
    {
      stat (concat (local, ".tmp", 0), &s);
      if (s.st_size == expected_size)
	{
	  log (0, "Downloaded %s", local);
	  rename (concat (local, ".tmp", 0), local);
	}
      else
	{
	  log (0, "Download %s wrong size (%d actual vs %d expected)",
	       local, s.st_size, expected_size);
	  note (IDS_DOWNLOAD_SHORT, local, s.st_size, expected_size);
	  return 1;
	}
    }

  return 0;
}

void
do_download (HINSTANCE h)
{
  int i;
  int errors = 0;

  for (i=0; i<npackages; i++)
    if (package[i].action == ACTION_NEW || package[i].action == ACTION_UPGRADE)
      {
	int e = download_one (pi.install, pi.install_size);
	if (package[i].srcaction == SRCACTION_YES && pi.source)
	  e += download_one (pi.source, pi.source_size);
	errors += e;
	if (e)
	  package[i].action = ACTION_ERROR;
      }

  dismiss_url_status_dialog ();

  if (errors)
    {
      if (yesno (IDS_DOWNLOAD_INCOMPLETE) == IDYES)
	{
	  next_dialog = IDD_SITE;
	  return;
	}
    }

  if (source == IDC_SOURCE_DOWNLOAD)
    {
      if (errors)
	exit_msg = IDS_DOWNLOAD_INCOMPLETE;
      else
	exit_msg = IDS_DOWNLOAD_COMPLETE;
      next_dialog = 0;
    }
  else
    next_dialog = IDD_S_INSTALL;
}