From ddc040d686033f3acf32b3f5c18aee33dd63126c Mon Sep 17 00:00:00 2001 From: Chris Mann Date: Sun, 4 Jan 2009 12:49:28 +1030 Subject: [PATCH] * wesnoth-mode.el: Updated copyright information. * wesnoth-mode.texi: Updated copyright information and date. * wesnoth-update.el (wesnoth-create-wml-hash-table, wesnoth-macro-additions, wesnoth-merge-macro-data, wesnoth-merge-tag-data, wesnoth-update-project-information, wesnoth-refresh-wml-data): Updated doc-strings. --- wesnoth-mode.el | 4 ++-- wesnoth-mode.texi | 4 ++-- wesnoth-update.el | 19 +++++++++++++------ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/wesnoth-mode.el b/wesnoth-mode.el index 21bc64b..e3323d5 100644 --- a/wesnoth-mode.el +++ b/wesnoth-mode.el @@ -1,5 +1,5 @@ ;;; wesnoth-mode.el --- A major mode for editing WML. -;; Copyright (C) 2006, 2007, 2008 Chris Mann +;; Copyright (C) 2006, 2007, 2008, 2009 Chris Mann ;; This file is part of wesnoth-mode. @@ -831,7 +831,7 @@ for the matching tag." (if (save-excursion (beginning-of-line) (looking-at (wesnoth-element-opening))) (forward-line -1) - (when + (when (save-excursion (beginning-of-line) (looking-at (wesnoth-element-closing))) (setq skip nil)))) diff --git a/wesnoth-mode.texi b/wesnoth-mode.texi index bfe74bd..2a43dd3 100644 --- a/wesnoth-mode.texi +++ b/wesnoth-mode.texi @@ -4,7 +4,7 @@ @settitle Wesnoth Mode Manual @set VERSION 1.3.4 -@set DATE October 2008 +@set DATE January 2009 @dircategory Emacs @direntry @@ -20,7 +20,7 @@ @copying This manual is for Wesnoth Mode (version @value{VERSION}). -Copyright @copyright{} 2008 Chris Mann +Copyright @copyright{} 2008, 2009 Chris Mann @quotation This program is free software; you can redistribute it and/or modify it diff --git a/wesnoth-update.el b/wesnoth-update.el index 211e57f..a84c84b 100644 --- a/wesnoth-update.el +++ b/wesnoth-update.el @@ -1,5 +1,5 @@ ;;; wesnoth-update.el --- Update known WML data via existing valid WML. -;; Copyright (C) 2008 Chris Mann +;; Copyright (C) 2008, 2009 Chris Mann ;; This file is part of wesnoth-mode. @@ -122,7 +122,10 @@ This is relative to the wesnoth directory in `wesnoth-root-directory.'.") "Hash table of known WML tag data.") (defun wesnoth-create-wml-hash-table (tag-data &optional force) - "Handle generation of `wesnoth-tag-hash-table'." + "Handle generation of `wesnoth-tag-hash-table'. +TAG-DATA is the data to add to the hash-table. If FORCE is +non-nil, update the hash-table regardless of whether it replacing +any existing data." (when (or (= (hash-table-count wesnoth-tag-hash-table) 0) force) (clrhash wesnoth-tag-hash-table) @@ -281,7 +284,7 @@ MACRO-LIST is the variable to append macro information." (wesnoth-read-tmp-tag-data)) (defun wesnoth-macro-additions () - "Update WML macro information contained in `wesnoth-addition-file.'" + "Update WML macro information contained in `wesnoth-addition-file'." (setq wesnoth-tmp-macro-data nil) (wesnoth-determine-details wesnoth-addition-file @@ -328,7 +331,8 @@ Path to WML information included in wesnoth is set by (message "Updating WML information...done")) (defun wesnoth-merge-macro-data (&rest macro-data) - "Merge WML macro information sets and return the result." + "Merge WML macro information and return the result. +MACRO-DATA is the macro-data to merge." (let ((set-data '()) (macro-base-data (car macro-data))) (while (setq macro-data (cdr macro-data)) @@ -342,7 +346,8 @@ Path to WML information included in wesnoth is set by macro-base-data)) (defun wesnoth-merge-tag-data (&rest tag-data) - "Merge WML tag information sets and return the result." + "Merge WML tag information and return the result. +TAG-DATA is the tag-data to merge." (setq wesnoth-tmp-tag-data (car tag-data)) (let ((set-data '())) (while (setq tag-data (cdr tag-data)) @@ -362,7 +367,8 @@ Path to WML information included in wesnoth is set by (wesnoth-read-tmp-tag-data))) (defun wesnoth-update-project-information (&optional clear) - "Update WML macro information for the current project." + "Update WML macro information for the current project. +If CLEAR is non-nil, reset `wesnoth-local-macro-data'." (interactive "P") (setq wesnoth-tmp-macro-data nil) (if clear @@ -373,6 +379,7 @@ Path to WML information included in wesnoth is set by (setq wesnoth-tmp-macro-data nil))) (defun wesnoth-refresh-wml-data () + "Return merged WML tag data and WML data from the addition file." (save-match-data (let ((result (wesnoth-merge-tag-data wesnoth-tag-data (wesnoth-tag-additions)))) -- 2.11.4.GIT