Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / category.h

diff --git a/src/category.h b/src/category.h
index 3b2e609bdd3235ccd6c6a53862d6d45685511a5a..ac79c13a83b9c1a21be303cbf57dbdfcb311110f 100644 (file)
--- a/src/category.h
+++ b/src/category.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* We introduce here three types of object: category, category set,
@@ -109,7 +109,7 @@ extern Lisp_Object _temp_category_set;
 #else
 #define CATEGORY_SET(c) \
   Faref (current_buffer->category_table, make_number (c))
-#endif   
+#endif
 
 /* Return the doc string of CATEGORY in category table TABLE.  */
 #define CATEGORY_DOCSTRING(table, category) \
@@ -129,3 +129,6 @@ extern Lisp_Object _temp_category_set;
    && word_boundary_p (c1, c2))
 
 extern int word_boundary_p P_ ((int, int));
+
+/* arch-tag: 309dfe83-c3e2-4d22-8e81-faae5aece0ff
+   (do not change this comment) */