;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Code:
(defalias-maybe 'int-char 'identity)
-(defalias-maybe 'characterp 'integerp)
+(defalias-maybe 'characterp
+ (cond
+ ((fboundp 'char-valid-p) 'char-valid-p)
+ (t 'integerp)))
-(defalias-maybe 'char-or-char-int-p 'integerp)
+(defalias-maybe 'char-or-char-int-p
+ (cond
+ ((fboundp 'char-valid-p) 'char-valid-p)
+ (t 'integerp)))
(defun-maybe char-octet (ch &optional n)
"Return the octet numbered N (should be 0 or 1) of char CH.